From: Florian Weimer <fweimer@redhat.com>
Date: Mon, 20 Nov 2023 08:22:21 +0000 (+0100)
Subject: nptl: Rename tst-execstack to tst-execstack-threads
X-Git-Tag: upstream/2.39~275
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8c8eff33e4e492d95f87dd49cfdc2d4de25693eb;p=platform%2Fupstream%2Fglibc.git

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>
---

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-mod.c
deleted file mode 100644
index 5b9812c258..0000000000
--- a/nptl/tst-execstack-mod.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../elf/tst-execstack-mod.c"
diff --git a/nptl/tst-execstack-threads-mod.c b/nptl/tst-execstack-threads-mod.c
new file mode 100644
index 0000000000..5b9812c258
--- /dev/null
+++ b/nptl/tst-execstack-threads-mod.c
@@ -0,0 +1 @@
+#include "../elf/tst-execstack-mod.c"
diff --git a/nptl/tst-execstack-threads.c b/nptl/tst-execstack-threads.c
new file mode 100644
index 0000000000..6e45c1a5e6
--- /dev/null
+++ b/nptl/tst-execstack-threads.c
@@ -0,0 +1,2 @@
+#define USE_PTHREADS 1
+#include "../elf/tst-execstack.c"
diff --git a/nptl/tst-execstack.c b/nptl/tst-execstack.c
deleted file mode 100644
index 6e45c1a5e6..0000000000
--- a/nptl/tst-execstack.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define USE_PTHREADS 1
-#include "../elf/tst-execstack.c"