[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r18850 - in /fsf/trunk/libc: ./ include/ misc/ nptl/ nptl/sysdeps/unix/sysv/linux/i386/ nptl/sysdeps/unix/sysv/linux/i386/bi...
- To: commits@xxxxxxxxxx
- Subject: [Commits] r18850 - in /fsf/trunk/libc: ./ include/ misc/ nptl/ nptl/sysdeps/unix/sysv/linux/i386/ nptl/sysdeps/unix/sysv/linux/i386/bi...
- From: eglibc@xxxxxxxxxx
- Date: Thu, 31 May 2012 14:00:46 -0000
Author: eglibc
Date: Thu May 31 14:00:45 2012
New Revision: 18850
Log:
Import glibc-mainline for 2012-05-31
Added:
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/Implies
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/bits/
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/bits/pthreadtypes.h
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/bits/semaphore.h
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/Implies
fsf/trunk/libc/sysdeps/x86/bits/wordsize.h
fsf/trunk/libc/sysdeps/x86/bits/xtitypes.h
Removed:
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/bits/
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/bits/
fsf/trunk/libc/sysdeps/x86_64/bits/wordsize.h
fsf/trunk/libc/sysdeps/x86_64/bits/xtitypes.h
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/include/mntent.h
fsf/trunk/libc/misc/mntent_r.c
fsf/trunk/libc/nptl/ChangeLog
fsf/trunk/libc/sysdeps/sparc/sparc32/soft-fp/q_util.c
fsf/trunk/libc/sysdeps/sparc/sparc64/soft-fp/qp_util.c
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu May 31 14:00:45 2012
@@ -1,6 +1,29 @@
+2012-05-31 Marek Polacek <polacek@xxxxxxxxxx>
+
+ [BZ #14132]
+ * include/mntent.h (__setmntent_internal, __getmntent_r_internal
+ __endmntent_internal): Remove declaration.
+ (__setmntent, __endmntent, __getmntent_r) [NOT_IN_libc]: Remove macro.
+ (__setmntent, __endmntent, __getmntent_r): Declare hidden proto.
+ * misc/mntent_r.c: Replace INTDEF with libc_hidden_def.
+
+2012-05-30 David S. Miller <davem@xxxxxxxxxxxxx>
+
+ * sysdeps/sparc/sparc32/soft-fp/q_util.c
+ (___Q_simulate_exceptions): Use real FP ops rather than writing
+ into the %fsr.
+ * sysdeps/sparc/sparc32/soft-fp/q_util.c (__Qp_handle_exceptions):
+ Likewise.
+
2012-05-30 H.J. Lu <hongjiu.lu@xxxxxxxxx>
[BZ #14117]
+ * sysdeps/x86_64/bits/xtitypes.h: Renamed to ...
+ * sysdeps/x86/bits/xtitypes.h: This.
+
+ * sysdeps/x86_64/bits/wordsize.h: Renamed to ...
+ * sysdeps/x86/bits/wordsize.h: This.
+
* sysdeps/i386/bits/huge_vall.h: Renamed to ...
* sysdeps/x86/bits/huge_vall.h: This.
Modified: fsf/trunk/libc/include/mntent.h
==============================================================================
--- fsf/trunk/libc/include/mntent.h (original)
+++ fsf/trunk/libc/include/mntent.h Thu May 31 14:00:45 2012
@@ -3,24 +3,15 @@
/* Now define the internal interfaces. */
extern FILE *__setmntent (const char *__file, const char *__mode);
-extern FILE *__setmntent_internal (const char *__file, const char *__mode);
extern struct mntent *__getmntent_r (FILE *__stream,
struct mntent *__result,
char *__buffer, int __bufsize);
-extern struct mntent *__getmntent_r_internal (FILE *__stream,
- struct mntent *__result,
- char *__buffer, int __bufsize)
- attribute_hidden;
extern int __addmntent (FILE *__stream, const struct mntent *__mnt);
extern int __endmntent (FILE *__stream);
-extern int __endmntent_internal (FILE *__stream) attribute_hidden;
extern char *__hasmntopt (const struct mntent *__mnt, const char *__opt);
-#ifndef NOT_IN_libc
-# define __setmntent(file, mode) INTUSE(__setmntent) (file, mode)
-# define __endmntent(stream) INTUSE(__endmntent) (stream)
-# define __getmntent_r(stream, result, buffer, bufsize) \
- INTUSE(__getmntent_r) (stream, result, buffer, bufsize)
-#endif
+libc_hidden_proto (__setmntent)
+libc_hidden_proto (__getmntent_r)
+libc_hidden_proto (__endmntent)
#endif
Modified: fsf/trunk/libc/misc/mntent_r.c
==============================================================================
--- fsf/trunk/libc/misc/mntent_r.c (original)
+++ fsf/trunk/libc/misc/mntent_r.c Thu May 31 14:00:45 2012
@@ -1,6 +1,5 @@
/* Utilities for reading/writing fstab, mtab, etc.
- Copyright (C) 1995-2000, 2001, 2002, 2003, 2006, 2010, 2011
- Free Software Foundation, Inc.
+ Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -49,7 +48,7 @@
return result;
}
-INTDEF(__setmntent)
+libc_hidden_def (__setmntent)
weak_alias (__setmntent, setmntent)
@@ -61,7 +60,7 @@
fclose (stream);
return 1; /* SunOS 4.x says to always return 1 */
}
-INTDEF(__endmntent)
+libc_hidden_def (__endmntent)
weak_alias (__endmntent, endmntent)
@@ -178,7 +177,7 @@
return mp;
}
-INTDEF(__getmntent_r)
+libc_hidden_def (__getmntent_r)
weak_alias (__getmntent_r, getmntent_r)
Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Thu May 31 14:00:45 2012
@@ -1,3 +1,17 @@
+2012-05-30 H.J. Lu <hongjiu.lu@xxxxxxxxx>
+
+ [BZ #14117]
+ * sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h: Removed.
+ * sysdeps/unix/sysv/linux/i386/bits/semaphore.h: Likewise.
+ * sysdeps/unix/sysv/linux/i386/Implies: New file.
+ * sysdeps/unix/sysv/linux/x86_64/Implies: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h: Renamed
+ to ...
+ * sysdeps/unix/sysv/linux/x86/bits/pthreadtypes.h: This.
+ * sysdeps/unix/sysv/linux/x86_64/bits/semaphore.h: Renamed
+ to ...
+ * sysdeps/unix/sysv/linux/x86/bits/semaphore.h: This.
+
2012-05-30 Andreas Schwab <schwab@xxxxxxxxxxxxxx>
[BZ #14132]
Added: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/Implies
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/Implies (added)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/Implies Thu May 31 14:00:45 2012
@@ -1,0 +1,1 @@
+unix/sysv/linux/x86
Added: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/bits/pthreadtypes.h
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/bits/pthreadtypes.h (added)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/bits/pthreadtypes.h Thu May 31 14:00:45 2012
@@ -1,0 +1,240 @@
+/* Copyright (C) 2002-2007, 2012 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef _BITS_PTHREADTYPES_H
+#define _BITS_PTHREADTYPES_H 1
+
+#include <bits/wordsize.h>
+
+#ifdef __x86_64__
+# if __WORDSIZE == 64
+# define __SIZEOF_PTHREAD_ATTR_T 56
+# define __SIZEOF_PTHREAD_MUTEX_T 40
+# define __SIZEOF_PTHREAD_MUTEXATTR_T 4
+# define __SIZEOF_PTHREAD_COND_T 48
+# define __SIZEOF_PTHREAD_CONDATTR_T 4
+# define __SIZEOF_PTHREAD_RWLOCK_T 56
+# define __SIZEOF_PTHREAD_RWLOCKATTR_T 8
+# define __SIZEOF_PTHREAD_BARRIER_T 32
+# define __SIZEOF_PTHREAD_BARRIERATTR_T 4
+# else
+# define __SIZEOF_PTHREAD_ATTR_T 32
+# define __SIZEOF_PTHREAD_MUTEX_T 32
+# define __SIZEOF_PTHREAD_MUTEXATTR_T 4
+# define __SIZEOF_PTHREAD_COND_T 48
+# define __SIZEOF_PTHREAD_CONDATTR_T 4
+# define __SIZEOF_PTHREAD_RWLOCK_T 44
+# define __SIZEOF_PTHREAD_RWLOCKATTR_T 8
+# define __SIZEOF_PTHREAD_BARRIER_T 20
+# define __SIZEOF_PTHREAD_BARRIERATTR_T 4
+# endif
+#else
+# define __SIZEOF_PTHREAD_ATTR_T 36
+# define __SIZEOF_PTHREAD_MUTEX_T 24
+# define __SIZEOF_PTHREAD_MUTEXATTR_T 4
+# define __SIZEOF_PTHREAD_COND_T 48
+# define __SIZEOF_PTHREAD_CONDATTR_T 4
+# define __SIZEOF_PTHREAD_RWLOCK_T 32
+# define __SIZEOF_PTHREAD_RWLOCKATTR_T 8
+# define __SIZEOF_PTHREAD_BARRIER_T 20
+# define __SIZEOF_PTHREAD_BARRIERATTR_T 4
+#endif
+
+
+/* Thread identifiers. The structure of the attribute type is not
+ exposed on purpose. */
+typedef unsigned long int pthread_t;
+
+
+union pthread_attr_t
+{
+ char __size[__SIZEOF_PTHREAD_ATTR_T];
+ long int __align;
+};
+#ifndef __have_pthread_attr_t
+typedef union pthread_attr_t pthread_attr_t;
+# define __have_pthread_attr_t 1
+#endif
+
+
+#ifdef __x86_64__
+typedef struct __pthread_internal_list
+{
+ struct __pthread_internal_list *__prev;
+ struct __pthread_internal_list *__next;
+} __pthread_list_t;
+#else
+typedef struct __pthread_internal_slist
+{
+ struct __pthread_internal_slist *__next;
+} __pthread_slist_t;
+#endif
+
+
+/* Data structures for mutex handling. The structure of the attribute
+ type is not exposed on purpose. */
+typedef union
+{
+ struct __pthread_mutex_s
+ {
+ int __lock;
+ unsigned int __count;
+ int __owner;
+#ifdef __x86_64__
+ unsigned int __nusers;
+#endif
+ /* KIND must stay at this position in the structure to maintain
+ binary compatibility. */
+ int __kind;
+#ifdef __x86_64__
+ int __spins;
+ __pthread_list_t __list;
+# define __PTHREAD_MUTEX_HAVE_PREV 1
+#else
+ unsigned int __nusers;
+ __extension__ union
+ {
+ int __spins;
+ __pthread_slist_t __list;
+ };
+#endif
+ } __data;
+ char __size[__SIZEOF_PTHREAD_MUTEX_T];
+ long int __align;
+} pthread_mutex_t;
+
+typedef union
+{
+ char __size[__SIZEOF_PTHREAD_MUTEXATTR_T];
+ int __align;
+} pthread_mutexattr_t;
+
+
+/* Data structure for conditional variable handling. The structure of
+ the attribute type is not exposed on purpose. */
+typedef union
+{
+ struct
+ {
+ int __lock;
+ unsigned int __futex;
+ __extension__ unsigned long long int __total_seq;
+ __extension__ unsigned long long int __wakeup_seq;
+ __extension__ unsigned long long int __woken_seq;
+ void *__mutex;
+ unsigned int __nwaiters;
+ unsigned int __broadcast_seq;
+ } __data;
+ char __size[__SIZEOF_PTHREAD_COND_T];
+ __extension__ long long int __align;
+} pthread_cond_t;
+
+typedef union
+{
+ char __size[__SIZEOF_PTHREAD_CONDATTR_T];
+ int __align;
+} pthread_condattr_t;
+
+
+/* Keys for thread-specific data */
+typedef unsigned int pthread_key_t;
+
+
+/* Once-only execution */
+typedef int pthread_once_t;
+
+
+#if defined __USE_UNIX98 || defined __USE_XOPEN2K
+/* Data structure for read-write lock variable handling. The
+ structure of the attribute type is not exposed on purpose. */
+typedef union
+{
+# ifdef __x86_64__
+ struct
+ {
+ int __lock;
+ unsigned int __nr_readers;
+ unsigned int __readers_wakeup;
+ unsigned int __writer_wakeup;
+ unsigned int __nr_readers_queued;
+ unsigned int __nr_writers_queued;
+ int __writer;
+ int __shared;
+ unsigned long int __pad1;
+ unsigned long int __pad2;
+ /* FLAGS must stay at this position in the structure to maintain
+ binary compatibility. */
+ unsigned int __flags;
+# define __PTHREAD_RWLOCK_INT_FLAGS_SHARED 1
+ } __data;
+# else
+ struct
+ {
+ int __lock;
+ unsigned int __nr_readers;
+ unsigned int __readers_wakeup;
+ unsigned int __writer_wakeup;
+ unsigned int __nr_readers_queued;
+ unsigned int __nr_writers_queued;
+ /* FLAGS must stay at this position in the structure to maintain
+ binary compatibility. */
+ unsigned char __flags;
+ unsigned char __shared;
+ unsigned char __pad1;
+ unsigned char __pad2;
+ int __writer;
+ } __data;
+# endif
+ char __size[__SIZEOF_PTHREAD_RWLOCK_T];
+ long int __align;
+} pthread_rwlock_t;
+
+typedef union
+{
+ char __size[__SIZEOF_PTHREAD_RWLOCKATTR_T];
+ long int __align;
+} pthread_rwlockattr_t;
+#endif
+
+
+#ifdef __USE_XOPEN2K
+/* POSIX spinlock data type. */
+typedef volatile int pthread_spinlock_t;
+
+
+/* POSIX barriers data type. The structure of the type is
+ deliberately not exposed. */
+typedef union
+{
+ char __size[__SIZEOF_PTHREAD_BARRIER_T];
+ long int __align;
+} pthread_barrier_t;
+
+typedef union
+{
+ char __size[__SIZEOF_PTHREAD_BARRIERATTR_T];
+ int __align;
+} pthread_barrierattr_t;
+#endif
+
+
+#ifndef __x86_64__
+/* Extra attributes for the cleanup functions. */
+# define __cleanup_fct_attribute __attribute__ ((__regparm__ (1)))
+#endif
+
+#endif /* bits/pthreadtypes.h */
Added: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/bits/semaphore.h
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/bits/semaphore.h (added)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/bits/semaphore.h Thu May 31 14:00:45 2012
@@ -1,0 +1,40 @@
+/* Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef _SEMAPHORE_H
+# error "Never use <bits/semaphore.h> directly; include <semaphore.h> instead."
+#endif
+
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 64
+# define __SIZEOF_SEM_T 32
+#else
+# define __SIZEOF_SEM_T 16
+#endif
+
+
+/* Value returned if `sem_open' failed. */
+#define SEM_FAILED ((sem_t *) 0)
+
+
+typedef union
+{
+ char __size[__SIZEOF_SEM_T];
+ long int __align;
+} sem_t;
Added: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/Implies
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/Implies (added)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/Implies Thu May 31 14:00:45 2012
@@ -1,0 +1,1 @@
+unix/sysv/linux/x86
Modified: fsf/trunk/libc/sysdeps/sparc/sparc32/soft-fp/q_util.c
==============================================================================
--- fsf/trunk/libc/sysdeps/sparc/sparc32/soft-fp/q_util.c (original)
+++ fsf/trunk/libc/sysdeps/sparc/sparc32/soft-fp/q_util.c Thu May 31 14:00:45 2012
@@ -19,25 +19,44 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+#include <float.h>
+#include <math.h>
+#include <assert.h>
#include "soft-fp.h"
unsigned long long ___Q_zero = 0x0000000000000000ULL;
void ___Q_simulate_exceptions(int exceptions)
{
- fpu_control_t fcw;
- int tem, ou;
-
- _FPU_GETCW(fcw);
-
- tem = (fcw >> 23) & 0x1f;
-
- ou = exceptions & (FP_EX_OVERFLOW | FP_EX_UNDERFLOW);
- if (ou & tem)
- exceptions &= ~FP_EX_INVALID;
-
- fcw &= ~0x1f;
- fcw |= (exceptions | (exceptions << 5));
-
- _FPU_SETCW(fcw);
+ if (exceptions & FP_EX_INVALID)
+ {
+ float f = 0.0;
+ __asm__ __volatile__ ("fdivs %0, %0, %0" : "+f" (f));
+ }
+ if (exceptions & FP_EX_DIVZERO)
+ {
+ float f = 1.0, g = 0.0;
+ __asm__ __volatile__ ("fdivs %0, %1, %0"
+ : "+f" (f)
+ : "f" (g));
+ }
+ if (exceptions & FP_EX_OVERFLOW)
+ {
+ float f = FLT_MAX;
+ __asm__ __volatile__("fmuls %0, %0, %0" : "+f" (f));
+ exceptions &= ~FP_EX_INEXACT;
+ }
+ if (exceptions & FP_EX_UNDERFLOW)
+ {
+ float f = FLT_MIN;
+ __asm__ __volatile__("fmuls %0, %0, %0" : "+f" (f));
+ exceptions &= ~FP_EX_INEXACT;
+ }
+ if (exceptions & FP_EX_INEXACT)
+ {
+ double d = 1.0, e = M_PI;
+ __asm__ __volatile__ ("fdivd %0, %1, %0"
+ : "+f" (d)
+ : "f" (e));
+ }
}
Modified: fsf/trunk/libc/sysdeps/sparc/sparc64/soft-fp/qp_util.c
==============================================================================
--- fsf/trunk/libc/sysdeps/sparc/sparc64/soft-fp/qp_util.c (original)
+++ fsf/trunk/libc/sysdeps/sparc/sparc64/soft-fp/qp_util.c Thu May 31 14:00:45 2012
@@ -19,23 +19,42 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+#include <float.h>
+#include <math.h>
+#include <assert.h>
#include "soft-fp.h"
void __Qp_handle_exceptions(int exceptions)
{
- fpu_control_t fcw;
- int tem, ou;
-
- _FPU_GETCW(fcw);
-
- tem = (fcw >> 23) & 0x1f;
-
- ou = exceptions & (FP_EX_OVERFLOW | FP_EX_UNDERFLOW);
- if (ou & tem)
- exceptions &= ~FP_EX_INVALID;
-
- fcw &= ~0x1f;
- fcw |= (exceptions | (exceptions << 5));
-
- _FPU_SETCW(fcw);
+ if (exceptions & FP_EX_INVALID)
+ {
+ float f = 0.0;
+ __asm__ __volatile__ ("fdivs %0, %0, %0" : "+f" (f));
+ }
+ if (exceptions & FP_EX_DIVZERO)
+ {
+ float f = 1.0, g = 0.0;
+ __asm__ __volatile__ ("fdivs %0, %1, %0"
+ : "+f" (f)
+ : "f" (g));
+ }
+ if (exceptions & FP_EX_OVERFLOW)
+ {
+ float f = FLT_MAX;
+ __asm__ __volatile__("fmuls %0, %0, %0" : "+f" (f));
+ exceptions &= ~FP_EX_INEXACT;
+ }
+ if (exceptions & FP_EX_UNDERFLOW)
+ {
+ float f = FLT_MIN;
+ __asm__ __volatile__("fmuls %0, %0, %0" : "+f" (f));
+ exceptions &= ~FP_EX_INEXACT;
+ }
+ if (exceptions & FP_EX_INEXACT)
+ {
+ double d = 1.0, e = M_PI;
+ __asm__ __volatile__ ("fdivd %0, %1, %0"
+ : "+f" (d)
+ : "f" (e));
+ }
}
Added: fsf/trunk/libc/sysdeps/x86/bits/wordsize.h
==============================================================================
--- fsf/trunk/libc/sysdeps/x86/bits/wordsize.h (added)
+++ fsf/trunk/libc/sysdeps/x86/bits/wordsize.h Thu May 31 14:00:45 2012
@@ -1,0 +1,13 @@
+/* Determine the wordsize from the preprocessor defines. */
+
+#if defined __x86_64__ && !defined __ILP32__
+# define __WORDSIZE 64
+#else
+# define __WORDSIZE 32
+#endif
+
+#ifdef __x86_64__
+# define __WORDSIZE_TIME64_COMPAT32 1
+/* Both x86-64 and x32 use the 64-bit system call interface. */
+# define __SYSCALL_WORDSIZE 64
+#endif
Added: fsf/trunk/libc/sysdeps/x86/bits/xtitypes.h
==============================================================================
--- fsf/trunk/libc/sysdeps/x86/bits/xtitypes.h (added)
+++ fsf/trunk/libc/sysdeps/x86/bits/xtitypes.h Thu May 31 14:00:45 2012
@@ -1,0 +1,33 @@
+/* bits/xtitypes.h -- Define some types used by <bits/stropts.h>. x86-64.
+ Copyright (C) 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef _STROPTS_H
+# error "Never include <bits/xtitypes.h> directly; use <stropts.h> instead."
+#endif
+
+#ifndef _BITS_XTITYPES_H
+#define _BITS_XTITYPES_H 1
+
+#include <bits/types.h>
+
+/* This type is used by some structs in <bits/stropts.h>. */
+typedef __SLONG32_TYPE __t_scalar_t;
+typedef __ULONG32_TYPE __t_uscalar_t;
+
+
+#endif /* bits/xtitypes.h */
Removed: fsf/trunk/libc/sysdeps/x86_64/bits/wordsize.h
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/bits/wordsize.h (original)
+++ fsf/trunk/libc/sysdeps/x86_64/bits/wordsize.h (removed)
@@ -1,13 +1,0 @@
-/* Determine the wordsize from the preprocessor defines. */
-
-#if defined __x86_64__ && !defined __ILP32__
-# define __WORDSIZE 64
-#else
-# define __WORDSIZE 32
-#endif
-
-#ifdef __x86_64__
-# define __WORDSIZE_TIME64_COMPAT32 1
-/* Both x86-64 and x32 use the 64-bit system call interface. */
-# define __SYSCALL_WORDSIZE 64
-#endif
Removed: fsf/trunk/libc/sysdeps/x86_64/bits/xtitypes.h
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/bits/xtitypes.h (original)
+++ fsf/trunk/libc/sysdeps/x86_64/bits/xtitypes.h (removed)
@@ -1,33 +1,0 @@
-/* bits/xtitypes.h -- Define some types used by <bits/stropts.h>. x86-64.
- Copyright (C) 2002 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
-#ifndef _STROPTS_H
-# error "Never include <bits/xtitypes.h> directly; use <stropts.h> instead."
-#endif
-
-#ifndef _BITS_XTITYPES_H
-#define _BITS_XTITYPES_H 1
-
-#include <bits/types.h>
-
-/* This type is used by some structs in <bits/stropts.h>. */
-typedef __SLONG32_TYPE __t_scalar_t;
-typedef __ULONG32_TYPE __t_uscalar_t;
-
-
-#endif /* bits/xtitypes.h */
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits