Use __SWORD_TYPE for __FSWORD_T_TYPE with -m32

diff --git a/ChangeLog b/ChangeLog
index b8fdedac28017d2ee1c3cf12338432aa0e1d81cc..07521859e0730e5257d071e62435cce4fe6144c4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-05-31  H.J. Lu  <hongjiu.lu@intel.com>
 
+       [BZ #14183]
+       * sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h (__FSWORD_T_TYPE):
+       Defined with __SWORD_TYPE if __x86_64__ isn't defined.
+
        [BZ #14117]
        * sysdeps/unix/sysv/linux/x86_64/bits/siginfo.h: Renamed to ...
        * sysdeps/unix/sysv/linux/x86/bits/siginfo.h: This.

diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h b/sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h
index a52a1d3f6f9262faaa604ec97be9217aad3207eb..be8985b4c65f97b6354bc1dae6473a21f2278ba7 100644 (file)
--- a/sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h
@@ -43,8 +43,10 @@
 #define __MODE_T_TYPE          __U32_TYPE
 #ifdef __x86_64__
 # define __NLINK_T_TYPE                __SYSCALL_ULONG_TYPE
+# define __FSWORD_T_TYPE       __SYSCALL_SLONG_TYPE
 #else
 # define __NLINK_T_TYPE                __UWORD_TYPE
+# define __FSWORD_T_TYPE       __SWORD_TYPE
 #endif
 #define __OFF_T_TYPE           __SYSCALL_SLONG_TYPE
 #define __OFF64_T_TYPE         __SQUAD_TYPE
@@ -57,7 +59,6 @@
 #define __FSBLKCNT64_T_TYPE    __UQUAD_TYPE
 #define __FSFILCNT_T_TYPE      __SYSCALL_ULONG_TYPE
 #define __FSFILCNT64_T_TYPE    __UQUAD_TYPE
-#define __FSWORD_T_TYPE                __SYSCALL_SLONG_TYPE
 #define __ID_T_TYPE            __U32_TYPE
 #define __CLOCK_T_TYPE         __SYSCALL_SLONG_TYPE
 #define __TIME_T_TYPE          __SYSCALL_SLONG_TYPE