Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Update.
2003-04-16  Jakub Jelinek  <jakub@redhat.com>

	* elf/Makefile (distribute): Add tst-tlsmod{[7-9],1[0-2]}.c and
	tst-tls10.h.
	(tests): Add tst-tls1[0-2].
	(modules-names): Add tst-tlsmod{[7-8],1[0-2]}.
	($(objpfx)tst-tlsmod8.so): Depend on tst-tlsmod7.so.
	($(objpfx)tst-tlsmod10.so): Depend on tst-tlsmod9.so.
	($(objpfx)tst-tlsmod12.so): Depend on tst-tlsmod11.so.
	($(objpfx)tst-tls10): Depend on tst-tlsmod8.so.
	($(objpfx)tst-tls11): Depend on tst-tlsmod10.so.
	($(objpfx)tst-tls12): Depend on tst-tlsmod12.so.
	* elf/tst-tls10.c: New test.
	* elf/tst-tls11.c: New test.
	* elf/tst-tls12.c: New test.
	* elf/tst-tls10.h: New file.
	* elf/tst-tlsmod7.c: New file.
	* elf/tst-tlsmod8.c: New file.
	* elf/tst-tlsmod9.c: New file.
	* elf/tst-tlsmod10.c: New file.
	* elf/tst-tlsmod11.c: New file.
	* elf/tst-tlsmod12.c: New file.

2003-04-15  Steven Munroe  <sjmunroe@us.ibm.com>

	* sysdeps/powerpc/bits/atomic.h: Moved ppc32/64 specific code to ...
	* sysdeps/powerpc/powerpc32/bits/atomic.h: New file.
	* sysdeps/powerpc/powerpc64/bits/atomic.h: New file.

	* posix/regex.h: Include <sys/types.h>.
  • Loading branch information
Ulrich Drepper committed Apr 17, 2003
1 parent 66cd688 commit 94c2422
Show file tree
Hide file tree
Showing 16 changed files with 696 additions and 159 deletions.
31 changes: 31 additions & 0 deletions ChangeLog
@@ -1,5 +1,36 @@
2003-04-16 Jakub Jelinek <jakub@redhat.com>

* elf/Makefile (distribute): Add tst-tlsmod{[7-9],1[0-2]}.c and
tst-tls10.h.
(tests): Add tst-tls1[0-2].
(modules-names): Add tst-tlsmod{[7-8],1[0-2]}.
($(objpfx)tst-tlsmod8.so): Depend on tst-tlsmod7.so.
($(objpfx)tst-tlsmod10.so): Depend on tst-tlsmod9.so.
($(objpfx)tst-tlsmod12.so): Depend on tst-tlsmod11.so.
($(objpfx)tst-tls10): Depend on tst-tlsmod8.so.
($(objpfx)tst-tls11): Depend on tst-tlsmod10.so.
($(objpfx)tst-tls12): Depend on tst-tlsmod12.so.
* elf/tst-tls10.c: New test.
* elf/tst-tls11.c: New test.
* elf/tst-tls12.c: New test.
* elf/tst-tls10.h: New file.
* elf/tst-tlsmod7.c: New file.
* elf/tst-tlsmod8.c: New file.
* elf/tst-tlsmod9.c: New file.
* elf/tst-tlsmod10.c: New file.
* elf/tst-tlsmod11.c: New file.
* elf/tst-tlsmod12.c: New file.

2003-04-15 Steven Munroe <sjmunroe@us.ibm.com>

* sysdeps/powerpc/bits/atomic.h: Moved ppc32/64 specific code to ...
* sysdeps/powerpc/powerpc32/bits/atomic.h: New file.
* sysdeps/powerpc/powerpc64/bits/atomic.h: New file.

2003-04-17 Ulrich Drepper <drepper@redhat.com>

* posix/regex.h: Include <sys/types.h>.

