From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id 4E417388206C; Mon, 20 Nov 2023 08:42:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4E417388206C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1700469744; bh=6nIlzuq+VaskfOwjV1QzZ+Sdb0BvIGq71P5uJvJXUDg=; h=From:To:Subject:Date:From; b=oe4gWrzYSWXiGXM/VdeHeWvseOxKxzV3ibYYam57apH16x0LDMz2hKx9tqjbtsOzb 3bkFNlVy7QequF8L1fPQnhSVRhkeIRaZBfRZSMMNKkYfsbAbG5yZadsPOGvZZwjnav hMl/Yy5O6ONDgtKAk4bGU8ZSxF87C4tf8q88Rq64= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc] nptl: Rename tst-execstack to tst-execstack-threads X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/master X-Git-Oldrev: 6ae7b5f43d4b13f24606d7108d822e469a96af3d X-Git-Newrev: 8c8eff33e4e492d95f87dd49cfdc2d4de25693eb Message-Id: <20231120084224.4E417388206C@sourceware.org> Date: Mon, 20 Nov 2023 08:42:24 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=8c8eff33e4e492d95f87dd49cfdc2d4de25693eb commit 8c8eff33e4e492d95f87dd49cfdc2d4de25693eb Author: Florian Weimer Date: Mon Nov 20 09:22:21 2023 +0100 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 Diff: --- elf/tst-execstack.c | 7 ++++++- nptl/Makefile | 10 +++++----- nptl/{tst-execstack-mod.c => tst-execstack-threads-mod.c} | 0 nptl/{tst-execstack.c => tst-execstack-threads.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 similarity index 100% rename from nptl/tst-execstack-mod.c rename to nptl/tst-execstack-threads-mod.c diff --git a/nptl/tst-execstack.c b/nptl/tst-execstack-threads.c similarity index 100% rename from nptl/tst-execstack.c rename to nptl/tst-execstack-threads.c