Update.
* elf/tst-tls3.c: New file. * elf/tst-tlsmod1.c: New file. * elf/Makefile: Add rules to build and run tst-tls3. * sysdeps/i386/dl-machine.h: Include <tls.h>. (elf_machine_type_class): Set ELF_RTYPE_CLASS_PLT also for the three TLS relocations.
This commit is contained in:
parent
7670e25ad5
commit
2e36cb48e5
@ -1,5 +1,13 @@
|
||||
2002-02-10 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* elf/tst-tls3.c: New file.
|
||||
* elf/tst-tlsmod1.c: New file.
|
||||
* elf/Makefile: Add rules to build and run tst-tls3.
|
||||
|
||||
* sysdeps/i386/dl-machine.h: Include <tls.h>.
|
||||
(elf_machine_type_class): Set ELF_RTYPE_CLASS_PLT also for the three
|
||||
TLS relocations.
|
||||
|
||||
* elf/do-lookup.h (FCT): st_value can be zero for STT_TLS symbols.
|
||||
|
||||
* po/fr.po: Update from translation team.
|
||||
|
@ -118,7 +118,8 @@ tests = loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
|
||||
reldep reldep2 reldep3 reldep4 $(tests-nodelete-$(have-z-nodelete)) \
|
||||
$(tests-nodlopen-$(have-z-nodlopen)) neededtest neededtest2 \
|
||||
neededtest3 neededtest4 unload2 lateglobal initfirst global \
|
||||
restest2 next dblload dblunload reldep5 reldep6 tst-tls1 tst-tls2
|
||||
restest2 next dblload dblunload reldep5 reldep6 tst-tls1 tst-tls2 \
|
||||
tst-tls3
|
||||
test-srcs = tst-pathopt
|
||||
tests-vis-yes = vismain
|
||||
tests-nodelete-yes = nodelete
|
||||
@ -135,7 +136,8 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
|
||||
neededobj5 neededobj6 firstobj globalmod1 \
|
||||
unload2mod unload2dep ltglobmod1 ltglobmod2 pathoptobj \
|
||||
dblloadmod1 dblloadmod2 dblloadmod3 reldepmod5 reldepmod6 \
|
||||
reldep6mod0 reldep6mod1 reldep6mod2 reldep6mod3 reldep6mod4
|
||||
reldep6mod0 reldep6mod1 reldep6mod2 reldep6mod3 reldep6mod4 \
|
||||
tst-tlsmod1
|
||||
modules-vis-yes = vismod1 vismod2 vismod3
|
||||
modules-nodelete-yes = nodelmod1 nodelmod2 nodelmod3 nodelmod4
|
||||
modules-nodlopen-yes = nodlopenmod nodlopenmod2
|
||||
@ -438,3 +440,5 @@ $(objpfx)reldep5.out: $(objpfx)reldepmod5.so $(objpfx)reldepmod5.so
|
||||
|
||||
$(objpfx)reldep6: $(libdl)
|
||||
$(objpfx)reldep6.out: $(objpfx)reldep6mod3.so $(objpfx)reldep6mod4.so
|
||||
|
||||
$(objpfx)tst-tls3: $(objpfx)tst-tlsmod1.so
|
||||
|
69
elf/tst-tls3.c
Normal file
69
elf/tst-tls3.c
Normal file
@ -0,0 +1,69 @@
|
||||
/* glibc test for TLS in ld.so. */
|
||||
#include <stdio.h>
|
||||
|
||||
#include <tls.h>
|
||||
#include "tls-macros.h"
|
||||
|
||||
|
||||
/* One define int variable, two externs. */
|
||||
COMMON_INT_DECL(foo);
|
||||
VAR_INT_DECL(bar);
|
||||
VAR_INT_DEF(baz);
|
||||
|
||||
|
||||
extern int in_dso (void);
|
||||
|
||||
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
#ifdef USE_TLS
|
||||
int result = 0;
|
||||
int *ap, *bp, *cp;
|
||||
|
||||
|
||||
/* Set the variable using the local exec model. */
|
||||
puts ("set baz to 3 (LE)");
|
||||
ap = TLS_LE (baz);
|
||||
*ap = 3;
|
||||
|
||||
|
||||
/* Get variables using initial exec model. */
|
||||
puts ("set variables foo and bar (IE)");
|
||||
ap = TLS_IE (foo);
|
||||
*ap = 1;
|
||||
bp = TLS_IE (bar);
|
||||
*bp = 2;
|
||||
|
||||
|
||||
/* Get variables using local dynamic model. */
|
||||
fputs ("get sum of foo, bar (GD) and baz (LD)", stdout);
|
||||
ap = TLS_GD (foo);
|
||||
bp = TLS_GD (bar);
|
||||
cp = TLS_LD (baz);
|
||||
printf (" = %d\n", *ap + *bp + *cp);
|
||||
result |= *ap + *bp + *cp != 6;
|
||||
if (*ap != 1)
|
||||
{
|
||||
printf ("foo = %d\n", *ap);
|
||||
result = 1;
|
||||
}
|
||||
if (*bp != 2)
|
||||
{
|
||||
printf ("bar = %d\n", *bp);
|
||||
result = 1;
|
||||
}
|
||||
if (*cp != 3)
|
||||
{
|
||||
printf ("baz = %d\n", *cp);
|
||||
result = 1;
|
||||
}
|
||||
|
||||
|
||||
result |= in_dso ();
|
||||
|
||||
return result;
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
}
|
63
elf/tst-tlsmod1.c
Normal file
63
elf/tst-tlsmod1.c
Normal file
@ -0,0 +1,63 @@
|
||||
#include <stdio.h>
|
||||
|
||||
#include <tls.h>
|
||||
#include "tls-macros.h"
|
||||
|
||||
|
||||
/* One define int variable, two externs. */
|
||||
COMMON_INT_DEF(foo);
|
||||
VAR_INT_DEF(bar);
|
||||
VAR_INT_DECL(baz);
|
||||
|
||||
|
||||
int
|
||||
in_dso (void)
|
||||
{
|
||||
int result = 0;
|
||||
#ifdef USE_TLS
|
||||
int *ap, *bp, *cp;
|
||||
|
||||
/* Get variables using initial exec model. */
|
||||
fputs ("get sum of foo and bar (IE)", stdout);
|
||||
ap = TLS_IE (foo);
|
||||
bp = TLS_IE (bar);
|
||||
printf (" = %d\n", *ap + *bp);
|
||||
result |= *ap + *bp != 3;
|
||||
if (*ap != 1)
|
||||
{
|
||||
printf ("foo = %d\n", *ap);
|
||||
result = 1;
|
||||
}
|
||||
if (*bp != 2)
|
||||
{
|
||||
printf ("bar = %d\n", *bp);
|
||||
result = 1;
|
||||
}
|
||||
|
||||
|
||||
/* Get variables using generic dynamic model. */
|
||||
fputs ("get sum of foo and bar and baz (GD)", stdout);
|
||||
ap = TLS_GD (foo);
|
||||
bp = TLS_GD (bar);
|
||||
cp = TLS_GD (baz);
|
||||
printf (" = %d\n", *ap + *bp + *cp);
|
||||
result |= *ap + *bp + *cp != 6;
|
||||
if (*ap != 1)
|
||||
{
|
||||
printf ("foo = %d\n", *ap);
|
||||
result = 1;
|
||||
}
|
||||
if (*bp != 2)
|
||||
{
|
||||
printf ("bar = %d\n", *bp);
|
||||
result = 1;
|
||||
}
|
||||
if (*cp != 3)
|
||||
{
|
||||
printf ("baz = %d\n", *cp);
|
||||
result = 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
return result;
|
||||
}
|
@ -24,6 +24,8 @@
|
||||
|
||||
#include <sys/param.h>
|
||||
|
||||
#include <tls.h>
|
||||
|
||||
/* Return nonzero iff ELF header is compatible with the running host. */
|
||||
static inline int __attribute__ ((unused))
|
||||
elf_machine_matches_host (const Elf32_Ehdr *ehdr)
|
||||
@ -255,13 +257,22 @@ _dl_start_user:\n\
|
||||
# define RTLD_START_SPECIAL_INIT /* nothing */
|
||||
#endif
|
||||
|
||||
/* ELF_RTYPE_CLASS_PLT iff TYPE describes relocation of a PLT entry, so
|
||||
PLT entries should not be allowed to define the value.
|
||||
/* ELF_RTYPE_CLASS_PLT iff TYPE describes relocation of a PLT entry or
|
||||
TLS variable, so undefined references should not be allowed to
|
||||
define the value.
|
||||
ELF_RTYPE_CLASS_NOCOPY iff TYPE should not be allowed to resolve to one
|
||||
of the main executable's symbols, as for a COPY reloc. */
|
||||
#define elf_machine_type_class(type) \
|
||||
((((type) == R_386_JMP_SLOT) * ELF_RTYPE_CLASS_PLT) \
|
||||
#ifdef USE_TLS
|
||||
# define elf_machine_type_class(type) \
|
||||
((((type) == R_386_JMP_SLOT || (type) == R_386_TLS_DTPMOD32 \
|
||||
|| (type) == R_386_TLS_DTPOFF32 || (type) == R_386_TLS_TPOFF32) \
|
||||
* ELF_RTYPE_CLASS_PLT) \
|
||||
| (((type) == R_386_COPY) * ELF_RTYPE_CLASS_COPY))
|
||||
#else
|
||||
# define elf_machine_type_class(type) \
|
||||
((((type) == R_386_JMP_SLOT) * ELF_RTYPE_CLASS_PLT) \
|
||||
| (((type) == R_386_COPY) * ELF_RTYPE_CLASS_COPY))
|
||||
#endif
|
||||
|
||||
/* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */
|
||||
#define ELF_MACHINE_JMP_SLOT R_386_JMP_SLOT
|
||||
|
Loading…
Reference in New Issue
Block a user