summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--toolchain/eglibc/Config.in6
-rw-r--r--toolchain/eglibc/patches/2.9/901-glibc_bug_7048.patch14
2 files changed, 17 insertions, 3 deletions
diff --git a/toolchain/eglibc/Config.in b/toolchain/eglibc/Config.in
index 3caea3919..132f57f6c 100644
--- a/toolchain/eglibc/Config.in
+++ b/toolchain/eglibc/Config.in
@@ -27,9 +27,9 @@ config EGLIBC_REVISION
prompt "eglibc revision"
depends on TOOLCHAINOPTS && USE_EGLIBC
default "5887" if EGLIBC_VERSION_2_6_1
- default "5886" if EGLIBC_VERSION_2_7
- default "6913" if EGLIBC_VERSION_2_8
- default "7430" if EGLIBC_VERSION_2_9
+ default "8588" if EGLIBC_VERSION_2_7
+ default "8587" if EGLIBC_VERSION_2_8
+ default "8690" if EGLIBC_VERSION_2_9
default "HEAD" if EGLIBC_VERSION_TRUNK
default ""
diff --git a/toolchain/eglibc/patches/2.9/901-glibc_bug_7048.patch b/toolchain/eglibc/patches/2.9/901-glibc_bug_7048.patch
new file mode 100644
index 000000000..3d14a3883
--- /dev/null
+++ b/toolchain/eglibc/patches/2.9/901-glibc_bug_7048.patch
@@ -0,0 +1,14 @@
+http://sourceware.org/bugzilla/show_bug.cgi?id=7048
+
+--- a/libc/sysdeps/i386/dl-tlsdesc.S
++++ b/libc/sysdeps/i386/dl-tlsdesc.S
+@@ -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