summaryrefslogtreecommitdiff
path: root/recipes/glibc
diff options
context:
space:
mode:
authorHenning Heinold <heinold@inf.fu-berlin.de>2009-07-10 18:46:08 +0200
committerHenning Heinold <heinold@inf.fu-berlin.de>2009-07-10 18:50:18 +0200
commit8cb8b3a08af11bedf2bf2d8333a321259e8344a4 (patch)
tree09d1216bec42091074bfb528fc93b126a9b32c93 /recipes/glibc
parent5e910c56c38255f8d9745d1901e7faa97f918648 (diff)
glibc: fix build for i486 arch at version 2.9
* patch stolen from some mailinglist and from pb_ on irc * bump PR
Diffstat (limited to 'recipes/glibc')
-rw-r--r--recipes/glibc/files/tls_i486.patch14
-rw-r--r--recipes/glibc/glibc_2.9.bb3
2 files changed, 16 insertions, 1 deletions
diff --git a/recipes/glibc/files/tls_i486.patch b/recipes/glibc/files/tls_i486.patch
new file mode 100644
index 0000000000..69a1fdf91d
--- /dev/null
+++ b/recipes/glibc/files/tls_i486.patch
@@ -0,0 +1,14 @@
+Index: glibc-2.9/sysdeps/i386/dl-tlsdesc.S
+===================================================================
+--- glibc-2.9.orig/sysdeps/i386/dl-tlsdesc.S 2009-07-07 23:21:11.647664128 +0200
++++ glibc-2.9/sysdeps/i386/dl-tlsdesc.S 2009-07-07 23:21:32.802555992 +0200
+@@ -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@PLT
+ movl 16(%esp), %ebx
+ jmp .Lret
diff --git a/recipes/glibc/glibc_2.9.bb b/recipes/glibc/glibc_2.9.bb
index be66e2b727..b0ba738477 100644
--- a/recipes/glibc/glibc_2.9.bb
+++ b/recipes/glibc/glibc_2.9.bb
@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm"
PACKAGES_DYNAMIC = "libc6*"
RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
-PR = "r1"
+PR = "r2"
# the -isystem in bitbake.conf screws up glibc do_stage
BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
@@ -64,6 +64,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
file://etc/ld.so.conf \
file://generate-supported.mk \
file://march-i686.patch;patch=1;pnum=0 \
+ file://tls_i486.patch;patch=1 \
"