]> git.ipfire.org Git - thirdparty/glibc.git/blobdiff - math/Makefile
Add narrowing divide functions.
[thirdparty/glibc.git] / math / Makefile
index bbee8f3c58720879238aff16aad3eb87ffc0ffb5..23574f5e091c9bcb8dd0691bce9b881821b8b433 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -22,14 +22,14 @@ subdir              := math
 include ../Makeconfig
 
 # Installed header files.
-headers                := math.h bits/mathcalls.h bits/mathinline.h bits/huge_val.h \
-                  bits/huge_valf.h bits/huge_vall.h bits/inf.h bits/nan.h \
+headers                := math.h bits/mathcalls.h bits/mathinline.h \
                   fpu_control.h complex.h bits/cmathcalls.h fenv.h \
                   bits/fenv.h bits/fenvinline.h bits/mathdef.h tgmath.h \
                   bits/math-finite.h bits/math-vector.h \
                   bits/libm-simd-decl-stubs.h bits/iscanonical.h \
                   bits/flt-eval-method.h bits/fp-fast.h bits/fp-logb.h \
-                  bits/long-double.h
+                  bits/long-double.h bits/mathcalls-helper-functions.h \
+                  bits/floatn.h bits/floatn-common.h bits/mathcalls-narrow.h
 
 # FPU support code.
 aux            := setfpucw fpu_control
@@ -54,7 +54,11 @@ gen-libm-calls = cargF conjF cimagF crealF cabsF s_cacosF              \
                 s_ctanF s_ctanhF s_cexpF s_clogF s_cprojF s_csqrtF       \
                 s_cpowF s_clog10F s_fdimF s_nextdownF s_fmaxF s_fminF    \
                 s_nanF s_iseqsigF s_canonicalizeF w_ilogbF w_llogbF      \
-                w_log1pF w_scalblnF s_fmaxmagF s_fminmagF
+                w_log1pF w_scalblnF s_fmaxmagF s_fminmagF w_acosF        \
+                w_acoshF w_asinF w_atan2F w_atanhF w_coshF w_exp10F      \
+                w_exp2F w_fmodF w_hypotF w_j0F w_j1F w_jnF w_logF        \
+                w_log10F w_log2F w_powF w_remainderF w_sinhF w_sqrtF     \
+                w_tgammaF w_lgammaF w_lgammaF_r w_expF e_exp2F
 
 libm-calls =                                                             \
        e_acosF e_acoshF e_asinF e_atan2F e_atanhF e_coshF e_expF e_fmodF \
@@ -66,10 +70,8 @@ libm-calls =                                                           \
        s_floorF s_log1pF s_logbF                                 \
        s_nextafterF s_nexttowardF s_rintF s_scalblnF                     \
        s_significandF s_sinF s_tanF s_tanhF                              \
-       w_expF                                                            \
-       w_lgammaF w_lgammaF_r                                             \
        s_fpclassifyF s_truncF                                            \
-       s_remquoF e_log2F e_exp2F s_roundF s_nearbyintF s_sincosF         \
+       s_remquoF e_log2F s_roundF s_nearbyintF s_sincosF                 \
        s_fmaF s_lrintF s_llrintF s_lroundF s_llroundF e_exp10F           \
        s_issignalingF $(calls:s_%=m_%) x2y2m1F                           \
        gamma_productF lgamma_negF lgamma_productF                        \
@@ -77,18 +79,25 @@ libm-calls =                                                                  \
        s_setpayloadF s_setpayloadsigF s_roundevenF s_fromfpF s_ufromfpF  \
        s_fromfpxF s_ufromfpxF $(gen-libm-calls)
 
-libm-compat-calls-auto =                                               \
+libm-compat-calls =                                                    \
        w_acosF_compat w_acoshF_compat w_asinF_compat w_atan2F_compat   \
        w_atanhF_compat w_coshF_compat w_exp2F_compat w_exp10F_compat   \
        w_fmodF_compat w_hypotF_compat w_j0F_compat w_j1F_compat        \
        w_jnF_compat w_log2F_compat w_log10F_compat w_logF_compat       \
        w_powF_compat w_remainderF_compat w_scalbF_compat               \
