[glibc] AArch64: Update mathvec directory structure.

Adhemerval Zanella via Glibc-cvs <[email protected]> Tue, 23 Jun 2026 17:51:25 +0000 (GMT)
Newsgroups gmane.comp.lib.glibc.cvs
Message-ID <[email protected]>
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=5a60281b88a7dfd4423648fc8e1e02609219a4b6

commit 5a60281b88a7dfd4423648fc8e1e02609219a4b6
Author: Pierre Blanchard <[email protected]>
Date:   Thu Jun 18 21:44:41 2026 +0000

    AArch64: Update mathvec directory structure.
    
    The new structure matches that of Arm Optimized-routines,
    to facilitate files traceability.
    
    Reviewed-by: Adhemerval Zanella  <[email protected]>

Diff:
---
 sysdeps/aarch64/fpu/Makefile                       | 35 +++++++++++++++-------
 .../aarch64/fpu/{acos_advsimd.c => advsimd/acos.c} |  0
 .../fpu/{acosf_advsimd.c => advsimd/acosf.c}       |  0
 .../fpu/{acosh_advsimd.c => advsimd/acosh.c}       |  0
 .../fpu/{acoshf_advsimd.c => advsimd/acoshf.c}     |  0
 .../fpu/{acospi_advsimd.c => advsimd/acospi.c}     |  0
 .../fpu/{acospif_advsimd.c => advsimd/acospif.c}   |  0
 .../aarch64/fpu/{asin_advsimd.c => advsimd/asin.c} |  0
 .../fpu/{asinf_advsimd.c => advsimd/asinf.c}       |  0
 .../fpu/{asinh_advsimd.c => advsimd/asinh.c}       |  0
 .../fpu/{asinhf_advsimd.c => advsimd/asinhf.c}     |  0
 .../fpu/{asinpi_advsimd.c => advsimd/asinpi.c}     |  0
 .../fpu/{asinpif_advsimd.c => advsimd/asinpif.c}   |  0
 .../aarch64/fpu/{atan_advsimd.c => advsimd/atan.c} |  0
 .../fpu/{atan2_advsimd.c => advsimd/atan2.c}       |  0
 .../fpu/{atan2f_advsimd.c => advsimd/atan2f.c}     |  0
 .../fpu/{atan2pi_advsimd.c => advsimd/atan2pi.c}   |  0
 .../fpu/{atan2pif_advsimd.c => advsimd/atan2pif.c} |  0
 .../fpu/{atanf_advsimd.c => advsimd/atanf.c}       |  0
 .../fpu/{atanh_advsimd.c => advsimd/atanh.c}       |  0
 .../fpu/{atanhf_advsimd.c => advsimd/atanhf.c}     |  0
 .../fpu/{atanpi_advsimd.c => advsimd/atanpi.c}     |  0
 .../fpu/{atanpif_advsimd.c => advsimd/atanpif.c}   |  0
 .../aarch64/fpu/{cbrt_advsimd.c => advsimd/cbrt.c} |  0
 .../fpu/{cbrtf_advsimd.c => advsimd/cbrtf.c}       |  0
 .../aarch64/fpu/{cos_advsimd.c => advsimd/cos.c}   |  0
 .../aarch64/fpu/{cosf_advsimd.c => advsimd/cosf.c} |  0
 .../aarch64/fpu/{cosh_advsimd.c => advsimd/cosh.c} |  0
 .../fpu/{coshf_advsimd.c => advsimd/coshf.c}       |  0
 .../fpu/{cospi_advsimd.c => advsimd/cospi.c}       |  0
 .../fpu/{cospif_advsimd.c => advsimd/cospif.c}     |  0
 .../aarch64/fpu/{erf_advsimd.c => advsimd/erf.c}   |  0
 .../aarch64/fpu/{erfc_advsimd.c => advsimd/erfc.c} |  0
 .../fpu/{erfcf_advsimd.c => advsimd/erfcf.c}       |  0
 .../aarch64/fpu/{erff_advsimd.c => advsimd/erff.c} |  0
 .../aarch64/fpu/{exp_advsimd.c => advsimd/exp.c}   |  0
 .../fpu/{exp10_advsimd.c => advsimd/exp10.c}       |  0
 .../fpu/{exp10f_advsimd.c => advsimd/exp10f.c}     |  0
 .../fpu/{exp10m1_advsimd.c => advsimd/exp10m1.c}   |  0
 .../fpu/{exp10m1f_advsimd.c => advsimd/exp10m1f.c} |  0
 .../aarch64/fpu/{exp2_advsimd.c => advsimd/exp2.c} |  0
 .../fpu/{exp2f_advsimd.c => advsimd/exp2f.c}       |  0
 .../fpu/{exp2m1_advsimd.c => advsimd/exp2m1.c}     |  0
 .../fpu/{exp2m1f_advsimd.c => advsimd/exp2m1f.c}   |  0
 .../aarch64/fpu/{expf_advsimd.c => advsimd/expf.c} |  0
 .../fpu/{expm1_advsimd.c => advsimd/expm1.c}       |  0
 .../fpu/{expm1f_advsimd.c => advsimd/expm1f.c}     |  0
 sysdeps/aarch64/fpu/{ => advsimd}/finite_pow.h     |  0
 .../fpu/{hypot_advsimd.c => advsimd/hypot.c}       |  0
 .../fpu/{hypotf_advsimd.c => advsimd/hypotf.c}     |  0
 .../aarch64/fpu/{log_advsimd.c => advsimd/log.c}   |  0
 .../fpu/{log10_advsimd.c => advsimd/log10.c}       |  0
 .../fpu/{log10f_advsimd.c => advsimd/log10f.c}     |  0
 .../fpu/{log10p1_advsimd.c => advsimd/log10p1.c}   |  0
 .../fpu/{log10p1f_advsimd.c => advsimd/log10p1f.c} |  0
 .../fpu/{log1p_advsimd.c => advsimd/log1p.c}       |  0
 .../fpu/{log1pf_advsimd.c => advsimd/log1pf.c}     |  0
 .../aarch64/fpu/{log2_advsimd.c => advsimd/log2.c} |  0
 .../fpu/{log2f_advsimd.c => advsimd/log2f.c}       |  0
 .../fpu/{log2p1_advsimd.c => advsimd/log2p1.c}     |  0
 .../fpu/{log2p1f_advsimd.c => advsimd/log2p1f.c}   |  0
 .../aarch64/fpu/{logf_advsimd.c => advsimd/logf.c} |  0
 .../aarch64/fpu/{ => advsimd}/poly_advsimd_f32.h   |  0
 .../aarch64/fpu/{ => advsimd}/poly_advsimd_f64.h   |  0
 sysdeps/aarch64/fpu/{ => advsimd}/poly_generic.h   |  0
 .../aarch64/fpu/{pow_advsimd.c => advsimd/pow.c}   |  0
 .../aarch64/fpu/{powf_advsimd.c => advsimd/powf.c} |  0
 .../aarch64/fpu/{powr_advsimd.c => advsimd/powr.c} |  0
 .../fpu/{powrf_advsimd.c => advsimd/powrf.c}       |  0
 .../fpu/{rsqrt_advsimd.c => advsimd/rsqrt.c}       |  0
 .../fpu/{rsqrtf_advsimd.c => advsimd/rsqrtf.c}     |  0
 .../aarch64/fpu/{sin_advsimd.c => advsimd/sin.c}   |  0
 .../aarch64/fpu/{sinf_advsimd.c => advsimd/sinf.c} |  0
 .../aarch64/fpu/{sinh_advsimd.c => advsimd/sinh.c} |  0
 .../fpu/{sinhf_advsimd.c => advsimd/sinhf.c}       |  0
 .../fpu/{sinpi_advsimd.c => advsimd/sinpi.c}       |  0
 .../fpu/{sinpif_advsimd.c => advsimd/sinpif.c}     |  0
 .../aarch64/fpu/{tan_advsimd.c => advsimd/tan.c}   |  0
 .../aarch64/fpu/{tanf_advsimd.c => advsimd/tanf.c} |  0
 .../aarch64/fpu/{tanh_advsimd.c => advsimd/tanh.c} |  0
 .../fpu/{tanhf_advsimd.c => advsimd/tanhf.c}       |  0
 .../fpu/{tanpi_advsimd.c => advsimd/tanpi.c}       |  0
 .../fpu/{tanpif_advsimd.c => advsimd/tanpif.c}     |  0
 .../fpu/{ => advsimd}/v_exp_special_case_inline.h  |  0
 sysdeps/aarch64/fpu/{ => advsimd}/v_expf_inline.h  |  0
 .../fpu/{ => advsimd}/v_expf_special_inline.h      |  0
 sysdeps/aarch64/fpu/{ => advsimd}/v_expm1_inline.h |  0
 .../aarch64/fpu/{ => advsimd}/v_expm1f_inline.h    |  0
 sysdeps/aarch64/fpu/{ => advsimd}/v_log1p_inline.h |  0
 .../aarch64/fpu/{ => advsimd}/v_log1pf_inline.h    |  0
 sysdeps/aarch64/fpu/{ => advsimd}/v_math.h         |  0
 sysdeps/aarch64/fpu/{ => advsimd}/v_pow_inline.h   |  0
 sysdeps/aarch64/fpu/{ => advsimd}/v_powf_inline.h  |  0
 sysdeps/aarch64/fpu/{ => advsimd}/v_powrf_inline.h |  0
 .../aarch64/fpu/{ => advsimd}/v_trig_fallback.h    |  0
 .../aarch64/fpu/{ => advsimd}/v_trigf_fallback.h   |  0
 sysdeps/aarch64/fpu/{acos_sve.c => sve/acos.c}     |  0
 sysdeps/aarch64/fpu/{acosf_sve.c => sve/acosf.c}   |  0
 sysdeps/aarch64/fpu/{acosh_sve.c => sve/acosh.c}   |  0
 sysdeps/aarch64/fpu/{acoshf_sve.c => sve/acoshf.c} |  0
 sysdeps/aarch64/fpu/{acospi_sve.c => sve/acospi.c} |  0
 .../aarch64/fpu/{acospif_sve.c => sve/acospif.c}   |  0
 sysdeps/aarch64/fpu/{asin_sve.c => sve/asin.c}     |  0
 sysdeps/aarch64/fpu/{asinf_sve.c => sve/asinf.c}   |  0
 sysdeps/aarch64/fpu/{asinh_sve.c => sve/asinh.c}   |  0
 sysdeps/aarch64/fpu/{asinhf_sve.c => sve/asinhf.c} |  0
 sysdeps/aarch64/fpu/{asinpi_sve.c => sve/asinpi.c} |  0
 .../aarch64/fpu/{asinpif_sve.c => sve/asinpif.c}   |  0
 sysdeps/aarch64/fpu/{atan_sve.c => sve/atan.c}     |  0
 sysdeps/aarch64/fpu/{atan2_sve.c => sve/atan2.c}   |  0
 sysdeps/aarch64/fpu/{atan2f_sve.c => sve/atan2f.c} |  0
 .../aarch64/fpu/{atan2pi_sve.c => sve/atan2pi.c}   |  0
 .../aarch64/fpu/{atan2pif_sve.c => sve/atan2pif.c} |  0
 sysdeps/aarch64/fpu/{atanf_sve.c => sve/atanf.c}   |  0
 sysdeps/aarch64/fpu/{atanh_sve.c => sve/atanh.c}   |  0
 sysdeps/aarch64/fpu/{atanhf_sve.c => sve/atanhf.c} |  0
 sysdeps/aarch64/fpu/{atanpi_sve.c => sve/atanpi.c} |  0
 .../aarch64/fpu/{atanpif_sve.c => sve/atanpif.c}   |  0
 sysdeps/aarch64/fpu/{cbrt_sve.c => sve/cbrt.c}     |  0
 sysdeps/aarch64/fpu/{cbrtf_sve.c => sve/cbrtf.c}   |  0
 sysdeps/aarch64/fpu/{cos_sve.c => sve/cos.c}       |  0
 sysdeps/aarch64/fpu/{cosf_sve.c => sve/cosf.c}     |  0
 sysdeps/aarch64/fpu/{cosh_sve.c => sve/cosh.c}     |  0
 sysdeps/aarch64/fpu/{coshf_sve.c => sve/coshf.c}   |  0
 sysdeps/aarch64/fpu/{cospi_sve.c => sve/cospi.c}   |  0
 sysdeps/aarch64/fpu/{cospif_sve.c => sve/cospif.c} |  0
 sysdeps/aarch64/fpu/{erf_sve.c => sve/erf.c}       |  0
 sysdeps/aarch64/fpu/{erfc_sve.c => sve/erfc.c}     |  0
 sysdeps/aarch64/fpu/{erfcf_sve.c => sve/erfcf.c}   |  0
 sysdeps/aarch64/fpu/{erff_sve.c => sve/erff.c}     |  0
 sysdeps/aarch64/fpu/{exp_sve.c => sve/exp.c}       |  0
 sysdeps/aarch64/fpu/{exp10_sve.c => sve/exp10.c}   |  0
 sysdeps/aarch64/fpu/{exp10f_sve.c => sve/exp10f.c} |  0
 .../aarch64/fpu/{exp10m1_sve.c => sve/exp10m1.c}   |  0
 .../aarch64/fpu/{exp10m1f_sve.c => sve/exp10m1f.c} |  0
 sysdeps/aarch64/fpu/{exp2_sve.c => sve/exp2.c}     |  0
 sysdeps/aarch64/fpu/{exp2f_sve.c => sve/exp2f.c}   |  0
 sysdeps/aarch64/fpu/{exp2m1_sve.c => sve/exp2m1.c} |  0
 .../aarch64/fpu/{exp2m1f_sve.c => sve/exp2m1f.c}   |  0
 sysdeps/aarch64/fpu/{expf_sve.c => sve/expf.c}     |  0
 sysdeps/aarch64/fpu/{expm1_sve.c => sve/expm1.c}   |  0
 sysdeps/aarch64/fpu/{expm1f_sve.c => sve/expm1f.c} |  0
 sysdeps/aarch64/fpu/{hypot_sve.c => sve/hypot.c}   |  0
 sysdeps/aarch64/fpu/{hypotf_sve.c => sve/hypotf.c} |  0
 sysdeps/aarch64/fpu/{log_sve.c => sve/log.c}       |  0
 sysdeps/aarch64/fpu/{log10_sve.c => sve/log10.c}   |  0
 sysdeps/aarch64/fpu/{log10f_sve.c => sve/log10f.c} |  0
 .../aarch64/fpu/{log10p1_sve.c => sve/log10p1.c}   |  0
 .../aarch64/fpu/{log10p1f_sve.c => sve/log10p1f.c} |  0
 sysdeps/aarch64/fpu/{log1p_sve.c => sve/log1p.c}   |  0
 sysdeps/aarch64/fpu/{log1pf_sve.c => sve/log1pf.c} |  0
 sysdeps/aarch64/fpu/{log2_sve.c => sve/log2.c}     |  0
 sysdeps/aarch64/fpu/{log2f_sve.c => sve/log2f.c}   |  0
 sysdeps/aarch64/fpu/{log2p1_sve.c => sve/log2p1.c} |  0
 .../aarch64/fpu/{log2p1f_sve.c => sve/log2p1f.c}   |  0
 sysdeps/aarch64/fpu/{logf_sve.c => sve/logf.c}     |  0
 sysdeps/aarch64/fpu/{ => sve}/poly_sve_f32.h       |  0
 sysdeps/aarch64/fpu/{ => sve}/poly_sve_f64.h       |  0
 sysdeps/aarch64/fpu/{ => sve}/poly_sve_generic.h   |  0
 sysdeps/aarch64/fpu/{pow_sve.c => sve/pow.c}       |  0
 sysdeps/aarch64/fpu/{powf_sve.c => sve/powf.c}     |  0
 sysdeps/aarch64/fpu/{powr_sve.c => sve/powr.c}     |  0
 sysdeps/aarch64/fpu/{powrf_sve.c => sve/powrf.c}   |  0
 sysdeps/aarch64/fpu/{rsqrt_sve.c => sve/rsqrt.c}   |  0
 sysdeps/aarch64/fpu/{rsqrtf_sve.c => sve/rsqrtf.c} |  0
 sysdeps/aarch64/fpu/{sin_sve.c => sve/sin.c}       |  0
 sysdeps/aarch64/fpu/{sinf_sve.c => sve/sinf.c}     |  0
 sysdeps/aarch64/fpu/{sinh_sve.c => sve/sinh.c}     |  0
 sysdeps/aarch64/fpu/{sinhf_sve.c => sve/sinhf.c}   |  0
 sysdeps/aarch64/fpu/{sinpi_sve.c => sve/sinpi.c}   |  0
 sysdeps/aarch64/fpu/{sinpif_sve.c => sve/sinpif.c} |  0
 .../aarch64/fpu/{ => sve}/sv_exp_special_inline.h  |  0
 sysdeps/aarch64/fpu/{ => sve}/sv_expf_inline.h     |  0
 .../aarch64/fpu/{ => sve}/sv_expf_special_inline.h |  0
 sysdeps/aarch64/fpu/{ => sve}/sv_expm1f_inline.h   |  0
 sysdeps/aarch64/fpu/{ => sve}/sv_log1p_inline.h    |  0
 sysdeps/aarch64/fpu/{ => sve}/sv_log1pf_inline.h   |  0
 sysdeps/aarch64/fpu/{ => sve}/sv_math.h            |  0
 sysdeps/aarch64/fpu/{ => sve}/sv_pow_inline.h      |  0
 sysdeps/aarch64/fpu/{ => sve}/sv_powf_inline.h     |  0
 sysdeps/aarch64/fpu/{ => sve}/sv_trig_fallback.h   |  0
 sysdeps/aarch64/fpu/{ => sve}/sv_trigf_fallback.h  |  0
 sysdeps/aarch64/fpu/{tan_sve.c => sve/tan.c}       |  0
 sysdeps/aarch64/fpu/{tanf_sve.c => sve/tanf.c}     |  0
 sysdeps/aarch64/fpu/{tanh_sve.c => sve/tanh.c}     |  0
 sysdeps/aarch64/fpu/{tanhf_sve.c => sve/tanhf.c}   |  0
 sysdeps/aarch64/fpu/{tanpi_sve.c => sve/tanpi.c}   |  0
 sysdeps/aarch64/fpu/{tanpif_sve.c => sve/tanpif.c} |  0
 188 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/sysdeps/aarch64/fpu/Makefile b/sysdeps/aarch64/fpu/Makefile
