mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2025-01-18 02:39:46 +00:00
libc/uClibc: workaround for a MIPS TLS issue
Some macros declarations were missing, so we duplicate them. See the added patch description for more information. ----> THIS IS A DIRTY HACK! <---- Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
This commit is contained in:
parent
b8aa940233
commit
03ecefbfc3
40
patches/uClibc/0.9.32/160-fix-TLS-DTPREL-TPREL-macros.patch
Normal file
40
patches/uClibc/0.9.32/160-fix-TLS-DTPREL-TPREL-macros.patch
Normal file
@ -0,0 +1,40 @@
|
||||
ldso/mips: workaround for missing TLS macros in elfinterpret.c
|
||||
|
||||
These macros declarations are missing, so gcc believes the code is calling
|
||||
a function, so any later linking will fail.
|
||||
|
||||
Work this around by copying the mcaros from:
|
||||
libpthread/nptl/sysdeps/mips/dl-tls.h
|
||||
|
||||
We can't include the header because of incompatible symbol declarations,
|
||||
so we just copy the macros for now.
|
||||
|
||||
----> THIS IS A DIRTY HACK! <----
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
|
||||
|
||||
diff -durN uClibc-0.9.32.orig/ldso/ldso/mips/elfinterp.c uClibc-0.9.32/ldso/ldso/mips/elfinterp.c
|
||||
--- uClibc-0.9.32.orig/ldso/ldso/mips/elfinterp.c 2011-06-08 21:35:20.000000000 +0200
|
||||
+++ uClibc-0.9.32/ldso/ldso/mips/elfinterp.c 2011-09-12 14:02:37.553628824 +0200
|
||||
@@ -34,6 +34,21 @@
|
||||
|
||||
#define OFFSET_GP_GOT 0x7ff0
|
||||
|
||||
+/* The thread pointer points 0x7000 past the first static TLS block. */
|
||||
+#define TLS_TP_OFFSET 0x7000
|
||||
+
|
||||
+/* Dynamic thread vector pointers point 0x8000 past the start of each
|
||||
+ * TLS block. */
|
||||
+#define TLS_DTV_OFFSET 0x8000
|
||||
+
|
||||
+/* Compute the value for a GOTTPREL reloc. */
|
||||
+#define TLS_TPREL_VALUE(sym_map, sym_val) \
|
||||
+ ((sym_map)->l_tls_offset + sym_val - TLS_TP_OFFSET)
|
||||
+
|
||||
+/* Compute the value for a DTPREL reloc. */
|
||||
+#define TLS_DTPREL_VALUE(sym_val) \
|
||||
+ (sym_val - TLS_DTV_OFFSET)
|
||||
+
|
||||
unsigned long __dl_runtime_resolve(unsigned long sym_index,
|
||||
unsigned long old_gpreg)
|
||||
{
|
Loading…
Reference in New Issue
Block a user