Undefine and redefine __i686 for assembly code.

diff --git a/ChangeLog b/ChangeLog
index b0e625b24dcb5b610a876579c6445bf1870cc30e..0f743112ca23bd1f99d07192febdfcce42a26d90 100644 (file)
--- 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 1dbb8e12a953279a5cc6ed355875d796232fbbdc..c1dac6c361628b79c073a5add0271acc68c11b3a 100644 (file)
--- 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)