1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/patches/glibc/2.5.1/glibc-2.4-i686-assembler.patch	Sat Aug 11 10:57:18 2007 +0000
     1.3 @@ -0,0 +1,38 @@
     1.4 +2007-02-15  Khem Raj  <kraj@xxxxxxxxxx>
     1.5 +
     1.6 +       * sysdeps/unix/sysv/linux/i386/sysdep.h: Re-define __i686.
     1.7 +       * nptl/sysdeps/pthread/pt-initfini.c: Ditto.
     1.8 +
     1.9 +
    1.10 +
    1.11 +Index: glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h
    1.12 +===================================================================
    1.13 +--- glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h	(revision 1469)
    1.14 ++++ glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h	(working copy)
    1.15 +@@ -29,6 +29,10 @@
    1.16 + #include <dl-sysdep.h>
    1.17 + #include <tls.h>
    1.18 + 
    1.19 ++#if defined __i686 && defined __ASSEMBLER__
    1.20 ++#undef __i686
    1.21 ++#define __i686 __i686
    1.22 ++#endif
    1.23 + 
    1.24 + /* For Linux we can use the system call table in the header file
    1.25 + 	/usr/include/asm/unistd.h
    1.26 +Index: glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c
    1.27 +===================================================================
    1.28 +--- glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c	(revision 1469)
    1.29 ++++ glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c	(working copy)
    1.30 +@@ -45,6 +45,11 @@
    1.31 + /* Embed an #include to pull in the alignment and .end directives. */
    1.32 + asm ("\n#include \"defs.h\"");
    1.33 + 
    1.34 ++asm ("\n#if defined __i686 && defined __ASSEMBLER__");
    1.35 ++asm ("\n#undef __i686");
    1.36 ++asm ("\n#define __i686 __i686");
    1.37 ++asm ("\n#endif");
    1.38 ++
    1.39 + /* The initial common code ends here. */
    1.40 + asm ("\n/*@HEADER_ENDS*/");
    1.41 +