101 lines
2.7 KiB
Diff
101 lines
2.7 KiB
Diff
commit ef7f4b1fef67430a8f3cfc77fa6aada2add851d7
|
|
Author: H.J. Lu <hjl.tools@gmail.com>
|
|
Date: Thu Feb 15 11:19:56 2024 -0800
|
|
|
|
Apply the Makefile sorting fix
|
|
|
|
Apply the Makefile sorting fix generated by sort-makefile-lines.py.
|
|
|
|
Conflicts:
|
|
sysdeps/loongarch/lp64/multiarch/Makefile
|
|
(loongarch does not exist downstream)
|
|
sysdeps/x86/Makefile
|
|
(missing commit 2a969b53c0b02fed7e43473a92f219d737fd217a)
|
|
sysdeps/x86_64/Makefile
|
|
(CET support is not specific to x86-64 downstream)
|
|
sysdeps/x86_64/multiarch/Makefile
|
|
(memchr-evex512, rawmemchr-evex512 not present downstream)
|
|
|
|
diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile
|
|
index 60feef5d87fef1fd..e938d2f821d7f839 100644
|
|
--- a/sysdeps/x86/Makefile
|
|
+++ b/sysdeps/x86/Makefile
|
|
@@ -11,17 +11,17 @@ 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 \
|
|
+ tst-get-cpu-features \
|
|
+ tst-get-cpu-features-static \
|
|
# tests
|
|
tests-static += \
|
|
- tst-get-cpu-features-static \
|
|
tst-cpu-features-cpuinfo-static \
|
|
tst-cpu-features-supports-static \
|
|
+ tst-get-cpu-features-static \
|
|
# tests-static
|
|
ifeq (yes,$(have-ifunc))
|
|
ifeq (yes,$(have-gcc-ifunc))
|
|
diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile
|
|
index 29ab16d2f3d1e38f..6843bb99ca99a07d 100644
|
|
--- a/sysdeps/x86_64/fpu/multiarch/Makefile
|
|
+++ b/sysdeps/x86_64/fpu/multiarch/Makefile
|
|
@@ -4,10 +4,10 @@ libm-sysdep_routines += \
|
|
s_ceilf-c \
|
|
s_floor-c \
|
|
s_floorf-c \
|
|
- s_rint-c \
|
|
- s_rintf-c \
|
|
s_nearbyint-c \
|
|
s_nearbyintf-c \
|
|
+ s_rint-c \
|
|
+ s_rintf-c \
|
|
s_roundeven-c \
|
|
s_roundevenf-c \
|
|
s_trunc-c \
|
|
@@ -21,10 +21,10 @@ libm-sysdep_routines += \
|
|
s_floorf-sse4_1 \
|
|
s_nearbyint-sse4_1 \
|
|
s_nearbyintf-sse4_1 \
|
|
- s_roundeven-sse4_1 \
|
|
- s_roundevenf-sse4_1 \
|
|
s_rint-sse4_1 \
|
|
s_rintf-sse4_1 \
|
|
+ s_roundeven-sse4_1 \
|
|
+ s_roundevenf-sse4_1 \
|
|
s_trunc-sse4_1 \
|
|
s_truncf-sse4_1 \
|
|
# libm-sysdep_routines
|
|
@@ -84,12 +84,12 @@ CFLAGS-s_cosf-fma.c = -mfma -mavx2
|
|
CFLAGS-s_sincosf-fma.c = -mfma -mavx2
|
|
|
|
libm-sysdep_routines += \
|
|
+ e_asin-fma4 \
|
|
+ e_atan2-fma4 \
|
|
e_exp-fma4 \
|
|
e_log-fma4 \
|
|
e_pow-fma4 \
|
|
- e_asin-fma4 \
|
|
s_atan-fma4 \
|
|
- e_atan2-fma4 \
|
|
s_sin-fma4 \
|
|
s_sincos-fma4 \
|
|
s_tan-fma4 \
|
|
@@ -106,10 +106,10 @@ CFLAGS-s_tan-fma4.c = -mfma4
|
|
CFLAGS-s_sincos-fma4.c = -mfma4
|
|
|
|
libm-sysdep_routines += \
|
|
+ e_atan2-avx \
|
|
e_exp-avx \
|
|
e_log-avx \
|
|
s_atan-avx \
|
|
- e_atan2-avx \
|
|
s_sin-avx \
|
|
s_sincos-avx \
|
|
s_tan-avx \
|