index 6c8cacf21d..40d6509c89 100644
--- a/sysdeps/aarch64/fpu/Makefile
+++ b/sysdeps/aarch64/fpu/Makefile
@@ -44,10 +44,20 @@ float-sve-funcs = $(libmvec-supported-funcs)
 double-sve-funcs = $(libmvec-supported-funcs)
 
 ifeq ($(subdir),mathvec)
-libmvec-support = $(addsuffix f_advsimd,$(float-advsimd-funcs)) \
-                  $(addsuffix _advsimd,$(double-advsimd-funcs)) \
-                  $(addsuffix f_sve,$(float-sve-funcs)) \
-                  $(addsuffix _sve,$(double-sve-funcs)) \
+generated-dirs += advsimd sve
+generated += advsimd/stamp sve/stamp
+before-compile += $(addprefix $(objpfx),advsimd/stamp sve/stamp)
+
+$(objpfx)advsimd/stamp $(objpfx)sve/stamp:
+	$(make-target-directory)
+	touch $@
+
+sysd-rules-patterns += advsimd/%:advsimd/% sve/%:sve/%
+
+libmvec-support = $(addprefix advsimd/,$(addsuffix f,$(float-advsimd-funcs))) \
+                  $(addprefix advsimd/,$(double-advsimd-funcs)) \
+                  $(addprefix sve/,$(addsuffix f,$(float-sve-funcs))) \
+                  $(addprefix sve/,$(double-sve-funcs)) \
                   v_log_data \
                   v_exp_data \
                   v_log2_data \
