From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 912423858D35; Wed, 26 Jul 2023 13:27:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 912423858D35 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1690378032; bh=or6XDqdA/elfj5dWqOvR9p+mgGa1hJDB9Nibv5K8wIE=; h=From:To:Subject:Date:From; b=hFuYMuQNektSTH2lMciQwkPU52XIpqapwWctKF0MliZLnUPsGtnjnkmctIrYWw343 khDs8Dw7eUDZl02FiNtyaKkT7WB338hjPdPParHtcwy3mfKltTX6sofDK2Ef4rJnsR ugqD04Z3jrJXuSkIA6pkMEv1TCz3sHZ45stHlIqg= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: newlib-cvs@sourceware.org Subject: [newlib-cygwin/main] RISC-V: Support Zfinx/Zdinx extension. X-Act-Checkin: newlib-cygwin X-Git-Author: Kito Cheng via Newlib X-Git-Refname: refs/heads/main X-Git-Oldrev: fcc87263c41cc6be7d1c61b8c8feee76cf20bb6c X-Git-Newrev: d572c4482b473d7725be0f9380d4f5d8342e4390 Message-Id: <20230726132712.912423858D35@sourceware.org> Date: Wed, 26 Jul 2023 13:27:12 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Dd572c4482b4= 73d7725be0f9380d4f5d8342e4390 commit d572c4482b473d7725be0f9380d4f5d8342e4390 Author: Kito Cheng via Newlib AuthorDate: Wed Jul 26 18:03:19 2023 +0800 Commit: Corinna Vinschen CommitDate: Wed Jul 26 15:21:35 2023 +0200 RISC-V: Support Zfinx/Zdinx extension. =20 Zfinx/Zdinx are new extensions ratified in 2022, it similar to F/D exte= nsions, support hard float operation for single/double precision, but the diffe= rence between Zfinx/Zdinx and F/D is Zfinx/Zdinx is operating under general p= urpose registers rather than dedicated floating-point registers. =20 This patch improve the hard float support detection for RISC-V port, so that Zfinx/Zdinx can have better/right performance. =20 Co-authored-by: Jesse Huang Diff: --- newlib/libc/include/machine/ieeefp.h | 4 ++-- newlib/libc/machine/riscv/ieeefp.c | 10 +++++----- newlib/libc/machine/riscv/sys/fenv.h | 2 +- newlib/libm/common/math_config.h | 6 ++++-- newlib/libm/machine/riscv/e_sqrt.c | 2 +- newlib/libm/machine/riscv/ef_sqrt.c | 2 +- newlib/libm/machine/riscv/feclearexcept.c | 3 ++- newlib/libm/machine/riscv/fegetenv.c | 3 ++- newlib/libm/machine/riscv/fegetexceptflag.c | 3 ++- newlib/libm/machine/riscv/fegetround.c | 3 ++- newlib/libm/machine/riscv/feholdexcept.c | 3 ++- newlib/libm/machine/riscv/feraiseexcept.c | 3 ++- newlib/libm/machine/riscv/fesetenv.c | 3 ++- newlib/libm/machine/riscv/fesetexceptflag.c | 3 ++- newlib/libm/machine/riscv/fesetround.c | 3 ++- newlib/libm/machine/riscv/fetestexcept.c | 3 ++- newlib/libm/machine/riscv/feupdateenv.c | 3 ++- newlib/libm/machine/riscv/riscv_math.h | 12 +++++++++--- newlib/libm/machine/riscv/s_copysign.c | 3 ++- newlib/libm/machine/riscv/s_fabs.c | 3 ++- newlib/libm/machine/riscv/s_finite.c | 3 ++- newlib/libm/machine/riscv/s_fmax.c | 3 ++- newlib/libm/machine/riscv/s_fmin.c | 3 ++- newlib/libm/machine/riscv/s_fpclassify.c | 5 ++--- newlib/libm/machine/riscv/s_isinf.c | 4 ++-- newlib/libm/machine/riscv/s_isnan.c | 4 ++-- newlib/libm/machine/riscv/s_llrint.c | 3 ++- newlib/libm/machine/riscv/s_llround.c | 3 ++- newlib/libm/machine/riscv/s_lrint.c | 3 ++- newlib/libm/machine/riscv/s_lround.c | 3 ++- newlib/libm/machine/riscv/sf_copysign.c | 3 ++- newlib/libm/machine/riscv/sf_fabs.c | 3 ++- newlib/libm/machine/riscv/sf_finite.c | 3 ++- newlib/libm/machine/riscv/sf_fmax.c | 3 ++- newlib/libm/machine/riscv/sf_fmin.c | 3 ++- newlib/libm/machine/riscv/sf_fpclassify.c | 3 ++- newlib/libm/machine/riscv/sf_isinf.c | 4 ++-- newlib/libm/machine/riscv/sf_isnan.c | 4 ++-- newlib/libm/machine/riscv/sf_llrint.c | 3 ++- newlib/libm/machine/riscv/sf_llround.c | 3 ++- newlib/libm/machine/riscv/sf_lrint.c | 3 ++- newlib/libm/machine/riscv/sf_lround.c | 3 ++- 42 files changed, 93 insertions(+), 56 deletions(-) diff --git a/newlib/libc/include/machine/ieeefp.h b/newlib/libc/include/mac= hine/ieeefp.h index a29557a6d00c..abadf520b47e 100644 --- a/newlib/libc/include/machine/ieeefp.h +++ b/newlib/libc/include/machine/ieeefp.h @@ -218,10 +218,10 @@ #else #define __IEEE_LITTLE_ENDIAN #endif -#ifdef __riscv_flen +#if defined(__riscv_flen) || defined (__riscv_zfinx) # define _SUPPORTS_ERREXCEPT #endif -#if __riscv_flen =3D=3D 64 +#if (__riscv_flen =3D=3D 64) || defined (__riscv_zdinx) # define __OBSOLETE_MATH_DEFAULT 0 #else # define __OBSOLETE_MATH_DEFAULT 1 diff --git a/newlib/libc/machine/riscv/ieeefp.c b/newlib/libc/machine/riscv= /ieeefp.c index 60ecacfc2914..185da648c8b1 100644 --- a/newlib/libc/machine/riscv/ieeefp.c +++ b/newlib/libc/machine/riscv/ieeefp.c @@ -11,7 +11,7 @@ =20 #include =20 -#ifdef __riscv_flen +#if defined(__riscv_flen) || defined (__riscv_zfinx) static void fssr(unsigned value) { @@ -85,7 +85,7 @@ fpgetmask(void) fp_rnd fpgetround(void) { -#ifdef __riscv_flen +#if defined(__riscv_flen) || defined (__riscv_zfinx) unsigned rm =3D (frsr () >> 5) & 0x7; return frm_fp_rnd (rm); #else @@ -96,7 +96,7 @@ fpgetround(void) fp_except fpgetsticky(void) { -#ifdef __riscv_flen +#if defined(__riscv_flen) || defined (__riscv_zfinx) return frm_fp_except(frsr ()); #else return 0; @@ -112,7 +112,7 @@ fpsetmask(fp_except mask) fp_rnd fpsetround(fp_rnd rnd_dir) { -#ifdef __riscv_flen +#if defined(__riscv_flen) || defined (__riscv_zfinx) unsigned fsr =3D frsr (); unsigned rm =3D (fsr >> 5) & 0x7; unsigned new_rm; @@ -134,7 +134,7 @@ fpsetround(fp_rnd rnd_dir) fp_except fpsetsticky(fp_except sticky) { -#ifdef __riscv_flen +#if defined(__riscv_flen) || defined (__riscv_zfinx) unsigned fsr =3D frsr (); fssr (frm_except(sticky) | (fsr & ~0x1f)); return frm_fp_except(fsr); diff --git a/newlib/libc/machine/riscv/sys/fenv.h b/newlib/libc/machine/ris= cv/sys/fenv.h index 772f3833f4a4..1d577d527bb7 100644 --- a/newlib/libc/machine/riscv/sys/fenv.h +++ b/newlib/libc/machine/riscv/sys/fenv.h @@ -14,7 +14,7 @@ =20 #include =20 -#if __riscv_flen +#if defined(__riscv_f) || defined(__riscv_zfinx) =20 /* Per "The RISC-V Instruction Set Manual: Volume I: User-Level ISA: * Version 2.1", Section 8.2, "Floating-Point Control and Status diff --git a/newlib/libm/common/math_config.h b/newlib/libm/common/math_con= fig.h index 0f78b5c09b4f..bf881e81b819 100644 --- a/newlib/libm/common/math_config.h +++ b/newlib/libm/common/math_config.h @@ -72,7 +72,8 @@ =20 /* Compiler can inline fma as a single instruction. */ #ifndef HAVE_FAST_FMA -# if __aarch64__ || (__ARM_FEATURE_FMA && (__ARM_FP & 8)) || __riscv_flen = >=3D 64 +# if __aarch64__ || (__ARM_FEATURE_FMA && (__ARM_FP & 8)) \ + || __riscv_flen >=3D 64 || defined (__riscv_zdinx) # define HAVE_FAST_FMA 1 # else # define HAVE_FAST_FMA 0 @@ -80,7 +81,8 @@ #endif =20 #ifndef HAVE_FAST_FMAF -# if HAVE_FAST_FMA || (__ARM_FEATURE_FMA && (__ARM_FP & 4)) || __riscv_fle= n >=3D 32 +# if HAVE_FAST_FMA || (__ARM_FEATURE_FMA && (__ARM_FP & 4)) \ + || __riscv_flen >=3D 32 || defined (__riscv_zfinx) # define HAVE_FAST_FMAF 1 # else # define HAVE_FAST_FMAF 0 diff --git a/newlib/libm/machine/riscv/e_sqrt.c b/newlib/libm/machine/riscv= /e_sqrt.c index d6bfd90ad6b9..0c5aaadf3fa2 100644 --- a/newlib/libm/machine/riscv/e_sqrt.c +++ b/newlib/libm/machine/riscv/e_sqrt.c @@ -36,7 +36,7 @@ #include #include "math_config.h" =20 -#if defined(__riscv_fsqrt) && __riscv_flen >=3D 64 +#if defined(__RISCV_HARD_FLOAT) && __RISCV_HARD_FLOAT >=3D 64 =20 double __ieee754_sqrt (double x) diff --git a/newlib/libm/machine/riscv/ef_sqrt.c b/newlib/libm/machine/risc= v/ef_sqrt.c index 1f378f547df4..cc41813dd546 100644 --- a/newlib/libm/machine/riscv/ef_sqrt.c +++ b/newlib/libm/machine/riscv/ef_sqrt.c @@ -36,7 +36,7 @@ #include #include "math_config.h" =20 -#if defined(__riscv_fsqrt) && __riscv_flen >=3D 32 +#if defined(__RISCV_HARD_FLOAT) && __RISCV_HARD_FLOAT >=3D 32 =20 float __ieee754_sqrtf (float x) diff --git a/newlib/libm/machine/riscv/feclearexcept.c b/newlib/libm/machin= e/riscv/feclearexcept.c index 90c7775a49c0..e236a59ebae8 100644 --- a/newlib/libm/machine/riscv/feclearexcept.c +++ b/newlib/libm/machine/riscv/feclearexcept.c @@ -33,6 +33,7 @@ =20 #include #include +#include "riscv_math.h" =20 /* This implementation is intended to comply with the following * specification: @@ -47,7 +48,7 @@ int feclearexcept(int excepts) { =20 -#if __riscv_flen +#if __RISCV_HARD_FLOAT =20 /* Mask excepts to be sure only supported flag bits are set */ =20 diff --git a/newlib/libm/machine/riscv/fegetenv.c b/newlib/libm/machine/ris= cv/fegetenv.c index c1488c789801..10a9af337544 100644 --- a/newlib/libm/machine/riscv/fegetenv.c +++ b/newlib/libm/machine/riscv/fegetenv.c @@ -32,6 +32,7 @@ */ =20 #include +#include "riscv_math.h" =20 /* This implementation is intended to comply with the following * specification: @@ -47,7 +48,7 @@ int fegetenv(fenv_t *envp) { =20 -#if __riscv_flen +#if __RISCV_HARD_FLOAT =20 /* Get the current environment (FCSR) */ =20 diff --git a/newlib/libm/machine/riscv/fegetexceptflag.c b/newlib/libm/mach= ine/riscv/fegetexceptflag.c index ab1b8a66b282..43d5543f73ef 100644 --- a/newlib/libm/machine/riscv/fegetexceptflag.c +++ b/newlib/libm/machine/riscv/fegetexceptflag.c @@ -32,6 +32,7 @@ */ =20 #include +#include "riscv_math.h" =20 /* This implementation is intended to comply with the following * specification: @@ -48,7 +49,7 @@ int fegetexceptflag(fexcept_t *flagp, int excepts) { =20 -#if __riscv_flen +#if __RISCV_HARD_FLOAT =20 /* Mask excepts to be sure only supported flag bits are set */ =20 diff --git a/newlib/libm/machine/riscv/fegetround.c b/newlib/libm/machine/r= iscv/fegetround.c index b4c0f2b19b14..6d553479b4ad 100644 --- a/newlib/libm/machine/riscv/fegetround.c +++ b/newlib/libm/machine/riscv/fegetround.c @@ -32,6 +32,7 @@ */ =20 #include +#include "riscv_math.h" =20 /* This implementation is intended to comply with the following * specification: @@ -45,7 +46,7 @@ int fegetround() { =20 -#if __riscv_flen +#ifdef __RISCV_HARD_FLOAT =20 /* Get current rounding mode */ =20 diff --git a/newlib/libm/machine/riscv/feholdexcept.c b/newlib/libm/machine= /riscv/feholdexcept.c index 9d726dabe804..c83a09bc127d 100644 --- a/newlib/libm/machine/riscv/feholdexcept.c +++ b/newlib/libm/machine/riscv/feholdexcept.c @@ -32,6 +32,7 @@ */ =20 #include +#include "riscv_math.h" =20 /* This implementation is intended to comply with the following * specification: @@ -49,7 +50,7 @@ int feholdexcept(fenv_t *envp) { =20 -#if __riscv_flen +#ifdef __RISCV_HARD_FLOAT =20 /* Store the current FP environment in envp*/ =20 diff --git a/newlib/libm/machine/riscv/feraiseexcept.c b/newlib/libm/machin= e/riscv/feraiseexcept.c index 6f28632d1a25..817fa6274c22 100644 --- a/newlib/libm/machine/riscv/feraiseexcept.c +++ b/newlib/libm/machine/riscv/feraiseexcept.c @@ -32,6 +32,7 @@ */ =20 #include +#include "riscv_math.h" =20 /* This implementation is intended to comply with the following * specification: @@ -58,7 +59,7 @@ int feraiseexcept(int excepts) =20 excepts &=3D FE_ALL_EXCEPT; =20 -#if __riscv_flen +#ifdef __RISCV_HARD_FLOAT =20 /* Set the requested exception flags */ =20 diff --git a/newlib/libm/machine/riscv/fesetenv.c b/newlib/libm/machine/ris= cv/fesetenv.c index 943b272b706b..a752c45d6f6d 100644 --- a/newlib/libm/machine/riscv/fesetenv.c +++ b/newlib/libm/machine/riscv/fesetenv.c @@ -32,6 +32,7 @@ */ =20 #include +#include "riscv_math.h" =20 /* This implementation is intended to comply with the following * specification: @@ -54,7 +55,7 @@ int fesetenv(const fenv_t *envp) { =20 -#if __riscv_flen +#ifdef __RISCV_HARD_FLOAT =20 /* Set environment (FCSR) */ =20 diff --git a/newlib/libm/machine/riscv/fesetexceptflag.c b/newlib/libm/mach= ine/riscv/fesetexceptflag.c index 04400f4ff085..8c70bbd00eaf 100644 --- a/newlib/libm/machine/riscv/fesetexceptflag.c +++ b/newlib/libm/machine/riscv/fesetexceptflag.c @@ -32,6 +32,7 @@ */ =20 #include +#include "riscv_math.h" =20 /* This implementation is intended to comply with the following * specification: @@ -53,7 +54,7 @@ int fesetexceptflag(const fexcept_t *flagp, int excepts) { =20 -#if __riscv_flen +#ifdef __RISCV_HARD_FLOAT =20 /* Mask excepts to be sure only supported flag bits are set */ =20 diff --git a/newlib/libm/machine/riscv/fesetround.c b/newlib/libm/machine/r= iscv/fesetround.c index b2451c71bc9e..76585261d07b 100644 --- a/newlib/libm/machine/riscv/fesetround.c +++ b/newlib/libm/machine/riscv/fesetround.c @@ -32,6 +32,7 @@ */ =20 #include +#include "riscv_math.h" =20 /* This implementation is intended to comply with the following * specification: @@ -48,7 +49,7 @@ int fesetround(int round) { =20 -#if __riscv_flen +#ifdef __RISCV_HARD_FLOAT =20 /* Mask round to be sure only valid rounding bits are set */ =20 diff --git a/newlib/libm/machine/riscv/fetestexcept.c b/newlib/libm/machine= /riscv/fetestexcept.c index 55d880c990e9..8ed0d5ffa572 100644 --- a/newlib/libm/machine/riscv/fetestexcept.c +++ b/newlib/libm/machine/riscv/fetestexcept.c @@ -32,6 +32,7 @@ */ =20 #include +#include "riscv_math.h" =20 /* This implementation is intended to comply with the following * specification: @@ -47,7 +48,7 @@ int fetestexcept(int excepts) { =20 -#if __riscv_flen +#ifdef __RISCV_HARD_FLOAT =20 /* Mask excepts to be sure only supported flag bits are set */ =20 diff --git a/newlib/libm/machine/riscv/feupdateenv.c b/newlib/libm/machine/= riscv/feupdateenv.c index 737095c2b03c..90235d0210ea 100644 --- a/newlib/libm/machine/riscv/feupdateenv.c +++ b/newlib/libm/machine/riscv/feupdateenv.c @@ -32,6 +32,7 @@ */ =20 #include +#include "riscv_math.h" =20 /* This implementation is intended to comply with the following * specification: @@ -50,7 +51,7 @@ int feupdateenv(const fenv_t *envp) { =20 -#if __riscv_flen +#ifdef __RISCV_HARD_FLOAT =20 /* Get current exception flags */ =20 diff --git a/newlib/libm/machine/riscv/riscv_math.h b/newlib/libm/machine/r= iscv/riscv_math.h index 38948ca12dfa..31220ba0e98a 100644 --- a/newlib/libm/machine/riscv/riscv_math.h +++ b/newlib/libm/machine/riscv/riscv_math.h @@ -38,7 +38,13 @@ =20 =20 =20 -#ifdef __riscv_flen +#if defined(__riscv_flen) || defined(__riscv_zfinx) + +#if (__riscv_flen >=3D 64) || defined(__riscv_zdinx) +#define __RISCV_HARD_FLOAT 64 +#else +#define __RISCV_HARD_FLOAT 32 +#endif =20 #define FCLASS_NEG_INF (1 << 0) #define FCLASS_NEG_NORMAL (1 << 1) @@ -58,7 +64,7 @@ #define FCLASS_SUBNORMAL (FCLASS_NEG_SUBNORMAL | FCLASS_POS_SUBNORMAL) #define FCLASS_NAN (FCLASS_SNAN | FCLASS_QNAN) =20 -#if __riscv_flen >=3D 64 +#if (__riscv_flen >=3D 64) || defined(__riscv_zdinx) static inline long _fclass_d(double x){ long fclass; __asm __volatile ("fclass.d\t%0, %1" : "=3Dr" (fclass) : "f" (x)); @@ -66,7 +72,7 @@ static inline long _fclass_d(double x){ } #endif =20 -#if __riscv_flen >=3D 32 +#if (__riscv_flen >=3D 32) || defined(__riscv_zfinx) static inline long _fclass_f(float x){ long fclass; __asm __volatile ("fclass.s\t%0, %1" : "=3Dr" (fclass) : "f" (x)); diff --git a/newlib/libm/machine/riscv/s_copysign.c b/newlib/libm/machine/r= iscv/s_copysign.c index 047535578353..876e4a80eede 100644 --- a/newlib/libm/machine/riscv/s_copysign.c +++ b/newlib/libm/machine/riscv/s_copysign.c @@ -34,8 +34,9 @@ */ =20 #include +#include "riscv_math.h" =20 -#if defined(__riscv_flen) && __riscv_flen >=3D 64 +#if defined(__RISCV_HARD_FLOAT) && __RISCV_HARD_FLOAT >=3D 64 =20 double copysign (double x, double y) diff --git a/newlib/libm/machine/riscv/s_fabs.c b/newlib/libm/machine/riscv= /s_fabs.c index abf7d2c0f56d..bb26d3d0aaac 100644 --- a/newlib/libm/machine/riscv/s_fabs.c +++ b/newlib/libm/machine/riscv/s_fabs.c @@ -34,8 +34,9 @@ */ =20 #include +#include "riscv_math.h" =20 -#if defined(__riscv_flen) && __riscv_flen >=3D 64 +#if defined(__RISCV_HARD_FLOAT) && __RISCV_HARD_FLOAT >=3D 64 =20 double fabs (double x) diff --git a/newlib/libm/machine/riscv/s_finite.c b/newlib/libm/machine/ris= cv/s_finite.c index 1f1f2244d818..d9ad888a4bbc 100644 --- a/newlib/libm/machine/riscv/s_finite.c +++ b/newlib/libm/machine/riscv/s_finite.c @@ -38,8 +38,9 @@ */ =20 #include +#include "riscv_math.h" =20 -#if defined(__riscv_flen) && __riscv_flen >=3D 64 +#if defined(__RISCV_HARD_FLOAT) && __RISCV_HARD_FLOAT >=3D 64 #include "riscv_math.h" int finite(double x) { diff --git a/newlib/libm/machine/riscv/s_fmax.c b/newlib/libm/machine/riscv= /s_fmax.c index bc174d0a0978..059b71c47501 100644 --- a/newlib/libm/machine/riscv/s_fmax.c +++ b/newlib/libm/machine/riscv/s_fmax.c @@ -34,8 +34,9 @@ */ =20 #include +#include "riscv_math.h" =20 -#if defined(__riscv_flen) && __riscv_flen >=3D 64 +#if defined(__RISCV_HARD_FLOAT) && __RISCV_HARD_FLOAT >=3D 64 =20 double fmax (double x, double y) diff --git a/newlib/libm/machine/riscv/s_fmin.c b/newlib/libm/machine/riscv= /s_fmin.c index 13dbbf5dd0e7..c62dd868d2de 100644 --- a/newlib/libm/machine/riscv/s_fmin.c +++ b/newlib/libm/machine/riscv/s_fmin.c @@ -34,8 +34,9 @@ */ =20 #include +#include "riscv_math.h" =20 -#if defined(__riscv_flen) && __riscv_flen >=3D 64 +#if defined(__RISCV_HARD_FLOAT) && __RISCV_HARD_FLOAT >=3D 64 =20 double fmin (double x, double y) diff --git a/newlib/libm/machine/riscv/s_fpclassify.c b/newlib/libm/machine= /riscv/s_fpclassify.c index 8112d4f786b0..42b4e9fcb2f0 100644 --- a/newlib/libm/machine/riscv/s_fpclassify.c +++ b/newlib/libm/machine/riscv/s_fpclassify.c @@ -33,11 +33,10 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ #include - -#if defined(__riscv_flen) && __riscv_flen >=3D 64 - #include "riscv_math.h" =20 +#if defined(__RISCV_HARD_FLOAT) && __RISCV_HARD_FLOAT >=3D 64 + int __fpclassifyd (double x) { diff --git a/newlib/libm/machine/riscv/s_isinf.c b/newlib/libm/machine/risc= v/s_isinf.c index 3d6d685a3e9b..2860b3f88864 100644 --- a/newlib/libm/machine/riscv/s_isinf.c +++ b/newlib/libm/machine/riscv/s_isinf.c @@ -35,10 +35,10 @@ =20 #include #include +#include "riscv_math.h" =20 -#if defined(__riscv_flen) && __riscv_flen >=3D 64 +#if defined(__RISCV_HARD_FLOAT) && __RISCV_HARD_FLOAT >=3D 64 =20 -#include "riscv_math.h" #undef isinf =20 int diff --git a/newlib/libm/machine/riscv/s_isnan.c b/newlib/libm/machine/risc= v/s_isnan.c index a0209729ae31..96185cd9a1c2 100644 --- a/newlib/libm/machine/riscv/s_isnan.c +++ b/newlib/libm/machine/riscv/s_isnan.c @@ -35,10 +35,10 @@ =20 #include #include +#include "riscv_math.h" =20 -#if defined(__riscv_flen) && __riscv_flen >=3D 64 +#if defined(__RISCV_HARD_FLOAT) && __RISCV_HARD_FLOAT >=3D 64 =20 -#include "riscv_math.h" #undef isnan =20 int diff --git a/newlib/libm/machine/riscv/s_llrint.c b/newlib/libm/machine/ris= cv/s_llrint.c index 3f93e60b8da6..39aeb1dbfce7 100644 --- a/newlib/libm/machine/riscv/s_llrint.c +++ b/newlib/libm/machine/riscv/s_llrint.c @@ -34,8 +34,9 @@ */ =20 #include +#include "riscv_math.h" =20 -#if defined(__riscv_flen) && __riscv_flen >=3D 64 && __riscv_xlen >=3D 64 +#if defined(__RISCV_HARD_FLOAT) && __RISCV_HARD_FLOAT >=3D 64 && __riscv_x= len >=3D 64 long long int llrint (double x) { diff --git a/newlib/libm/machine/riscv/s_llround.c b/newlib/libm/machine/ri= scv/s_llround.c index ff41394cf153..538ae9a1826f 100644 --- a/newlib/libm/machine/riscv/s_llround.c +++ b/newlib/libm/machine/riscv/s_llround.c @@ -34,8 +34,9 @@ */ =20 #include +#include "riscv_math.h" =20 -#if defined(__riscv_flen) && __riscv_flen >=3D 64 && __riscv_xlen >=3D 64 +#if defined(__RISCV_HARD_FLOAT) && __RISCV_HARD_FLOAT >=3D 64 && __riscv_x= len >=3D 64 long long int llround(double x) { diff --git a/newlib/libm/machine/riscv/s_lrint.c b/newlib/libm/machine/risc= v/s_lrint.c index 0e9a9bc8baee..9bed894eebc7 100644 --- a/newlib/libm/machine/riscv/s_lrint.c +++ b/newlib/libm/machine/riscv/s_lrint.c @@ -34,8 +34,9 @@ */ =20 #include +#include "riscv_math.h" =20 -#if defined(__riscv_flen) && __riscv_flen >=3D 64 +#if defined(__RISCV_HARD_FLOAT) && __RISCV_HARD_FLOAT >=3D 64 long int lrint (double x) { diff --git a/newlib/libm/machine/riscv/s_lround.c b/newlib/libm/machine/ris= cv/s_lround.c index 5be778834f6a..8f15a0ad7abc 100644 --- a/newlib/libm/machine/riscv/s_lround.c +++ b/newlib/libm/machine/riscv/s_lround.c @@ -34,8 +34,9 @@ */ =20 #include +#include "riscv_math.h" =20 -#if defined(__riscv_flen) && __riscv_flen >=3D 64 +#if defined(__RISCV_HARD_FLOAT) && __RISCV_HARD_FLOAT >=3D 64 long int lround (double x) { diff --git a/newlib/libm/machine/riscv/sf_copysign.c b/newlib/libm/machine/= riscv/sf_copysign.c index 31b1321ad15f..88afbe2f82f1 100644 --- a/newlib/libm/machine/riscv/sf_copysign.c +++ b/newlib/libm/machine/riscv/sf_copysign.c @@ -34,8 +34,9 @@ */ =20 #include +#include "riscv_math.h" =20 -#if defined(__riscv_flen) && __riscv_flen >=3D 32 +#if defined(__RISCV_HARD_FLOAT) && __RISCV_HARD_FLOAT >=3D 32 =20 float copysignf (float x, float y) diff --git a/newlib/libm/machine/riscv/sf_fabs.c b/newlib/libm/machine/risc= v/sf_fabs.c index 1ca92d30d359..ac7a4e0d8010 100644 --- a/newlib/libm/machine/riscv/sf_fabs.c +++ b/newlib/libm/machine/riscv/sf_fabs.c @@ -34,8 +34,9 @@ */ =20 #include +#include "riscv_math.h" =20 -#if defined(__riscv_flen) && __riscv_flen >=3D 32 +#if defined(__RISCV_HARD_FLOAT) && __RISCV_HARD_FLOAT >=3D 32 =20 float fabsf (float x) diff --git a/newlib/libm/machine/riscv/sf_finite.c b/newlib/libm/machine/ri= scv/sf_finite.c index a17b0fa363cf..690985567e62 100644 --- a/newlib/libm/machine/riscv/sf_finite.c +++ b/newlib/libm/machine/riscv/sf_finite.c @@ -34,8 +34,9 @@ */ =20 #include +#include "riscv_math.h" =20 -#if defined(__riscv_flen) && __riscv_flen >=3D 32 +#if defined(__RISCV_HARD_FLOAT) && __RISCV_HARD_FLOAT >=3D 32 =20 #include "riscv_math.h" int finitef(float x) diff --git a/newlib/libm/machine/riscv/sf_fmax.c b/newlib/libm/machine/risc= v/sf_fmax.c index 7b18f006234a..e2d4ad774f62 100644 --- a/newlib/libm/machine/riscv/sf_fmax.c +++ b/newlib/libm/machine/riscv/sf_fmax.c @@ -34,8 +34,9 @@ */ =20 #include +#include "riscv_math.h" =20 -#if defined(__riscv_flen) && __riscv_flen >=3D 32 +#if defined(__RISCV_HARD_FLOAT) && __RISCV_HARD_FLOAT >=3D 32 =20 float fmaxf (float x, float y) diff --git a/newlib/libm/machine/riscv/sf_fmin.c b/newlib/libm/machine/risc= v/sf_fmin.c index 771613338ef9..7387d46d399f 100644 --- a/newlib/libm/machine/riscv/sf_fmin.c +++ b/newlib/libm/machine/riscv/sf_fmin.c @@ -34,8 +34,9 @@ */ =20 #include +#include "riscv_math.h" =20 -#if defined(__riscv_flen) && __riscv_flen >=3D 32 +#if defined(__RISCV_HARD_FLOAT) && __RISCV_HARD_FLOAT >=3D 32 =20 float fminf (float x, float y) diff --git a/newlib/libm/machine/riscv/sf_fpclassify.c b/newlib/libm/machin= e/riscv/sf_fpclassify.c index dee9a7a25f53..9b164085389a 100644 --- a/newlib/libm/machine/riscv/sf_fpclassify.c +++ b/newlib/libm/machine/riscv/sf_fpclassify.c @@ -33,8 +33,9 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ #include +#include "riscv_math.h" =20 -#if defined(__riscv_flen) && __riscv_flen >=3D 32 +#if defined(__RISCV_HARD_FLOAT) && __RISCV_HARD_FLOAT >=3D 32 =20 #include "riscv_math.h" =20 diff --git a/newlib/libm/machine/riscv/sf_isinf.c b/newlib/libm/machine/ris= cv/sf_isinf.c index 0c60f33af43d..d6687469485b 100644 --- a/newlib/libm/machine/riscv/sf_isinf.c +++ b/newlib/libm/machine/riscv/sf_isinf.c @@ -35,10 +35,10 @@ =20 #include #include +#include "riscv_math.h" =20 -#if defined(__riscv_flen) && __riscv_flen >=3D 32 +#if defined(__RISCV_HARD_FLOAT) && __RISCV_HARD_FLOAT >=3D 32 =20 -#include "riscv_math.h" #undef isinff =20 int diff --git a/newlib/libm/machine/riscv/sf_isnan.c b/newlib/libm/machine/ris= cv/sf_isnan.c index e38abf4abb8e..75b17f151a61 100644 --- a/newlib/libm/machine/riscv/sf_isnan.c +++ b/newlib/libm/machine/riscv/sf_isnan.c @@ -35,10 +35,10 @@ =20 #include #include +#include "riscv_math.h" =20 -#if defined(__riscv_flen) && __riscv_flen >=3D 32 +#if defined(__RISCV_HARD_FLOAT) && __RISCV_HARD_FLOAT >=3D 32 =20 -#include "riscv_math.h" #undef isnanf =20 int diff --git a/newlib/libm/machine/riscv/sf_llrint.c b/newlib/libm/machine/ri= scv/sf_llrint.c index 58f2e5371a7b..9be28402c44c 100644 --- a/newlib/libm/machine/riscv/sf_llrint.c +++ b/newlib/libm/machine/riscv/sf_llrint.c @@ -34,8 +34,9 @@ */ =20 #include +#include "riscv_math.h" =20 -#if defined(__riscv_flen) && __riscv_flen >=3D 32 && __riscv_xlen >=3D 64 +#if defined(__RISCV_HARD_FLOAT) && __RISCV_HARD_FLOAT >=3D 32 && __riscv_x= len >=3D 64 long long int llrintf (float x) { diff --git a/newlib/libm/machine/riscv/sf_llround.c b/newlib/libm/machine/r= iscv/sf_llround.c index 389da692e7c0..c378eb0cbabd 100644 --- a/newlib/libm/machine/riscv/sf_llround.c +++ b/newlib/libm/machine/riscv/sf_llround.c @@ -34,8 +34,9 @@ */ =20 #include +#include "riscv_math.h" =20 -#if defined(__riscv_flen) && __riscv_flen >=3D 32 && __riscv_xlen >=3D 64 +#if defined(__RISCV_HARD_FLOAT) && __RISCV_HARD_FLOAT >=3D 32 && __riscv_x= len >=3D 64 long long int llroundf (float x) { diff --git a/newlib/libm/machine/riscv/sf_lrint.c b/newlib/libm/machine/ris= cv/sf_lrint.c index 4f80a93391a6..13320eb15562 100644 --- a/newlib/libm/machine/riscv/sf_lrint.c +++ b/newlib/libm/machine/riscv/sf_lrint.c @@ -34,8 +34,9 @@ */ =20 #include +#include "riscv_math.h" =20 -#if defined(__riscv_flen) && __riscv_flen >=3D 32 +#if defined(__RISCV_HARD_FLOAT) && __RISCV_HARD_FLOAT >=3D 32 long int lrintf (float x) { diff --git a/newlib/libm/machine/riscv/sf_lround.c b/newlib/libm/machine/ri= scv/sf_lround.c index dda6d984e347..398dfd2d8cac 100644 --- a/newlib/libm/machine/riscv/sf_lround.c +++ b/newlib/libm/machine/riscv/sf_lround.c @@ -34,8 +34,9 @@ */ =20 #include +#include "riscv_math.h" =20 -#if defined(__riscv_flen) && __riscv_flen >=3D 32 +#if defined(__RISCV_HARD_FLOAT) && __RISCV_HARD_FLOAT >=3D 32 long int lroundf(float x) {