diff options
| author |   Dmitry Pankratov <dp@ubiquitech.com> | 2016-11-11 20:03:11 (GMT) |
|---|---|---|
| committer | Dmitry Pankratov <dp@ubiquitech.com> | 2016-11-11 20:03:11 (GMT) |
| commit | 0d17d26005efbd5d6157df0f68a26c738c385ed2 (patch) | |
| tree | 9c25ccb481bd4b58e54c692403d9c49402f09d98 /patches/glibc/2.5/130-i686-assembler.patch | |
| parent | 34ca68e3b076f4a7eea78aa46215fa50dfb1e322 (diff) | |
| parent | 5ebbb52be04e42bbd1c28b903eba642bebaeb1b6 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'patches/glibc/2.5/130-i686-assembler.patch')
| -rw-r--r-- | patches/glibc/2.5/130-i686-assembler.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/patches/glibc/2.5/130-i686-assembler.patch b/patches/glibc/2.5/130-i686-assembler.patch deleted file mode 100644 index 9904efb..0000000 --- a/patches/glibc/2.5/130-i686-assembler.patch +++ /dev/null @@ -1,38 +0,0 @@ -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*/"); - |