From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by sourceware.org (Postfix) with ESMTPS id 1CF66387740E for ; Mon, 29 Nov 2021 12:51:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1CF66387740E Received: by mail-pl1-x632.google.com with SMTP id u17so12078059plg.9 for ; Mon, 29 Nov 2021 04:51:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=KlcKPl6N0ZCN1WON4fI+XLBI+VamwEXnou0nOM0oOm8=; b=hFYOmawRcPPLU2ETr2RXE67roooBa96GFor54zNqh8suh4RORB9gYNNVrnJJvAsVVU Yd0zUWUCY1b/AFPHljLsk9YzFpWuP5fjPgyuovjm+I8r83WlV7xGek+wdcUMycqipnQ0 tpyLtTlJUrpzBsZcB+5Mev/69UTCx984DqOAj2j7pr/5EtH894GbNJLYGvr+6goIhVuI lMQzTCWTBPyDTCn43pGfXSkRiBquD/VuCIgbOv91sYHsG6FheE5bp0O0hvYETNhhE0zV 67jK6zDUqQqdodxaPAifuNQUDAeNqSrzz7qpdCmudiidkt7JLLSc8Mmi1zo/Af2OHLX4 zmEg== X-Gm-Message-State: AOAM531WAG+VIBEWGpc1Pd0kIqY1XIA1gF7sdhDWdYd1z65bhLG+EJI7 aJ7SGqIMuWLHgX6mHiyzk6gOQZ5qK955uWy6IEvzGGFA X-Google-Smtp-Source: ABdhPJxiRhUnkas1thbMqzA4iKDCox8/aW7Iy48TTqvdaXTQwb1wFMHBlkWvBNIDgLy9acuF/4CGKPHcxJfGCxU87m8= X-Received: by 2002:a17:902:904b:b0:143:73ff:eb7d with SMTP id w11-20020a170902904b00b0014373ffeb7dmr58634780plz.85.1638190287974; Mon, 29 Nov 2021 04:51:27 -0800 (PST) MIME-Version: 1.0 References: <20211015200708.3990016-1-hjl.tools@gmail.com> In-Reply-To: <20211015200708.3990016-1-hjl.tools@gmail.com> From: "H.J. Lu" Date: Mon, 29 Nov 2021 04:50:52 -0800 Message-ID: Subject: PING^1 [PATCH] Add and use link-test-modules-rpath-link [BZ #28455] To: GNU C Library Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-3028.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Nov 2021 12:51:32 -0000 On Fri, Oct 15, 2021 at 1:07 PM H.J. Lu wrote: > > DT_RUNPATH is only used to find the immediate dependencies of the > executable or shared object containing the DT_RUNPATH entry: > > 1. Define link-test-modules-rpath-link if $(build-hardcoded-path-in-tests) > is yes. > 2. Use $(link-test-modules-rpath-link) in build-module-helper so that > test modules can dlopen modules with DT_RUNPATH. > 3. Add a test to show why link-test-modules-rpath-link is needed. > > This partially fixes BZ #28455. > --- > Makeconfig | 2 ++ > Makerules | 1 + > elf/Makefile | 8 +++++++- > elf/tst-global2.c | 28 ++++++++++++++++++++++++++++ > elf/tst-globalmod2.c | 37 +++++++++++++++++++++++++++++++++++++ > 5 files changed, 75 insertions(+), 1 deletion(-) > create mode 100644 elf/tst-global2.c > create mode 100644 elf/tst-globalmod2.c > > diff --git a/Makeconfig b/Makeconfig > index 2fa0884b4e..302fbf7e6b 100644 > --- a/Makeconfig > +++ b/Makeconfig > @@ -569,8 +569,10 @@ link-libc-rpath-link = -Wl,-rpath-link=$(rpath-link) > # build-hardcoded-path-in-tests. > ifeq (yes,$(build-hardcoded-path-in-tests)) > link-libc-tests-rpath-link = $(link-libc-rpath) > +link-test-modules-rpath-link = $(link-libc-rpath) > else > link-libc-tests-rpath-link = $(link-libc-rpath-link) > +link-test-modules-rpath-link = > endif # build-hardcoded-path-in-tests > > link-libc-between-gnulib = $(common-objpfx)libc.so$(libc.so-version) \ > diff --git a/Makerules b/Makerules > index 596fa68376..ac15671a0a 100644 > --- a/Makerules > +++ b/Makerules > @@ -600,6 +600,7 @@ $(LINK.o) -shared -static-libgcc $(sysdep-LDFLAGS) $(rtld-LDFLAGS) \ > $(if $($(@F)-no-z-defs)$(no-z-defs),,-Wl,-z,defs) \ > -B$(csu-objpfx) $(load-map-file) \ > $(LDFLAGS.so) $(LDFLAGS-$(@F:%.so=%).so) \ > + $(link-test-modules-rpath-link) \ > -L$(subst :, -L,$(rpath-link)) -Wl,-rpath-link=$(rpath-link) > endef > > diff --git a/elf/Makefile b/elf/Makefile > index b01ace2d5a..eeef71b82a 100644 > --- a/elf/Makefile > +++ b/elf/Makefile > @@ -224,7 +224,7 @@ tests += restest1 preloadtest loadfail multiload origtest resolvfail \ > tst-tls-ie tst-tls-ie-dlmopen argv0test \ > tst-glibc-hwcaps tst-glibc-hwcaps-prepend tst-glibc-hwcaps-mask \ > tst-tls20 tst-tls21 tst-dlmopen-dlerror tst-dlmopen-gethostbyname \ > - tst-dl-is_dso tst-ro-dynamic > + tst-dl-is_dso tst-ro-dynamic tst-global2 > # reldep9 > tests-internal += loadtest unload unload2 circleload1 \ > neededtest neededtest2 neededtest3 neededtest4 \ > @@ -365,6 +365,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ > tst-tls20mod-bad tst-tls21mod tst-dlmopen-dlerror-mod \ > tst-auxvalmod \ > tst-dlmopen-gethostbyname-mod tst-ro-dynamic-mod \ > + tst-globalmod2 \ > > # Most modules build with _ISOMAC defined, but those filtered out > # depend on internal headers. > @@ -1269,6 +1270,11 @@ tst-audit8-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so > > $(objpfx)tst-global1.out: $(objpfx)testobj6.so $(objpfx)testobj2.so > > +$(objpfx)tst-global2: $(objpfx)tst-globalmod2.so > +$(objpfx)tst-global2.out: $(objpfx)reldepmod1.so $(objpfx)reldepmod4.so > +LDFLAGS-tst-global2 = -Wl,--enable-new-dtags > +LDFLAGS-tst-globalmod2.so = -Wl,--enable-new-dtags > + > $(objpfx)order2.out: $(objpfx)order2mod1.so $(objpfx)order2mod2.so > $(objpfx)order2-cmp.out: $(objpfx)order2.out > (echo "12345" | cmp $< -) > $@; \ > diff --git a/elf/tst-global2.c b/elf/tst-global2.c > new file mode 100644 > index 0000000000..b17b69c42b > --- /dev/null > +++ b/elf/tst-global2.c > @@ -0,0 +1,28 @@ > +/* Test dlopening a shared library in a shared library built with > + -Wl,--enable-new-dtags in glibc with --enable-hardcoded-path-in-tests. > + Copyright (C) 2021 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + . */ > + > +extern int test (void); > + > +static int > +do_test (void) > +{ > + return test (); > +} > + > +#include > diff --git a/elf/tst-globalmod2.c b/elf/tst-globalmod2.c > new file mode 100644 > index 0000000000..1d0cf3047e > --- /dev/null > +++ b/elf/tst-globalmod2.c > @@ -0,0 +1,37 @@ > +/* Test dlopening a shared library in a shared library built with > + -Wl,--enable-new-dtags in glibc with --enable-hardcoded-path-in-tests. > + Copyright (C) 2021 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + . */ > + > +#include > +#include > +#include > + > +extern int test (void); > + > +int > +test (void) > +{ > + (void) dlopen ("reldepmod4.so", RTLD_LAZY | RTLD_GLOBAL); > + if (dlsym (RTLD_DEFAULT, "call_me") != NULL) > + { > + puts ("found \"call_me\""); > + return EXIT_SUCCESS; > + } > + puts ("didn't find \"call_me\""); > + return EXIT_FAILURE; > +} > -- > 2.31.1 > PING. -- H.J.