63c381c3fe
- stdlib: Test using setenv with updated environ [BZ #32588] - Fix underallocation of abort_msg_s struct (CVE-2025-0395) - elf: Support recursive use of dynamic TLS in interposed malloc - elf: Avoid some free (NULL) calls in _dl_update_slotinfo - x86/string: Fixup alignment of main loop in str{n}cmp-evex [BZ #32212] - x86: Improve large memset perf with non-temporal stores [RHEL-29312] - x86_64: Fix missing wcsncat function definition without multiarch (x86-64-v4) - sysdeps/x86/Makefile: Split and sort tests - x86: Only align destination to 1x VEC_SIZE in memset 4x loop - elf: Fix slow tls access after dlopen [BZ #19924] - x86: Check the lower byte of EAX of CPUID leaf 2 [BZ #30643] - x86_64: Add log1p with FMA - x86_64: Add expm1 with FMA - x86_64: Add log2 with FMA - x86_64: Sort fpu/multiarch/Makefile (cherry picked from commit d5576a8feda207f06e46bcbcc1bdb566f0fd460a)
179 lines
5.1 KiB
Diff
179 lines
5.1 KiB
Diff
From 0d14bf0754ee8d8cf2bf3dad298fa5c5f97537db Mon Sep 17 00:00:00 2001
|
|
From: "H.J. Lu" <hjl.tools@gmail.com>
|
|
Date: Thu, 7 Dec 2023 09:00:11 -0800
|
|
Subject: [PATCH] sysdeps/x86/Makefile: Split and sort tests
|
|
|
|
Put each test on a separate line and sort tests.
|
|
|
|
(cherry picked from commit 7e03e0de7e7c2de975b5c5e18f5a4b0c75816674)
|
|
---
|
|
sysdeps/x86/Makefile | 110 ++++++++++++++++++++++++++++++-------------
|
|
1 file changed, 78 insertions(+), 32 deletions(-)
|
|
|
|
diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile
|
|
index 917c26f116..5631a59a26 100644
|
|
--- a/sysdeps/x86/Makefile
|
|
+++ b/sysdeps/x86/Makefile
|
|
@@ -10,36 +10,51 @@ sysdep_headers += sys/platform/x86.h bits/platform/x86.h
|
|
CFLAGS-dl-get-cpu-features.os += $(rtld-early-cflags)
|
|
CFLAGS-get-cpuid-feature-leaf.o += $(no-stack-protector)
|
|
|
|
-tests += tst-get-cpu-features tst-get-cpu-features-static \
|
|
- tst-cpu-features-cpuinfo tst-cpu-features-cpuinfo-static \
|
|
- tst-cpu-features-supports tst-cpu-features-supports-static
|
|
-tests-static += tst-get-cpu-features-static \
|
|
- tst-cpu-features-cpuinfo-static \
|
|
- tst-cpu-features-supports-static
|
|
+tests += \
|
|
+ tst-get-cpu-features \
|
|
+ tst-get-cpu-features-static \
|
|
+ tst-cpu-features-cpuinfo \
|
|
+ tst-cpu-features-cpuinfo-static \
|
|
+ tst-cpu-features-supports \
|
|
+ tst-cpu-features-supports-static \
|
|
+# tests
|
|
+tests-static += \
|
|
+ tst-get-cpu-features-static \
|
|
+ tst-cpu-features-cpuinfo-static \
|
|
+ tst-cpu-features-supports-static \
|
|
+# tests-static
|
|
ifeq (yes,$(have-ifunc))
|
|
ifeq (yes,$(have-gcc-ifunc))
|
|
tests += \
|
|
tst-ifunc-isa-1 \
|
|
- tst-ifunc-isa-1-static
|
|
+ tst-ifunc-isa-1-static \
|
|
+# tests
|
|
tests-static += \
|
|
- tst-ifunc-isa-1-static
|
|
+ tst-ifunc-isa-1-static \
|
|
+# tests-static
|
|
test-xfail-tst-ifunc-isa-1 = $(with-lld)
|
|
test-xfail-tst-ifunc-isa-1-static = $(with-lld)
|
|
tests += \
|
|
tst-ifunc-isa-2 \
|
|
- tst-ifunc-isa-2-static
|
|
+ tst-ifunc-isa-2-static \
|
|
+# tests
|
|
tests-static += \
|
|
- tst-ifunc-isa-2-static
|
|
+ tst-ifunc-isa-2-static \
|
|
+# tests-static
|
|
test-xfail-tst-ifunc-isa-2 = $(with-lld)
|
|
test-xfail-tst-ifunc-isa-2-static = $(with-lld)
|
|
endif
|
|
endif
|
|
ifeq (yes,$(enable-x86-isa-level))
|
|
-tests += tst-isa-level-1
|
|
-modules-names += tst-isa-level-mod-1-baseline \
|
|
- tst-isa-level-mod-1-v2 \
|
|
- tst-isa-level-mod-1-v3 \
|
|
- tst-isa-level-mod-1-v4 \
|
|
+tests += \
|
|
+ tst-isa-level-1 \
|
|
+# tests
|
|
+modules-names += \
|
|
+ tst-isa-level-mod-1-baseline \
|
|
+ tst-isa-level-mod-1-v2 \
|
|
+ tst-isa-level-mod-1-v3 \
|
|
+ tst-isa-level-mod-1-v4 \
|
|
+# modules-names
|
|
|
|
# X86 ISA level baseline
|
|
CFLAGS-tst-isa-level-mod-1-baseline.c += -DINCLUDE_X86_ISA_LEVEL \
|
|
@@ -68,14 +83,18 @@ tst-ifunc-isa-2-static-ENV = $(tst-ifunc-isa-2-ENV)
|
|
endif
|
|
|
|
ifeq ($(subdir),math)
|
|
-tests += tst-ldbl-nonnormal-printf
|
|
+tests += \
|
|
+ tst-ldbl-nonnormal-printf \
|
|
+# tests
|
|
endif # $(subdir) == math
|
|
|
|
ifeq ($(subdir),setjmp)
|
|
gen-as-const-headers += jmp_buf-ssp.sym
|
|
sysdep_routines += __longjmp_cancel
|
|
ifneq ($(enable-cet),no)
|
|
-tests += tst-setjmp-cet
|
|
+tests += \
|
|
+ tst-setjmp-cet \
|
|
+# tests
|
|
tst-setjmp-cet-ENV = GLIBC_TUNABLES=glibc.cpu.x86_ibt=on:glibc.cpu.x86_shstk=on
|
|
endif
|
|
endif
|
|
@@ -122,20 +141,45 @@ ifneq ($(enable-cet),no)
|
|
ifeq ($(subdir),elf)
|
|
sysdep-dl-routines += dl-cet
|
|
|
|
-tests += tst-cet-legacy-1 tst-cet-legacy-1a tst-cet-legacy-2 \
|
|
- tst-cet-legacy-2a tst-cet-legacy-3 tst-cet-legacy-4 \
|
|
- tst-cet-legacy-5a tst-cet-legacy-6a tst-cet-legacy-7 \
|
|
- tst-cet-legacy-8 tst-cet-legacy-9 tst-cet-legacy-9-static \
|
|
- tst-cet-legacy-10 tst-cet-legacy-10-static
|
|
-tests-static += tst-cet-legacy-9-static tst-cet-legacy-10-static
|
|
+tests += \
|
|
+ tst-cet-legacy-1 \
|
|
+ tst-cet-legacy-1a \
|
|
+ tst-cet-legacy-2 \
|
|
+ tst-cet-legacy-2a \
|
|
+ tst-cet-legacy-3 \
|
|
+ tst-cet-legacy-4 \
|
|
+ tst-cet-legacy-5a \
|
|
+ tst-cet-legacy-6a \
|
|
+ tst-cet-legacy-7 \
|
|
+ tst-cet-legacy-8 \
|
|
+ tst-cet-legacy-9 \
|
|
+ tst-cet-legacy-9-static \
|
|
+ tst-cet-legacy-10 \
|
|
+ tst-cet-legacy-10-static \
|
|
+# tests
|
|
+tests-static += \
|
|
+ tst-cet-legacy-9-static \
|
|
+ tst-cet-legacy-10-static \
|
|
+# tests-static
|
|
tst-cet-legacy-1a-ARGS = -- $(host-test-program-cmd)
|
|
-tests += tst-cet-legacy-4a tst-cet-legacy-4b tst-cet-legacy-4c \
|
|
- tst-cet-legacy-5b tst-cet-legacy-6b
|
|
-modules-names += tst-cet-legacy-mod-1 tst-cet-legacy-mod-2 \
|
|
- tst-cet-legacy-mod-4 tst-cet-legacy-mod-5a \
|
|
- tst-cet-legacy-mod-5b tst-cet-legacy-mod-5c \
|
|
- tst-cet-legacy-mod-6a tst-cet-legacy-mod-6b \
|
|
- tst-cet-legacy-mod-6c
|
|
+tests += \
|
|
+ tst-cet-legacy-4a \
|
|
+ tst-cet-legacy-4b \
|
|
+ tst-cet-legacy-4c \
|
|
+ tst-cet-legacy-5b \
|
|
+ tst-cet-legacy-6b \
|
|
+# tests
|
|
+modules-names += \
|
|
+ tst-cet-legacy-mod-1 \
|
|
+ tst-cet-legacy-mod-2 \
|
|
+ tst-cet-legacy-mod-4 \
|
|
+ tst-cet-legacy-mod-5a \
|
|
+ tst-cet-legacy-mod-5b \
|
|
+ tst-cet-legacy-mod-5c \
|
|
+ tst-cet-legacy-mod-6a \
|
|
+ tst-cet-legacy-mod-6b \
|
|
+ tst-cet-legacy-mod-6c \
|
|
+# modules-names
|
|
|
|
CFLAGS-tst-cet-legacy-2.c += -fcf-protection=branch
|
|
CFLAGS-tst-cet-legacy-2a.c += -fcf-protection
|
|
@@ -243,7 +287,9 @@ endif
|
|
ifeq ($(subdir),posix)
|
|
tests += \
|
|
tst-sysconf-cache-linesize \
|
|
- tst-sysconf-cache-linesize-static
|
|
+ tst-sysconf-cache-linesize-static \
|
|
+# tests
|
|
tests-static += \
|
|
- tst-sysconf-cache-linesize-static
|
|
+ tst-sysconf-cache-linesize-static \
|
|
+# tests-static
|
|
endif
|
|
--
|
|
2.27.0
|
|
|