From e2aecf83252b829fa3704123e8c975938c0faeb5 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Thu, 12 May 2022 15:36:01 -0300 Subject: 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. --- elf/Makefile | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/elf/Makefile b/elf/Makefile index 42450f9453..0a901aef6a 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -486,11 +486,15 @@ tests += \ valgrind-test \ # tests 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)) @@ -965,6 +969,15 @@ modules-names += \ # modules-names 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-mod2 \ tst-dlopen-nodelete-reloc-mod3 \ @@ -974,21 +987,8 @@ modules-names-cxx = \ tst-dlopen-nodelete-reloc-mod7 \ tst-dlopen-nodelete-reloc-mod8 \ tst-dlopen-nodelete-reloc-mod9 \ - tst-dlopen-nodelete-reloc-mod10 \ - tst-dlopen-nodelete-reloc-mod11 \ - tst-dlopen-nodelete-reloc-mod12 \ - tst-dlopen-nodelete-reloc-mod13 \ - tst-dlopen-nodelete-reloc-mod14 \ - tst-dlopen-nodelete-reloc-mod15 \ - tst-dlopen-nodelete-reloc-mod16 \ - tst-dlopen-nodelete-reloc-mod17 \ - 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)) \ -- cgit 1.4.1