-       w_sinhF_compat w_sqrtF_compat w_tgammaF_compat
-
-libm-compat-calls-ldouble-yes = w_lgamma_compatl k_standardl
-libm-compat-calls = w_lgamma_compatf w_lgamma_compat k_standard k_standardf \
-                   $(libm-compat-calls-ldouble-$(long-double-fcts))
-
+       w_sinhF_compat w_sqrtF_compat w_tgammaF_compat                  \
+       w_lgammaF_r_compat w_lgammaF_compat2 w_expF_compat              \
+       w_lgamma_compatF k_standardF
+
+libm-narrow-fns = add div mul sub
+libm-narrow-types-basic = s_fF s_f32xFf64
+libm-narrow-types-ldouble-yes = s_fFl s_dFl
+libm-narrow-types-float128-yes = s_f32Ff128 s_f64Ff128 s_f64xFf128
+libm-narrow-types-float128-alias-yes = s_f64xFf128
+libm-narrow-types = $(libm-narrow-types-basic) \
+                   $(libm-narrow-types-ldouble-$(long-double-fcts)) \
+                   $(libm-narrow-types-float128-$(float128-fcts)) \
+                   $(libm-narrow-types-float128-alias-$(float128-alias-fcts))
 
 # Type specific routine support.
 #
@@ -101,7 +110,11 @@ libm-compat-calls = w_lgamma_compatf w_lgamma_compat k_standard k_standardf \
 # Finally, note that types is an intentionally recursive variable.
 # We only know the full set of supported types for the target machine
 # after the Rules makefile has been parsed.
-types = $(type-ldouble-$(long-double-fcts)) double float
+types-basic = $(type-ldouble-$(long-double-fcts)) double float
+
+# Like types, but includes types whose functions alias those for
+# another type.
+test-types-basic = ldouble double float
 
 # long double support
 type-ldouble-suffix := l
@@ -110,22 +123,58 @@ type-ldouble-yes := ldouble
 
 # double support
 type-double-suffix :=
-type-double-routines := branred doasin dosincos halfulp mpa mpatan2    \
-                      mpatan mpexp mplog mpsqrt mptan sincos32 slowexp \
-                      slowpow sincostab k_rem_pio2
+type-double-routines := branred doasin dosincos mpa mpatan2    \
+                      mpatan mpsqrt mptan sincos32     \
+                      sincostab k_rem_pio2
 
 # float support
 type-float-suffix := f
-type-float-routines := k_rem_pio2f
-
+type-float-routines := k_rem_pio2f math_errf e_exp2f_data e_logf_data  \
+                      e_log2f_data e_powf_log2_data
+
+# _Float128 support
+type-float128-suffix := f128
+type-float128-routines := t_sincosf128 k_sincosf128
+type-float128-yes := float128
+
+# _Float64x may be supported, only as an alias type.
+type-float64x-yes := float64x
+
+types = $(types-basic) $(type-float128-$(float128-fcts))
+test-types = $(test-types-basic) $(type-float128-$(float128-fcts)) \
+            float32 float64 $(type-float128-$(float128-alias-fcts)) \
+            float32x $(type-float64x-$(float64x-alias-fcts))
+
+# Pairs of types for which narrowing functions should be tested (this
+# variable has more entries than libm-narrow-types because it includes
+# pairs for which the functions sometimes or always alias functions
+# for other types). This definition embeds the assumption that if
+# _Float64x is supported, so is _Float128, and vice versa (they may or
+# may not have the same format).
+test-type-pairs = float-double float-ldouble double-ldouble \
+                 float32-float64 float32-float32x float32x-float64 \
+                 $(test-type-pairs-f64xf128-$(float128-fcts)) \
+                 $(test-type-pairs-f64xf128-$(float128-alias-fcts))
+test-type-pairs-f64xf128-yes = float32-float64x float32-float128 \
+                              float64-float64x float64-float128 \
+                              float32x-float64x float32x-float128 \
+                              float64x-float128
+
+# For each of the basic types (float, double, long double), replace the
+# occurrences of 'F' in arg 1 with the appropriate suffix for the type.
+type-basic-foreach = $(foreach t, $(types-basic), \
+                      $(subst F,$(type-$(t)-suffix),$(1)))
 
 # Apply suffix to each type in arg 1
 type-foreach = $(foreach t,$(types),$(subst F,$(type-$(t)-suffix),$(1)))
 
