diff options
| -rw-r--r-- | nptl/Makefile | 41 | ||||
| -rw-r--r-- | sysdeps/pthread/Makefile | 41 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-_res1.c (renamed from nptl/tst-_res1.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-_res1mod1.c (renamed from nptl/tst-_res1mod1.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-_res1mod2.c (renamed from nptl/tst-_res1mod2.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-atfork2.c (renamed from nptl/tst-atfork2.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-atfork2mod.c (renamed from nptl/tst-atfork2mod.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-fini1.c (renamed from nptl/tst-fini1.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-fini1mod.c (renamed from nptl/tst-fini1mod.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-pt-tls4.c (renamed from nptl/tst-tls4.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-tls4moda.c (renamed from nptl/tst-tls4moda.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-tls4modb.c (renamed from nptl/tst-tls4modb.c) | 0 |
12 files changed, 45 insertions, 37 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 9b549454f1..3f0b107d2f 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -364,27 +364,23 @@ tests += tst-cancelx4 tst-cancelx5 tst-cancelx6 tst-cancelx7 tst-cancelx9 \ tst-cleanupx4 ifeq ($(build-shared),yes) -tests += tst-atfork2 tst-tls4 tst-_res1 tst-fini1 tst-compat-forwarder \ - tst-audit-threads +tests += tst-compat-forwarder tst-audit-threads tests-internal += tst-tls3 tst-tls3-malloc tst-tls5 tst-stackguard1 -tests-nolibpthread += tst-fini1 ifeq ($(have-z-execstack),yes) tests += tst-execstack endif endif -modules-names = tst-atfork2mod tst-tls3mod tst-tls4moda tst-tls4modb \ +modules-names = tst-tls3mod \ tst-tls5mod tst-tls5moda tst-tls5modb tst-tls5modc \ tst-tls5modd tst-tls5mode tst-tls5modf tst-stack4mod \ - tst-_res1mod1 tst-_res1mod2 tst-execstack-mod tst-fini1mod \ + tst-execstack-mod \ tst-compat-forwarder-mod tst-audit-threads-mod1 \ tst-audit-threads-mod2 extra-test-objs += $(addsuffix .os,$(strip $(modules-names))) \ tst-cleanup4aux.o tst-cleanupx4aux.o test-extras += tst-cleanup4aux tst-cleanupx4aux -test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names))) -tst-atfork2mod.so-no-z-defs = yes tst-tls3mod.so-no-z-defs = yes tst-tls5mod.so-no-z-defs = yes tst-tls5moda.so-no-z-defs = yes @@ -395,11 +391,6 @@ tst-tls5mode.so-no-z-defs = yes tst-tls5modf.so-no-z-defs = yes ifeq ($(build-shared),yes) -# Build all the modules even when not actually running test programs. -tests: $(test-modules) -endif - -ifeq ($(build-shared),yes) # Set the `multidir' variable by grabbing the variable from the compiler. # We do it once and save the result in a generated makefile. @@ -510,11 +501,6 @@ CFLAGS-tst-initializers1-gnu11.c += $(CFLAGS-tst-initializers1-<) tst-cancel7-ARGS = --command "exec $(host-test-program-cmd)" tst-cancelx7-ARGS = $(tst-cancel7-ARGS) -$(objpfx)tst-atfork2: $(libdl) $(shared-thread-library) -LDFLAGS-tst-atfork2 = -rdynamic -tst-atfork2-ENV = MALLOC_TRACE=$(objpfx)tst-atfork2.mtrace -$(objpfx)tst-atfork2mod.so: $(shared-thread-library) - tst-stack3-ENV = MALLOC_TRACE=$(objpfx)tst-stack3.mtrace $(objpfx)tst-stack3-mem.out: $(objpfx)tst-stack3.out $(common-objpfx)malloc/mtrace $(objpfx)tst-stack3.mtrace > $@; \ @@ -546,9 +532,6 @@ $(objpfx)tst-tls3-malloc: $(libdl) $(shared-thread-library) LDFLAGS-tst-tls3-malloc = -rdynamic $(objpfx)tst-tls3-malloc.out: $(objpfx)tst-tls3mod.so -$(objpfx)tst-tls4: $(libdl) $(shared-thread-library) -$(objpfx)tst-tls4.out: $(objpfx)tst-tls4moda.so $(objpfx)tst-tls4modb.so - $(objpfx)tst-tls5: $(objpfx)tst-tls5mod.so $(shared-thread-library) LDFLAGS-tst-tls5 = -Wl,--no-as-needed LDFLAGS-tst-tls5mod.so = -Wl,-soname,tst-tls5mod.so @@ -565,8 +548,6 @@ endif $(objpfx)tst-dlsym1: $(libdl) $(shared-thread-library) -$(objpfx)tst-fini1: $(shared-thread-library) $(objpfx)tst-fini1mod.so - ifeq (yes,$(build-shared)) librt = $(common-objpfx)rt/librt.so else @@ -579,11 +560,6 @@ $(common-objpfx)rt/librt.so: $(shared-thread-library) $(objpfx)tst-cancel17: $(librt) $(objpfx)tst-cancelx17: $(librt) -$(objpfx)tst-_res1mod2.so: $(objpfx)tst-_res1mod1.so -LDFLAGS-tst-_res1mod1.so = -Wl,-soname,tst-_res1mod1.so -LDFLAGS-tst-_res1mod2.so = -Wl,-soname,tst-_res1mod2.so -$(objpfx)tst-_res1: $(objpfx)tst-_res1mod1.so $(objpfx)tst-_res1mod2.so \ - $(shared-thread-library) LDLIBS-tst-cancel24 = -Wl,--no-as-needed -lstdc++ LDLIBS-tst-cancel24-static = $(LDLIBS-tst-cancel24) @@ -594,10 +570,6 @@ $(objpfx)libpthread.so: +preinit += $(addprefix $(objpfx),$(crti-objs)) $(objpfx)libpthread.so: +postinit += $(addprefix $(objpfx),$(crtn-objs)) ifeq ($(build-shared),yes) -$(objpfx)tst-atfork2.out: $(objpfx)tst-atfork2mod.so -endif - -ifeq ($(build-shared),yes) $(objpfx)crti.o: $(objpfx)pt-crti.o ln -f $< $@ @@ -609,10 +581,7 @@ $(objpfx)$(multidir)/crtn.o: $(objpfx)crtn.o $(objpfx)$(multidir)/ ln -f $< $@ endif -generated += multidir.mk tst-atfork2.mtrace tst-tls6.out - -generated += $(objpfx)tst-atfork2.mtrace \ - $(addsuffix .so,$(strip $(modules-names))) +generated += multidir.mk tst-tls6.out # Give libpthread.so an entry point and make it directly runnable itself. LDFLAGS-pthread.so += -e __nptl_main @@ -627,8 +596,6 @@ $(objpfx)tst-execstack.out: $(objpfx)tst-execstack-mod.so LDFLAGS-tst-execstack = -Wl,-z,noexecstack CFLAGS-tst-execstack-mod.c += -Wno-trampolines -$(objpfx)tst-fini1mod.so: $(shared-thread-library) - tst-stackguard1-ARGS = --command "$(host-test-program-cmd) --child" tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child" diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index 5f9610ecbf..2d483c8534 100644 --- a/sysdeps/pthread/Makefile +++ b/sysdeps/pthread/Makefile @@ -117,6 +117,22 @@ tests += tst-cancelx2 tst-cancelx3 tst-cancelx8 tst-cancelx10 \ tst-cancelx12 tst-cancelx14 tst-cancelx15 tst-cancelx18 \ tst-cleanupx0 tst-cleanupx1 tst-cleanupx2 tst-cleanupx3 +ifeq ($(build-shared),yes) +tests += tst-atfork2 tst-pt-tls4 tst-_res1 tst-fini1 +tests-nolibpthread += tst-fini1 +endif + +modules-names += tst-atfork2mod tst-tls4moda tst-tls4modb \ + tst-_res1mod1 tst-_res1mod2 tst-fini1mod +test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names))) + +tst-atfork2mod.so-no-z-defs = yes + +ifeq ($(build-shared),yes) +# Build all the modules even when not actually running test programs. +tests: $(test-modules) +endif + tests-static += tst-locale1 tst-locale2 tests += tst-cond11-static @@ -150,6 +166,15 @@ CFLAGS-tst-pt-align3.c += $(stack-align-test-flags) tst-umask1-ARGS = $(objpfx)tst-umask1.temp +$(objpfx)tst-atfork2: $(libdl) $(shared-thread-library) +LDFLAGS-tst-atfork2 = -rdynamic +tst-atfork2-ENV = MALLOC_TRACE=$(objpfx)tst-atfork2.mtrace +$(objpfx)tst-atfork2mod.so: $(shared-thread-library) + +ifeq ($(build-shared),yes) +$(objpfx)tst-atfork2.out: $(objpfx)tst-atfork2mod.so +endif + ifeq ($(build-shared),yes) $(objpfx)tst-cleanup0.out: /dev/null $(objpfx)tst-cleanup0 $(make-test-out) > $@ 2>&1; \ @@ -164,7 +189,23 @@ else $(objpfx)tst-cancel28: $(common-objpfx)rt/librt.a endif +$(objpfx)tst-fini1: $(shared-thread-library) $(objpfx)tst-fini1mod.so + +$(objpfx)tst-fini1mod.so: $(shared-thread-library) + +$(objpfx)tst-_res1mod2.so: $(objpfx)tst-_res1mod1.so +LDFLAGS-tst-_res1mod1.so = -Wl,-soname,tst-_res1mod1.so +LDFLAGS-tst-_res1mod2.so = -Wl,-soname,tst-_res1mod2.so +$(objpfx)tst-_res1: $(objpfx)tst-_res1mod1.so $(objpfx)tst-_res1mod2.so \ + $(shared-thread-library) + +$(objpfx)tst-pt-tls4: $(libdl) $(shared-thread-library) +$(objpfx)tst-pt-tls4.out: $(objpfx)tst-tls4moda.so $(objpfx)tst-tls4modb.so + +generated += tst-atfork2.mtrace +generated += $(objpfx)tst-atfork2.mtrace \ + $(addsuffix .so,$(strip $(modules-names))) tests-internal += tst-robust8 diff --git a/nptl/tst-_res1.c b/sysdeps/pthread/tst-_res1.c index 3e186bcb39..3e186bcb39 100644 --- a/nptl/tst-_res1.c +++ b/sysdeps/pthread/tst-_res1.c diff --git a/nptl/tst-_res1mod1.c b/sysdeps/pthread/tst-_res1mod1.c index 3af31c4c03..3af31c4c03 100644 --- a/nptl/tst-_res1mod1.c +++ b/sysdeps/pthread/tst-_res1mod1.c diff --git a/nptl/tst-_res1mod2.c b/sysdeps/pthread/tst-_res1mod2.c index d2a3509c6d..d2a3509c6d 100644 --- a/nptl/tst-_res1mod2.c +++ b/sysdeps/pthread/tst-_res1mod2.c diff --git a/nptl/tst-atfork2.c b/sysdeps/pthread/tst-atfork2.c index 6e4b803413..6e4b803413 100644 --- a/nptl/tst-atfork2.c +++ b/sysdeps/pthread/tst-atfork2.c diff --git a/nptl/tst-atfork2mod.c b/sysdeps/pthread/tst-atfork2mod.c index b307a307ec..b307a307ec 100644 --- a/nptl/tst-atfork2mod.c +++ b/sysdeps/pthread/tst-atfork2mod.c diff --git a/nptl/tst-fini1.c b/sysdeps/pthread/tst-fini1.c index d395fad970..d395fad970 100644 --- a/nptl/tst-fini1.c +++ b/sysdeps/pthread/tst-fini1.c diff --git a/nptl/tst-fini1mod.c b/sysdeps/pthread/tst-fini1mod.c index 6c10303d34..6c10303d34 100644 --- a/nptl/tst-fini1mod.c +++ b/sysdeps/pthread/tst-fini1mod.c diff --git a/nptl/tst-tls4.c b/sysdeps/pthread/tst-pt-tls4.c index 7fd65de79d..7fd65de79d 100644 --- a/nptl/tst-tls4.c +++ b/sysdeps/pthread/tst-pt-tls4.c diff --git a/nptl/tst-tls4moda.c b/sysdeps/pthread/tst-tls4moda.c index ccff2a797a..ccff2a797a 100644 --- a/nptl/tst-tls4moda.c +++ b/sysdeps/pthread/tst-tls4moda.c diff --git a/nptl/tst-tls4modb.c b/sysdeps/pthread/tst-tls4modb.c index 2c29c2d18a..2c29c2d18a 100644 --- a/nptl/tst-tls4modb.c +++ b/sysdeps/pthread/tst-tls4modb.c |