From f267e1c9dd7fb8852cc32d6eafd96bbcfd5cbb2b Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 4 Dec 2020 09:13:43 +0100 Subject: x86_64: Add glibc-hwcaps support The subdirectories match those in the x86-64 psABI: https://gitlab.com/x86-psABIs/x86-64-ABI/-/commit/77566eb03bc6a326811cb7e9a6b9396884b67c7c Reviewed-by: Adhemerval Zanella --- elf/Makefile | 2 +- elf/tst-glibc-hwcaps-cache.script | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'elf') diff --git a/elf/Makefile b/elf/Makefile index 95cbf66c25..09ff878d7a 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -1832,7 +1832,7 @@ $(objpfx)argv0test.out: tst-rtld-argv0.sh $(objpfx)ld.so \ # glibc-hwcaps mechanism for this architecture). Used to obtain test # coverage for some glibc-hwcaps tests for the widest possible range # of systems. -glibc-hwcaps-first-subdirs-for-tests = +glibc-hwcaps-first-subdirs-for-tests = x86-64-v2 # The test modules are parameterized by preprocessor macros. LDFLAGS-libmarkermod1-1.so += -Wl,-soname,libmarkermod1.so diff --git a/elf/tst-glibc-hwcaps-cache.script b/elf/tst-glibc-hwcaps-cache.script index 6356d15208..66d6942402 100644 --- a/elf/tst-glibc-hwcaps-cache.script +++ b/elf/tst-glibc-hwcaps-cache.script @@ -4,3 +4,13 @@ cp $B/elf/libmarkermod2-1.so $L/libmarkermod2.so cp $B/elf/libmarkermod3-1.so $L/libmarkermod3.so cp $B/elf/libmarkermod4-1.so $L/libmarkermod4.so + +mkdirp 0770 $L/glibc-hwcaps/x86-64-v2 +cp $B/elf/libmarkermod2-2.so $L/glibc-hwcaps/x86-64-v2/libmarkermod2.so +mkdirp 0770 $L/glibc-hwcaps/x86-64-v3 +cp $B/elf/libmarkermod3-2.so $L/glibc-hwcaps/x86-64-v2/libmarkermod3.so +cp $B/elf/libmarkermod3-3.so $L/glibc-hwcaps/x86-64-v3/libmarkermod3.so +mkdirp 0770 $L/glibc-hwcaps/x86-64-v4 +cp $B/elf/libmarkermod4-2.so $L/glibc-hwcaps/x86-64-v2/libmarkermod4.so +cp $B/elf/libmarkermod4-3.so $L/glibc-hwcaps/x86-64-v3/libmarkermod4.so +cp $B/elf/libmarkermod4-4.so $L/glibc-hwcaps/x86-64-v4/libmarkermod4.so -- cgit v1.2.1