* signal/sigrelse.c (sigrelse): Use sigdelset and not __sigdelset.
The signal number must be checked.
* signal/sighold.c (sighold): Use sigaddset and not __sigaddset.
Expand Down
19 changes: 16 additions & 3 deletions elf/Makefile
Expand Up @@ -69,7 +69,9 @@ distribute := rtld-Rules \
unwind-dw2.c unwind-dw2-fde.c unwind.h unwind-pe.h \
unwind-dw2-fde.h dwarf2.h dl-procinfo.c tls.h dl-tls.h \
tst-tlsmod1.c tst-tlsmod2.c tst-tlsmod3.c tst-tlsmod4.c \
tst-tlsmod5.c tst-tlsmod6.c \
tst-tlsmod5.c tst-tlsmod6.c tst-tlsmod7.c tst-tlsmod8.c \
tst-tlsmod9.c tst-tlsmod10.c tst-tlsmod11.c \
tst-tlsmod12.c tst-tls10.h \
circlemod1.c circlemod1a.c circlemod2.c circlemod2a.c \
circlemod3.c circlemod3a.c nodlopenmod2.c \
tls-macros.h \
Expand Down Expand Up @@ -142,7 +144,8 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
$(tests-nodlopen-$(have-z-nodlopen)) neededtest neededtest2 \
neededtest3 neededtest4 unload2 lateglobal initfirst global \
restest2 next dblload dblunload reldep5 reldep6 reldep7 reldep8 \
circleload1 tst-tls3 tst-tls4 tst-tls5 tst-tls6 tst-tls7 tst-tls8
circleload1 tst-tls3 tst-tls4 tst-tls5 tst-tls6 tst-tls7 tst-tls8 \
tst-tls10 tst-tls11 tst-tls12
# reldep9
test-srcs = tst-pathopt
tests-vis-yes = vismain
Expand All @@ -163,7 +166,8 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
reldep6mod0 reldep6mod1 reldep6mod2 reldep6mod3 reldep6mod4 \
reldep7mod1 reldep7mod2 \
tst-tlsmod1 tst-tlsmod2 tst-tlsmod3 tst-tlsmod4 \
tst-tlsmod5 tst-tlsmod6 \
tst-tlsmod5 tst-tlsmod6 tst-tlsmod7 tst-tlsmod8 \
tst-tlsmod9 tst-tlsmod10 tst-tlsmod11 tst-tlsmod12 \
circlemod1 circlemod1a circlemod2 circlemod2a \
circlemod3 circlemod3a \
reldep8mod1 reldep8mod2 reldep8mod3 \
Expand Down Expand Up @@ -376,6 +380,9 @@ $(objpfx)reldep6mod2.so: $(objpfx)reldep6mod1.so
$(objpfx)reldep6mod3.so: $(objpfx)reldep6mod2.so
$(objpfx)reldep6mod4.so: $(objpfx)reldep6mod1.so
$(objpfx)tst-tlsmod3.so: $(objpfx)tst-tlsmod2.so
$(objpfx)tst-tlsmod8.so: $(objpfx)tst-tlsmod7.so
$(objpfx)tst-tlsmod10.so: $(objpfx)tst-tlsmod9.so
$(objpfx)tst-tlsmod12.so: $(objpfx)tst-tlsmod11.so
# For tst-tls9-static, make sure the modules it dlopens have libc.so in DT_NEEDED
$(objpfx)tst-tlsmod5.so: $(common-objpfx)libc.so
$(objpfx)tst-tlsmod6.so: $(common-objpfx)libc.so
Expand Down Expand Up @@ -577,6 +584,12 @@ $(objpfx)tst-tls8.out: $(objpfx)tst-tlsmod3.so $(objpfx)tst-tlsmod4.so
$(objpfx)tst-tls9: $(libdl)
$(objpfx)tst-tls9.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so

$(objpfx)tst-tls10: $(objpfx)tst-tlsmod8.so

$(objpfx)tst-tls11: $(objpfx)tst-tlsmod10.so

$(objpfx)tst-tls12: $(objpfx)tst-tlsmod12.so

