This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.15-1083-gd5c9086
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 30 May 2012 18:36:19 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.15-1083-gd5c9086
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via d5c908673413571d74a93af05cc29880697c04b0 (commit)
from 8d8f2279e7dc2b0bd3e605d017d52ce0094834fd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=d5c908673413571d74a93af05cc29880697c04b0
commit d5c908673413571d74a93af05cc29880697c04b0
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Wed May 30 11:35:47 2012 -0700
Use __UWORD_TYPE for __NLINK_T_TYPE with -m32
diff --git a/ChangeLog b/ChangeLog
index 053e623..42df8d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
2012-05-30 Richard Henderson <rth@twiddle.net>
* 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 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
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h | 6 +++++-
2 files changed, 11 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources