diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-05-30 11:35:47 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-05-30 11:35:47 -0700 |
| commit | d5c908673413571d74a93af05cc29880697c04b0 (patch) | |
| tree | acdfddf3c5fe622e83d07bbe219e3b79a19039b0 | |
| parent | 8d8f2279e7dc2b0bd3e605d017d52ce0094834fd (diff) | |
| download | glibc-d5c908673413571d74a93af05cc29880697c04b0.tar.gz glibc-d5c908673413571d74a93af05cc29880697c04b0.tar.xz glibc-d5c908673413571d74a93af05cc29880697c04b0.zip | |
Use __UWORD_TYPE for __NLINK_T_TYPE with -m32
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 053e623dc5..42df8d72b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-05-30 H.J. Lu <hongjiu.lu@intel.com> + + [BZ #14183] + * sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h (__NLINK_T_TYPE): + Defined with __UWORD_TYPE if __x86_64__ isn't defined. + 2012-05-30 Richard Henderson <rth@twiddle.net> * sysdeps/unix/make-syscalls.sh: Protect symbol_version output diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h b/sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h index cbad9a3b15..a52a1d3f6f 100644 --- a/sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h +++ b/sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h @@ -41,7 +41,11 @@ #define __INO_T_TYPE __SYSCALL_ULONG_TYPE #define __INO64_T_TYPE __UQUAD_TYPE #define __MODE_T_TYPE __U32_TYPE -#define __NLINK_T_TYPE __SYSCALL_ULONG_TYPE +#ifdef __x86_64__ +# define __NLINK_T_TYPE __SYSCALL_ULONG_TYPE +#else +# define __NLINK_T_TYPE __UWORD_TYPE +#endif #define __OFF_T_TYPE __SYSCALL_SLONG_TYPE #define __OFF64_T_TYPE __SQUAD_TYPE #define __PID_T_TYPE __S32_TYPE |