From 1dfeb17e67a194b48c78c09b1b4f788ab0bec938 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 23 May 2018 20:05:31 +0000 Subject: Remove sysdeps/sh/soft-fp directory. As per , there should not be separate sysdeps//soft-fp directories when those are used by all configurations that use sysdeps/, and, more generally, should not be sysdeps/foo/Implies files pointing to a subdirectory foo/bar. This patch eliminates the sysdeps/sh/soft-fp directory accordingly, merging its contents into sysdeps/sh. Tested with build-many-glibcs.py that installed stripped shared libraries for sh configurations are unchanged by this patch. * sysdeps/sh/Implies: Remove sh/soft-fp. * sysdeps/sh/soft-fp/sfp-machine.h: Move to .... * sysdeps/sh/sfp-machine.h: ... here. --- ChangeLog | 6 +++++ sysdeps/sh/Implies | 1 - sysdeps/sh/sfp-machine.h | 57 ++++++++++++++++++++++++++++++++++++++++ sysdeps/sh/soft-fp/sfp-machine.h | 57 ---------------------------------------- 4 files changed, 63 insertions(+), 58 deletions(-) create mode 100644 sysdeps/sh/sfp-machine.h delete mode 100644 sysdeps/sh/soft-fp/sfp-machine.h diff --git a/ChangeLog b/ChangeLog index 87c3f3df54..56a3aa337d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-05-23 Joseph Myers + + * sysdeps/sh/Implies: Remove sh/soft-fp. + * sysdeps/sh/soft-fp/sfp-machine.h: Move to .... + * sysdeps/sh/sfp-machine.h: ... here. + 2018-05-23 H.J. Lu * sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S diff --git a/sysdeps/sh/Implies b/sysdeps/sh/Implies index 1fdc53d034..780c4e2467 100644 --- a/sysdeps/sh/Implies +++ b/sysdeps/sh/Implies @@ -1,4 +1,3 @@ -sh/soft-fp wordsize-32 ieee754/flt-32 ieee754/dbl-64 diff --git a/sysdeps/sh/sfp-machine.h b/sysdeps/sh/sfp-machine.h new file mode 100644 index 0000000000..81474e8a7c --- /dev/null +++ b/sysdeps/sh/sfp-machine.h @@ -0,0 +1,57 @@ +#define _FP_W_TYPE_SIZE 32 +#define _FP_W_TYPE unsigned long +#define _FP_WS_TYPE signed long +#define _FP_I_TYPE long + +#define _FP_MUL_MEAT_S(R,X,Y) \ + _FP_MUL_MEAT_1_wide(_FP_WFRACBITS_S,R,X,Y,umul_ppmm) +#define _FP_MUL_MEAT_D(R,X,Y) \ + _FP_MUL_MEAT_2_wide(_FP_WFRACBITS_D,R,X,Y,umul_ppmm) +#define _FP_MUL_MEAT_Q(R,X,Y) \ + _FP_MUL_MEAT_4_wide(_FP_WFRACBITS_Q,R,X,Y,umul_ppmm) + +#define _FP_MUL_MEAT_DW_S(R,X,Y) \ + _FP_MUL_MEAT_DW_1_wide(_FP_WFRACBITS_S,R,X,Y,umul_ppmm) +#define _FP_MUL_MEAT_DW_D(R,X,Y) \ + _FP_MUL_MEAT_DW_2_wide(_FP_WFRACBITS_D,R,X,Y,umul_ppmm) +#define _FP_MUL_MEAT_DW_Q(R,X,Y) \ + _FP_MUL_MEAT_DW_4_wide(_FP_WFRACBITS_Q,R,X,Y,umul_ppmm) + +#define _FP_DIV_MEAT_S(R,X,Y) _FP_DIV_MEAT_1_loop(S,R,X,Y) +#define _FP_DIV_MEAT_D(R,X,Y) _FP_DIV_MEAT_2_udiv(D,R,X,Y) +#define _FP_DIV_MEAT_Q(R,X,Y) _FP_DIV_MEAT_4_udiv(Q,R,X,Y) + +#define _FP_NANFRAC_S ((_FP_QNANBIT_S << 1) - 1) +#define _FP_NANFRAC_D ((_FP_QNANBIT_D << 1) - 1), -1 +#define _FP_NANFRAC_Q ((_FP_QNANBIT_Q << 1) - 1), -1, -1, -1 +#define _FP_NANSIGN_S 0 +#define _FP_NANSIGN_D 0 +#define _FP_NANSIGN_Q 0 + +#define _FP_KEEPNANFRACP 1 +#define _FP_QNANNEGATEDP 0 + +/* Someone please check this. */ +#define _FP_CHOOSENAN(fs, wc, R, X, Y, OP) \ + do { \ + if ((_FP_FRAC_HIGH_RAW_##fs(X) & _FP_QNANBIT_##fs) \ + && !(_FP_FRAC_HIGH_RAW_##fs(Y) & _FP_QNANBIT_##fs)) \ + { \ + R##_s = Y##_s; \ + _FP_FRAC_COPY_##wc(R,Y); \ + } \ + else \ + { \ + R##_s = X##_s; \ + _FP_FRAC_COPY_##wc(R,X); \ + } \ + R##_c = FP_CLS_NAN; \ + } while (0) + +#define FP_EX_INVALID (1 << 6) +#define FP_EX_DIVZERO (1 << 5) +#define FP_EX_OVERFLOW (1 << 4) +#define FP_EX_UNDERFLOW (1 << 3) +#define FP_EX_INEXACT (1 << 2) + +#define _FP_TININESS_AFTER_ROUNDING 1 diff --git a/sysdeps/sh/soft-fp/sfp-machine.h b/sysdeps/sh/soft-fp/sfp-machine.h deleted file mode 100644 index 81474e8a7c..0000000000 --- a/sysdeps/sh/soft-fp/sfp-machine.h +++ /dev/null @@ -1,57 +0,0 @@ -#define _FP_W_TYPE_SIZE 32 -#define _FP_W_TYPE unsigned long -#define _FP_WS_TYPE signed long -#define _FP_I_TYPE long - -#define _FP_MUL_MEAT_S(R,X,Y) \ - _FP_MUL_MEAT_1_wide(_FP_WFRACBITS_S,R,X,Y,umul_ppmm) -#define _FP_MUL_MEAT_D(R,X,Y) \ - _FP_MUL_MEAT_2_wide(_FP_WFRACBITS_D,R,X,Y,umul_ppmm) -#define _FP_MUL_MEAT_Q(R,X,Y) \ - _FP_MUL_MEAT_4_wide(_FP_WFRACBITS_Q,R,X,Y,umul_ppmm) - -#define _FP_MUL_MEAT_DW_S(R,X,Y) \ - _FP_MUL_MEAT_DW_1_wide(_FP_WFRACBITS_S,R,X,Y,umul_ppmm) -#define _FP_MUL_MEAT_DW_D(R,X,Y) \ - _FP_MUL_MEAT_DW_2_wide(_FP_WFRACBITS_D,R,X,Y,umul_ppmm) -#define _FP_MUL_MEAT_DW_Q(R,X,Y) \ - _FP_MUL_MEAT_DW_4_wide(_FP_WFRACBITS_Q,R,X,Y,umul_ppmm) - -#define _FP_DIV_MEAT_S(R,X,Y) _FP_DIV_MEAT_1_loop(S,R,X,Y) -#define _FP_DIV_MEAT_D(R,X,Y) _FP_DIV_MEAT_2_udiv(D,R,X,Y) -#define _FP_DIV_MEAT_Q(R,X,Y) _FP_DIV_MEAT_4_udiv(Q,R,X,Y) - -#define _FP_NANFRAC_S ((_FP_QNANBIT_S << 1) - 1) -#define _FP_NANFRAC_D ((_FP_QNANBIT_D << 1) - 1), -1 -#define _FP_NANFRAC_Q ((_FP_QNANBIT_Q << 1) - 1), -1, -1, -1 -#define _FP_NANSIGN_S 0 -#define _FP_NANSIGN_D 0 -#define _FP_NANSIGN_Q 0 - -#define _FP_KEEPNANFRACP 1 -#define _FP_QNANNEGATEDP 0 - -/* Someone please check this. */ -#define _FP_CHOOSENAN(fs, wc, R, X, Y, OP) \ - do { \ - if ((_FP_FRAC_HIGH_RAW_##fs(X) & _FP_QNANBIT_##fs) \ - && !(_FP_FRAC_HIGH_RAW_##fs(Y) & _FP_QNANBIT_##fs)) \ - { \ - R##_s = Y##_s; \ - _FP_FRAC_COPY_##wc(R,Y); \ - } \ - else \ - { \ - R##_s = X##_s; \ - _FP_FRAC_COPY_##wc(R,X); \ - } \ - R##_c = FP_CLS_NAN; \ - } while (0) - -#define FP_EX_INVALID (1 << 6) -#define FP_EX_DIVZERO (1 << 5) -#define FP_EX_OVERFLOW (1 << 4) -#define FP_EX_UNDERFLOW (1 << 3) -#define FP_EX_INEXACT (1 << 2) - -#define _FP_TININESS_AFTER_ROUNDING 1 -- cgit 1.4.1