diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile | 2 | ||||
| -rw-r--r-- | test/misc/Makefile.in | 5 | ||||
| -rw-r--r-- | test/nptl/Makefile.in | 12 | ||||
| -rw-r--r-- | test/nptl/tst-unload.c | 6 | ||||
| -rw-r--r-- | test/stdlib/Makefile.in | 1 | ||||
| -rw-r--r-- | test/time/Makefile.in | 4 | ||||
| -rw-r--r-- | test/tls/Makefile.in | 4 | ||||
| -rw-r--r-- | test/tls/tls-macros.h | 37 | ||||
| -rw-r--r-- | test/unistd/Makefile.in | 6 |
9 files changed, 66 insertions, 11 deletions
diff --git a/test/Makefile b/test/Makefile index 787c530d4..e4f64181e 100644 --- a/test/Makefile +++ b/test/Makefile @@ -18,7 +18,7 @@ endif ifneq ($(findstring -static,$(LDFLAGS)),) DIRS := $(filter-out dlopen,$(DIRS)) endif -ifneq ($(UCLIBC_HAS_THREADS),y) +ifneq ($(UCLIBC_HAS_THREADS)$(ARCH_USE_MMU),yy) DIRS := $(filter-out pthread,$(DIRS)) endif ifneq ($(UCLIBC_HAS_FULL_RPC),y) diff --git a/test/misc/Makefile.in b/test/misc/Makefile.in index 1e0da6f43..04b677f69 100644 --- a/test/misc/Makefile.in +++ b/test/misc/Makefile.in @@ -2,6 +2,11 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. TESTS_DISABLED := outb tst-fnmatch bug-glob1 tst-gnuglob + +ifeq ($(TARGET_avr32),y) +TESTS_DISABLED += tst-inotify +endif + ifeq ($(UCLIBC_HAS_LFS),) TESTS_DISABLED += dirent64 TESTS_DISABLED += tst-statfs # assuming host has LFS on diff --git a/test/nptl/Makefile.in b/test/nptl/Makefile.in index dd53f9102..d20d2c1a5 100644 --- a/test/nptl/Makefile.in +++ b/test/nptl/Makefile.in @@ -38,11 +38,10 @@ TESTS := tst-align tst-align2 tst-atfork1 tst-attr1 tst-attr2 tst-attr3 \ tst-cancelx12 tst-cancelx13 tst-cancelx14 tst-cancelx15 tst-cancelx16 \ tst-cancelx18 tst-cancelx20 tst-cancelx21 tst-cleanupx0 tst-cleanupx1 \ tst-cleanupx2 tst-cleanupx3 tst-cleanupx4 tst-cond22 tst-cond23 \ - tst-dlsym1 tst-getpid1 tst-getpid2 tst-getpid3 tst-join6 tst-tsd6 \ + tst-getpid1 tst-getpid2 tst-getpid3 tst-join6 tst-tsd6 \ tst-oddstacklimit tst-oncex3 tst-oncex4 tst-rwlock2a \ - tst-basic7 tst-fini1 tst-signal7 \ - tst-unload tst-vfork1x tst-vfork2x tst-sem10 tst-sem11 tst-sem12 \ - tst-typesizes tst-initializers1-c89 tst-initializers1-c99 \ + tst-basic7 tst-signal7 tst-vfork1x tst-vfork2x tst-sem10 tst-sem11 \ + tst-sem12 tst-typesizes tst-initializers1-c89 tst-initializers1-c99 \ tst-initializers1-gnu89 tst-initializers1-gnu99 # @@ -68,7 +67,8 @@ GLIBC_TESTS_DISABLED := tst-eintr1_glibc tst-eintr2_glibc \ ifeq ($(HAVE_SHARED),) -TESTS_DISABLED += tst-tls3 tst-tls4 tst-tls5 +TESTS_DISABLED += tst-tls3 tst-tls4 tst-tls5 tst-dlsym1 tst-fini1 \ + tst-unload else GLIBC_TESTS_DISABLED += tst-tls3_glibc tst-tls4_glibc tst-tls5_glibc endif @@ -109,7 +109,7 @@ LDFLAGS_tst-rwlock14 = -lrt LDFLAGS_tst-fini1 = -Wl,-rpath=./ tst-fini1mod.so LDFLAGS_tst-fini1mod.so = -Wl,-soname=tst-fini1mod.so LDFLAGS_tst-unload = -ldl -LDFLAGS_tst-cancel5 := -lpthread -lpthread_nonshared +LDFLAGS_tst-cancel5 := -lpthread LDFLAGS_tst-cancel23 := -lc -lpthread LDFLAGS_tst-vfork1x := -lc -lpthread LDFLAGS_tst-vfork2x := -lc -lpthread diff --git a/test/nptl/tst-unload.c b/test/nptl/tst-unload.c index c7de2cb91..74a714ecb 100644 --- a/test/nptl/tst-unload.c +++ b/test/nptl/tst-unload.c @@ -23,17 +23,17 @@ static int do_test (void) { - void *p = dlopen ("libpthread.so.0", RTLD_LAZY); + void *p = dlopen ("libpthread.so.1", RTLD_LAZY); if (p == NULL) { - puts ("failed to load libpthread.so.0"); + puts ("failed to load libpthread.so.1"); return 1; } if (dlclose (p) != 0) { - puts ("dlclose (libpthread.so.0) failed"); + puts ("dlclose (libpthread.so.1) failed"); return 1; } diff --git a/test/stdlib/Makefile.in b/test/stdlib/Makefile.in index 53e5a7280..135db6b33 100644 --- a/test/stdlib/Makefile.in +++ b/test/stdlib/Makefile.in @@ -10,4 +10,3 @@ TESTS_DISABLED := ifeq ($(UCLIBC_HAS_PTY),) TESTS_DISABLED += ptytest endif - diff --git a/test/time/Makefile.in b/test/time/Makefile.in index bb11e18bd..83bc07dbb 100644 --- a/test/time/Makefile.in +++ b/test/time/Makefile.in @@ -4,6 +4,10 @@ TESTS_DISABLED := bug-asctime bug-asctime_r time tst-mktime2 tst-posixtz \ tst-strftime tst-strptime tst-timezone +ifeq ($(TARGET_avr32),y) +TESTS_DISABLED += tst-timerfd +endif + ifneq ($(UCLIBC_HAS_XLOCALE),y) TESTS_DISABLED += tst-ftime_l endif diff --git a/test/tls/Makefile.in b/test/tls/Makefile.in index 7ab4e2ad3..0a9833757 100644 --- a/test/tls/Makefile.in +++ b/test/tls/Makefile.in @@ -12,6 +12,10 @@ ifeq ($(HAVE_SHARED),) TESTS_DISABLED := $(TESTS) endif +ifeq ($(TARGET_ARCH),arc) +TESTS_DISABLED += tst-tls12 tst-tls-at-ctor +endif + # All these tests need tls.h, which is not installed with glibc GLIBC_TESTS_DISABLED := $(addsuffix _glibc,$(filter-out $(TESTS_DISABLED),$(TESTS))) diff --git a/test/tls/tls-macros.h b/test/tls/tls-macros.h index 2787809f5..a41aef688 100644 --- a/test/tls/tls-macros.h +++ b/test/tls/tls-macros.h @@ -885,6 +885,43 @@ register void *__gp __asm__("$29"); : "=&r" (__result) : "r" (tp)); \ __result; }) +#elif defined __xtensa__ + +#define TLS_GD(x) \ + ({ int *__l; \ + __asm__ ("movi a8, " #x "@TLSFUNC\n\t" \ + "movi a10, " #x "@TLSARG\n\t" \ + "callx8.tls a8, " #x "@TLSCALL\n\t" \ + "mov %0, a10\n\t" \ + : "=r" (__l) \ + : \ + : "a8", "a9", "a10", "a11", "a12", "a13", "a14", "a15"); \ + __l; }) + +#define TLS_LD(x) \ + ({ int *__l; \ + __asm__ ("movi a8, " #x "@TLSFUNC\n\t" \ + "movi a10, " #x "@TLSARG\n\t" \ + "callx8.tls a8, " #x "@TLSCALL\n\t" \ + "movi %0, " #x "@TPOFF\n\t" \ + "add %0, %0, a10\n\t" \ + : "=r" (__l) \ + : \ + : "a8", "a9", "a10", "a11", "a12", "a13", "a14", "a15"); \ + __l; }) + +#define TLS_IE(x) TLS_LE(x) + +#define TLS_LE(x) \ + ({ int *__l; \ + int __t; \ + __asm__ ("rur %0, threadptr\n\t" \ + "movi %1, " #x "@TPOFF\n\t" \ + "add %0, %0, %1\n\t" \ + : "=r" (__l), "=r" (__t) ); \ + __l; }); \ + + #elif !defined TLS_LE || !defined TLS_IE \ || !defined TLS_LD || !defined TLS_GD # error "No support for this architecture so far." diff --git a/test/unistd/Makefile.in b/test/unistd/Makefile.in index ed33d9ae8..44ff36087 100644 --- a/test/unistd/Makefile.in +++ b/test/unistd/Makefile.in @@ -11,6 +11,10 @@ ifeq ($(UCLIBC_LINUX_SPECIFIC),) TESTS_DISABLED += tst-fallocate endif +ifeq ($(TARGET_avr32),y) +TESTS_DISABLED += tst-fallocate tst-posix_fallocate tst-fallocate64 +endif + # The logic is similar for HAS_ADVANCED_REALTIME and # tst-posix_fallocate/tst-posix_fallocate64 ifeq ($(UCLIBC_HAS_ADVANCED_REALTIME),) @@ -25,6 +29,8 @@ else # reordering is not supported, behaves as if POSIXLY_CORRECT would be set OPTS_tstgetopt := -a -b -cfoobar --required foobar --optional=bazbug --none --colou --color --colour random endif +# for embedded systems 4 GB disk space is not available +TESTS_DISABLED += tst-posix_fallocate64 # getconf.c lives in utils/ # Testsuite cannot currently be built with O= anyway, so hardcode path here |