patches/glibc/2.9/240-i386-LOAD_PIC_REG.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:09:43 2011 +0200 (2011-05-19)
branch1.11
changeset 2465 5f98b7a90fbc
parent 1201 c9967a6e3b25
permissions -rw-r--r--
complibs/ppl: fix 0.11-0.11.2 to compile with --disable-shared

PPL 0.11 (through 0.11.2) had a small bug where it still tried to build
and test its Java interface even when shared libraries are disabled.
Since that's exactly what ct-ng does, it explodes.

This is the patch from the PPL authors (see final link below).

More information can be found in these messages/threads:

Anthony's initial report and analysis with Yann:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00046.html

Ron Flory hit the same problem:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00054.html

Anthony's report to the ppl-devel list:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017450.html

Roberto's reply with a link to the fix in the PPL git repo:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017455.html

Signed-Off-By: Anthony Foiani <anthony.foiani@gmail.com>
(transplanted from 139b85d70b623e51f7585e7c64ecb8c6a6cf4567)
yann@1201
     1
Original patch from: gentoo/src/patchsets/glibc/2.9/1050_all_glibc-i386-LOAD_PIC_REG.patch
yann@1201
     2
yann@1201
     3
-= BEGIN original header =-
yann@1201
     4
From e41177ea18a77a7f62328293b4fd49ae17482e77 Mon Sep 17 00:00:00 2001
yann@1201
     5
From: Ulrich Drepper <drepper@redhat.com>
yann@1201
     6
Date: Sat, 6 Dec 2008 00:15:17 +0000
yann@1201
     7
Subject: [PATCH] (_dl_tlsdesc_dynamic): Use LOAD_PIC_REG instead of doing things manually.
yann@1201
     8
yann@1201
     9
-= END original header =-
yann@1201
    10
yann@1201
    11
diff -durN glibc-2_9.orig/sysdeps/i386/dl-tlsdesc.S glibc-2_9/sysdeps/i386/dl-tlsdesc.S
yann@1201
    12
--- glibc-2_9.orig/sysdeps/i386/dl-tlsdesc.S	2008-05-13 07:33:06.000000000 +0200
yann@1201
    13
+++ glibc-2_9/sysdeps/i386/dl-tlsdesc.S	2009-02-02 22:00:56.000000000 +0100
yann@1201
    14
@@ -128,8 +128,7 @@
yann@1201
    15
 .Lslow:
yann@1201
    16
 	cfi_adjust_cfa_offset (28)
yann@1201
    17
 	movl	%ebx, 16(%esp)
yann@1201
    18
-	call	__i686.get_pc_thunk.bx
yann@1201
    19
-	addl	$_GLOBAL_OFFSET_TABLE_, %ebx
yann@1201
    20
+	LOAD_PIC_REG (bx)
yann@1201
    21
 	call	___tls_get_addr@PLT
yann@1201
    22
 	movl	16(%esp), %ebx
yann@1201
    23
 	jmp	.Lret