diff options
| author | Matheus Castanho <msc@linux.ibm.com> | 2020-12-15 15:35:41 -0300 |
|---|---|---|
| committer | Matheus Castanho <msc@linux.ibm.com> | 2021-01-27 11:34:50 -0300 |
| commit | 01cdcf783a666481133d4975b1980624b0ef4799 (patch) | |
| tree | 355bda8dd66404c9d2fe1b4ff63b63cdd8de0c1f /elf/Makefile | |
| parent | 7d88c6142c6efc160c0ee5e4f85cde382c072888 (diff) | |
| download | glibc-01cdcf783a666481133d4975b1980624b0ef4799.tar.gz glibc-01cdcf783a666481133d4975b1980624b0ef4799.tar.xz glibc-01cdcf783a666481133d4975b1980624b0ef4799.zip | |
elf: Limit tst-prelink-cmp target archs
elf/tst-prelink-cmp was initially added for x86 (commit fe534fe898) to validate the fix for Bug 19178, and later applied to all architectures that use GLOB_DAT relocations (commit 89569c8bb6). However, that bug only affected targets that handle GLOB_DAT relocations as ELF_TYPE_CLASS_EXTERN_PROTECTED_DATA, so the test should only apply to targets defining DL_EXTERN_PROTECTED_DATA, which gates the usage of the elf type class above. For all other targets not meeting that criteria, the test now returns with UNSUPPORTED status. Fixes the test on POWER10 processors, which started using R_PPC64_GLOB_DAT. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'elf/Makefile')
| -rw-r--r-- | elf/Makefile | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/elf/Makefile b/elf/Makefile index 5e7f938e2d..5d666b1b0c 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -457,12 +457,10 @@ update-all-abi: update-all-abi-ld ifeq ($(have-glob-dat-reloc),yes) tests += tst-prelink +tests-internal += tst-prelink-cmp # Don't compile tst-prelink.c with PIE for GLOB_DAT relocation. CFLAGS-tst-prelink.c += -fno-pie tst-prelink-no-pie = yes -ifeq ($(run-built-tests),yes) -tests-special += $(objpfx)tst-prelink-cmp.out -endif endif # The test requires shared _and_ PIE because the executable @@ -1605,10 +1603,7 @@ tst-prelink-ENV = LD_TRACE_PRELINKING=1 $(objpfx)tst-prelink-conflict.out: $(objpfx)tst-prelink.out grep stdout $< | grep conflict | $(AWK) '{ print $$10, $$11 }' > $@ -$(objpfx)tst-prelink-cmp.out: tst-prelink.exp \ - $(objpfx)tst-prelink-conflict.out - cmp $^ > $@; \ - $(evaluate-test) +$(objpfx)tst-prelink-cmp.out: $(objpfx)tst-prelink-conflict.out $(objpfx)tst-ldconfig-X.out : tst-ldconfig-X.sh $(objpfx)ldconfig $(SHELL) $< '$(common-objpfx)' '$(test-wrapper-env)' \ |