diff options
| author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2007-05-27 20:22:06 +0000 |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2007-05-27 20:22:06 +0000 |
| commit | de5df0533c0bde20f08d788543feac6915a2a5f7 (patch) | |
| tree | 93bb27024a37f3953b8ae0ecc2af9dc06e0def8c /patches/glibc/2.5/glibc-2.4-i686-assembler.patch | |
| parent | 266e38cc13fe4f1388dfc792349a9dc333b87de6 (diff) | |
| download | crosstool-ng-de5df0533c0bde20f08d788543feac6915a2a5f7.tar.gz crosstool-ng-de5df0533c0bde20f08d788543feac6915a2a5f7.tar.bz2 crosstool-ng-de5df0533c0bde20f08d788543feac6915a2a5f7.zip | |
Merge the NPTL stuff.
That still leaves the linuxthreads stuff broken, but it was just before. I don't care anyway. Time to fix that later...
Diffstat (limited to 'patches/glibc/2.5/glibc-2.4-i686-assembler.patch')
| -rw-r--r-- | patches/glibc/2.5/glibc-2.4-i686-assembler.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/patches/glibc/2.5/glibc-2.4-i686-assembler.patch b/patches/glibc/2.5/glibc-2.4-i686-assembler.patch new file mode 100644 index 00000000..9904efbe --- /dev/null +++ b/patches/glibc/2.5/glibc-2.4-i686-assembler.patch @@ -0,0 +1,38 @@ +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: glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h +=================================================================== +--- glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h (revision 1469) ++++ glibc-2.4/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: glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c +=================================================================== +--- glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c (revision 1469) ++++ glibc-2.4/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*/"); + |