This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
PATCH: BZ #14183: Different __FSWORD_T_TYPE on i386 and -m32 onx86-64
- From: "H.J. Lu" <hongjiu dot lu at intel dot com>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Date: Thu, 31 May 2012 17:00:32 -0700
- Subject: PATCH: BZ #14183: Different __FSWORD_T_TYPE on i386 and -m32 onx86-64
- References: <20120530181001.GA4277@intel.com>
- Reply-to: "H.J. Lu" <hjl dot tools at gmail dot com>
On Wed, May 30, 2012 at 11:10:01AM -0700, H.J. Lu wrote:
> Hi,
>
> This patch restores __UWORD_TYPE for __NLINK_T_TYPE with gcc -m32 on
> x86-64. I am testing this patch on ia32, x86-64 and x32. OK to install
> if tests pass?
>
> Thanks.
>
>
> H.J.
> ---
> 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.
>
I missed __FSWORD_T_TYPE. Here is a patch. OK to install?
Thanks.
H.J.
---
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.
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h b/sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h
index a52a1d3..be8985b 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