|
|
--- ./nptl/sysdeps/pthread/pt-initfini.c.orig 2005-02-25 20:38:45.000000000 -0500
+++ ./nptl/sysdeps/pthread/pt-initfini.c 2005-04-14 07:40:10.000000000 -0400
@@ -44,6 +44,10 @@
/* Embed an #include to pull in the alignment and .end directives. */ asm ("\n#include \"defs.h\"");+asm ("\n#ifdef __i686");
+asm ("\n# undef __i686");
+asm ("\n# define __i686 __i686");
+asm ("\n#endif");
/* The initial common code ends here. */ asm ("\n/*@HEADER_ENDS*/");--- ./nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S.orig 2004-09-02 14:52:38.000000000 -0400
+++ ./nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2005-04-13 16:27:43.000000000 -0400
@@ -22,6 +22,11 @@
#include <lowlevelcond.h> #include <tcb-offsets.h> +#if defined(PIC) && defined(__i686)
+# undef __i686
+# define __i686 __i686
+#endif
+
#ifdef UP # define LOCK #else--- ./nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S.orig 2005-02-16 06:07:43.000000000 -0500
+++ ./nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S 2005-04-13 16:27:34.000000000 -0400
@@ -21,6 +21,11 @@
#include <shlib-compat.h> #include <pthread-errnos.h> +#if defined(PIC) && defined(__i686)
+# undef __i686
+# define __i686 __i686
+#endif
+
#ifndef UP # define LOCK lock #else--- ./nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S.orig 2005-02-16 06:07:44.000000000 -0500
+++ ./nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S 2005-04-13 16:27:26.000000000 -0400
@@ -21,6 +21,11 @@
#include <shlib-compat.h> #include <pthread-errnos.h> +#if defined(PIC) && defined(__i686)
+# undef __i686
+# define __i686 __i686
+#endif
+
#ifndef UP # define LOCK lock #else--- ./nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S.orig 2005-02-16 06:07:44.000000000 -0500
+++ ./nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S 2005-04-13 16:27:23.000000000 -0400
@@ -21,6 +21,11 @@
#include <shlib-compat.h> #include <pthread-errnos.h> +#if defined(PIC) && defined(__i686)
+# undef __i686
+# define __i686 __i686
+#endif
+
#ifndef UP # define LOCK lock #else--- ./nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S.orig 2005-02-16 06:07:44.000000000 -0500
+++ ./nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S 2005-04-13 16:27:31.000000000 -0400
@@ -21,6 +21,11 @@
#include <shlib-compat.h> #include <pthread-errnos.h> +#if defined(PIC) && defined(__i686)
+# undef __i686
+# define __i686 __i686
+#endif
+
#ifndef UP # define LOCK lock #else--- ./nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S.orig 2003-10-03 15:49:23.000000000 -0400
+++ ./nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S 2005-04-13 16:27:46.000000000 -0400
@@ -20,6 +20,11 @@
#include <unwindbuf.h> #include <sysdep.h> +#if defined(PIC) && defined(__i686)
+# undef __i686
+# define __i686 __i686
+#endif
+
#ifndef UP # define LOCK lock #else--- ./sysdeps/i386/elf/setjmp.S.orig 2003-10-03 16:25:46.000000000 -0400
+++ ./sysdeps/i386/elf/setjmp.S 2005-04-13 16:27:16.000000000 -0400
@@ -24,6 +24,11 @@
#include "bp-sym.h" #include "bp-asm.h" +#ifdef __i686
+# undef __i686
+# define __i686 __i686
+#endif
+
#define PARMS LINKAGE /* no space for saved regs */ #define JMPBUF PARMS #define SIGMSK JMPBUF+PTR_SIZE--- ./sysdeps/i386/elf/bsd-setjmp.S.orig 2003-10-03 16:29:03.000000000 -0400
+++ ./sysdeps/i386/elf/bsd-setjmp.S 2005-04-13 16:27:20.000000000 -0400
@@ -24,6 +24,11 @@
#include "bp-sym.h" #include "bp-asm.h" +#ifdef __i686
+# undef __i686
+# define __i686 __i686
+#endif
+
#define PARMS LINKAGE /* no space for saved regs */ #define JMPBUF PARMS #define SIGMSK JMPBUF+PTR_SIZE--- ./sysdeps/i386/i686/memcmp.S.orig 2004-04-01 18:28:37.000000000 -0500
+++ ./sysdeps/i386/i686/memcmp.S 2005-04-13 16:26:56.000000000 -0400
@@ -22,6 +22,11 @@
#include "bp-sym.h" #include "bp-asm.h" +#ifdef __i686
+# undef __i686
+# define __i686 __i686
+#endif
+
#define PARMS LINKAGE+4 /* Preserve EBX. */ #define BLK1 PARMS #define BLK2 BLK1+PTR_SIZE--- ./sysdeps/unix/sysv/linux/i386/sysdep.h.orig 2005-02-16 06:20:22.000000000 -0500
+++ ./sysdeps/unix/sysv/linux/i386/sysdep.h 2005-04-13 16:22:41.000000000 -0400
@@ -117,6 +117,10 @@
ret; \ .previous # else+# ifdef __i686
+# undef __i686
+# define __i686 __i686
+# endif
# define SETUP_PIC_REG(reg) \ .section .gnu.linkonce.t.__i686.get_pc_thunk.reg,"ax",@progbits; \ .globl __i686.get_pc_thunk.reg; \
|
