aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-02-10 18:58:00 +0000
committerUlrich Drepper <drepper@redhat.com>2002-02-10 18:58:00 +0000
commit2cef4257d02ec72a6ca3bef6ce189fe002253bf6 (patch)
tree964da6844fa5c3216edeb2f2e259bc57ccf468ea
parenta5176eabfb9cb8bc76b34dbce68c1ad3efbbc57e (diff)
downloadglibc-2cef4257d02ec72a6ca3bef6ce189fe002253bf6.zip
glibc-2cef4257d02ec72a6ca3bef6ce189fe002253bf6.tar.gz
glibc-2cef4257d02ec72a6ca3bef6ce189fe002253bf6.tar.bz2
Update.
* elf/tst-tls1.c: Move TLS helper macros to... * elf/tls-macros.h: ...here. New file. * elf/tst-tls2.c: New file. * elf/Makefile (tests): Add tst-tls2. (distribute): Add tls-macros.h.
-rw-r--r--ChangeLog6
-rw-r--r--elf/Makefile5
-rw-r--r--elf/tls-macros.h66
-rw-r--r--elf/tst-tls1.c61
-rw-r--r--elf/tst-tls2.c84
5 files changed, 163 insertions, 59 deletions
diff --git a/ChangeLog b/ChangeLog
index c5eaac0..c8d34f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2002-02-10 Ulrich Drepper <drepper@redhat.com>
+ * elf/tst-tls1.c: Move TLS helper macros to...
+ * elf/tls-macros.h: ...here. New file.
+ * elf/tst-tls2.c: New file.
+ * elf/Makefile (tests): Add tst-tls2.
+ (distribute): Add tls-macros.h.
+
* po/sv.po: Update from translation team.
* elf/tst-tls1.c (main): Add complete set of tests. Split
diff --git a/elf/Makefile b/elf/Makefile
index 4235a59..64ad384 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -67,7 +67,8 @@ distribute := $(rtld-routines:=.c) dynamic-link.h do-rel.h dl-machine.h \
reldep6mod4.c reldep6mod3.c reldep6mod2.c reldep6mod1.c \
reldep6mod0.c \
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
+ unwind-dw2-fde.h dwarf2.h dl-procinfo.c tls.h dl-tls.h \
+ tls-macros.h
include ../Makeconfig
@@ -117,7 +118,7 @@ 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
+ restest2 next dblload dblunload reldep5 reldep6 tst-tls1 tst-tls2
test-srcs = tst-pathopt
tests-vis-yes = vismain
tests-nodelete-yes = nodelete
diff --git a/elf/tls-macros.h b/elf/tls-macros.h
new file mode 100644
index 0000000..c3018b8
--- /dev/null
+++ b/elf/tls-macros.h
@@ -0,0 +1,66 @@
+/* Macros to support TLS testing in times of missing compiler support. */
+
+#define COMMON_INT_DEF(x) \
+ asm (".tls_common " #x ",4,4")
+
+/* XXX This definition will probably be machine specific, too. */
+#define VAR_INT_DEF(x) \
+ asm (".section .tdata\n\t" \
+ ".globl " #x "\n" \
+ #x ":\t.long 0\n\t" \
+ ".previous")
+
+
+ /* XXX Each architecture must have its own asm for now. */
+#ifdef __i386__
+# define TLS_LE(x) \
+ ({ int *__l; \
+ asm ("movl %%gs:0,%0\n\t" \
+ "subl $" #x "@tpoff,%0" \
+ : "=r" (__l)); \
+ __l; })
+
+#define TLS_IE(x) \
+ ({ int *__l, __b; \
+ asm ("call 1f\n\t" \
+ ".subsection 1\n" \
+ "1:\tmovl (%%esp), %%ebx\n\t" \
+ "ret\n\t" \
+ ".previous\n\t" \
+ "addl $_GLOBAL_OFFSET_TABLE_, %%ebx\n\t" \
+ "movl %%gs:0,%0\n\t" \
+ "subl " #x "@gottpoff(%%ebx),%0" \
+ : "=r" (__l), "=&b" (__b)); \
+ __l; })
+
+#define TLS_LD(x) \
+ ({ int *__l, __b; \
+ asm ("call 1f\n\t" \
+ ".subsection 1\n" \
+ "1:\tmovl (%%esp), %%ebx\n\t" \
+ "ret\n\t" \
+ ".previous\n\t" \
+ "addl $_GLOBAL_OFFSET_TABLE_, %%ebx\n\t" \
+ "leal " #x "@tlsldm(%%ebx),%%eax\n\t" \
+ "call ___tls_get_addr@plt\n\t" \
+ "leal " #x "@dtpoff(%%eax), %%eax" \
+ : "=a" (__l), "=&b" (__b)); \
+ __l; })
+
+#define TLS_GD(x) \
+ ({ int *__l, __b; \
+ asm ("call 1f\n\t" \
+ ".subsection 1\n" \
+ "1:\tmovl (%%esp), %%ebx\n\t" \
+ "ret\n\t" \
+ ".previous\n\t" \
+ "addl $_GLOBAL_OFFSET_TABLE_, %%ebx\n\t" \
+ "leal " #x "@tlsgd(%%ebx),%%eax\n\t" \
+ "call ___tls_get_addr@plt\n\t" \
+ "nop" \
+ : "=a" (__l), "=&b" (__b)); \
+ __l; })
+
+#else
+# error "No support for this architecture so far."
+#endif
diff --git a/elf/tst-tls1.c b/elf/tst-tls1.c
index fc426b0..5e67482 100644
--- a/elf/tst-tls1.c
+++ b/elf/tst-tls1.c
@@ -2,12 +2,12 @@
#include <stdio.h>
#include <tls.h>
+#include "tls-macros.h"
-/* XXX Until gcc gets told how to define and use thread-local
- variables we will have to resort to use asms. */
-asm (".tls_common foo,4,4");
-asm (".tls_common bar,4,4");
+/* Two common 'int' variables in TLS. */
+COMMON_INT_DEF(foo);
+COMMON_INT_DEF(bar);
int
@@ -17,59 +17,6 @@ main (void)
int result = 0;
int *ap, *bp;
- /* XXX Each architecture must have its own asm for now. */
-# ifdef __i386__
-# define TLS_LE(x) \
- ({ int *__l; \
- asm ("movl %%gs:0,%0\n\t" \
- "subl $" #x "@tpoff,%0" \
- : "=r" (__l)); \
- __l; })
-
-#define TLS_IE(x) \
- ({ int *__l, __b; \
- asm ("call 1f\n\t" \
- ".subsection 1\n" \
- "1:\tmovl (%%esp), %%ebx\n\t" \
- "ret\n\t" \
- ".previous\n\t" \
- "addl $_GLOBAL_OFFSET_TABLE_, %%ebx\n\t" \
- "movl %%gs:0,%0\n\t" \
- "subl " #x "@gottpoff(%%ebx),%0" \
- : "=r" (__l), "=&b" (__b)); \
- __l; })
-
-#define TLS_LD(x) \
- ({ int *__l, __b; \
- asm ("call 1f\n\t" \
- ".subsection 1\n" \
- "1:\tmovl (%%esp), %%ebx\n\t" \
- "ret\n\t" \
- ".previous\n\t" \
- "addl $_GLOBAL_OFFSET_TABLE_, %%ebx\n\t" \
- "leal " #x "@tlsldm(%%ebx),%%eax\n\t" \
- "call ___tls_get_addr@plt\n\t" \
- "leal " #x "@dtpoff(%%eax), %%eax" \
- : "=a" (__l), "=&b" (__b)); \
- __l; })
-
-#define TLS_GD(x) \
- ({ int *__l, __b; \
- asm ("call 1f\n\t" \
- ".subsection 1\n" \
- "1:\tmovl (%%esp), %%ebx\n\t" \
- "ret\n\t" \
- ".previous\n\t" \
- "addl $_GLOBAL_OFFSET_TABLE_, %%ebx\n\t" \
- "leal " #x "@tlsgd(%%ebx),%%eax\n\t" \
- "call ___tls_get_addr@plt\n\t" \
- "nop" \
- : "=a" (__l), "=&b" (__b)); \
- __l; })
-
-# else
-# error "No support for this architecture so far."
-# endif
/* Set the variable using the local exec model. */
puts ("set bar to 1 (LE)");
diff --git a/elf/tst-tls2.c b/elf/tst-tls2.c
new file mode 100644
index 0000000..1810ffa
--- /dev/null
+++ b/elf/tst-tls2.c
@@ -0,0 +1,84 @@
+/* glibc test for TLS in ld.so. */
+#include <stdio.h>
+
+#include <tls.h>
+#include "tls-macros.h"
+
+
+/* Two 'int' variables in TLS. */
+VAR_INT_DEF(foo);
+VAR_INT_DEF(bar);
+
+
+int
+main (void)
+{
+#ifdef USE_TLS
+ int result = 0;
+ int *ap, *bp;
+
+
+ /* Set the variable using the local exec model. */
+ puts ("set bar to 1 (LE)");
+ ap = TLS_LE (bar);
+ *ap = 1;
+
+
+ /* 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 != 1;
+ if (*ap != 0)
+ {
+ printf ("foo = %d\n", *ap);
+ result = 1;
+ }
+ if (*bp != 1)
+ {
+ printf ("bar = %d\n", *bp);
+ result = 1;
+ }
+
+
+ /* Get variables using local dynamic model. */
+ fputs ("get sum of foo and bar (LD)", stdout);
+ ap = TLS_LD (foo);
+ bp = TLS_LD (bar);
+ printf (" = %d\n", *ap + *bp);
+ result |= *ap + *bp != 1;
+ if (*ap != 0)
+ {
+ printf ("foo = %d\n", *ap);
+ result = 1;
+ }
+ if (*bp != 1)
+ {
+ printf ("bar = %d\n", *bp);
+ result = 1;
+ }
+
+
+ /* Get variables using generic dynamic model. */
+ fputs ("get sum of foo and bar (GD)", stdout);
+ ap = TLS_GD (foo);
+ bp = TLS_GD (bar);
+ printf (" = %d\n", *ap + *bp);
+ result |= *ap + *bp != 1;
+ if (*ap != 0)
+ {
+ printf ("foo = %d\n", *ap);
+ result = 1;
+ }
+ if (*bp != 1)
+ {
+ printf ("bar = %d\n", *bp);
+ result = 1;
+ }
+
+ return result;
+#else
+ return 0;
+#endif
+}