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-604-g34a2740
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 13 Apr 2012 23:24:45 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.15-604-g34a2740
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 34a27407f49e61b1be2b2437eb7748a777f359aa (commit)
from 7e73e17d3f34799fe3108391197198a1cd1adb08 (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=34a27407f49e61b1be2b2437eb7748a777f359aa
commit 34a27407f49e61b1be2b2437eb7748a777f359aa
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Apr 13 16:24:17 2012 -0700
Check __ILP32__ instead of __LP64__
* elf/tst-auditmod1.c: Check __ILP32__ instead of __LP64__.
* elf/tst-auditmod3b.c: Likewise.
* elf/tst-auditmod4b.c: Likewise.
* elf/tst-auditmod5b.c: Likewise.
* elf/tst-auditmod6b.c: Likewise.
* elf/tst-auditmod6c.c: Likewise.
* elf/tst-auditmod7b.c: Likewise.
* sysdeps/x86_64/ffsll.c (ffsl): Likewise.
* sysdeps/x86_64/preconfigure.in: Likewise.
* sysdeps/x86_64/preconfigure: Regenerated.
diff --git a/ChangeLog b/ChangeLog
index 718824d..77e60af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2012-04-13 H.J. Lu <hongjiu.lu@intel.com>
+ * elf/tst-auditmod1.c: Check __ILP32__ instead of __LP64__.
+ * elf/tst-auditmod3b.c: Likewise.
+ * elf/tst-auditmod4b.c: Likewise.
+ * elf/tst-auditmod5b.c: Likewise.
+ * elf/tst-auditmod6b.c: Likewise.
+ * elf/tst-auditmod6c.c: Likewise.
+ * elf/tst-auditmod7b.c: Likewise.
+ * sysdeps/x86_64/ffsll.c (ffsl): Likewise.
+ * sysdeps/x86_64/preconfigure.in: Likewise.
+ * sysdeps/x86_64/preconfigure: Regenerated.
+
+2012-04-13 H.J. Lu <hongjiu.lu@intel.com>
+
* sysdeps/x86_64/bits/wordsize.h (__WORDSIZE): Also check
__ILP32__.
diff --git a/elf/tst-auditmod1.c b/elf/tst-auditmod1.c
index 67fc758..108d6de 100644
--- a/elf/tst-auditmod1.c
+++ b/elf/tst-auditmod1.c
@@ -109,7 +109,7 @@ la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook,
# define La_retval La_i86_retval
# define int_retval lrv_eax
#elif defined __x86_64__
-# ifdef __LP64__
+# ifndef __ILP32__
# define pltenter la_x86_64_gnu_pltenter
# define pltexit la_x86_64_gnu_pltexit
# define La_regs La_x86_64_regs
diff --git a/elf/tst-auditmod3b.c b/elf/tst-auditmod3b.c
index 921eaca..a9bb0e2 100644
--- a/elf/tst-auditmod3b.c
+++ b/elf/tst-auditmod3b.c
@@ -105,7 +105,7 @@ la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook,
return sym->st_value;
}
-#ifdef __LP64__
+# ifndef __ILP32__
# define pltenter la_x86_64_gnu_pltenter
# define pltexit la_x86_64_gnu_pltexit
# define La_regs La_x86_64_regs
diff --git a/elf/tst-auditmod4b.c b/elf/tst-auditmod4b.c
index 75e8558..7778d6a 100644
--- a/elf/tst-auditmod4b.c
+++ b/elf/tst-auditmod4b.c
@@ -94,7 +94,7 @@ la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook,
return sym->st_value;
}
-#ifdef __LP64__
+# ifndef __ILP32__
# define pltenter la_x86_64_gnu_pltenter
# define pltexit la_x86_64_gnu_pltexit
# define La_regs La_x86_64_regs
diff --git a/elf/tst-auditmod5b.c b/elf/tst-auditmod5b.c
index d2443c8..3a42215 100644
--- a/elf/tst-auditmod5b.c
+++ b/elf/tst-auditmod5b.c
@@ -95,7 +95,7 @@ la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook,
return sym->st_value;
}
-#ifdef __LP64__
+# ifndef __ILP32__
# define pltenter la_x86_64_gnu_pltenter
# define pltexit la_x86_64_gnu_pltexit
# define La_regs La_x86_64_regs
diff --git a/elf/tst-auditmod6b.c b/elf/tst-auditmod6b.c
index b00dcd7..a9fe5dc 100644
--- a/elf/tst-auditmod6b.c
+++ b/elf/tst-auditmod6b.c
@@ -94,7 +94,7 @@ la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook,
return sym->st_value;
}
-#ifdef __LP64__
+# ifndef __ILP32__
# define pltenter la_x86_64_gnu_pltenter
# define pltexit la_x86_64_gnu_pltexit
# define La_regs La_x86_64_regs
diff --git a/elf/tst-auditmod6c.c b/elf/tst-auditmod6c.c
index a78c913..9b1063b 100644
--- a/elf/tst-auditmod6c.c
+++ b/elf/tst-auditmod6c.c
@@ -94,7 +94,7 @@ la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook,
return sym->st_value;
}
-#ifdef __LP64__
+# ifndef __ILP32__
# define pltenter la_x86_64_gnu_pltenter
# define pltexit la_x86_64_gnu_pltexit
# define La_regs La_x86_64_regs
diff --git a/elf/tst-auditmod7b.c b/elf/tst-auditmod7b.c
index d761149..1ae9e72 100644
--- a/elf/tst-auditmod7b.c
+++ b/elf/tst-auditmod7b.c
@@ -94,7 +94,7 @@ la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook,
return sym->st_value;
}
-#ifdef __LP64__
+#ifndef __ILP32__
# define pltenter la_x86_64_gnu_pltenter
# define pltexit la_x86_64_gnu_pltexit
# define La_regs La_x86_64_regs
diff --git a/sysdeps/x86_64/ffsll.c b/sysdeps/x86_64/ffsll.c
index a7a5dc8..0c07dce 100644
--- a/sysdeps/x86_64/ffsll.c
+++ b/sysdeps/x86_64/ffsll.c
@@ -36,7 +36,7 @@ ffsll (long long int x)
return cnt + 1;
}
-#ifdef __LP64__
+#ifndef __ILP32__
#undef ffsl
weak_alias (ffsll, ffsl)
#endif
diff --git a/sysdeps/x86_64/preconfigure b/sysdeps/x86_64/preconfigure
index 48ba6a1..ca9de75 100644
--- a/sysdeps/x86_64/preconfigure
+++ b/sysdeps/x86_64/preconfigure
@@ -133,7 +133,7 @@ if ${libc_cv_x32+:} false; then :
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#ifdef __LP64__
+#ifndef __ILP32__
# error not x32
#endif
int
diff --git a/sysdeps/x86_64/preconfigure.in b/sysdeps/x86_64/preconfigure.in
index 1f049c7..600700e 100644
--- a/sysdeps/x86_64/preconfigure.in
+++ b/sysdeps/x86_64/preconfigure.in
@@ -8,7 +8,7 @@ x86_64)
AC_CACHE_CHECK(whether $CC compiles in -mx32 mode by default,
libc_cv_x32, [dnl
AC_TRY_COMPILE(dnl
-[#ifdef __LP64__
+[#ifndef __ILP32__
# error not x32
#endif], [], libc_cv_x32=yes, libc_cv_x32=no)])
if test $libc_cv_x32 = yes; then
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 13 +++++++++++++
elf/tst-auditmod1.c | 2 +-
elf/tst-auditmod3b.c | 2 +-
elf/tst-auditmod4b.c | 2 +-
elf/tst-auditmod5b.c | 2 +-
elf/tst-auditmod6b.c | 2 +-
elf/tst-auditmod6c.c | 2 +-
elf/tst-auditmod7b.c | 2 +-
sysdeps/x86_64/ffsll.c | 2 +-
sysdeps/x86_64/preconfigure | 2 +-
sysdeps/x86_64/preconfigure.in | 2 +-
11 files changed, 23 insertions(+), 10 deletions(-)
hooks/post-receive
--
GNU C Library master sources