ifdef libdl
$(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a
$(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so
Expand Down
40 changes: 40 additions & 0 deletions elf/tst-tls10.c
@@ -0,0 +1,40 @@
#include "tst-tls10.h"

#ifdef USE_TLS__THREAD
static __thread int dummy = 12;
__thread struct A local = { 1, 2, 3 };
#endif

#define CHECK(N, S) \
p = f##N##a (); \
if (p->a != S || p->b != S + 1 || p->c != S + 2) \
abort ()

int
main (void)
{
#ifdef USE_TLS__THREAD
struct A *p;
if (local.a != 1 || local.b != 2 || local.c != 3)
abort ();
if (a1.a != 4 || a1.b != 5 || a1.c != 6)
abort ();
if (a2.a != 22 || a2.b != 23 || a2.c != 24)
abort ();
if (a3.a != 10 || a3.b != 11 || a3.c != 12)
abort ();
if (a4.a != 25 || a4.b != 26 || a4.c != 27)
abort ();
check1 ();
check2 ();
if (f1a () != &a1 || f2a () != &a2 || f3a () != &a3 || f4a () != &a4)
abort ();
CHECK (5, 16);
CHECK (6, 19);
if (f7a () != &a2 || f8a () != &a4)
abort ();
CHECK (9, 28);
CHECK (10, 31);
#endif
exit (0);
}
38 changes: 38 additions & 0 deletions elf/tst-tls10.h
@@ -0,0 +1,38 @@
#include <tls.h>
#include <stdlib.h>

#if defined USE_TLS && defined HAVE___THREAD \
&& defined HAVE_TLS_MODEL_ATTRIBUTE
# define USE_TLS__THREAD

struct A
{
char a;
int b;
long long c;
};

extern __thread struct A a1, a2, a3, a4;
extern struct A *f1a (void);
extern struct A *f2a (void);
extern struct A *f3a (void);
extern struct A *f4a (void);
extern struct A *f5a (void);
extern struct A *f6a (void);
extern struct A *f7a (void);
extern struct A *f8a (void);
extern struct A *f9a (void);
extern struct A *f10a (void);
extern int f1b (void);
extern int f2b (void);
extern int f3b (void);
extern int f4b (void);
extern int f5b (void);
extern int f6b (void);
extern int f7b (void);
extern int f8b (void);
extern int f9b (void);
extern int f10b (void);
extern void check1 (void);
extern void check2 (void);
#endif
27 changes: 27 additions & 0 deletions elf/tst-tls11.c
@@ -0,0 +1,27 @@
#include "tst-tls10.h"

#define CHECK(N, S) \
p = f##N##a (); \
if (p->a != S || p->b != S + 1 || p->c != S + 2) \
abort ()

int
main (void)
{
#ifdef USE_TLS__THREAD
struct A *p;
check1 ();
check2 ();
CHECK (1, 4);
CHECK (2, 22);
CHECK (3, 10);
CHECK (4, 25);
CHECK (5, 16);
CHECK (6, 19);
CHECK (7, 22);
CHECK (8, 25);
CHECK (9, 28);
CHECK (10, 31);
#endif
exit (0);
}
17 changes: 17 additions & 0 deletions elf/tst-tls12.c
@@ -0,0 +1,17 @@
#include "tst-tls10.h"

#define CHECK(N, S) \
p = &a##N; \
if (p->a != S || p->b != S + 1 || p->c != S + 2) \
abort ()

int main()
{
#ifdef USE_TLS__THREAD
struct A *p;
check1 ();
CHECK (1, 4);
CHECK (2, 7);
#endif
exit (0);
}
1 change: 1 addition & 0 deletions elf/tst-tlsmod10.c
@@ -0,0 +1 @@
#include "tst-tlsmod8.c"
6 changes: 6 additions & 0 deletions elf/tst-tlsmod11.c
@@ -0,0 +1,6 @@
#include "tst-tls10.h"

#ifdef USE_TLS__THREAD
__thread struct A a1 = { 4, 5, 6 };
__thread struct A a2 = { 7, 8, 9 };
#endif
14 changes: 14 additions & 0 deletions elf/tst-tlsmod12.c
@@ -0,0 +1,14 @@
#include "tst-tls10.h"

#ifdef USE_TLS__THREAD
extern __thread struct A a2 __attribute__((tls_model("initial-exec")));

void
check1 (void)
{
if (a1.a != 4 || a1.b != 5 || a1.c != 6)
abort ();
if (a2.a != 7 || a2.b != 8 || a2.c != 9)
abort ();
}
#endif
103 changes: 103 additions & 0 deletions elf/tst-tlsmod7.c
@@ -0,0 +1,103 @@
#include "tst-tls10.h"

#ifdef USE_TLS__THREAD
static __thread int dummy = 12;
__thread struct A a1 = { 4, 5, 6 };
__thread struct A a2 = { 7, 8, 9 };
__thread struct A a3 __attribute__((tls_model("initial-exec")))
= { 10, 11, 12 };
__thread struct A a4 __attribute__((tls_model("initial-exec")))
= { 13, 14, 15 };
static __thread struct A local1 = { 16, 17, 18 };
static __thread struct A local2 __attribute__((tls_model("initial-exec")))
= { 19, 20, 21 };

void
check1 (void)
{
if (a1.a != 4 || a1.b != 5 || a1.c != 6)
abort ();
if (a2.a != 22 || a2.b != 23 || a2.c != 24)
abort ();
if (a3.a != 10 || a3.b != 11 || a3.c != 12)
abort ();
if (a4.a != 25 || a4.b != 26 || a4.c != 27)
abort ();
if (local1.a != 16 || local1.b != 17 || local1.c != 18)
abort ();
if (local2.a != 19 || local2.b != 20 || local2.c != 21)
abort ();
}

struct A *
f1a (void)
{
return &a1;
}

struct A *
f2a (void)
{
return &a2;
}

struct A *
f3a (void)
{
return &a3;
}

struct A *
f4a (void)
{
return &a4;
}

struct A *
f5a (void)
{
return &local1;
}

struct A *
f6a (void)
{
return &local2;
}

int
f1b (void)
{
return a1.a;
}

int
f2b (void)
{
return a2.b;
}

int
f3b (void)
{
return a3.c;
}

int
f4b (void)
{
return a4.a;
}

int
f5b (void)
{
return local1.b;
}

int
f6b (void)
{
return local2.c;
}
#endif

0 comments on commit 94c2422

Please sign in to comment.