packages: glibc/glibc-i686.patch - more workarounds

arekm arekm at pld-linux.org
Sat Apr 24 23:32:19 CEST 2010


Author: arekm                        Date: Sat Apr 24 21:32:19 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- more workarounds

---- Files affected:
packages/glibc:
   glibc-i686.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/glibc/glibc-i686.patch
diff -u packages/glibc/glibc-i686.patch:1.1 packages/glibc/glibc-i686.patch:1.2
--- packages/glibc/glibc-i686.patch:1.1	Sat Apr 24 23:22:56 2010
+++ packages/glibc/glibc-i686.patch	Sat Apr 24 23:32:14 2010
@@ -18,3 +18,23 @@
  
  # define LOAD_PIC_REG(reg) \
    SETUP_PIC_REG(reg); addl $_GLOBAL_OFFSET_TABLE_, %e##reg
+--- glibc-2.11.1/sysdeps/i386/i686/memcmp.S.org	2010-04-24 23:25:03.876469117 +0200
++++ glibc-2.11.1/sysdeps/i386/i686/memcmp.S	2010-04-24 23:26:58.336457933 +0200
+@@ -34,6 +34,8 @@
+ /* Load an entry in a jump table into EBX.  TABLE is a jump table
+    with relative offsets.  INDEX is a register contains the index
+    into the jump table.  */
++# define __old__i686 __i686
++# undef __i686
+ #define LOAD_JUMP_TABLE_ENTRY(TABLE, INDEX) \
+   /* We first load PC into EBX.  */					      \
+   call	__i686.get_pc_thunk.bx;						      \
+@@ -42,6 +44,8 @@
+   /* Get the entry and convert the relative offset to the		      \
+      absolute address.  */						      \
+   addl	(%ebx,INDEX,4), %ebx
++# define __i686 __old__i686
++# undef __old__i686
+ 
+ 	.section	.gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax", at progbits
+ 	.globl	__i686.get_pc_thunk.bx
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/glibc/glibc-i686.patch?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list