patches/uClibc/0.9.32/160-fix-TLS-DTPREL-TPREL-macros.patch
author "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
Wed Dec 14 16:55:22 2011 +0100 (2011-12-14)
branch1.13
changeset 2848 1ff89596dab0
permissions -rw-r--r--
libc/eglibc: fix localedef 2.14 build

The localedef of eglibc 2.14 requires NOT_IN_libc to be defined in order to
compile intl/l10nflist.c.

This is because localedef is built separately from eglibc and uses some parts of
eglibc that don't compile in standalone without this preprocessor definition.

This fixes the following error:

[ALL ] gcc -g -O2 -DNO_SYSCONF -DNO_UNCOMPRESS
-DLOCALE_PATH='"/usr/lib/locale:/usr/share/i18n"'
-DLOCALEDIR='"/usr/lib/locale"' -DLOCALE_ALIAS_PATH='"/usr/share/locale"'
-DCHARMAP_PATH='"/usr/share/i18n/charmaps"'
-DREPERTOIREMAP_PATH='"/usr/share/i18n/repertoiremaps"'
-DLOCSRCDIR='"/usr/share/i18n/locales"' -Iglibc/locale/programs -Iglibc/locale
-I/<snip>/.build/src/eglibc-localedef-2_14/include
-I/<snip>/.build/src/eglibc-localedef-2_14 -I.
-include /<snip>/.build/src/eglibc-localedef-2_14/include/always.h -Wall
-Wno-format -c -o locarchive.o glibc/locale/programs/locarchive.c
[ALL ] glibc/locale/programs/locarchive.c: In function 'enlarge_archive':
[ALL ] glibc/locale/programs/locarchive.c:303:21: warning: variable
'oldlocrectab' set but not used [-Wunused-but-set-variable]
[ALL ] In file included from glibc/locale/programs/locarchive.c:651:0:
[ALL ] glibc/locale/programs/../../intl/l10nflist.c: In function
'_nl_normalize_codeset':
[ERROR] glibc/locale/programs/../../intl/l10nflist.c:342:9: error:
'_nl_C_locobj_ptr' undeclared (first use in this function)
[ALL ] glibc/locale/programs/../../intl/l10nflist.c:342:9: note: each
undeclared identifier is reported only once for each function it appears in
[ALL ] glibc/locale/programs/locarchive.c: In function
'add_locales_to_archive':
[ALL ] glibc/locale/programs/locarchive.c:1450:7: warning: passing argument
1 of '__xpg_basename' discards 'const' qualifier from pointer target type
[enabled by default]
[ALL ] /usr/include/libgen.h:35:14: note: expected 'char *' but argument is
of type 'const char *'
[ERROR] make[1]: *** [locarchive.o] Error 1

Signed-off-by: "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
(transplanted from 4cd9134739b594451794cf61a6e1b137422cdafd)
yann@2667
     1
ldso/mips: workaround for missing TLS macros in elfinterpret.c
yann@2667
     2
yann@2667
     3
These macros declarations are missing, so gcc believes the code is calling
yann@2667
     4
a function, so any later linking will fail.
yann@2667
     5
yann@2667
     6
Work this around by copying the mcaros from:
yann@2667
     7
   libpthread/nptl/sysdeps/mips/dl-tls.h
yann@2667
     8
yann@2667
     9
We can't include the header because of incompatible symbol declarations,
yann@2667
    10
so we just copy the macros for now.
yann@2667
    11
yann@2667
    12
---->  THIS IS A DIRTY HACK!  <----
yann@2667
    13
yann@2667
    14
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
yann@2667
    15
yann@2667
    16
diff -durN uClibc-0.9.32.orig/ldso/ldso/mips/elfinterp.c uClibc-0.9.32/ldso/ldso/mips/elfinterp.c
yann@2667
    17
--- uClibc-0.9.32.orig/ldso/ldso/mips/elfinterp.c	2011-06-08 21:35:20.000000000 +0200
yann@2667
    18
+++ uClibc-0.9.32/ldso/ldso/mips/elfinterp.c	2011-09-12 14:02:37.553628824 +0200
yann@2667
    19
@@ -34,6 +34,21 @@
yann@2667
    20
 
yann@2667
    21
 #define OFFSET_GP_GOT 0x7ff0
yann@2667
    22
 
yann@2667
    23
+/* The thread pointer points 0x7000 past the first static TLS block.  */
yann@2667
    24
+#define TLS_TP_OFFSET           0x7000
yann@2667
    25
+
yann@2667
    26
+/* Dynamic thread vector pointers point 0x8000 past the start of each
yann@2667
    27
+ *    TLS block.  */
yann@2667
    28
+#define TLS_DTV_OFFSET          0x8000
yann@2667
    29
+
yann@2667
    30
+/* Compute the value for a GOTTPREL reloc.  */
yann@2667
    31
+#define TLS_TPREL_VALUE(sym_map, sym_val) \
yann@2667
    32
+  ((sym_map)->l_tls_offset + sym_val - TLS_TP_OFFSET)
yann@2667
    33
+
yann@2667
    34
+/* Compute the value for a DTPREL reloc.  */
yann@2667
    35
+#define TLS_DTPREL_VALUE(sym_val) \
yann@2667
    36
+  (sym_val - TLS_DTV_OFFSET)
yann@2667
    37
+
yann@2667
    38
 unsigned long __dl_runtime_resolve(unsigned long sym_index,
yann@2667
    39
 	unsigned long old_gpreg)
yann@2667
    40
 {