-libm-routines = $(strip $(libm-support) $(libm-compat-calls)           \
-                       $(call type-foreach, $(libm-compat-calls-auto)) \
+libm-routines = $(strip $(libm-support)                                        \
+                       $(call type-basic-foreach,                      \
+                              $(libm-compat-calls))                    \
                        $(call type-foreach, $(libm-calls))             \
                        $(foreach t, $(types), $(type-$(t)-routines)))  \
+                       $(foreach f,$(libm-narrow-fns),                 \
+                                   $(subst F,$(f),$(libm-narrow-types)))
 
 # These functions are in libc instead of libm because __printf_fp
 # calls them, so any program using printf will need them linked in,
@@ -170,7 +219,7 @@ $(inst_libdir)/libm.a: $(common-objpfx)format.lds \
 endif
 
 # Rules for the test suite.
-tests = test-matherr test-fenv atest-exp atest-sincos atest-exp2 basic-test \
+tests = test-matherr-3 test-fenv basic-test \
        test-misc test-fpucw test-fpucw-ieee tst-definitions test-tgmath \
        test-tgmath-ret bug-nextafter bug-nexttoward bug-tgmath1 \
        test-tgmath-int test-tgmath2 test-powl tst-CMPLX tst-CMPLX2 test-snan \
@@ -185,64 +234,141 @@ tests = test-matherr test-fenv atest-exp atest-sincos atest-exp2 basic-test \
        test-femode-traps test-iszero-excess-precision \
        test-iseqsig-excess-precision test-flt-eval-method \
        test-fp-ilogb-constants test-fp-llogb-constants \
-       test-fe-snans-always-signal $(tests-static)
+       test-fe-snans-always-signal test-finite-macros test-narrow-macros \
+       $(tests-static)
 tests-static = test-fpucw-static test-fpucw-ieee-static \
               test-signgam-uchar-static test-signgam-uchar-init-static \
               test-signgam-uint-static test-signgam-uint-init-static \
               test-signgam-ullong-static test-signgam-ullong-init-static
+tests-internal = test-matherr test-matherr-2
+
+# These tests use internal (unexported) GMP functions and are linked
+# statically to obtain access to these functions.
+tests-static += atest-exp atest-sincos atest-exp2
 
 ifneq (,$(CXX))
-tests += test-math-isinff test-math-iszero
+tests += test-math-isinff test-math-iszero test-math-issignaling \
+        test-math-iscanonical test-math-cxx11 test-math-iseqsig
 endif
 
 ifneq (no,$(PERL))
 libm-vec-tests = $(addprefix test-,$(libmvec-tests))
+libm-test-support = $(foreach t,$(test-types),libm-test-support-$(t))
+test-extras += $(libm-test-support)
+extra-test-objs += $(addsuffix .o, $(libm-test-support))
+libm-vec-test-wrappers = $(addsuffix -wrappers, $(libm-vec-tests))
+test-extras += $(libm-vec-test-wrappers)
+extra-test-objs += $(addsuffix .o, $(libm-vec-test-wrappers))
 
-libm-tests = $(foreach t,$(types),test-$(t) test-$(t)-finite test-i$(t)) \
-            $(libm-vec-tests)
+ulps-file = $(firstword $(wildcard $(sysdirs:%=%/libm-test-ulps)))
+
+$(objpfx)libm-test-ulps.h: $(ulps-file) gen-libm-test.pl
+       $(make-target-directory)
+       $(PERL) gen-libm-test.pl -u $< -H $@
+
+libm-test-funcs-auto = acos acosh asin asinh atan atan2 atanh cabs cacos \
+                      cacosh carg casin casinh catan catanh cbrt ccos ccosh \
+                      cexp clog clog10 cos cosh cpow csin csinh csqrt ctan \
+                      ctanh erf erfc exp exp10 exp2 expm1 fma hypot j0 j1 jn \
+                      lgamma log log10 log1p log2 pow sin sincos sinh sqrt \
+                      tan tanh tgamma y0 y1 yn
+libm-test-funcs-noauto = canonicalize ceil cimag conj copysign cproj creal \
+                        fabs fdim floor fmax fmaxmag fmin fminmag fmod \
+                        fpclassify frexp fromfp fromfpx getpayload ilogb \
+                        iscanonical iseqsig isfinite isgreater \
+                        isgreaterequal isinf isless islessequal \
+                        islessgreater isnan isnormal issignaling issubnormal \
+                        isunordered iszero llogb llrint llround logb lrint \
+                        lround modf nearbyint nextafter nextdown nexttoward \
+                        nextup remainder remquo rint round roundeven scalb \
+                        scalbln scalbn setpayload setpayloadsig signbit \
+                        significand totalorder totalordermag trunc ufromfp \
+                        ufromfpx
+libm-test-funcs-narrow = add div mul sub
+libm-test-funcs-all = $(libm-test-funcs-auto) $(libm-test-funcs-noauto)
+libm-test-c-auto = $(foreach f,$(libm-test-funcs-auto),libm-test-$(f).c)
+libm-test-c-noauto = $(foreach f,$(libm-test-funcs-noauto),libm-test-$(f).c)
+libm-test-c-narrow = $(foreach f,$(libm-test-funcs-narrow),\
+                                libm-test-narrow-$(f).c)
+generated += libm-test-ulps.h $(libm-test-c-auto) $(libm-test-c-noauto) \
+            $(libm-test-c-narrow)
+
+libm-tests-base-normal = $(foreach t,$(test-types),test-$(t))
+libm-tests-base-finite = $(foreach t,$(test-types),test-$(t)-finite)
+libm-tests-base-inline = $(foreach t,$(test-types),test-i$(t))
+libm-tests-base-narrow = $(foreach t,$(test-type-pairs),test-$(t))
+libm-tests-base = $(libm-tests-base-normal) $(libm-tests-base-finite) \
+                 $(libm-tests-base-inline) $(libm-vec-tests)
+libm-tests-normal = $(foreach t,$(libm-tests-base-normal),\
+                               $(foreach f,$(libm-test-funcs-all),\
+                                           $(t)-$(f)))
+libm-tests-finite = $(foreach t,$(libm-tests-base-finite),\
+                               $(foreach f,$(libm-test-funcs-all),\
+                                           $(t)-$(f)))
+libm-tests-inline = $(foreach t,$(libm-tests-base-inline),\
+                               $(foreach f,$(libm-test-funcs-all),\
+                                           $(t)-$(f)))
+libm-tests-narrow = $(foreach t,$(libm-tests-base-narrow),\
+                               $(foreach f,$(libm-test-funcs-narrow),\
+                                           $(t)-$(f)))
+libm-tests-vector = $(foreach t,$(libmvec-tests),\
+                               $(foreach f,$($(t)-funcs),test-$(t)-$(f)))
+libm-tests = $(libm-tests-normal) $(libm-tests-finite) $(libm-tests-inline) \
+            $(libm-tests-narrow) $(libm-tests-vector)
+libm-tests-for-type = $(foreach f,$(libm-test-funcs-all),\
+                                 test-$(1)-$(f) test-$(1)-finite-$(f) \
+                                 test-i$(1)-$(f)) \
+                     $(filter test-$(1)-%,$(libm-tests-vector) \
+                                          $(libm-tests-narrow))
 
 libm-tests.o = $(addsuffix .o,$(libm-tests))
 
 tests += $(libm-tests)
-libm-vec-test-wrappers = $(addsuffix -wrappers, $(libm-vec-tests))
-test-extras += $(libm-vec-test-wrappers)
-extra-test-objs += $(addsuffix .o, $(libm-vec-test-wrappers))
-libm-tests-generated = libm-test-ulps.h libm-have-vector-test.h libm-test.c
-generated += $(libm-tests-generated) libm-test.stmp
+generated += $(addsuffix .c,$(libm-tests)) \
+            $(foreach t,$(test-types),libm-test-support-$(t).c)
 
-ulps-file = $(firstword $(wildcard $(sysdirs:%=%/libm-test-ulps)))
+libm-test-c-auto-obj = $(addprefix $(objpfx),$(libm-test-c-auto))
+libm-test-c-noauto-obj = $(addprefix $(objpfx),$(libm-test-c-noauto))
+libm-test-c-narrow-obj = $(addprefix $(objpfx),$(libm-test-c-narrow))
+
+$(libm-test-c-noauto-obj): $(objpfx)libm-test%.c: libm-test%.inc \
+                                                 gen-libm-test.pl
+       $(make-target-directory)
+       $(PERL) gen-libm-test.pl -c $< -a /dev/null -C $@
 
-$(addprefix $(objpfx), $(libm-tests-generated)): $(objpfx)libm-test.stmp
+$(libm-test-c-auto-obj): $(objpfx)libm-test%.c: libm-test%.inc \
+                                               gen-libm-test.pl \
+                                               auto-libm-test-out%
+       $(make-target-directory)
+       $(PERL) gen-libm-test.pl -c $< -a auto-libm-test-out$* -C $@
 
-$(objpfx)libm-test.stmp: $(ulps-file) libm-test.inc gen-libm-test.pl \
-                        gen-libm-have-vector-test.sh auto-libm-test-out
+$(libm-test-c-narrow-obj): $(objpfx)libm-test%.c: libm-test%.inc \
+                                                 gen-libm-test.pl \
+                                                 auto-libm-test-out%
        $(make-target-directory)
-       $(PERL) gen-libm-test.pl -u $< -H "$(objpfx)libm-test-ulps.h"
-       $(PERL) gen-libm-test.pl -c libm-test.inc -a auto-libm-test-out \
-                                -C "$(objpfx)libm-test.c"
-       $(SHELL) gen-libm-have-vector-test.sh > $(objpfx)libm-have-vector-test.h
-       @echo > $@
+       $(PERL) gen-libm-test.pl -c $< -a auto-libm-test-out$* -C $@
+endif
+
+ifdef PYTHON
+tests += test-tgmath3
+generated += test-tgmath3.c
+CFLAGS-test-tgmath3.c += -fno-builtin
+
+$(objpfx)test-tgmath3.c: gen-tgmath-tests.py
+       $(PYTHON) $< > $@
 endif
 
 libm-test-fast-math-cflags = -fno-builtin -D__FAST_MATH__ -DTEST_FAST_MATH
 libm-test-vec-cflags = $(libm-test-fast-math-cflags) -fno-inline \
                       -ffloat-store -D_OPENMP=201307 -Wno-unknown-pragmas
 
-CFLAGS-test-double-vlen2.c = $(libm-test-vec-cflags)
-
-CFLAGS-test-double-vlen4.c = $(libm-test-vec-cflags)
-CFLAGS-test-double-vlen4-wrappers.c = $(double-vlen4-arch-ext-cflags)
+CFLAGS-test-double-vlen4-wrappers.c += $(double-vlen4-arch-ext-cflags)
 
-CFLAGS-test-double-vlen8.c = $(libm-test-vec-cflags)
-CFLAGS-test-double-vlen8-wrappers.c = $(double-vlen8-arch-ext-cflags)
+CFLAGS-test-double-vlen8-wrappers.c += $(double-vlen8-arch-ext-cflags)
 
-CFLAGS-test-float-vlen4.c = $(libm-test-vec-cflags)
+CFLAGS-test-float-vlen8-wrappers.c += $(float-vlen8-arch-ext-cflags)
 
-CFLAGS-test-float-vlen8.c = $(libm-test-vec-cflags)
-CFLAGS-test-float-vlen8-wrappers.c = $(float-vlen8-arch-ext-cflags)
-
-CFLAGS-test-float-vlen16.c = $(libm-test-vec-cflags)
-CFLAGS-test-float-vlen16-wrappers.c = $(float-vlen16-arch-ext-cflags)
+CFLAGS-test-float-vlen16-wrappers.c += $(float-vlen16-arch-ext-cflags)
 
 # The no-inline tests use -fsignaling-nans, and thereby use the
 # versions of classification macros that support sNaNs.  The inline
@@ -254,58 +380,47 @@ libm-test-no-inline-cflags = -fno-inline -ffloat-store -fno-builtin \
                             -fsignaling-nans
 libm-test-finite-cflags = $(libm-test-no-inline-cflags) \
                          -U__FINITE_MATH_ONLY__ -D__FINITE_MATH_ONLY__=1
-CFLAGS-test-float.c = $(libm-test-no-inline-cflags)
-CFLAGS-test-float-finite.c = $(libm-test-finite-cflags)
-CFLAGS-test-double.c = $(libm-test-no-inline-cflags)
-CFLAGS-test-double-finite.c = $(libm-test-finite-cflags)
-CFLAGS-test-ldouble.c = $(libm-test-no-inline-cflags)
-CFLAGS-test-ldouble-finite.c = $(libm-test-finite-cflags)
-CFLAGS-test-tgmath.c = -fno-builtin
+libm-test-inline-cflags = $(libm-test-fast-math-cflags)
+CFLAGS-test-tgmath.c += -fno-builtin
 # The following testcase uses very long lines (>3 million), so it may take a
 # while to compile it. See: http://llvm.org/bugs/show_bug.cgi?id=14106 and
 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54402
-CFLAGS-test-tgmath2.c = -fno-builtin
-CFLAGS-test-tgmath-ret.c = -fno-builtin
-CFLAGS-test-powl.c = -fno-builtin
-
-CFLAGS-test-snan.c = -fsignaling-nans
-CPPFLAGS-test-ifloat.c = -U__LIBC_INTERNAL_MATH_INLINES \
-                        $(libm-test-fast-math-cflags)
-CPPFLAGS-test-idouble.c = -U__LIBC_INTERNAL_MATH_INLINES \
-                         $(libm-test-fast-math-cflags)
-CPPFLAGS-test-ildouble.c = -U__LIBC_INTERNAL_MATH_INLINES \
-                         $(libm-test-fast-math-cflags)
-
-CFLAGS-test-signgam-finite.c = -ffinite-math-only
-CFLAGS-test-signgam-finite-c99.c = -ffinite-math-only -std=c99
-CFLAGS-test-signgam-finite-c11.c = -ffinite-math-only -std=c11
-CFLAGS-test-signgam-uchar.c = -std=c99
-CFLAGS-test-signgam-uchar-init.c = -std=c99
-CFLAGS-test-signgam-uchar-static.c = -std=c99
-CFLAGS-test-signgam-uchar-init-static.c = -std=c99
-CFLAGS-test-signgam-uint.c = -std=c99
-CFLAGS-test-signgam-uint-init.c = -std=c99
-CFLAGS-test-signgam-uint-static.c = -std=c99
-CFLAGS-test-signgam-uint-init-static.c = -std=c99
-CFLAGS-test-signgam-ullong.c = -std=c99
-CFLAGS-test-signgam-ullong-init.c = -std=c99
-CFLAGS-test-signgam-ullong-static.c = -std=c99
-CFLAGS-test-signgam-ullong-init-static.c = -std=c99
-
-CFLAGS-test-math-isinff.cc = -std=gnu++11
-CFLAGS-test-math-iszero.cc = -std=gnu++11
-
-CFLAGS-test-iszero-excess-precision.c = -fexcess-precision=standard
-CFLAGS-test-iseqsig-excess-precision.c = -fexcess-precision=standard
-CFLAGS-test-flt-eval-method.c = -fexcess-precision=standard
-
-CFLAGS-test-fe-snans-always-signal.c = -fsignaling-nans
-
-# The -lieee module sets the _LIB_VERSION_ switch to IEEE mode
-# for error handling in the -lm functions.
-install-lib += libieee.a
-non-lib.a += libieee.a
-extra-objs += libieee.a ieee-math.o
+CFLAGS-test-tgmath2.c += -fno-builtin
+CFLAGS-test-tgmath-ret.c += -fno-builtin
+CFLAGS-test-powl.c += -fno-builtin
+
+CFLAGS-test-snan.c += -fsignaling-nans
+
+CFLAGS-test-signgam-finite.c += -ffinite-math-only
+CFLAGS-test-signgam-finite-c99.c += -ffinite-math-only -std=c99
+CFLAGS-test-signgam-finite-c11.c += -ffinite-math-only -std=c11
+CFLAGS-test-signgam-uchar.c += -std=c99
+CFLAGS-test-signgam-uchar-init.c += -std=c99
+CFLAGS-test-signgam-uchar-static.c += -std=c99
+CFLAGS-test-signgam-uchar-init-static.c += -std=c99
+CFLAGS-test-signgam-uint.c += -std=c99
+CFLAGS-test-signgam-uint-init.c += -std=c99
+CFLAGS-test-signgam-uint-static.c += -std=c99
+CFLAGS-test-signgam-uint-init-static.c += -std=c99
+CFLAGS-test-signgam-ullong.c += -std=c99
+CFLAGS-test-signgam-ullong-init.c += -std=c99
+CFLAGS-test-signgam-ullong-static.c += -std=c99
+CFLAGS-test-signgam-ullong-init-static.c += -std=c99
+
+CFLAGS-test-math-cxx11.cc += -std=c++11
+
+CFLAGS-test-math-isinff.cc += -std=gnu++11
+CFLAGS-test-math-iszero.cc += -std=gnu++11
+CFLAGS-test-math-issignaling.cc += -std=gnu++11
+CFLAGS-test-math-iscanonical.cc += -std=gnu++11
+
+CFLAGS-test-iszero-excess-precision.c += -fexcess-precision=standard
+CFLAGS-test-iseqsig-excess-precision.c += -fexcess-precision=standard
+CFLAGS-test-flt-eval-method.c += -fexcess-precision=standard
+
+CFLAGS-test-fe-snans-always-signal.c += -fsignaling-nans
+
+CFLAGS-test-finite-macros.c += -ffinite-math-only
 
 include ../Rules
 
@@ -337,19 +452,154 @@ $(foreach t, $(call type-foreach, $(gen-all-calls)), \
 
 ifneq (no,$(PERL))
 # This must come after the inclusion of sysdeps Makefiles via Rules.
-$(addprefix $(objpfx), $(libm-tests.o)): $(objpfx)libm-test.stmp
+
+$(foreach t,$(libm-tests-normal),$(objpfx)$(t).c): $(objpfx)test-%.c:
+       type_func=$*; \
+       type=$${type_func%%-*}; \
+       func=$${type_func#*-}; \
+       ( \
+         echo "#include <test-$$type.h>"; \
+         echo "#include <test-math-no-finite.h>"; \
+         echo "#include <test-math-no-inline.h>"; \
+         echo "#include <test-math-errno.h>"; \
+         echo "#include <test-math-scalar.h>"; \
+         echo "#include <libm-test-$$func.c>"; \
+       ) > $@
+
+$(foreach t,$(libm-tests-finite),$(objpfx)$(t).c): $(objpfx)test-%.c:
+       type_func=$*; \
+       type=$${type_func%%-*}; \
+       func=$${type_func#*-finite-}; \
+       ( \
+         echo "#include <test-$$type.h>"; \
+         echo "#include <test-math-finite.h>"; \
+         echo "#include <test-math-no-inline.h>"; \
+         echo "#include <test-math-scalar.h>"; \
+         echo "#include <libm-test-$$func.c>"; \
+       ) > $@
+
+$(foreach t,$(libm-tests-inline),$(objpfx)$(t).c): $(objpfx)test-i%.c:
+       type_func=$*; \
+       type=$${type_func%%-*}; \
+       func=$${type_func#*-}; \
+       ( \
+         echo "#include <test-$$type.h>"; \
+         echo "#include <test-math-inline.h>"; \
+         echo "#include <test-math-scalar.h>"; \
+         echo "#include <libm-test-$$func.c>"; \
+       ) > $@
+
+$(foreach t,$(libm-tests-narrow),$(objpfx)$(t).c): $(objpfx)test-%.c:
+       type_pair_func=$*; \
+       type_pair=$${type_pair_func%-*}; \
+       func=$${type_pair_func##*-}; \
+       ret_type=$${type_pair%%-*}; \
+       arg_type=$${type_pair#*-}; \
+       ( \
+         echo "#include <test-$$ret_type.h>"; \
+         echo "#include <test-arg-$$arg_type.h>"; \
+         echo "#include <test-math-no-finite.h>"; \
+         echo "#include <test-math-no-inline.h>"; \
+         echo "#include <test-math-errno.h>"; \
+         echo "#include <test-math-narrow.h>"; \
+         echo "#include <libm-test-narrow-$$func.c>"; \
+       ) > $@
+
+$(foreach t,$(libm-tests-vector),$(objpfx)$(t).c): $(objpfx)test-%.c:
+       type_func=$*; \
+       type=$${type_func%-*}; \
+       func=$${type_func##*-}; \
+       func_args=$$(grep ALL_RM_TEST libm-test-$$func.inc \
+                    | sed 's/.*RUN_TEST_LOOP_//;s/_.*//'); \
+       ( \
+         echo "#include <test-$$type.h>"; \
+         echo "WRAPPER_DECL_$$func_args (WRAPPER_NAME (FUNC ($$func)))"; \
+         echo "#include <libm-test-$$func.c>"; \
+       ) > $@
+
+$(foreach t,$(test-types),\
+           $(objpfx)libm-test-support-$(t).c): $(objpfx)libm-test-support-%.c:
+       ( \
+         echo "#include <test-$*.h>"; \
+         echo "#include <libm-test-support.c>"; \
+       ) > $@
+
+$(addprefix $(objpfx), $(libm-tests.o)): $(objpfx)libm-test-ulps.h
+
+define o-iterator-doit
+$(foreach f,$(libm-test-funcs-all),\
+           $(objpfx)$(o)-$(f).o): $(objpfx)$(o)%.o: $(objpfx)libm-test%.c
+endef
+object-suffixes-left := $(libm-tests-base)
+include $(o-iterator)
+
+define o-iterator-doit
+$(foreach f,$(libm-test-funcs-narrow),\
+           $(objpfx)$(o)-$(f).o): $(objpfx)$(o)%.o: \
+                                  $(objpfx)libm-test-narrow%.c
+endef
+object-suffixes-left := $(libm-tests-base-narrow)
+include $(o-iterator)
+
+define o-iterator-doit
+$(foreach f,$(libm-test-funcs-all),\
+           $(objpfx)$(o)-$(f).o): CFLAGS += $(libm-test-no-inline-cflags)
+endef
+object-suffixes-left := $(libm-tests-base-normal)
+include $(o-iterator)
+
+define o-iterator-doit
+$(foreach f,$(libm-test-funcs-all),\
+           $(objpfx)$(o)-$(f).o): CFLAGS += $(libm-test-finite-cflags)
+endef
+object-suffixes-left := $(libm-tests-base-finite)
+include $(o-iterator)
+
+define o-iterator-doit
+$(foreach f,$(libm-test-funcs-all),\
+           $(objpfx)$(o)-$(f).o): CFLAGS += $(libm-test-inline-cflags)
+endef
+object-suffixes-left := $(libm-tests-base-inline)
+include $(o-iterator)
+
+define o-iterator-doit
+$(foreach f,$(libm-test-funcs-narrow),\
+           $(objpfx)$(o)-$(f).o): CFLAGS += $(libm-test-no-inline-cflags)
+endef
+object-suffixes-left := $(libm-tests-base-narrow)
+include $(o-iterator)
+
+define o-iterator-doit
+$(foreach f,$($(o)-funcs),\
+           $(objpfx)test-$(o)-$(f).o): CFLAGS += $(libm-test-vec-cflags)
+endef
+object-suffixes-left := $(libmvec-tests)
+include $(o-iterator)
+
+define o-iterator-doit
+$(addprefix $(objpfx),\
+           $(call libm-tests-for-type,$(o))): $(objpfx)libm-test-support-$(o).o
+endef
+object-suffixes-left := $(test-types)
+include $(o-iterator)
+
+define o-iterator-doit
+$(objpfx)libm-test-support-$(o).o: CFLAGS += $(libm-test-no-inline-cflags)
+endef
+object-suffixes-left := $(test-types)
+include $(o-iterator)
 
 # Run the math programs to automatically generate ULPs files.
 .PHONY: regen-ulps
 
 run-regen-ulps = $(test-wrapper-env) \
            $(run-program-env) \
-           $($*-ENV) $(rtld-prefix) $${run}
+           $($*-ENV) $(rtld-prefix) $(objpfx)$${run}
 
 regen-ulps: $(addprefix $(objpfx),$(libm-tests))
        rm -f $(objpfx)ULPs; rm -f $(objpfx)NewUlps; \
        cp $(ulps-file) $(objpfx)libm-test-ulps; \
-       for run in $^; do \
+       for run in $(libm-tests); do \
          echo "Regenerating ULPs for $${run}"; \
          $(run-regen-ulps) -u -o $(objpfx); \
          cat $(objpfx)ULPs >> $(objpfx)libm-test-ulps; \
@@ -382,10 +632,6 @@ endef
 object-suffixes-left := $(all-object-suffixes)
 include $(o-iterator)
 
-# This file defines the default _LIB_VERSION variable that controls
-# the error return conventions for the math functions.
-CPPFLAGS-s_lib_version.c := -D_POSIX_MODE
-
 # We don't want the fdlibm code to use the inline math functions,
 # only the fdlibm code.
 math-CPPFLAGS += -D__NO_MATH_INLINES -D__LIBC_INTERNAL_MATH_INLINES
@@ -393,10 +639,8 @@ math-CPPFLAGS += -D__NO_MATH_INLINES -D__LIBC_INTERNAL_MATH_INLINES
 ifneq ($(long-double-fcts),yes)
 # The `double' and `long double' types are the same on this machine.
 # We won't compile the `long double' code at all.  Tell the `double' code
-# to define aliases for the `FUNCl' names.  To avoid type conflicts in
-# defining those aliases, tell <math.h> to declare the `FUNCl' names with
-# `double' instead of `long double'.
-math-CPPFLAGS += -DNO_LONG_DOUBLE -D_Mlong_double_=double
+# to define aliases for the `FUNCl' names.
+math-CPPFLAGS += -DNO_LONG_DOUBLE
 endif
 
 # These files quiet sNaNs in a way that is optimized away without
@@ -404,26 +648,18 @@ endif
 CFLAGS-s_modf.c += -fsignaling-nans
 CFLAGS-s_modff.c += -fsignaling-nans
 CFLAGS-s_modfl.c += -fsignaling-nans
-
-# The -lieee library is actually an object file.
-# The module just defines the _LIB_VERSION_ variable.
-# It's not a library to make sure it is linked in instead of s_lib_version.o.
-$(objpfx)libieee.a: $(objpfx)ieee-math.o
-       rm -f $@
-       $(patsubst %/,cd % &&,$(objpfx)) \
-       $(LN_S) $(<F) $(@F)
+CFLAGS-s_modff128.c += -fsignaling-nans
 
 $(addprefix $(objpfx),\
-           $(filter-out $(tests-static) $(libm-vec-tests),$(tests))): $(libm)
+           $(filter-out $(tests-static) $(libm-tests-vector),\
+                        $(tests) $(tests-internal))): $(libm)
 $(addprefix $(objpfx),$(tests-static)): $(objpfx)libm.a
-$(addprefix $(objpfx), $(libm-vec-tests)): $(objpfx)%: $(objpfx)%-wrappers.o \
-                                                      $(libm) $(libmvec)
-
-gmp-objs = $(patsubst %,$(common-objpfx)stdlib/%.o,\
-                     add_n sub_n cmp addmul_1 mul_1 mul_n divmod_1 \
-                     lshift rshift mp_clz_tab udiv_qrnnd inlines \
-                     $(gmp-sysdep_routines))
-$(objpfx)atest-exp: $(gmp-objs)
-$(objpfx)atest-sincos: $(gmp-objs)
-$(objpfx)atest-exp2: $(gmp-objs)
+define o-iterator-doit
+$(foreach f,$($(o)-funcs),\
+           $(objpfx)test-$(o)-$(f)): $(objpfx)test-$(o)-wrappers.o \
+                                     $(libm) $(libmvec)
+endef
+object-suffixes-left := $(libmvec-tests)
+include $(o-iterator)
+
 $(objpfx)test-fenv-tls: $(shared-thread-library)