aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2012-05-31 19:33:55 -0700
committerH.J. Lu <hjl.tools@gmail.com>2012-05-31 19:33:55 -0700
commit57c6cf4038123982250af140c1ce18d872510d3e (patch)
treed2fabb6c9a721f86560e2a29a768123968f0f4cf
parent8eb6281eaadd5a71f04d5ec4c11da2339b382b10 (diff)
downloadglibc-57c6cf4038123982250af140c1ce18d872510d3e.tar
glibc-57c6cf4038123982250af140c1ce18d872510d3e.tar.gz
glibc-57c6cf4038123982250af140c1ce18d872510d3e.tar.bz2
glibc-57c6cf4038123982250af140c1ce18d872510d3e.zip
Use __SWORD_TYPE for __FSWORD_T_TYPE with -m32
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b8fdedac28..07521859e0 100644
--- 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 a52a1d3f6f..be8985b4c6 100644
--- 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