diff options
33 files changed, 56 insertions, 39 deletions
diff --git a/ChangeLog b/ChangeLog index 2ceae53f87..f560b2a832 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,42 @@ +2017-12-12 Joseph Myers <joseph@codesourcery.com> + + * soft-fp/fmadf4.c: Move to .... + * sysdeps/ieee754/soft-fp/s_fma.c: ... here. + * soft-fp/fmasf4.c: Move to .... + * sysdeps/ieee754/soft-fp/s_fmaf.c: ... here. + * soft-fp/fmatf4.c: Move to .... + * sysdeps/ieee754/soft-fp/s_fmal.c: ... here. + * sysdeps/ieee754/soft-fp/Makefile: New file. + * sysdeps/arm/preconfigure.ac: Define with_fp_cond. + * sysdeps/arm/preconfigure: Regenerated. + * sysdeps/arm/nofpu/Implies: New file. + * sysdeps/arm/s_fma.c: Remove file. + * sysdeps/arm/s_fmaf.c: Likewise. + * sysdeps/m68k/coldfire/nofpu/Implies: New file. + * sysdeps/m68k/coldfire/nofpu/s_fma.c: Remove file. + * sysdeps/m68k/coldfire/nofpu/s_fmaf.c: Likewise. + * sysdeps/microblaze/Implies: Add ieee754/soft-fp. + * sysdeps/microblaze/s_fma.c: Remove file. + * sysdeps/microblaze/s_fmaf.c: Likewise. + * sysdeps/mips/mips32/nofpu/Implies: New file. + * sysdeps/mips/mips64/n32/fpu/s_fma.c: Likewise. + * sysdeps/mips/mips64/n32/nofpu/Implies: Likewise. + * sysdeps/mips/mips64/n64/fpu/s_fma.c: Likewise. + * sysdeps/mips/mips64/n64/nofpu/Implies: Likewise. + * sysdeps/mips/ieee754/s_fma.c: Remove file. + * sysdeps/mips/ieee754/s_fmaf.c: Likewise. + * sysdeps/mips/ieee754/s_fmal.c: Update include for move of fmal + implementation. + * sysdeps/nios2/Implies: Add ieee754/soft-fp. + * sysdeps/nios2/s_fma.c: Remove file. + * sysdeps/nios2/s_fmaf.c: Likewise. + * sysdeps/sh/nofpu/Implies: New file. + * sysdeps/sh/s_fma.c: Remove file. + * sysdeps/sh/s_fmaf.c: Likewise. + * sysdeps/tile/Implies: Add ieee754/soft-fp. + * sysdeps/tile/s_fma.c: Remove file. + * sysdeps/tile/s_fmaf.c: Likewise. + 2017-12-12 H.J. Lu <hongjiu.lu@intel.com> * sysdeps/x86_64/fpu/multiarch/Makefile (libm-sysdep_routines): diff --git a/sysdeps/arm/nofpu/Implies b/sysdeps/arm/nofpu/Implies new file mode 100644 index 0000000000..abcbadb25f --- /dev/null +++ b/sysdeps/arm/nofpu/Implies @@ -0,0 +1 @@ +ieee754/soft-fp diff --git a/sysdeps/arm/preconfigure b/sysdeps/arm/preconfigure index 33e9501c4f..d803256d9f 100644 --- a/sysdeps/arm/preconfigure +++ b/sysdeps/arm/preconfigure @@ -52,4 +52,5 @@ $as_echo "$as_me: WARNING: arm/preconfigure: Did not find ARM architecture type; esac machine=arm/$machine + with_fp_cond="!defined __SOFTFP__" esac diff --git a/sysdeps/arm/preconfigure.ac b/sysdeps/arm/preconfigure.ac index 20de5bcfea..43d014031d 100644 --- a/sysdeps/arm/preconfigure.ac +++ b/sysdeps/arm/preconfigure.ac @@ -47,4 +47,5 @@ arm*) esac machine=arm/$machine + with_fp_cond="!defined __SOFTFP__" esac diff --git a/sysdeps/arm/s_fma.c b/sysdeps/arm/s_fma.c deleted file mode 100644 index dc4e27bfc1..0000000000 --- a/sysdeps/arm/s_fma.c +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __SOFTFP__ -# include <soft-fp/fmadf4.c> -#else -# include <sysdeps/ieee754/dbl-64/s_fma.c> -#endif diff --git a/sysdeps/arm/s_fmaf.c b/sysdeps/arm/s_fmaf.c deleted file mode 100644 index 550d8b85d3..0000000000 --- a/sysdeps/arm/s_fmaf.c +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __SOFTFP__ -# include <soft-fp/fmasf4.c> -#else -# include <sysdeps/ieee754/dbl-64/s_fmaf.c> -#endif diff --git a/sysdeps/ieee754/soft-fp/Makefile b/sysdeps/ieee754/soft-fp/Makefile new file mode 100644 index 0000000000..ada13e8b70 --- /dev/null +++ b/sysdeps/ieee754/soft-fp/Makefile @@ -0,0 +1,3 @@ +ifeq ($(subdir),math) +CPPFLAGS += -I../soft-fp +endif diff --git a/soft-fp/fmadf4.c b/sysdeps/ieee754/soft-fp/s_fma.c index 313547d061..313547d061 100644 --- a/soft-fp/fmadf4.c +++ b/sysdeps/ieee754/soft-fp/s_fma.c diff --git a/soft-fp/fmasf4.c b/sysdeps/ieee754/soft-fp/s_fmaf.c index 295223da50..295223da50 100644 --- a/soft-fp/fmasf4.c +++ b/sysdeps/ieee754/soft-fp/s_fmaf.c diff --git a/soft-fp/fmatf4.c b/sysdeps/ieee754/soft-fp/s_fmal.c index 79be52c4f1..79be52c4f1 100644 --- a/soft-fp/fmatf4.c +++ b/sysdeps/ieee754/soft-fp/s_fmal.c diff --git a/sysdeps/m68k/coldfire/nofpu/Implies b/sysdeps/m68k/coldfire/nofpu/Implies new file mode 100644 index 0000000000..abcbadb25f --- /dev/null +++ b/sysdeps/m68k/coldfire/nofpu/Implies @@ -0,0 +1 @@ +ieee754/soft-fp diff --git a/sysdeps/m68k/coldfire/nofpu/s_fma.c b/sysdeps/m68k/coldfire/nofpu/s_fma.c deleted file mode 100644 index d9613fa67c..0000000000 --- a/sysdeps/m68k/coldfire/nofpu/s_fma.c +++ /dev/null @@ -1 +0,0 @@ -#include <soft-fp/fmadf4.c> diff --git a/sysdeps/m68k/coldfire/nofpu/s_fmaf.c b/sysdeps/m68k/coldfire/nofpu/s_fmaf.c deleted file mode 100644 index aa5c9b2d91..0000000000 --- a/sysdeps/m68k/coldfire/nofpu/s_fmaf.c +++ /dev/null @@ -1 +0,0 @@ -#include <soft-fp/fmasf4.c> diff --git a/sysdeps/microblaze/Implies b/sysdeps/microblaze/Implies index 73c766c52e..746b21ad66 100644 --- a/sysdeps/microblaze/Implies +++ b/sysdeps/microblaze/Implies @@ -1,4 +1,5 @@ wordsize-32 # MicroBlaze uses IEEE 754 floating point. +ieee754/soft-fp ieee754/flt-32 ieee754/dbl-64 diff --git a/sysdeps/microblaze/s_fma.c b/sysdeps/microblaze/s_fma.c deleted file mode 100644 index d9613fa67c..0000000000 --- a/sysdeps/microblaze/s_fma.c +++ /dev/null @@ -1 +0,0 @@ -#include <soft-fp/fmadf4.c> diff --git a/sysdeps/microblaze/s_fmaf.c b/sysdeps/microblaze/s_fmaf.c deleted file mode 100644 index aa5c9b2d91..0000000000 --- a/sysdeps/microblaze/s_fmaf.c +++ /dev/null @@ -1 +0,0 @@ -#include <soft-fp/fmasf4.c> diff --git a/sysdeps/mips/ieee754/s_fma.c b/sysdeps/mips/ieee754/s_fma.c deleted file mode 100644 index 574141416b..0000000000 --- a/sysdeps/mips/ieee754/s_fma.c +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __mips_hard_float -# include <sysdeps/ieee754/dbl-64/s_fma.c> -#else -# include <soft-fp/fmadf4.c> -#endif diff --git a/sysdeps/mips/ieee754/s_fmaf.c b/sysdeps/mips/ieee754/s_fmaf.c deleted file mode 100644 index 30bcdae620..0000000000 --- a/sysdeps/mips/ieee754/s_fmaf.c +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __mips_hard_float -# include <sysdeps/ieee754/dbl-64/s_fmaf.c> -#else -# include <soft-fp/fmasf4.c> -#endif diff --git a/sysdeps/mips/ieee754/s_fmal.c b/sysdeps/mips/ieee754/s_fmal.c index 6b83e914fe..c52331967d 100644 --- a/sysdeps/mips/ieee754/s_fmal.c +++ b/sysdeps/mips/ieee754/s_fmal.c @@ -4,4 +4,4 @@ # error "long double fma being compiled for o32 ABI" #endif -#include <soft-fp/fmatf4.c> +#include <sysdeps/ieee754/soft-fp/s_fmal.c> diff --git a/sysdeps/mips/mips32/nofpu/Implies b/sysdeps/mips/mips32/nofpu/Implies new file mode 100644 index 0000000000..abcbadb25f --- /dev/null +++ b/sysdeps/mips/mips32/nofpu/Implies @@ -0,0 +1 @@ +ieee754/soft-fp diff --git a/sysdeps/mips/mips64/n32/fpu/s_fma.c b/sysdeps/mips/mips64/n32/fpu/s_fma.c new file mode 100644 index 0000000000..b61fa643de --- /dev/null +++ b/sysdeps/mips/mips64/n32/fpu/s_fma.c @@ -0,0 +1 @@ +#include <sysdeps/ieee754/dbl-64/s_fma.c> diff --git a/sysdeps/mips/mips64/n32/nofpu/Implies b/sysdeps/mips/mips64/n32/nofpu/Implies new file mode 100644 index 0000000000..abcbadb25f --- /dev/null +++ b/sysdeps/mips/mips64/n32/nofpu/Implies @@ -0,0 +1 @@ +ieee754/soft-fp diff --git a/sysdeps/mips/mips64/n64/fpu/s_fma.c b/sysdeps/mips/mips64/n64/fpu/s_fma.c new file mode 100644 index 0000000000..b61fa643de --- /dev/null +++ b/sysdeps/mips/mips64/n64/fpu/s_fma.c @@ -0,0 +1 @@ +#include <sysdeps/ieee754/dbl-64/s_fma.c> diff --git a/sysdeps/mips/mips64/n64/nofpu/Implies b/sysdeps/mips/mips64/n64/nofpu/Implies new file mode 100644 index 0000000000..abcbadb25f --- /dev/null +++ b/sysdeps/mips/mips64/n64/nofpu/Implies @@ -0,0 +1 @@ +ieee754/soft-fp diff --git a/sysdeps/nios2/Implies b/sysdeps/nios2/Implies index 387a0ca052..7d69983412 100644 --- a/sysdeps/nios2/Implies +++ b/sysdeps/nios2/Implies @@ -1,3 +1,4 @@ wordsize-32 +ieee754/soft-fp ieee754/dbl-64 ieee754/flt-32 diff --git a/sysdeps/nios2/s_fma.c b/sysdeps/nios2/s_fma.c deleted file mode 100644 index d9613fa67c..0000000000 --- a/sysdeps/nios2/s_fma.c +++ /dev/null @@ -1 +0,0 @@ -#include <soft-fp/fmadf4.c> diff --git a/sysdeps/nios2/s_fmaf.c b/sysdeps/nios2/s_fmaf.c deleted file mode 100644 index aa5c9b2d91..0000000000 --- a/sysdeps/nios2/s_fmaf.c +++ /dev/null @@ -1 +0,0 @@ -#include <soft-fp/fmasf4.c> diff --git a/sysdeps/sh/nofpu/Implies b/sysdeps/sh/nofpu/Implies new file mode 100644 index 0000000000..abcbadb25f --- /dev/null +++ b/sysdeps/sh/nofpu/Implies @@ -0,0 +1 @@ +ieee754/soft-fp diff --git a/sysdeps/sh/s_fma.c b/sysdeps/sh/s_fma.c deleted file mode 100644 index d92438d448..0000000000 --- a/sysdeps/sh/s_fma.c +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __SH_FPU_ANY__ -# include <sysdeps/ieee754/dbl-64/s_fma.c> -#else -# include <soft-fp/fmadf4.c> -#endif diff --git a/sysdeps/sh/s_fmaf.c b/sysdeps/sh/s_fmaf.c deleted file mode 100644 index 3b811ae6da..0000000000 --- a/sysdeps/sh/s_fmaf.c +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __SH_FPU_ANY__ -# include <sysdeps/ieee754/dbl-64/s_fmaf.c> -#else -# include <soft-fp/fmasf4.c> -#endif diff --git a/sysdeps/tile/Implies b/sysdeps/tile/Implies index 5b29b26128..1cbc053905 100644 --- a/sysdeps/tile/Implies +++ b/sysdeps/tile/Implies @@ -1,2 +1,3 @@ +ieee754/soft-fp ieee754/dbl-64 ieee754/flt-32 diff --git a/sysdeps/tile/s_fma.c b/sysdeps/tile/s_fma.c deleted file mode 100644 index d9613fa67c..0000000000 --- a/sysdeps/tile/s_fma.c +++ /dev/null @@ -1 +0,0 @@ -#include <soft-fp/fmadf4.c> diff --git a/sysdeps/tile/s_fmaf.c b/sysdeps/tile/s_fmaf.c deleted file mode 100644 index aa5c9b2d91..0000000000 --- a/sysdeps/tile/s_fmaf.c +++ /dev/null @@ -1 +0,0 @@ -#include <soft-fp/fmasf4.c> |