This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
PATCH: BZ #14183: Different __NLINK_T_TYPE on i386 and -m32 on x86-64
- From: "H.J. Lu" <hongjiu dot lu at intel dot com>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Date: Wed, 30 May 2012 11:10:01 -0700
- Subject: PATCH: BZ #14183: Different __NLINK_T_TYPE on i386 and -m32 on x86-64
- Reply-to: "H.J. Lu" <hjl dot tools at gmail dot com>
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.
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h b/sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h
index cbad9a3..a52a1d3 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