diff options
| author | Florian Weimer <fweimer@redhat.com> | 2023-11-20 09:22:21 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2023-11-20 09:22:21 +0100 |
| commit | 8c8eff33e4e492d95f87dd49cfdc2d4de25693eb (patch) | |
| tree | 8fcad5c2a8df8baaffef8c703310e89f9827b77b | |
| parent | 6ae7b5f43d4b13f24606d7108d822e469a96af3d (diff) | |
| download | glibc-8c8eff33e4e492d95f87dd49cfdc2d4de25693eb.tar.gz glibc-8c8eff33e4e492d95f87dd49cfdc2d4de25693eb.tar.xz glibc-8c8eff33e4e492d95f87dd49cfdc2d4de25693eb.zip | |
nptl: Rename tst-execstack to tst-execstack-threads
So that the test is harder to confuse with elf/tst-execstack (although the tests are supposed to be the same). Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
| -rw-r--r-- | elf/tst-execstack.c | 7 | ||||
| -rw-r--r-- | nptl/Makefile | 10 | ||||
| -rw-r--r-- | nptl/tst-execstack-threads-mod.c (renamed from nptl/tst-execstack-mod.c) | 0 | ||||
| -rw-r--r-- | nptl/tst-execstack-threads.c (renamed from nptl/tst-execstack.c) | 0 |
4 files changed, 11 insertions, 6 deletions
diff --git a/elf/tst-execstack.c b/elf/tst-execstack.c index 7e898b4f58..560b353918 100644 --- a/elf/tst-execstack.c +++ b/elf/tst-execstack.c @@ -137,7 +137,12 @@ do_test (void) #endif /* Loading this module should force stacks to become executable. */ - void *h = dlopen ("tst-execstack-mod.so", RTLD_LAZY); +#if USE_PTHREADS + const char *soname = "tst-execstack-threads-mod.so"; +#else + const char *soname = "tst-execstack-mod.so"; +#endif + void *h = dlopen (soname, RTLD_LAZY); if (h == NULL) { printf ("cannot load: %s\n", dlerror ()); diff --git a/nptl/Makefile b/nptl/Makefile index d969419af7..015295e45c 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -466,7 +466,7 @@ tests-internal += \ tst-tls5 \ # tests-internal ifeq ($(have-z-execstack),yes) -tests += tst-execstack +tests += tst-execstack-threads endif endif @@ -474,7 +474,7 @@ modules-names = \ tst-audit-threads-mod1 \ tst-audit-threads-mod2 \ tst-compat-forwarder-mod \ - tst-execstack-mod \ + tst-execstack-threads-mod \ tst-stack4mod \ tst-tls3mod \ tst-tls5mod \ @@ -669,9 +669,9 @@ endif tst-exec4-ARGS = $(host-test-program-cmd) -$(objpfx)tst-execstack.out: $(objpfx)tst-execstack-mod.so -LDFLAGS-tst-execstack = -Wl,-z,noexecstack -CFLAGS-tst-execstack-mod.c += -Wno-trampolines +$(objpfx)tst-execstack-threads.out: $(objpfx)tst-execstack-threads-mod.so +LDFLAGS-tst-execstack-threads = -Wl,-z,noexecstack +CFLAGS-tst-execstack-threads-mod.c += -Wno-trampolines tst-stackguard1-ARGS = --command "$(host-test-program-cmd) --child" tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child" diff --git a/nptl/tst-execstack-mod.c b/nptl/tst-execstack-threads-mod.c index 5b9812c258..5b9812c258 100644 --- a/nptl/tst-execstack-mod.c +++ b/nptl/tst-execstack-threads-mod.c diff --git a/nptl/tst-execstack.c b/nptl/tst-execstack-threads.c index 6e45c1a5e6..6e45c1a5e6 100644 --- a/nptl/tst-execstack.c +++ b/nptl/tst-execstack-threads.c |