aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/i386/sysdep.h
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-02-06 23:01:25 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-02-06 23:01:25 +0000
commitd4a54ac6494dd47a9c3d490e02897c69c0432341 (patch)
tree32f4178ed80b3215b1068c23df3da79231e046cc /sysdeps/i386/sysdep.h
parent314054eaef2aec965d2f1bced7e86abca118463e (diff)
downloadglibc-d4a54ac6494dd47a9c3d490e02897c69c0432341.zip
glibc-d4a54ac6494dd47a9c3d490e02897c69c0432341.tar.gz
glibc-d4a54ac6494dd47a9c3d490e02897c69c0432341.tar.bz2
Undefine and redefine __i686 for assembly code.
Diffstat (limited to 'sysdeps/i386/sysdep.h')
-rw-r--r--sysdeps/i386/sysdep.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/sysdeps/i386/sysdep.h b/sysdeps/i386/sysdep.h
index 1dbb8e1..c1dac6c 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)