glibc-2.3.6-i686.patch

   1 diff -ur glibc-2.3.6.orig/sysdeps/i386/elf/bsd-setjmp.S glibc-2.3.6/sysdeps/i386/elf/bsd-setjmp.S
   2 --- glibc-2.3.6.orig/sysdeps/i386/elf/bsd-setjmp.S      2007-03-26 22:00:44.000000000 +0200
   3 +++ glibc-2.3.6/sysdeps/i386/elf/bsd-setjmp.S   2007-03-26 22:00:33.000000000 +0200
   4 @@ -27,6 +27,9 @@
   5  #define PARMS  LINKAGE         /* no space for saved regs */
   6  #define JMPBUF PARMS
   7  #define SIGMSK JMPBUF+PTR_SIZE
   8 +#ifdef __i686
   9 +#undef __i686
  10 +#endif
  11
  12  ENTRY (BP_SYM (setjmp))
  13         /* Note that we have to use a non-exported symbol in the next
  14 diff -ur glibc-2.3.6.orig/sysdeps/i386/elf/setjmp.S glibc-2.3.6/sysdeps/i386/elf/setjmp.S
  15 --- glibc-2.3.6.orig/sysdeps/i386/elf/setjmp.S  2007-03-26 22:00:52.000000000 +0200
  16 +++ glibc-2.3.6/sysdeps/i386/elf/setjmp.S       2007-03-26 22:00:17.000000000 +0200
  17 @@ -27,6 +27,9 @@
  18  #define PARMS  LINKAGE         /* no space for saved regs */
  19  #define JMPBUF PARMS
  20  #define SIGMSK JMPBUF+PTR_SIZE
  21 +#ifdef __i686
  22 +#undef __i686
  23 +#endif
  24
  25  ENTRY (BP_SYM (__sigsetjmp))
  26         ENTER
  27 diff -ru glibc-2.3.6/sysdeps/i386/i686/memcmp.S glibc-2.3.6.new/sysdeps/i386/i686/memcmp.S
  28 --- glibc-2.3.6/sysdeps/i386/i686/memcmp.S      2004-04-02 01:28:37.000000000 +0200
  29 +++ glibc-2.3.6.new/sysdeps/i386/i686/memcmp.S  2007-04-19 14:01:44.000000000 +0200
  30 @@ -350,6 +350,7 @@
  31         sbbl    $-1, %eax
  32         popl    %esi
  33         RETURN
  34 +END (BP_SYM (memcmp))
  35
  36         .section        .rodata
  37         ALIGN (2)
  38 @@ -387,8 +388,6 @@
  39         .long   L(30bytes) - . + 0x78
  40         .long   L(31bytes) - . + 0x7c
  41
  42 -END (BP_SYM (memcmp))
  43 -
  44  #undef bcmp
  45  weak_alias (BP_SYM (memcmp), BP_SYM (bcmp))
  46  libc_hidden_builtin_def (BP_SYM (memcmp))
  47 diff -ru glibc-2.3.6/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.3.6.new/sysdeps/unix/sysv/linux/i386/sysdep.h
  48 --- glibc-2.3.6/sysdeps/unix/sysv/linux/i386/sysdep.h   2005-02-16 12:20:22.000000000 +0100
  49 +++ glibc-2.3.6.new/sysdeps/unix/sysv/linux/i386/sysdep.h       2007-04-19 14:01:55.000000000 +0200
  50 @@ -21,6 +21,11 @@
  51  #ifndef _LINUX_I386_SYSDEP_H
  52  #define _LINUX_I386_SYSDEP_H 1
  53
  54 +/* This confuses apple-gcc */
  55 +#ifdef __i686
  56 +#undef __i686
  57 +#endif
  58 +
  59  /* There is some commonality.  */
  60  #include <sysdeps/unix/i386/sysdep.h>
  61  #include <bp-sym.h>
  62