summaryrefslogtreecommitdiff
path: root/test/tls
diff options
context:
space:
mode:
Diffstat (limited to 'test/tls')
-rw-r--r--test/tls/Makefile2
-rw-r--r--test/tls/Makefile.in30
-rw-r--r--test/tls/tst-tls-at-ctor.c1
-rw-r--r--test/tls/tst-tls1.c2
-rw-r--r--test/tls/tst-tls10.c2
-rw-r--r--test/tls/tst-tls10.h1
-rw-r--r--test/tls/tst-tls14.c2
-rw-r--r--test/tls/tst-tls2.c2
-rw-r--r--test/tls/tst-tls3.c2
-rw-r--r--test/tls/tst-tls4.c2
-rw-r--r--test/tls/tst-tls5.c2
-rw-r--r--test/tls/tst-tls6.c7
-rw-r--r--test/tls/tst-tls7.c7
-rw-r--r--test/tls/tst-tls8.c7
-rw-r--r--test/tls/tst-tls9.c2
-rw-r--r--test/tls/tst-tlsmod-at-ctor.c1
-rw-r--r--test/tls/tst-tlsmod1.c2
-rw-r--r--test/tls/tst-tlsmod13.c2
-rw-r--r--test/tls/tst-tlsmod13a.c2
-rw-r--r--test/tls/tst-tlsmod14a.c2
-rw-r--r--test/tls/tst-tlsmod16a.c2
-rw-r--r--test/tls/tst-tlsmod16b.c2
-rw-r--r--test/tls/tst-tlsmod2.c2
-rw-r--r--test/tls/tst-tlsmod3.c2
-rw-r--r--test/tls/tst-tlsmod4.c2
-rw-r--r--test/tls/tst-tlsmod5.c2
-rw-r--r--test/tls/tst-tlsmod6.c2
27 files changed, 3 insertions, 91 deletions
diff --git a/test/tls/Makefile b/test/tls/Makefile
index 607fec2..1a9687c 100644
--- a/test/tls/Makefile
+++ b/test/tls/Makefile
@@ -1,4 +1,4 @@
-# uClibc TLS tests
+# uClibc-ng TLS tests
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
top_builddir=../../
diff --git a/test/tls/Makefile.in b/test/tls/Makefile.in
index 9f10378..10a515d 100644
--- a/test/tls/Makefile.in
+++ b/test/tls/Makefile.in
@@ -1,4 +1,4 @@
-# uClibc TLS tests
+# uClibc-ng TLS tests
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
TESTS := tst-tls1 tst-tls2 tst-tls3 tst-tls4 tst-tls5 tst-tls6 tst-tls7 \
@@ -11,34 +11,6 @@ TESTS_DISABLED := tst-tls1-static tst-tls2-static tst-tls9-static
# guessing some unimplemented check or feature
TESTS_DISABLED += tst-tls16
-#all these tests require shared libraries
-ifeq ($(HAVE_SHARED),)
-TESTS_DISABLED := $(TESTS)
-endif
-
-# All these tests need tls.h, which is not installed with glibc
-GLIBC_TESTS_DISABLED := $(addsuffix _glibc,$(filter-out $(TESTS_DISABLED),$(TESTS)))
-
-
-PTDIR := $(top_builddir)libpthread/nptl
-SYSDEPS_DIR := $(top_srcdir)libc/sysdeps
-
-EXTRA_CFLAGS := -DNOT_IN_libc=1 \
- -std=gnu99 -I. \
- -I$(SYSDEPS_DIR)/linux \
- -I$(SYSDEPS_DIR)/linux/$(TARGET_ARCH) \
- -I$(PTDIR) \
- -I$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH) \
- -I$(PTDIR)/sysdeps/$(TARGET_ARCH) \
- -I$(PTDIR)/sysdeps/unix/sysv/linux \
- -I$(PTDIR)/sysdeps/pthread \
- -I$(PTDIR)/sysdeps/pthread/bits \
- -I$(PTDIR)/sysdeps/generic \
- -I$(top_builddir)ldso/include \
- -I$(top_builddir)ldso/ldso/$(TARGET_ARCH) \
- -I$(top_builddir)include \
- -include $(top_builddir)include/libc-symbols.h
-
tlsmod17a-suffixes := 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
tlsmod18a-suffixes := 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
CFLAGS_tst-tlsmod1.so := -fPIC -DSHARED -shared
diff --git a/test/tls/tst-tls-at-ctor.c b/test/tls/tst-tls-at-ctor.c
index 53aece1..ef3ea70 100644
--- a/test/tls/tst-tls-at-ctor.c
+++ b/test/tls/tst-tls-at-ctor.c
@@ -1,6 +1,5 @@
#include <stdio.h>
#include <stdlib.h>
-#include <tls.h>
#define TLS_VAR_INIT_VALUE 99
diff --git a/test/tls/tst-tls1.c b/test/tls/tst-tls1.c
index f5ac6d2..03db7b2 100644
--- a/test/tls/tst-tls1.c
+++ b/test/tls/tst-tls1.c
@@ -2,8 +2,6 @@
#undef _LIBC
#include <stdio.h>
-#include <tls.h>
-
#ifdef USE_TLS
# include "tls-macros.h"
diff --git a/test/tls/tst-tls10.c b/test/tls/tst-tls10.c
index fc06770..2c5e823 100644
--- a/test/tls/tst-tls10.c
+++ b/test/tls/tst-tls10.c
@@ -14,9 +14,9 @@ int
main (void)
{
struct A *p;
+#ifdef USE_TLS__THREAD
if (local.a != 1 || local.b != 2 || local.c != 3)
abort ();
-#ifdef USE_TLS__THREAD
if (a1.a != 4 || a1.b != 5 || a1.c != 6)
abort ();
if (a2.a != 22 || a2.b != 23 || a2.c != 24)
diff --git a/test/tls/tst-tls10.h b/test/tls/tst-tls10.h
index 1be6adc..d55523d 100644
--- a/test/tls/tst-tls10.h
+++ b/test/tls/tst-tls10.h
@@ -1,4 +1,3 @@
-#include <tls.h>
#include <stdlib.h>
#if defined USE_TLS && defined HAVE___THREAD \
diff --git a/test/tls/tst-tls14.c b/test/tls/tst-tls14.c
index 428fd52..8395276 100644
--- a/test/tls/tst-tls14.c
+++ b/test/tls/tst-tls14.c
@@ -4,8 +4,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <tls.h>
-
#if USE_TLS && HAVE___THREAD
#define AL 4096
diff --git a/test/tls/tst-tls2.c b/test/tls/tst-tls2.c
index 4174899..9f6c35f 100644
--- a/test/tls/tst-tls2.c
+++ b/test/tls/tst-tls2.c
@@ -1,8 +1,6 @@
/* glibc test for TLS in ld.so. */
#include <stdio.h>
-#include <tls.h>
-
#ifdef USE_TLS
# include "tls-macros.h"
diff --git a/test/tls/tst-tls3.c b/test/tls/tst-tls3.c
index 84be435..6f4eaf0 100644
--- a/test/tls/tst-tls3.c
+++ b/test/tls/tst-tls3.c
@@ -1,8 +1,6 @@
/* glibc test for TLS in ld.so. */
#include <stdio.h>
-#include <tls.h>
-
#ifdef USE_TLS
# include "tls-macros.h"
diff --git a/test/tls/tst-tls4.c b/test/tls/tst-tls4.c
index f92ee53..93b8871 100644
--- a/test/tls/tst-tls4.c
+++ b/test/tls/tst-tls4.c
@@ -2,8 +2,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <tls.h>
-
#define TEST_FUNCTION do_test ()
static int
diff --git a/test/tls/tst-tls5.c b/test/tls/tst-tls5.c
index a571d2c..5168049 100644
--- a/test/tls/tst-tls5.c
+++ b/test/tls/tst-tls5.c
@@ -2,8 +2,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <tls.h>
-
#define TEST_FUNCTION do_test ()
static int
diff --git a/test/tls/tst-tls6.c b/test/tls/tst-tls6.c
index 0ebc507..7cc8f6b 100644
--- a/test/tls/tst-tls6.c
+++ b/test/tls/tst-tls6.c
@@ -1,14 +1,7 @@
#include <dlfcn.h>
#include <stdio.h>
#include <stdlib.h>
-
-#include <tls.h>
#include <link.h>
-#ifdef __UCLIBC__
-#include "dl-elf.h"
-#include "dl-hash.h"
-#endif
-
#define TEST_FUNCTION do_test ()
static int
diff --git a/test/tls/tst-tls7.c b/test/tls/tst-tls7.c
index 2dde9af..b8bb71d 100644
--- a/test/tls/tst-tls7.c
+++ b/test/tls/tst-tls7.c
@@ -1,14 +1,7 @@
#include <dlfcn.h>
#include <stdio.h>
#include <stdlib.h>
-
-#include <tls.h>
#include <link.h>
-#ifdef __UCLIBC__
-#include "dl-elf.h"
-#include "dl-hash.h"
-#endif
-
#define TEST_FUNCTION do_test ()
static int
diff --git a/test/tls/tst-tls8.c b/test/tls/tst-tls8.c
index 140de43..4635304 100644
--- a/test/tls/tst-tls8.c
+++ b/test/tls/tst-tls8.c
@@ -1,14 +1,7 @@
#include <dlfcn.h>
#include <stdio.h>
#include <stdlib.h>
-
-#include <tls.h>
#include <link.h>
-#ifdef __UCLIBC__
-#include "dl-elf.h"
-#include "dl-hash.h"
-#endif
-
#define TEST_FUNCTION do_test ()
static int
diff --git a/test/tls/tst-tls9.c b/test/tls/tst-tls9.c
index e317696..61dea1d 100644
--- a/test/tls/tst-tls9.c
+++ b/test/tls/tst-tls9.c
@@ -1,9 +1,7 @@
#include <dlfcn.h>
#include <stdio.h>
#include <stdlib.h>
-
#include <link.h>
-#include <tls.h>
#define TEST_FUNCTION do_test ()
static int
diff --git a/test/tls/tst-tlsmod-at-ctor.c b/test/tls/tst-tlsmod-at-ctor.c
index bd04b50..712e605 100644
--- a/test/tls/tst-tlsmod-at-ctor.c
+++ b/test/tls/tst-tlsmod-at-ctor.c
@@ -1,5 +1,4 @@
#include <stdio.h>
-#include <tls.h>
#define TLS_VAR_INIT_VALUE 99
diff --git a/test/tls/tst-tlsmod1.c b/test/tls/tst-tlsmod1.c
index b4954ca..a4c8665 100644
--- a/test/tls/tst-tlsmod1.c
+++ b/test/tls/tst-tlsmod1.c
@@ -1,7 +1,5 @@
#include <stdio.h>
-#include <tls.h>
-
#ifdef USE_TLS
#include "tls-macros.h"
diff --git a/test/tls/tst-tlsmod13.c b/test/tls/tst-tlsmod13.c
index beca89f..779b991 100644
--- a/test/tls/tst-tlsmod13.c
+++ b/test/tls/tst-tlsmod13.c
@@ -1,5 +1,3 @@
-#include <tls.h>
-
#if defined USE_TLS && defined HAVE___THREAD \
&& defined HAVE_TLS_MODEL_ATTRIBUTE
__thread int a[2] __attribute__ ((tls_model ("initial-exec")));
diff --git a/test/tls/tst-tlsmod13a.c b/test/tls/tst-tlsmod13a.c
index 14b12b0..f3c9681 100644
--- a/test/tls/tst-tlsmod13a.c
+++ b/test/tls/tst-tlsmod13a.c
@@ -1,5 +1,3 @@
-#include <tls.h>
-
#if defined USE_TLS && defined HAVE___THREAD \
&& defined HAVE_TLS_MODEL_ATTRIBUTE
__thread int b[2] __attribute__ ((tls_model ("initial-exec")));
diff --git a/test/tls/tst-tlsmod14a.c b/test/tls/tst-tlsmod14a.c
index 0bb393d..c2c6857 100644
--- a/test/tls/tst-tlsmod14a.c
+++ b/test/tls/tst-tlsmod14a.c
@@ -1,8 +1,6 @@
#include <stdint.h>
#include <stdio.h>
-#include <tls.h>
-
#if USE_TLS && HAVE___THREAD
#define AL 4096
diff --git a/test/tls/tst-tlsmod16a.c b/test/tls/tst-tlsmod16a.c
index 847c809..a93e102 100644
--- a/test/tls/tst-tlsmod16a.c
+++ b/test/tls/tst-tlsmod16a.c
@@ -1,5 +1,3 @@
-#include <tls.h>
-
#if defined HAVE___THREAD && defined HAVE_TLS_MODEL_ATTRIBUTE
int __thread tlsvar;
#else
diff --git a/test/tls/tst-tlsmod16b.c b/test/tls/tst-tlsmod16b.c
index 308e6ba..7275195 100644
--- a/test/tls/tst-tlsmod16b.c
+++ b/test/tls/tst-tlsmod16b.c
@@ -1,5 +1,3 @@
-#include <tls.h>
-
#if defined HAVE___THREAD && defined HAVE_TLS_MODEL_ATTRIBUTE
extern __thread int tlsvar __attribute__((tls_model("initial-exec")));
#else
diff --git a/test/tls/tst-tlsmod2.c b/test/tls/tst-tlsmod2.c
index 4547c97..ed8b206 100644
--- a/test/tls/tst-tlsmod2.c
+++ b/test/tls/tst-tlsmod2.c
@@ -1,7 +1,5 @@
#include <stdio.h>
-#include <tls.h>
-
#ifdef USE_TLS
#include "tls-macros.h"
diff --git a/test/tls/tst-tlsmod3.c b/test/tls/tst-tlsmod3.c
index 12505f6..bd0bec1 100644
--- a/test/tls/tst-tlsmod3.c
+++ b/test/tls/tst-tlsmod3.c
@@ -1,7 +1,5 @@
#include <stdio.h>
-#include <tls.h>
-
#ifdef USE_TLS
# include "tls-macros.h"
diff --git a/test/tls/tst-tlsmod4.c b/test/tls/tst-tlsmod4.c
index 4893cda..76a932c 100644
--- a/test/tls/tst-tlsmod4.c
+++ b/test/tls/tst-tlsmod4.c
@@ -1,7 +1,5 @@
#include <stdio.h>
-#include <tls.h>
-
#ifdef USE_TLS
# include "tls-macros.h"
diff --git a/test/tls/tst-tlsmod5.c b/test/tls/tst-tlsmod5.c
index 2ec69e1..f50cd8b 100644
--- a/test/tls/tst-tlsmod5.c
+++ b/test/tls/tst-tlsmod5.c
@@ -1,5 +1,3 @@
-#include <tls.h>
-
#ifdef USE_TLS
#include "tls-macros.h"
diff --git a/test/tls/tst-tlsmod6.c b/test/tls/tst-tlsmod6.c
index 0fda51b..2b92ffd 100644
--- a/test/tls/tst-tlsmod6.c
+++ b/test/tls/tst-tlsmod6.c
@@ -1,5 +1,3 @@
-#include <tls.h>
-
#ifdef USE_TLS
#include "tls-macros.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 11:36:22 +0000