From: Joseph Myers <joseph@codesourcery.com>
Date: Mon, 6 Feb 2012 23:01:25 +0000 (+0000)
Subject: Undefine and redefine __i686 for assembly code.
X-Git-Tag: glibc-2.16-tps~1032
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4a54ac6494dd47a9c3d490e02897c69c0432341;p=thirdparty%2Fglibc.git

Undefine and redefine __i686 for assembly code.
---

diff --git a/ChangeLog b/ChangeLog
index b0e625b24dc..0f743112ca2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-06  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #411]
+	* sysdeps/i386/sysdep.h (__i686): Undefine and redefine.
+
 2012-02-06  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/i386/sysdep.h: Include <features.h>.
diff --git a/sysdeps/i386/sysdep.h b/sysdeps/i386/sysdep.h
index 1dbb8e12a95..c1dac6c3616 100644
--- a/sysdeps/i386/sysdep.h
+++ b/sysdeps/i386/sysdep.h
@@ -23,7 +23,13 @@
 #include <features.h> /* For __GNUC_PREREQ.  */
 
 /* It is desirable that the names of PIC thunks match those used by
-   GCC so that multiple copies are eliminated by the linker.  */
+   GCC so that multiple copies are eliminated by the linker.  Because
+   GCC 4.6 and earlier use __i686 in the names, it is necessary to
+   override that predefined macro.  */
+#if defined __i686 && defined __ASSEMBLER__
+#undef __i686
+#define __i686 __i686
+#endif
 
 #ifdef	__ASSEMBLER__
 # if __GNUC_PREREQ (4, 7)