[SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (6f9d78f89027d4d60d1dcf63b4a5b77eb34caeec)

Arwed von Merkatz scm at sourcemage.org
Mon Jan 12 14:18:12 EST 2009


GIT changes to master grimoire by Arwed von Merkatz <v.merkatz at gmx.net>:

 libs/glibc/HISTORY         |    4 ++++
 libs/glibc/PRE_BUILD       |    1 +
 libs/glibc/bug-15014.patch |   13 +++++++++++++
 3 files changed, 18 insertions(+)

New commits:
commit 6f9d78f89027d4d60d1dcf63b4a5b77eb34caeec
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    glibc: fix linking, bug 15014

diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 43d8852..b5b1d1d 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,7 @@
+2009-01-12 Arwed v. Merkatz <v.merkatz at gmx.net>
+	* PRE_BUILD, bug-15014.patch: patch for link failure on i486 and i686,
+	  bug #15014
+
 2008-11-23 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS, PRE_BUILD: remove libidn related stuff. now in normal tarbal
 	* BUILD: fix ia32 usage
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 1c7fa4e..7726aa5 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -58,6 +58,7 @@ fi  &&
 cd  $SOURCE_DIRECTORY                               &&
 patch  -p0  <  $SCRIPT_DIRECTORY/Makefile.patch     &&
 patch  -p1  <  $SCRIPT_DIRECTORY/as-test-x.patch &&
+patch  -p1  <  $SCRIPT_DIRECTORY/bug-15014.patch &&
 
 # disabled libgd detection/building memusagestat for now until a better
 # fix has been found, bug #8277
diff --git a/libs/glibc/bug-15014.patch b/libs/glibc/bug-15014.patch
new file mode 100644
index 0000000..be0bf04
--- /dev/null
+++ b/libs/glibc/bug-15014.patch
@@ -0,0 +1,13 @@
+--- libc-HEAD/sysdeps/i386/dl-tlsdesc.S.org	2008-11-17 18:17:04.004203199 +0100
++++ libc-HEAD/sysdeps/i386/dl-tlsdesc.S	2008-11-17 18:18:28.029877701 +0100
+@@ -128,8 +128,7 @@
+ .Lslow:
+ 	cfi_adjust_cfa_offset (28)
+ 	movl	%ebx, 16(%esp)
+-	call	__i686.get_pc_thunk.bx
+-	addl	$_GLOBAL_OFFSET_TABLE_, %ebx
++	LOAD_PIC_REG(bx)
+ 	call	___tls_get_addr at PLT
+ 	movl	16(%esp), %ebx
+ 	jmp	.Lret
+



More information about the SM-Commit mailing list