[patches] RFA: Fix for compile error with -march=i686

[Khem Raj <kraj@xxxxxxxxxx>]

Hi

When we compile eglibc with -march=i686 or pentium3 I get following 
compile errors.

../sysdeps/i386/fpu/s_frexp.S: Assembler messages:
../sysdeps/i386/fpu/s_frexp.S:66: Error: invalid identifier for ".ifdef"
../sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first 
unrecognized character is `1'
../sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first 
unrecognized character is `1'
../sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first 
unrecognized character is `1'
../sysdeps/i386/fpu/s_frexp.S:66: Error: unrecognized symbol type ""
../sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first 
unrecognized character is `1'
../sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first 
unrecognized character is `1'
../sysdeps/i386/fpu/s_frexp.S:66: Error: expected comma after name `' in 
.size directive
../sysdeps/i386/fpu/s_frexp.S:66: Error: ".endif" without ".if"
../sysdeps/i386/fpu/s_frexp.S:66: Error: junk `.get_pc_thunk.dx' after 
expression


This error happens because gcc define __i686 if we have march=i686 and 
preprocessor replaces __i686
with "1" and hence the error.


This patch undefs the previous definition of __i686 and redefines it

OK?

Thanks  

-Khem

Changelog.eglibc

2007-02-15  Khem Raj  <kraj@xxxxxxxxxx>

       * sysdeps/unix/sysv/linux/i386/sysdep.h: Re-define __i686.
       * nptl/sysdeps/pthread/pt-initfini.c: Ditto.


Index: sysdeps/unix/sysv/linux/i386/sysdep.h
===================================================================
--- sysdeps/unix/sysv/linux/i386/sysdep.h	(revision 1469)
+++ sysdeps/unix/sysv/linux/i386/sysdep.h	(working copy)
@@ -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
Index: nptl/sysdeps/pthread/pt-initfini.c
===================================================================
--- nptl/sysdeps/pthread/pt-initfini.c	(revision 1469)
+++ nptl/sysdeps/pthread/pt-initfini.c	(working copy)
@@ -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*/");