From: H.J. Lu Date: Wed, 30 May 2012 18:35:47 +0000 (-0700) Subject: Use __UWORD_TYPE for __NLINK_T_TYPE with -m32 X-Git-Tag: glibc-2.16-tps~129 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5c908673413571d74a93af05cc29880697c04b0;p=thirdparty%2Fglibc.git Use __UWORD_TYPE for __NLINK_T_TYPE with -m32 --- diff --git a/ChangeLog b/ChangeLog index 053e623dc5b..42df8d72b5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-05-30 H.J. Lu + + [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 * 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 cbad9a3b151..a52a1d3f6f9 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