From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 2A7823835419; Thu, 12 May 2022 19:40:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2A7823835419 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/clang] elf: Disable tst-dlopen-nodelete-reloc if compiler does not generate STB_GNU_UNIQUE X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: e74f9f0475e1a503bfd21466baeb59c85c3f3f7b X-Git-Newrev: 4176e28cefe81d89160ccdf9475dc297af8789ba Message-Id: <20220512194027.2A7823835419@sourceware.org> Date: Thu, 12 May 2022 19:40:27 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 May 2022 19:40:27 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=4176e28cefe81d89160ccdf9475dc297af8789ba commit 4176e28cefe81d89160ccdf9475dc297af8789ba Author: Adhemerval Zanella Date: Thu May 12 15:36:01 2022 -0300 elf: Disable tst-dlopen-nodelete-reloc if compiler does not generate STB_GNU_UNIQUE The test requires STB_GNU_UNIQUE symbols so NODELETE is propagated by do_lookup_unique. Diff: --- elf/Makefile | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/elf/Makefile b/elf/Makefile index b15ec1bbb3..b2169488a9 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -470,11 +470,15 @@ tests += \ # tests endif tests-cxx = \ - tst-dlopen-nodelete-reloc \ tst-nodelete \ tst-unique3 \ tst-unique4 \ # tests-cxx +ifeq (yes,$(config-gnu-unique-object)) +tests-cxx += \ + tst-dlopen-nodelete-reloc \ + # tests-cxx +endif tests += $(if $(CXX),$(tests-cxx)) @@ -938,6 +942,15 @@ modules-names += \ endif modules-names-cxx = \ + tst-nodelete-rtldmod \ + tst-nodelete-uniquemod \ + tst-nodelete-zmod \ + tst-unique3lib \ + tst-unique3lib2 \ + tst-unique4lib \ + # modules-names-cxx +ifeq (yes,$(config-gnu-unique-object)) +modules-names-cxx += \ tst-dlopen-nodelete-reloc-mod1 \ tst-dlopen-nodelete-reloc-mod10 \ tst-dlopen-nodelete-reloc-mod11 \ @@ -955,13 +968,8 @@ modules-names-cxx = \ tst-dlopen-nodelete-reloc-mod7 \ tst-dlopen-nodelete-reloc-mod8 \ tst-dlopen-nodelete-reloc-mod9 \ - tst-nodelete-rtldmod \ - tst-nodelete-uniquemod \ - tst-nodelete-zmod \ - tst-unique3lib \ - tst-unique3lib2 \ - tst-unique4lib \ # modules-names-cxx +endif modules-names += \ $(if $(CXX),$(modules-names-cxx)) \