From: H.J. Lu <hjl.tools@gmail.com>
Date: Fri, 13 Apr 2012 23:24:17 +0000 (-0700)
Subject: Check __ILP32__ instead of __LP64__
X-Git-Tag: glibc-2.16-tps~606
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=34a27407f49e61b1be2b2437eb7748a777f359aa;p=thirdparty%2Fglibc.git

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 718824dcd5c..77e60af0864 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+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
diff --git a/elf/tst-auditmod1.c b/elf/tst-auditmod1.c
index 67fc758ac32..108d6ded59b 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 921eaca55ae..a9bb0e22c34 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 75e85582bd4..7778d6a172d 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 d2443c8d208..3a4221536c6 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 b00dcd7c2e2..a9fe5dcadcf 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 a78c9139636..9b1063b23f9 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 d761149a2fe..1ae9e727691 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 a7a5dc85834..0c07dcec02f 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 48ba6a1516b..ca9de75843d 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 1f049c7a047..600700ea1a6 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