@@ -96,18 +106,23 @@ ifeq ($(build-mathvec),yes)
 libmvec-tests += float-advsimd double-advsimd float-sve double-sve
 endif
 
-define sve-float-cflags-template
-CFLAGS-$(1)f_sve.c += $(sve-cflags)
+define sve-bench-float-cflags-template
 CFLAGS-bench-float-sve-$(1).c += $(sve-cflags)
 endef
 
-define sve-double-cflags-template
-CFLAGS-$(1)_sve.c += $(sve-cflags)
+define sve-bench-double-cflags-template
 CFLAGS-bench-double-sve-$(1).c += $(sve-cflags)
 endef
 
-$(foreach f,$(float-sve-funcs), $(eval $(call sve-float-cflags-template,$(f))))
-$(foreach f,$(double-sve-funcs), $(eval $(call sve-double-cflags-template,$(f))))
+$(foreach f,$(float-sve-funcs), $(eval $(call sve-bench-float-cflags-template,$(f))))
+$(foreach f,$(double-sve-funcs), $(eval $(call sve-bench-double-cflags-template,$(f))))
+
+# Specialize CFLAGS used for building SVE sources.
+define sve-object-cflags-template
+$(objpfx)sve/%$(1): CFLAGS += $(sve-cflags)
+endef
+
+$(foreach o,$(all-object-suffixes),$(eval $(call sve-object-cflags-template,$(o))))
 
 CFLAGS-test-float-sve-wrappers.c = $(sve-cflags)
 CFLAGS-test-double-sve-wrappers.c = $(sve-cflags)
