patches/uClibc/0.9.32.1/100-fix-TLS-DTPREL-TPREL-macros.patch
author Daniel Price <daniel.price@gmail.com>
Tue Nov 20 16:59:17 2012 -0800 (2012-11-20)
branch1.17
changeset 3129 b8e00eab8f81
parent 2667 3e81e43c0e14
permissions -rw-r--r--
scripts: fail on ':' in paths

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