From: Carlos O'Donell <carlos_odonell@mentor.com>
Date: Sun, 22 Apr 2012 16:06:09 +0000 (-0400)
Subject: Redefine __i686 for use with older compilers.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3836d4d661d718f455b0ea9300f41b1218682cc7;p=thirdparty%2Fglibc.git

Redefine __i686 for use with older compilers.

This is a conservative fix for BZ #411 which is already fixed
on trunk. In this fix we don't touch any of the thunks or
do any other work other than to redefine the compiler define.
This is the minimum change required to build on a broader range
of distributions.
---

diff --git a/ChangeLog b/ChangeLog
index 737c4ba1965..a80ee1bb481 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-22  Carlos O'Donell  <carlos_odonell@mentor.com>
+
+	[BZ #411]
+	* sysdeps/unix/sysv/linux/i386/sysdep.h: Redefine __i686.
+
 2012-01-01  Ulrich Drepper  <drepper@gmail.com>
 
 	* posix/getconf.c: Update copyright year.
diff --git a/NEWS b/NEWS
index 55dba1bb79f..9818c755bac 100644
--- a/NEWS
+++ b/NEWS
@@ -9,13 +9,13 @@ Version 2.15
 
 * The following bugs are resolved with this release:
 
-  6779, 6783, 9696, 10103, 10709, 11589, 12403, 12786, 12840, 12847, 12868,
-  12852, 12874, 12885, 12892, 12906, 12907, 12922, 12935, 12962, 13007,
-  13021, 13061, 13062, 13067, 13068, 13085, 13088, 13090, 13092, 13096,
-  13114, 13118, 13123, 13134, 13138, 13147, 13150, 13166, 13179, 13185,
-  13189, 13192, 13268, 13276, 13282, 13291, 13305, 13328, 13335, 13337,
-  13344, 13358, 13367, 13413, 13416, 13423, 13439, 13446, 13472, 13484,
-  13506, 13515, 13523, 13524, 13538, 13540
+  411, 6779, 6783, 9696, 10103, 10709, 11589, 12403, 12786, 12840, 12847,
+  12868, 12852, 12874, 12885, 12892, 12906, 12907, 12922, 12935, 12962, 
+  13007, 13021, 13061, 13062, 13067, 13068, 13085, 13088, 13090, 13092,
+  13096, 13114, 13118, 13123, 13134, 13138, 13147, 13150, 13166, 13179,
+  13185, 13189, 13192, 13268, 13276, 13282, 13291, 13305, 13328, 13335,
+  13337, 13344, 13358, 13367, 13413, 13416, 13423, 13439, 13446, 13472,
+  13484, 13506, 13515, 13523, 13524, 13538, 13540
 
 * New program pldd to list loaded object of a process
   Implemented by Ulrich Drepper.
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index e8ff69ab008..e7e58c504fd 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-22  Carlos O'Donell  <carlos_odonell@mentor.com>
+
+	[BZ #411]
+	* sysdeps/pthread/pt-initfini.c: Redefine __i686.
+
 2011-12-22  Ulrich Drepper  <drepper@gmail.com>
 
 	* sysdeps/pthread/gai_misc.h (__gai_create_helper_thread): Use
diff --git a/nptl/sysdeps/pthread/pt-initfini.c b/nptl/sysdeps/pthread/pt-initfini.c
index 9c00dc0b7dc..f5d4df88643 100644
--- a/nptl/sysdeps/pthread/pt-initfini.c
+++ b/nptl/sysdeps/pthread/pt-initfini.c
@@ -45,6 +45,11 @@
 /* Embed an #include to pull in the alignment and .end directives. */
 asm ("\n#include \"defs.h\"");
 
+asm ("\n#if defined __i686 && defined __ASSEMBLER__");
+asm ("\n#undef __i686");
+asm ("\n#define __i686 __i686");
+asm ("\n#endif");
+
 /* The initial common code ends here. */
 asm ("\n/*@HEADER_ENDS*/");
 
diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h
index 64ef4008bcb..726b1df4be2 100644
--- a/sysdeps/unix/sysv/linux/i386/sysdep.h
+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
@@ -29,6 +29,10 @@
 #include <dl-sysdep.h>
 #include <tls.h>
 
+#if defined __i686 && defined __ASSEMBLER__
+#undef __i686
+#define __i686 __i686
+#endif
 
 /* For Linux we can use the system call table in the header file
 	/usr/include/asm/unistd.h