diff --git a/sysdeps/aarch64/fpu/acos_advsimd.c b/sysdeps/aarch64/fpu/advsimd/acos.c
similarity index 100%
rename from sysdeps/aarch64/fpu/acos_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/acos.c
diff --git a/sysdeps/aarch64/fpu/acosf_advsimd.c b/sysdeps/aarch64/fpu/advsimd/acosf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/acosf_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/acosf.c
diff --git a/sysdeps/aarch64/fpu/acosh_advsimd.c b/sysdeps/aarch64/fpu/advsimd/acosh.c
similarity index 100%
rename from sysdeps/aarch64/fpu/acosh_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/acosh.c
diff --git a/sysdeps/aarch64/fpu/acoshf_advsimd.c b/sysdeps/aarch64/fpu/advsimd/acoshf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/acoshf_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/acoshf.c
diff --git a/sysdeps/aarch64/fpu/acospi_advsimd.c b/sysdeps/aarch64/fpu/advsimd/acospi.c
similarity index 100%
rename from sysdeps/aarch64/fpu/acospi_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/acospi.c
diff --git a/sysdeps/aarch64/fpu/acospif_advsimd.c b/sysdeps/aarch64/fpu/advsimd/acospif.c
similarity index 100%
rename from sysdeps/aarch64/fpu/acospif_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/acospif.c
diff --git a/sysdeps/aarch64/fpu/asin_advsimd.c b/sysdeps/aarch64/fpu/advsimd/asin.c
similarity index 100%
rename from sysdeps/aarch64/fpu/asin_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/asin.c
diff --git a/sysdeps/aarch64/fpu/asinf_advsimd.c b/sysdeps/aarch64/fpu/advsimd/asinf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/asinf_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/asinf.c
diff --git a/sysdeps/aarch64/fpu/asinh_advsimd.c b/sysdeps/aarch64/fpu/advsimd/asinh.c
similarity index 100%
rename from sysdeps/aarch64/fpu/asinh_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/asinh.c
diff --git a/sysdeps/aarch64/fpu/asinhf_advsimd.c b/sysdeps/aarch64/fpu/advsimd/asinhf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/asinhf_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/asinhf.c
diff --git a/sysdeps/aarch64/fpu/asinpi_advsimd.c b/sysdeps/aarch64/fpu/advsimd/asinpi.c
similarity index 100%
rename from sysdeps/aarch64/fpu/asinpi_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/asinpi.c
diff --git a/sysdeps/aarch64/fpu/asinpif_advsimd.c b/sysdeps/aarch64/fpu/advsimd/asinpif.c
similarity index 100%
rename from sysdeps/aarch64/fpu/asinpif_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/asinpif.c
diff --git a/sysdeps/aarch64/fpu/atan_advsimd.c b/sysdeps/aarch64/fpu/advsimd/atan.c
similarity index 100%
rename from sysdeps/aarch64/fpu/atan_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/atan.c
diff --git a/sysdeps/aarch64/fpu/atan2_advsimd.c b/sysdeps/aarch64/fpu/advsimd/atan2.c
similarity index 100%
rename from sysdeps/aarch64/fpu/atan2_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/atan2.c
diff --git a/sysdeps/aarch64/fpu/atan2f_advsimd.c b/sysdeps/aarch64/fpu/advsimd/atan2f.c
similarity index 100%
rename from sysdeps/aarch64/fpu/atan2f_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/atan2f.c
diff --git a/sysdeps/aarch64/fpu/atan2pi_advsimd.c b/sysdeps/aarch64/fpu/advsimd/atan2pi.c
similarity index 100%
rename from sysdeps/aarch64/fpu/atan2pi_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/atan2pi.c
diff --git a/sysdeps/aarch64/fpu/atan2pif_advsimd.c b/sysdeps/aarch64/fpu/advsimd/atan2pif.c
similarity index 100%
rename from sysdeps/aarch64/fpu/atan2pif_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/atan2pif.c
diff --git a/sysdeps/aarch64/fpu/atanf_advsimd.c b/sysdeps/aarch64/fpu/advsimd/atanf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/atanf_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/atanf.c
diff --git a/sysdeps/aarch64/fpu/atanh_advsimd.c b/sysdeps/aarch64/fpu/advsimd/atanh.c
similarity index 100%
rename from sysdeps/aarch64/fpu/atanh_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/atanh.c
diff --git a/sysdeps/aarch64/fpu/atanhf_advsimd.c b/sysdeps/aarch64/fpu/advsimd/atanhf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/atanhf_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/atanhf.c
diff --git a/sysdeps/aarch64/fpu/atanpi_advsimd.c b/sysdeps/aarch64/fpu/advsimd/atanpi.c
similarity index 100%
rename from sysdeps/aarch64/fpu/atanpi_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/atanpi.c
diff --git a/sysdeps/aarch64/fpu/atanpif_advsimd.c b/sysdeps/aarch64/fpu/advsimd/atanpif.c
similarity index 100%
rename from sysdeps/aarch64/fpu/atanpif_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/atanpif.c
diff --git a/sysdeps/aarch64/fpu/cbrt_advsimd.c b/sysdeps/aarch64/fpu/advsimd/cbrt.c
similarity index 100%
rename from sysdeps/aarch64/fpu/cbrt_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/cbrt.c
diff --git a/sysdeps/aarch64/fpu/cbrtf_advsimd.c b/sysdeps/aarch64/fpu/advsimd/cbrtf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/cbrtf_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/cbrtf.c
diff --git a/sysdeps/aarch64/fpu/cos_advsimd.c b/sysdeps/aarch64/fpu/advsimd/cos.c
similarity index 100%
rename from sysdeps/aarch64/fpu/cos_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/cos.c
diff --git a/sysdeps/aarch64/fpu/cosf_advsimd.c b/sysdeps/aarch64/fpu/advsimd/cosf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/cosf_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/cosf.c
diff --git a/sysdeps/aarch64/fpu/cosh_advsimd.c b/sysdeps/aarch64/fpu/advsimd/cosh.c
similarity index 100%
rename from sysdeps/aarch64/fpu/cosh_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/cosh.c
diff --git a/sysdeps/aarch64/fpu/coshf_advsimd.c b/sysdeps/aarch64/fpu/advsimd/coshf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/coshf_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/coshf.c
diff --git a/sysdeps/aarch64/fpu/cospi_advsimd.c b/sysdeps/aarch64/fpu/advsimd/cospi.c
similarity index 100%
rename from sysdeps/aarch64/fpu/cospi_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/cospi.c
diff --git a/sysdeps/aarch64/fpu/cospif_advsimd.c b/sysdeps/aarch64/fpu/advsimd/cospif.c
similarity index 100%
rename from sysdeps/aarch64/fpu/cospif_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/cospif.c
diff --git a/sysdeps/aarch64/fpu/erf_advsimd.c b/sysdeps/aarch64/fpu/advsimd/erf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/erf_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/erf.c
diff --git a/sysdeps/aarch64/fpu/erfc_advsimd.c b/sysdeps/aarch64/fpu/advsimd/erfc.c
similarity index 100%
rename from sysdeps/aarch64/fpu/erfc_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/erfc.c
diff --git a/sysdeps/aarch64/fpu/erfcf_advsimd.c b/sysdeps/aarch64/fpu/advsimd/erfcf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/erfcf_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/erfcf.c
diff --git a/sysdeps/aarch64/fpu/erff_advsimd.c b/sysdeps/aarch64/fpu/advsimd/erff.c
similarity index 100%
rename from sysdeps/aarch64/fpu/erff_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/erff.c
diff --git a/sysdeps/aarch64/fpu/exp_advsimd.c b/sysdeps/aarch64/fpu/advsimd/exp.c
similarity index 100%
rename from sysdeps/aarch64/fpu/exp_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/exp.c
diff --git a/sysdeps/aarch64/fpu/exp10_advsimd.c b/sysdeps/aarch64/fpu/advsimd/exp10.c
similarity index 100%
rename from sysdeps/aarch64/fpu/exp10_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/exp10.c
diff --git a/sysdeps/aarch64/fpu/exp10f_advsimd.c b/sysdeps/aarch64/fpu/advsimd/exp10f.c
similarity index 100%
rename from sysdeps/aarch64/fpu/exp10f_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/exp10f.c
diff --git a/sysdeps/aarch64/fpu/exp10m1_advsimd.c b/sysdeps/aarch64/fpu/advsimd/exp10m1.c
similarity index 100%
rename from sysdeps/aarch64/fpu/exp10m1_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/exp10m1.c
diff --git a/sysdeps/aarch64/fpu/exp10m1f_advsimd.c b/sysdeps/aarch64/fpu/advsimd/exp10m1f.c
similarity index 100%
rename from sysdeps/aarch64/fpu/exp10m1f_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/exp10m1f.c
diff --git a/sysdeps/aarch64/fpu/exp2_advsimd.c b/sysdeps/aarch64/fpu/advsimd/exp2.c
similarity index 100%
rename from sysdeps/aarch64/fpu/exp2_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/exp2.c
diff --git a/sysdeps/aarch64/fpu/exp2f_advsimd.c b/sysdeps/aarch64/fpu/advsimd/exp2f.c
similarity index 100%
rename from sysdeps/aarch64/fpu/exp2f_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/exp2f.c
diff --git a/sysdeps/aarch64/fpu/exp2m1_advsimd.c b/sysdeps/aarch64/fpu/advsimd/exp2m1.c
similarity index 100%
rename from sysdeps/aarch64/fpu/exp2m1_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/exp2m1.c
diff --git a/sysdeps/aarch64/fpu/exp2m1f_advsimd.c b/sysdeps/aarch64/fpu/advsimd/exp2m1f.c
similarity index 100%
rename from sysdeps/aarch64/fpu/exp2m1f_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/exp2m1f.c
diff --git a/sysdeps/aarch64/fpu/expf_advsimd.c b/sysdeps/aarch64/fpu/advsimd/expf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/expf_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/expf.c
diff --git a/sysdeps/aarch64/fpu/expm1_advsimd.c b/sysdeps/aarch64/fpu/advsimd/expm1.c
similarity index 100%
rename from sysdeps/aarch64/fpu/expm1_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/expm1.c
diff --git a/sysdeps/aarch64/fpu/expm1f_advsimd.c b/sysdeps/aarch64/fpu/advsimd/expm1f.c
similarity index 100%
rename from sysdeps/aarch64/fpu/expm1f_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/expm1f.c
diff --git a/sysdeps/aarch64/fpu/finite_pow.h b/sysdeps/aarch64/fpu/advsimd/finite_pow.h
similarity index 100%
rename from sysdeps/aarch64/fpu/finite_pow.h
rename to sysdeps/aarch64/fpu/advsimd/finite_pow.h
diff --git a/sysdeps/aarch64/fpu/hypot_advsimd.c b/sysdeps/aarch64/fpu/advsimd/hypot.c
similarity index 100%
rename from sysdeps/aarch64/fpu/hypot_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/hypot.c
diff --git a/sysdeps/aarch64/fpu/hypotf_advsimd.c b/sysdeps/aarch64/fpu/advsimd/hypotf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/hypotf_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/hypotf.c
diff --git a/sysdeps/aarch64/fpu/log_advsimd.c b/sysdeps/aarch64/fpu/advsimd/log.c
similarity index 100%
rename from sysdeps/aarch64/fpu/log_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/log.c
diff --git a/sysdeps/aarch64/fpu/log10_advsimd.c b/sysdeps/aarch64/fpu/advsimd/log10.c
similarity index 100%
rename from sysdeps/aarch64/fpu/log10_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/log10.c
diff --git a/sysdeps/aarch64/fpu/log10f_advsimd.c b/sysdeps/aarch64/fpu/advsimd/log10f.c
similarity index 100%
rename from sysdeps/aarch64/fpu/log10f_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/log10f.c
diff --git a/sysdeps/aarch64/fpu/log10p1_advsimd.c b/sysdeps/aarch64/fpu/advsimd/log10p1.c
similarity index 100%
rename from sysdeps/aarch64/fpu/log10p1_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/log10p1.c
diff --git a/sysdeps/aarch64/fpu/log10p1f_advsimd.c b/sysdeps/aarch64/fpu/advsimd/log10p1f.c
similarity index 100%
rename from sysdeps/aarch64/fpu/log10p1f_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/log10p1f.c
diff --git a/sysdeps/aarch64/fpu/log1p_advsimd.c b/sysdeps/aarch64/fpu/advsimd/log1p.c
similarity index 100%
rename from sysdeps/aarch64/fpu/log1p_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/log1p.c
diff --git a/sysdeps/aarch64/fpu/log1pf_advsimd.c b/sysdeps/aarch64/fpu/advsimd/log1pf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/log1pf_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/log1pf.c
diff --git a/sysdeps/aarch64/fpu/log2_advsimd.c b/sysdeps/aarch64/fpu/advsimd/log2.c
similarity index 100%
rename from sysdeps/aarch64/fpu/log2_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/log2.c
diff --git a/sysdeps/aarch64/fpu/log2f_advsimd.c b/sysdeps/aarch64/fpu/advsimd/log2f.c
similarity index 100%
rename from sysdeps/aarch64/fpu/log2f_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/log2f.c
diff --git a/sysdeps/aarch64/fpu/log2p1_advsimd.c b/sysdeps/aarch64/fpu/advsimd/log2p1.c
similarity index 100%
rename from sysdeps/aarch64/fpu/log2p1_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/log2p1.c
diff --git a/sysdeps/aarch64/fpu/log2p1f_advsimd.c b/sysdeps/aarch64/fpu/advsimd/log2p1f.c
similarity index 100%
rename from sysdeps/aarch64/fpu/log2p1f_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/log2p1f.c
diff --git a/sysdeps/aarch64/fpu/logf_advsimd.c b/sysdeps/aarch64/fpu/advsimd/logf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/logf_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/logf.c
diff --git a/sysdeps/aarch64/fpu/poly_advsimd_f32.h b/sysdeps/aarch64/fpu/advsimd/poly_advsimd_f32.h
similarity index 100%
rename from sysdeps/aarch64/fpu/poly_advsimd_f32.h
rename to sysdeps/aarch64/fpu/advsimd/poly_advsimd_f32.h
diff --git a/sysdeps/aarch64/fpu/poly_advsimd_f64.h b/sysdeps/aarch64/fpu/advsimd/poly_advsimd_f64.h
similarity index 100%
rename from sysdeps/aarch64/fpu/poly_advsimd_f64.h
rename to sysdeps/aarch64/fpu/advsimd/poly_advsimd_f64.h
diff --git a/sysdeps/aarch64/fpu/poly_generic.h b/sysdeps/aarch64/fpu/advsimd/poly_generic.h
similarity index 100%
rename from sysdeps/aarch64/fpu/poly_generic.h
rename to sysdeps/aarch64/fpu/advsimd/poly_generic.h
diff --git a/sysdeps/aarch64/fpu/pow_advsimd.c b/sysdeps/aarch64/fpu/advsimd/pow.c
similarity index 100%
rename from sysdeps/aarch64/fpu/pow_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/pow.c
diff --git a/sysdeps/aarch64/fpu/powf_advsimd.c b/sysdeps/aarch64/fpu/advsimd/powf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/powf_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/powf.c
diff --git a/sysdeps/aarch64/fpu/powr_advsimd.c b/sysdeps/aarch64/fpu/advsimd/powr.c
similarity index 100%
rename from sysdeps/aarch64/fpu/powr_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/powr.c
diff --git a/sysdeps/aarch64/fpu/powrf_advsimd.c b/sysdeps/aarch64/fpu/advsimd/powrf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/powrf_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/powrf.c
diff --git a/sysdeps/aarch64/fpu/rsqrt_advsimd.c b/sysdeps/aarch64/fpu/advsimd/rsqrt.c
similarity index 100%
rename from sysdeps/aarch64/fpu/rsqrt_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/rsqrt.c
diff --git a/sysdeps/aarch64/fpu/rsqrtf_advsimd.c b/sysdeps/aarch64/fpu/advsimd/rsqrtf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/rsqrtf_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/rsqrtf.c
diff --git a/sysdeps/aarch64/fpu/sin_advsimd.c b/sysdeps/aarch64/fpu/advsimd/sin.c
similarity index 100%
rename from sysdeps/aarch64/fpu/sin_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/sin.c
diff --git a/sysdeps/aarch64/fpu/sinf_advsimd.c b/sysdeps/aarch64/fpu/advsimd/sinf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/sinf_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/sinf.c
diff --git a/sysdeps/aarch64/fpu/sinh_advsimd.c b/sysdeps/aarch64/fpu/advsimd/sinh.c
similarity index 100%
rename from sysdeps/aarch64/fpu/sinh_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/sinh.c
diff --git a/sysdeps/aarch64/fpu/sinhf_advsimd.c b/sysdeps/aarch64/fpu/advsimd/sinhf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/sinhf_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/sinhf.c
diff --git a/sysdeps/aarch64/fpu/sinpi_advsimd.c b/sysdeps/aarch64/fpu/advsimd/sinpi.c
similarity index 100%
rename from sysdeps/aarch64/fpu/sinpi_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/sinpi.c
diff --git a/sysdeps/aarch64/fpu/sinpif_advsimd.c b/sysdeps/aarch64/fpu/advsimd/sinpif.c
similarity index 100%
rename from sysdeps/aarch64/fpu/sinpif_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/sinpif.c
diff --git a/sysdeps/aarch64/fpu/tan_advsimd.c b/sysdeps/aarch64/fpu/advsimd/tan.c
similarity index 100%
rename from sysdeps/aarch64/fpu/tan_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/tan.c
diff --git a/sysdeps/aarch64/fpu/tanf_advsimd.c b/sysdeps/aarch64/fpu/advsimd/tanf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/tanf_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/tanf.c
diff --git a/sysdeps/aarch64/fpu/tanh_advsimd.c b/sysdeps/aarch64/fpu/advsimd/tanh.c
similarity index 100%
rename from sysdeps/aarch64/fpu/tanh_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/tanh.c
diff --git a/sysdeps/aarch64/fpu/tanhf_advsimd.c b/sysdeps/aarch64/fpu/advsimd/tanhf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/tanhf_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/tanhf.c
diff --git a/sysdeps/aarch64/fpu/tanpi_advsimd.c b/sysdeps/aarch64/fpu/advsimd/tanpi.c
similarity index 100%
rename from sysdeps/aarch64/fpu/tanpi_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/tanpi.c
diff --git a/sysdeps/aarch64/fpu/tanpif_advsimd.c b/sysdeps/aarch64/fpu/advsimd/tanpif.c
similarity index 100%
rename from sysdeps/aarch64/fpu/tanpif_advsimd.c
rename to sysdeps/aarch64/fpu/advsimd/tanpif.c
diff --git a/sysdeps/aarch64/fpu/v_exp_special_case_inline.h b/sysdeps/aarch64/fpu/advsimd/v_exp_special_case_inline.h
similarity index 100%
rename from sysdeps/aarch64/fpu/v_exp_special_case_inline.h
rename to sysdeps/aarch64/fpu/advsimd/v_exp_special_case_inline.h
diff --git a/sysdeps/aarch64/fpu/v_expf_inline.h b/sysdeps/aarch64/fpu/advsimd/v_expf_inline.h
similarity index 100%
rename from sysdeps/aarch64/fpu/v_expf_inline.h
rename to sysdeps/aarch64/fpu/advsimd/v_expf_inline.h
diff --git a/sysdeps/aarch64/fpu/v_expf_special_inline.h b/sysdeps/aarch64/fpu/advsimd/v_expf_special_inline.h
similarity index 100%
rename from sysdeps/aarch64/fpu/v_expf_special_inline.h
rename to sysdeps/aarch64/fpu/advsimd/v_expf_special_inline.h
diff --git a/sysdeps/aarch64/fpu/v_expm1_inline.h b/sysdeps/aarch64/fpu/advsimd/v_expm1_inline.h
similarity index 100%
rename from sysdeps/aarch64/fpu/v_expm1_inline.h
rename to sysdeps/aarch64/fpu/advsimd/v_expm1_inline.h
diff --git a/sysdeps/aarch64/fpu/v_expm1f_inline.h b/sysdeps/aarch64/fpu/advsimd/v_expm1f_inline.h
similarity index 100%
rename from sysdeps/aarch64/fpu/v_expm1f_inline.h
rename to sysdeps/aarch64/fpu/advsimd/v_expm1f_inline.h
diff --git a/sysdeps/aarch64/fpu/v_log1p_inline.h b/sysdeps/aarch64/fpu/advsimd/v_log1p_inline.h
similarity index 100%
rename from sysdeps/aarch64/fpu/v_log1p_inline.h
rename to sysdeps/aarch64/fpu/advsimd/v_log1p_inline.h
diff --git a/sysdeps/aarch64/fpu/v_log1pf_inline.h b/sysdeps/aarch64/fpu/advsimd/v_log1pf_inline.h
similarity index 100%
rename from sysdeps/aarch64/fpu/v_log1pf_inline.h
rename to sysdeps/aarch64/fpu/advsimd/v_log1pf_inline.h
diff --git a/sysdeps/aarch64/fpu/v_math.h b/sysdeps/aarch64/fpu/advsimd/v_math.h
similarity index 100%
rename from sysdeps/aarch64/fpu/v_math.h
rename to sysdeps/aarch64/fpu/advsimd/v_math.h
diff --git a/sysdeps/aarch64/fpu/v_pow_inline.h b/sysdeps/aarch64/fpu/advsimd/v_pow_inline.h
similarity index 100%
rename from sysdeps/aarch64/fpu/v_pow_inline.h
rename to sysdeps/aarch64/fpu/advsimd/v_pow_inline.h
diff --git a/sysdeps/aarch64/fpu/v_powf_inline.h b/sysdeps/aarch64/fpu/advsimd/v_powf_inline.h
similarity index 100%
rename from sysdeps/aarch64/fpu/v_powf_inline.h
rename to sysdeps/aarch64/fpu/advsimd/v_powf_inline.h
diff --git a/sysdeps/aarch64/fpu/v_powrf_inline.h b/sysdeps/aarch64/fpu/advsimd/v_powrf_inline.h
similarity index 100%
rename from sysdeps/aarch64/fpu/v_powrf_inline.h
rename to sysdeps/aarch64/fpu/advsimd/v_powrf_inline.h
diff --git a/sysdeps/aarch64/fpu/v_trig_fallback.h b/sysdeps/aarch64/fpu/advsimd/v_trig_fallback.h
similarity index 100%
rename from sysdeps/aarch64/fpu/v_trig_fallback.h
rename to sysdeps/aarch64/fpu/advsimd/v_trig_fallback.h
diff --git a/sysdeps/aarch64/fpu/v_trigf_fallback.h b/sysdeps/aarch64/fpu/advsimd/v_trigf_fallback.h
similarity index 100%
rename from sysdeps/aarch64/fpu/v_trigf_fallback.h
rename to sysdeps/aarch64/fpu/advsimd/v_trigf_fallback.h
diff --git a/sysdeps/aarch64/fpu/acos_sve.c b/sysdeps/aarch64/fpu/sve/acos.c
similarity index 100%
rename from sysdeps/aarch64/fpu/acos_sve.c
rename to sysdeps/aarch64/fpu/sve/acos.c
diff --git a/sysdeps/aarch64/fpu/acosf_sve.c b/sysdeps/aarch64/fpu/sve/acosf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/acosf_sve.c
rename to sysdeps/aarch64/fpu/sve/acosf.c
diff --git a/sysdeps/aarch64/fpu/acosh_sve.c b/sysdeps/aarch64/fpu/sve/acosh.c
similarity index 100%
rename from sysdeps/aarch64/fpu/acosh_sve.c
rename to sysdeps/aarch64/fpu/sve/acosh.c
diff --git a/sysdeps/aarch64/fpu/acoshf_sve.c b/sysdeps/aarch64/fpu/sve/acoshf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/acoshf_sve.c
rename to sysdeps/aarch64/fpu/sve/acoshf.c
diff --git a/sysdeps/aarch64/fpu/acospi_sve.c b/sysdeps/aarch64/fpu/sve/acospi.c
similarity index 100%
rename from sysdeps/aarch64/fpu/acospi_sve.c
rename to sysdeps/aarch64/fpu/sve/acospi.c
diff --git a/sysdeps/aarch64/fpu/acospif_sve.c b/sysdeps/aarch64/fpu/sve/acospif.c
similarity index 100%
rename from sysdeps/aarch64/fpu/acospif_sve.c
rename to sysdeps/aarch64/fpu/sve/acospif.c
diff --git a/sysdeps/aarch64/fpu/asin_sve.c b/sysdeps/aarch64/fpu/sve/asin.c
similarity index 100%
rename from sysdeps/aarch64/fpu/asin_sve.c
rename to sysdeps/aarch64/fpu/sve/asin.c
diff --git a/sysdeps/aarch64/fpu/asinf_sve.c b/sysdeps/aarch64/fpu/sve/asinf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/asinf_sve.c
rename to sysdeps/aarch64/fpu/sve/asinf.c
diff --git a/sysdeps/aarch64/fpu/asinh_sve.c b/sysdeps/aarch64/fpu/sve/asinh.c
similarity index 100%
rename from sysdeps/aarch64/fpu/asinh_sve.c
rename to sysdeps/aarch64/fpu/sve/asinh.c
diff --git a/sysdeps/aarch64/fpu/asinhf_sve.c b/sysdeps/aarch64/fpu/sve/asinhf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/asinhf_sve.c
rename to sysdeps/aarch64/fpu/sve/asinhf.c
diff --git a/sysdeps/aarch64/fpu/asinpi_sve.c b/sysdeps/aarch64/fpu/sve/asinpi.c
similarity index 100%
rename from sysdeps/aarch64/fpu/asinpi_sve.c
rename to sysdeps/aarch64/fpu/sve/asinpi.c
diff --git a/sysdeps/aarch64/fpu/asinpif_sve.c b/sysdeps/aarch64/fpu/sve/asinpif.c
similarity index 100%
rename from sysdeps/aarch64/fpu/asinpif_sve.c
rename to sysdeps/aarch64/fpu/sve/asinpif.c
diff --git a/sysdeps/aarch64/fpu/atan_sve.c b/sysdeps/aarch64/fpu/sve/atan.c
similarity index 100%
rename from sysdeps/aarch64/fpu/atan_sve.c
rename to sysdeps/aarch64/fpu/sve/atan.c
diff --git a/sysdeps/aarch64/fpu/atan2_sve.c b/sysdeps/aarch64/fpu/sve/atan2.c
similarity index 100%
rename from sysdeps/aarch64/fpu/atan2_sve.c
rename to sysdeps/aarch64/fpu/sve/atan2.c
diff --git a/sysdeps/aarch64/fpu/atan2f_sve.c b/sysdeps/aarch64/fpu/sve/atan2f.c
similarity index 100%
rename from sysdeps/aarch64/fpu/atan2f_sve.c
rename to sysdeps/aarch64/fpu/sve/atan2f.c
diff --git a/sysdeps/aarch64/fpu/atan2pi_sve.c b/sysdeps/aarch64/fpu/sve/atan2pi.c
similarity index 100%
rename from sysdeps/aarch64/fpu/atan2pi_sve.c
rename to sysdeps/aarch64/fpu/sve/atan2pi.c
diff --git a/sysdeps/aarch64/fpu/atan2pif_sve.c b/sysdeps/aarch64/fpu/sve/atan2pif.c
similarity index 100%
rename from sysdeps/aarch64/fpu/atan2pif_sve.c
rename to sysdeps/aarch64/fpu/sve/atan2pif.c
diff --git a/sysdeps/aarch64/fpu/atanf_sve.c b/sysdeps/aarch64/fpu/sve/atanf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/atanf_sve.c
rename to sysdeps/aarch64/fpu/sve/atanf.c
diff --git a/sysdeps/aarch64/fpu/atanh_sve.c b/sysdeps/aarch64/fpu/sve/atanh.c
similarity index 100%
rename from sysdeps/aarch64/fpu/atanh_sve.c
rename to sysdeps/aarch64/fpu/sve/atanh.c
diff --git a/sysdeps/aarch64/fpu/atanhf_sve.c b/sysdeps/aarch64/fpu/sve/atanhf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/atanhf_sve.c
rename to sysdeps/aarch64/fpu/sve/atanhf.c
diff --git a/sysdeps/aarch64/fpu/atanpi_sve.c b/sysdeps/aarch64/fpu/sve/atanpi.c
similarity index 100%
rename from sysdeps/aarch64/fpu/atanpi_sve.c
rename to sysdeps/aarch64/fpu/sve/atanpi.c
diff --git a/sysdeps/aarch64/fpu/atanpif_sve.c b/sysdeps/aarch64/fpu/sve/atanpif.c
similarity index 100%
rename from sysdeps/aarch64/fpu/atanpif_sve.c
rename to sysdeps/aarch64/fpu/sve/atanpif.c
diff --git a/sysdeps/aarch64/fpu/cbrt_sve.c b/sysdeps/aarch64/fpu/sve/cbrt.c
similarity index 100%
rename from sysdeps/aarch64/fpu/cbrt_sve.c
rename to sysdeps/aarch64/fpu/sve/cbrt.c
diff --git a/sysdeps/aarch64/fpu/cbrtf_sve.c b/sysdeps/aarch64/fpu/sve/cbrtf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/cbrtf_sve.c
rename to sysdeps/aarch64/fpu/sve/cbrtf.c
diff --git a/sysdeps/aarch64/fpu/cos_sve.c b/sysdeps/aarch64/fpu/sve/cos.c
similarity index 100%
rename from sysdeps/aarch64/fpu/cos_sve.c
rename to sysdeps/aarch64/fpu/sve/cos.c
diff --git a/sysdeps/aarch64/fpu/cosf_sve.c b/sysdeps/aarch64/fpu/sve/cosf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/cosf_sve.c
rename to sysdeps/aarch64/fpu/sve/cosf.c
diff --git a/sysdeps/aarch64/fpu/cosh_sve.c b/sysdeps/aarch64/fpu/sve/cosh.c
similarity index 100%
rename from sysdeps/aarch64/fpu/cosh_sve.c
rename to sysdeps/aarch64/fpu/sve/cosh.c
diff --git a/sysdeps/aarch64/fpu/coshf_sve.c b/sysdeps/aarch64/fpu/sve/coshf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/coshf_sve.c
rename to sysdeps/aarch64/fpu/sve/coshf.c
diff --git a/sysdeps/aarch64/fpu/cospi_sve.c b/sysdeps/aarch64/fpu/sve/cospi.c
similarity index 100%
rename from sysdeps/aarch64/fpu/cospi_sve.c
rename to sysdeps/aarch64/fpu/sve/cospi.c
diff --git a/sysdeps/aarch64/fpu/cospif_sve.c b/sysdeps/aarch64/fpu/sve/cospif.c
similarity index 100%
rename from sysdeps/aarch64/fpu/cospif_sve.c
rename to sysdeps/aarch64/fpu/sve/cospif.c
diff --git a/sysdeps/aarch64/fpu/erf_sve.c b/sysdeps/aarch64/fpu/sve/erf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/erf_sve.c
rename to sysdeps/aarch64/fpu/sve/erf.c
diff --git a/sysdeps/aarch64/fpu/erfc_sve.c b/sysdeps/aarch64/fpu/sve/erfc.c
similarity index 100%
rename from sysdeps/aarch64/fpu/erfc_sve.c
rename to sysdeps/aarch64/fpu/sve/erfc.c
diff --git a/sysdeps/aarch64/fpu/erfcf_sve.c b/sysdeps/aarch64/fpu/sve/erfcf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/erfcf_sve.c
rename to sysdeps/aarch64/fpu/sve/erfcf.c
diff --git a/sysdeps/aarch64/fpu/erff_sve.c b/sysdeps/aarch64/fpu/sve/erff.c
similarity index 100%
rename from sysdeps/aarch64/fpu/erff_sve.c
rename to sysdeps/aarch64/fpu/sve/erff.c
diff --git a/sysdeps/aarch64/fpu/exp_sve.c b/sysdeps/aarch64/fpu/sve/exp.c
similarity index 100%
rename from sysdeps/aarch64/fpu/exp_sve.c
rename to sysdeps/aarch64/fpu/sve/exp.c
diff --git a/sysdeps/aarch64/fpu/exp10_sve.c b/sysdeps/aarch64/fpu/sve/exp10.c
similarity index 100%
rename from sysdeps/aarch64/fpu/exp10_sve.c
rename to sysdeps/aarch64/fpu/sve/exp10.c
diff --git a/sysdeps/aarch64/fpu/exp10f_sve.c b/sysdeps/aarch64/fpu/sve/exp10f.c
similarity index 100%
rename from sysdeps/aarch64/fpu/exp10f_sve.c
rename to sysdeps/aarch64/fpu/sve/exp10f.c
diff --git a/sysdeps/aarch64/fpu/exp10m1_sve.c b/sysdeps/aarch64/fpu/sve/exp10m1.c
similarity index 100%
rename from sysdeps/aarch64/fpu/exp10m1_sve.c
rename to sysdeps/aarch64/fpu/sve/exp10m1.c
diff --git a/sysdeps/aarch64/fpu/exp10m1f_sve.c b/sysdeps/aarch64/fpu/sve/exp10m1f.c
similarity index 100%
rename from sysdeps/aarch64/fpu/exp10m1f_sve.c
rename to sysdeps/aarch64/fpu/sve/exp10m1f.c
diff --git a/sysdeps/aarch64/fpu/exp2_sve.c b/sysdeps/aarch64/fpu/sve/exp2.c
similarity index 100%
rename from sysdeps/aarch64/fpu/exp2_sve.c
rename to sysdeps/aarch64/fpu/sve/exp2.c
diff --git a/sysdeps/aarch64/fpu/exp2f_sve.c b/sysdeps/aarch64/fpu/sve/exp2f.c
similarity index 100%
rename from sysdeps/aarch64/fpu/exp2f_sve.c
rename to sysdeps/aarch64/fpu/sve/exp2f.c
diff --git a/sysdeps/aarch64/fpu/exp2m1_sve.c b/sysdeps/aarch64/fpu/sve/exp2m1.c
similarity index 100%
rename from sysdeps/aarch64/fpu/exp2m1_sve.c
rename to sysdeps/aarch64/fpu/sve/exp2m1.c
diff --git a/sysdeps/aarch64/fpu/exp2m1f_sve.c b/sysdeps/aarch64/fpu/sve/exp2m1f.c
similarity index 100%
rename from sysdeps/aarch64/fpu/exp2m1f_sve.c
rename to sysdeps/aarch64/fpu/sve/exp2m1f.c
diff --git a/sysdeps/aarch64/fpu/expf_sve.c b/sysdeps/aarch64/fpu/sve/expf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/expf_sve.c
rename to sysdeps/aarch64/fpu/sve/expf.c
diff --git a/sysdeps/aarch64/fpu/expm1_sve.c b/sysdeps/aarch64/fpu/sve/expm1.c
similarity index 100%
rename from sysdeps/aarch64/fpu/expm1_sve.c
rename to sysdeps/aarch64/fpu/sve/expm1.c
diff --git a/sysdeps/aarch64/fpu/expm1f_sve.c b/sysdeps/aarch64/fpu/sve/expm1f.c
similarity index 100%
rename from sysdeps/aarch64/fpu/expm1f_sve.c
rename to sysdeps/aarch64/fpu/sve/expm1f.c
diff --git a/sysdeps/aarch64/fpu/hypot_sve.c b/sysdeps/aarch64/fpu/sve/hypot.c
similarity index 100%
rename from sysdeps/aarch64/fpu/hypot_sve.c
rename to sysdeps/aarch64/fpu/sve/hypot.c
diff --git a/sysdeps/aarch64/fpu/hypotf_sve.c b/sysdeps/aarch64/fpu/sve/hypotf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/hypotf_sve.c
rename to sysdeps/aarch64/fpu/sve/hypotf.c
diff --git a/sysdeps/aarch64/fpu/log_sve.c b/sysdeps/aarch64/fpu/sve/log.c
similarity index 100%
rename from sysdeps/aarch64/fpu/log_sve.c
rename to sysdeps/aarch64/fpu/sve/log.c
diff --git a/sysdeps/aarch64/fpu/log10_sve.c b/sysdeps/aarch64/fpu/sve/log10.c
similarity index 100%
rename from sysdeps/aarch64/fpu/log10_sve.c
rename to sysdeps/aarch64/fpu/sve/log10.c
diff --git a/sysdeps/aarch64/fpu/log10f_sve.c b/sysdeps/aarch64/fpu/sve/log10f.c
similarity index 100%
rename from sysdeps/aarch64/fpu/log10f_sve.c
rename to sysdeps/aarch64/fpu/sve/log10f.c
diff --git a/sysdeps/aarch64/fpu/log10p1_sve.c b/sysdeps/aarch64/fpu/sve/log10p1.c
similarity index 100%
rename from sysdeps/aarch64/fpu/log10p1_sve.c
rename to sysdeps/aarch64/fpu/sve/log10p1.c
diff --git a/sysdeps/aarch64/fpu/log10p1f_sve.c b/sysdeps/aarch64/fpu/sve/log10p1f.c
similarity index 100%
rename from sysdeps/aarch64/fpu/log10p1f_sve.c
rename to sysdeps/aarch64/fpu/sve/log10p1f.c
diff --git a/sysdeps/aarch64/fpu/log1p_sve.c b/sysdeps/aarch64/fpu/sve/log1p.c
similarity index 100%
rename from sysdeps/aarch64/fpu/log1p_sve.c
rename to sysdeps/aarch64/fpu/sve/log1p.c
diff --git a/sysdeps/aarch64/fpu/log1pf_sve.c b/sysdeps/aarch64/fpu/sve/log1pf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/log1pf_sve.c
rename to sysdeps/aarch64/fpu/sve/log1pf.c
diff --git a/sysdeps/aarch64/fpu/log2_sve.c b/sysdeps/aarch64/fpu/sve/log2.c
similarity index 100%
rename from sysdeps/aarch64/fpu/log2_sve.c
rename to sysdeps/aarch64/fpu/sve/log2.c
diff --git a/sysdeps/aarch64/fpu/log2f_sve.c b/sysdeps/aarch64/fpu/sve/log2f.c
similarity index 100%
rename from sysdeps/aarch64/fpu/log2f_sve.c
rename to sysdeps/aarch64/fpu/sve/log2f.c
diff --git a/sysdeps/aarch64/fpu/log2p1_sve.c b/sysdeps/aarch64/fpu/sve/log2p1.c
similarity index 100%
rename from sysdeps/aarch64/fpu/log2p1_sve.c
rename to sysdeps/aarch64/fpu/sve/log2p1.c
diff --git a/sysdeps/aarch64/fpu/log2p1f_sve.c b/sysdeps/aarch64/fpu/sve/log2p1f.c
similarity index 100%
rename from sysdeps/aarch64/fpu/log2p1f_sve.c
rename to sysdeps/aarch64/fpu/sve/log2p1f.c
diff --git a/sysdeps/aarch64/fpu/logf_sve.c b/sysdeps/aarch64/fpu/sve/logf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/logf_sve.c
rename to sysdeps/aarch64/fpu/sve/logf.c
diff --git a/sysdeps/aarch64/fpu/poly_sve_f32.h b/sysdeps/aarch64/fpu/sve/poly_sve_f32.h
similarity index 100%
rename from sysdeps/aarch64/fpu/poly_sve_f32.h
rename to sysdeps/aarch64/fpu/sve/poly_sve_f32.h
diff --git a/sysdeps/aarch64/fpu/poly_sve_f64.h b/sysdeps/aarch64/fpu/sve/poly_sve_f64.h
similarity index 100%
rename from sysdeps/aarch64/fpu/poly_sve_f64.h
rename to sysdeps/aarch64/fpu/sve/poly_sve_f64.h
diff --git a/sysdeps/aarch64/fpu/poly_sve_generic.h b/sysdeps/aarch64/fpu/sve/poly_sve_generic.h
similarity index 100%
rename from sysdeps/aarch64/fpu/poly_sve_generic.h
rename to sysdeps/aarch64/fpu/sve/poly_sve_generic.h
diff --git a/sysdeps/aarch64/fpu/pow_sve.c b/sysdeps/aarch64/fpu/sve/pow.c
similarity index 100%
rename from sysdeps/aarch64/fpu/pow_sve.c
rename to sysdeps/aarch64/fpu/sve/pow.c
diff --git a/sysdeps/aarch64/fpu/powf_sve.c b/sysdeps/aarch64/fpu/sve/powf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/powf_sve.c
rename to sysdeps/aarch64/fpu/sve/powf.c
diff --git a/sysdeps/aarch64/fpu/powr_sve.c b/sysdeps/aarch64/fpu/sve/powr.c
similarity index 100%
rename from sysdeps/aarch64/fpu/powr_sve.c
rename to sysdeps/aarch64/fpu/sve/powr.c
diff --git a/sysdeps/aarch64/fpu/powrf_sve.c b/sysdeps/aarch64/fpu/sve/powrf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/powrf_sve.c
rename to sysdeps/aarch64/fpu/sve/powrf.c
diff --git a/sysdeps/aarch64/fpu/rsqrt_sve.c b/sysdeps/aarch64/fpu/sve/rsqrt.c
similarity index 100%
rename from sysdeps/aarch64/fpu/rsqrt_sve.c
rename to sysdeps/aarch64/fpu/sve/rsqrt.c
diff --git a/sysdeps/aarch64/fpu/rsqrtf_sve.c b/sysdeps/aarch64/fpu/sve/rsqrtf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/rsqrtf_sve.c
rename to sysdeps/aarch64/fpu/sve/rsqrtf.c
diff --git a/sysdeps/aarch64/fpu/sin_sve.c b/sysdeps/aarch64/fpu/sve/sin.c
similarity index 100%
rename from sysdeps/aarch64/fpu/sin_sve.c
rename to sysdeps/aarch64/fpu/sve/sin.c
diff --git a/sysdeps/aarch64/fpu/sinf_sve.c b/sysdeps/aarch64/fpu/sve/sinf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/sinf_sve.c
rename to sysdeps/aarch64/fpu/sve/sinf.c
diff --git a/sysdeps/aarch64/fpu/sinh_sve.c b/sysdeps/aarch64/fpu/sve/sinh.c
similarity index 100%
rename from sysdeps/aarch64/fpu/sinh_sve.c
rename to sysdeps/aarch64/fpu/sve/sinh.c
diff --git a/sysdeps/aarch64/fpu/sinhf_sve.c b/sysdeps/aarch64/fpu/sve/sinhf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/sinhf_sve.c
rename to sysdeps/aarch64/fpu/sve/sinhf.c
diff --git a/sysdeps/aarch64/fpu/sinpi_sve.c b/sysdeps/aarch64/fpu/sve/sinpi.c
similarity index 100%
rename from sysdeps/aarch64/fpu/sinpi_sve.c
rename to sysdeps/aarch64/fpu/sve/sinpi.c
diff --git a/sysdeps/aarch64/fpu/sinpif_sve.c b/sysdeps/aarch64/fpu/sve/sinpif.c
similarity index 100%
rename from sysdeps/aarch64/fpu/sinpif_sve.c
rename to sysdeps/aarch64/fpu/sve/sinpif.c
diff --git a/sysdeps/aarch64/fpu/sv_exp_special_inline.h b/sysdeps/aarch64/fpu/sve/sv_exp_special_inline.h
similarity index 100%
rename from sysdeps/aarch64/fpu/sv_exp_special_inline.h
rename to sysdeps/aarch64/fpu/sve/sv_exp_special_inline.h
diff --git a/sysdeps/aarch64/fpu/sv_expf_inline.h b/sysdeps/aarch64/fpu/sve/sv_expf_inline.h
similarity index 100%
rename from sysdeps/aarch64/fpu/sv_expf_inline.h
rename to sysdeps/aarch64/fpu/sve/sv_expf_inline.h
diff --git a/sysdeps/aarch64/fpu/sv_expf_special_inline.h b/sysdeps/aarch64/fpu/sve/sv_expf_special_inline.h
similarity index 100%
rename from sysdeps/aarch64/fpu/sv_expf_special_inline.h
rename to sysdeps/aarch64/fpu/sve/sv_expf_special_inline.h
diff --git a/sysdeps/aarch64/fpu/sv_expm1f_inline.h b/sysdeps/aarch64/fpu/sve/sv_expm1f_inline.h
similarity index 100%
rename from sysdeps/aarch64/fpu/sv_expm1f_inline.h
rename to sysdeps/aarch64/fpu/sve/sv_expm1f_inline.h
diff --git a/sysdeps/aarch64/fpu/sv_log1p_inline.h b/sysdeps/aarch64/fpu/sve/sv_log1p_inline.h
similarity index 100%
rename from sysdeps/aarch64/fpu/sv_log1p_inline.h
rename to sysdeps/aarch64/fpu/sve/sv_log1p_inline.h
diff --git a/sysdeps/aarch64/fpu/sv_log1pf_inline.h b/sysdeps/aarch64/fpu/sve/sv_log1pf_inline.h
similarity index 100%
rename from sysdeps/aarch64/fpu/sv_log1pf_inline.h
rename to sysdeps/aarch64/fpu/sve/sv_log1pf_inline.h
diff --git a/sysdeps/aarch64/fpu/sv_math.h b/sysdeps/aarch64/fpu/sve/sv_math.h
similarity index 100%
rename from sysdeps/aarch64/fpu/sv_math.h
rename to sysdeps/aarch64/fpu/sve/sv_math.h
diff --git a/sysdeps/aarch64/fpu/sv_pow_inline.h b/sysdeps/aarch64/fpu/sve/sv_pow_inline.h
similarity index 100%
rename from sysdeps/aarch64/fpu/sv_pow_inline.h
rename to sysdeps/aarch64/fpu/sve/sv_pow_inline.h
diff --git a/sysdeps/aarch64/fpu/sv_powf_inline.h b/sysdeps/aarch64/fpu/sve/sv_powf_inline.h
similarity index 100%
rename from sysdeps/aarch64/fpu/sv_powf_inline.h
rename to sysdeps/aarch64/fpu/sve/sv_powf_inline.h
diff --git a/sysdeps/aarch64/fpu/sv_trig_fallback.h b/sysdeps/aarch64/fpu/sve/sv_trig_fallback.h
similarity index 100%
rename from sysdeps/aarch64/fpu/sv_trig_fallback.h
rename to sysdeps/aarch64/fpu/sve/sv_trig_fallback.h
diff --git a/sysdeps/aarch64/fpu/sv_trigf_fallback.h b/sysdeps/aarch64/fpu/sve/sv_trigf_fallback.h
similarity index 100%
rename from sysdeps/aarch64/fpu/sv_trigf_fallback.h
rename to sysdeps/aarch64/fpu/sve/sv_trigf_fallback.h
diff --git a/sysdeps/aarch64/fpu/tan_sve.c b/sysdeps/aarch64/fpu/sve/tan.c
similarity index 100%
rename from sysdeps/aarch64/fpu/tan_sve.c
rename to sysdeps/aarch64/fpu/sve/tan.c
diff --git a/sysdeps/aarch64/fpu/tanf_sve.c b/sysdeps/aarch64/fpu/sve/tanf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/tanf_sve.c
rename to sysdeps/aarch64/fpu/sve/tanf.c
diff --git a/sysdeps/aarch64/fpu/tanh_sve.c b/sysdeps/aarch64/fpu/sve/tanh.c
similarity index 100%
rename from sysdeps/aarch64/fpu/tanh_sve.c
rename to sysdeps/aarch64/fpu/sve/tanh.c
diff --git a/sysdeps/aarch64/fpu/tanhf_sve.c b/sysdeps/aarch64/fpu/sve/tanhf.c
similarity index 100%
rename from sysdeps/aarch64/fpu/tanhf_sve.c
rename to sysdeps/aarch64/fpu/sve/tanhf.c
diff --git a/sysdeps/aarch64/fpu/tanpi_sve.c b/sysdeps/aarch64/fpu/sve/tanpi.c
similarity index 100%
rename from sysdeps/aarch64/fpu/tanpi_sve.c
rename to sysdeps/aarch64/fpu/sve/tanpi.c
diff --git a/sysdeps/aarch64/fpu/tanpif_sve.c b/sysdeps/aarch64/fpu/sve/tanpif.c
similarity index 100%
rename from sysdeps/aarch64/fpu/tanpif_sve.c
rename to sysdeps/aarch64/fpu/sve/tanpif.c