glibc-i686.patch

   1 --- glibc-2.11.1/sysdeps/i386/sysdep.h.org      2010-04-24 23:40:14.583055795 +0200
   2 +++ glibc-2.11.1/sysdeps/i386/sysdep.h  2010-04-24 23:42:32.203043803 +0200
   3 @@ -133,6 +133,10 @@
   4      cfi_adjust_cfa_offset (-4);                                                      \
   5      addl $_GLOBAL_OFFSET_TABLE+[.-0b], %ebx;
   6
   7 +#ifdef __i686
   8 +# define __old__i686 __i686
   9 +# undef __i686
  10 +#endif
  11  # define SETUP_PIC_REG(reg) \
  12    .ifndef __i686.get_pc_thunk.reg;                                           \
  13    .section .gnu.linkonce.t.__i686.get_pc_thunk.reg,"ax",@progbits;           \
  14 @@ -146,6 +150,10 @@
  15    .previous;                                                                 \
  16    .endif;                                                                    \
  17    call __i686.get_pc_thunk.reg
  18 +#ifdef __old__i686
  19 +# define __i686 __old__i686
  20 +# undef __old__i686
  21 +#endif
  22
  23  # define LOAD_PIC_REG(reg) \
  24    SETUP_PIC_REG(reg); addl $_GLOBAL_OFFSET_TABLE_, %e##reg
  25 --- glibc-2.11.1/sysdeps/i386/i686/memcmp.S.org 2010-04-24 23:43:55.326564190 +0200
  26 +++ glibc-2.11.1/sysdeps/i386/i686/memcmp.S     2010-04-24 23:44:24.826561120 +0200
  27 @@ -34,6 +34,10 @@
  28  /* Load an entry in a jump table into EBX.  TABLE is a jump table
  29     with relative offsets.  INDEX is a register contains the index
  30     into the jump table.  */
  31 +#ifdef __i686
  32 +# define __old__i686 __i686
  33 +# undef __i686
  34 +#endif
  35  #define LOAD_JUMP_TABLE_ENTRY(TABLE, INDEX) \
  36    /* We first load PC into EBX.  */                                          \
  37    call __i686.get_pc_thunk.bx;                                               \
  38 @@ -42,6 +46,10 @@
  39    /* Get the entry and convert the relative offset to the                    \
  40       absolute address.  */                                                   \
  41    addl (%ebx,INDEX,4), %ebx
  42 +#ifdef __old__i686
  43 +# define __i686 __old__i686
  44 +# undef __old__i686
  45 +#endif
  46
  47         .section        .gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits
  48         .globl  __i686.get_pc_thunk.bx
  49 --- glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h.org      2010-04-24 23:45:37.399887418 +0200
  50 +++ glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h  2010-04-24 23:46:12.546342525 +0200
  51 @@ -537,6 +537,10 @@
  52
  53  /* Consistency check for position-independent code.  */
  54  #ifdef __PIC__
  55 +#ifdef __i686
  56 +# define __old__i686 __i686
  57 +# undef __i686
  58 +#endif
  59  # define check_consistency()                                                 \
  60    ({ int __res;                                                                      \
  61       __asm__ __volatile__                                                    \
  62 @@ -556,6 +560,10 @@
  63         ".previous"                                                           \
  64         : "=c" (__res));                                                      \
  65       __res; })
  66 +#ifdef __old__i686
  67 +# define __i686 __old__i686
  68 +# undef __old__i686
  69 +#endif
  70  #endif
  71
  72  #endif /* __ASSEMBLER__ */