public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Florian Weimer <fw@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc] nptl: Rename tst-execstack to tst-execstack-threads Date: Mon, 20 Nov 2023 08:42:24 +0000 (GMT) [thread overview] Message-ID: <20231120084224.4E417388206C@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=8c8eff33e4e492d95f87dd49cfdc2d4de25693eb commit 8c8eff33e4e492d95f87dd49cfdc2d4de25693eb Author: Florian Weimer <fweimer@redhat.com> 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 <adhemerval.zanella@linaro.org> 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
reply other threads:[~2023-11-20 8:42 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20231120084224.4E417388206C@sourceware.org \ --to=fw@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).