Just as on arm, long double is the same as double. --- mingw-w64-crt/math/cephes_mconf.h | 4 ++-- mingw-w64-crt/math/fabs.c | 4 ++-- mingw-w64-crt/math/fabsf.c | 4 ++-- mingw-w64-crt/math/fabsl.c | 2 +- mingw-w64-crt/math/fmal.c | 2 +- mingw-w64-crt/math/fpclassifyf.c | 2 +- mingw-w64-crt/math/fpclassifyl.c | 2 +- mingw-w64-crt/math/isnan.c | 2 +- mingw-w64-crt/math/isnanf.c | 2 +- mingw-w64-crt/math/isnanl.c | 2 +- mingw-w64-crt/math/lgammal.c | 4 ++-- mingw-w64-crt/math/lrintl.c | 2 +- mingw-w64-crt/math/rintl.c | 2 +- mingw-w64-crt/math/signbit.c | 2 +- mingw-w64-crt/math/signbitf.c | 2 +- mingw-w64-crt/math/signbitl.c | 2 +- mingw-w64-crt/math/truncl.c | 4 ++-- mingw-w64-headers/crt/math.h | 30 +++++++++++++++--------------- 18 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/mingw-w64-crt/math/cephes_mconf.h b/mingw-w64-crt/math/cephes_mconf.h index 832fae0..f502f18 100644 --- a/mingw-w64-crt/math/cephes_mconf.h +++ b/mingw-w64-crt/math/cephes_mconf.h @@ -66,7 +66,7 @@ extern double __QNAN; #endif /*long double*/ -#if defined(__arm__) || defined(_ARM_) +#if defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) #define MAXNUML 1.7976931348623158E308 #define MAXLOGL 7.09782712893383996843E2 #define MINLOGL -7.08396418532264106224E2 @@ -84,7 +84,7 @@ extern double __QNAN; #define PIL 3.1415926535897932384626L #define PIO2L 1.5707963267948966192313L #define PIO4L 7.8539816339744830961566E-1L -#endif /* defined(__arm__) || defined(_ARM_) */ +#endif /* defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) */ #define isfinitel isfinite #define isinfl isinf diff --git a/mingw-w64-crt/math/fabs.c b/mingw-w64-crt/math/fabs.c index cf2e6ef..2011378 100644 --- a/mingw-w64-crt/math/fabs.c +++ b/mingw-w64-crt/math/fabs.c @@ -9,12 +9,12 @@ double fabs (double x) { -#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) +#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) return __builtin_fabs (x); #elif defined(__i386__) || defined(_X86_) double res = 0.0; asm ("fabs;" : "=t" (res) : "0" (x)); return res; -#endif /* defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) */ +#endif /* defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) */ } diff --git a/mingw-w64-crt/math/fabsf.c b/mingw-w64-crt/math/fabsf.c index 5431c96..e8520d5 100644 --- a/mingw-w64-crt/math/fabsf.c +++ b/mingw-w64-crt/math/fabsf.c @@ -8,11 +8,11 @@ float fabsf (float x); float fabsf (float x) { -#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) +#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) return __builtin_fabsf (x); #elif defined(__i386__) || defined(_X86_) float res = 0.0F; asm ("fabs;" : "=t" (res) : "0" (x)); return res; -#endif /* defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) */ +#endif /* defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) */ } diff --git a/mingw-w64-crt/math/fabsl.c b/mingw-w64-crt/math/fabsl.c index 2dfdfaa..20b8b22 100644 --- a/mingw-w64-crt/math/fabsl.c +++ b/mingw-w64-crt/math/fabsl.c @@ -12,7 +12,7 @@ fabsl (long double x) long double res = 0.0L; asm ("fabs;" : "=t" (res) : "0" (x)); return res; -#elif defined(__arm__) || defined(_ARM_) +#elif defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) return __builtin_fabsl (x); #endif /* defined(__x86_64__) || defined(_AMD64_) || defined(__i386__) || defined(_X86_) */ } diff --git a/mingw-w64-crt/math/fmal.c b/mingw-w64-crt/math/fmal.c index f1d575d..bea6742 100644 --- a/mingw-w64-crt/math/fmal.c +++ b/mingw-w64-crt/math/fmal.c @@ -5,7 +5,7 @@ */ long double fmal(long double x, long double y, long double z); -#if defined(_ARM_) || defined(__arm__) +#if defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__) double fma(double x, double y, double z); diff --git a/mingw-w64-crt/math/fpclassifyf.c b/mingw-w64-crt/math/fpclassifyf.c index 93fc6b7..1fbbfa5 100644 --- a/mingw-w64-crt/math/fpclassifyf.c +++ b/mingw-w64-crt/math/fpclassifyf.c @@ -8,7 +8,7 @@ int __fpclassifyf (float _x) { -#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) +#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) __mingw_flt_type_t hlp; hlp.x = _x; diff --git a/mingw-w64-crt/math/fpclassifyl.c b/mingw-w64-crt/math/fpclassifyl.c index 59f55e0..a7b0c55 100644 --- a/mingw-w64-crt/math/fpclassifyl.c +++ b/mingw-w64-crt/math/fpclassifyl.c @@ -23,7 +23,7 @@ int __fpclassifyl (long double _x){ return (((hlp.ldt->lh.high & 0x7fffffff) | hlp.ldt->lh.low) == 0 ? FP_INFINITE : FP_NAN); return FP_NORMAL; -#elif defined(__arm__) || defined(_ARM_) +#elif defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) return __fpclassify(_x); #elif defined(__i386__) || defined(_X86_) unsigned short sw; diff --git a/mingw-w64-crt/math/isnan.c b/mingw-w64-crt/math/isnan.c index e9e18ee..57423c2 100644 --- a/mingw-w64-crt/math/isnan.c +++ b/mingw-w64-crt/math/isnan.c @@ -8,7 +8,7 @@ int __isnan (double _x) { -#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) +#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) __mingw_dbl_type_t hlp; int l, h; diff --git a/mingw-w64-crt/math/isnanf.c b/mingw-w64-crt/math/isnanf.c index f82277e..0c8e504 100644 --- a/mingw-w64-crt/math/isnanf.c +++ b/mingw-w64-crt/math/isnanf.c @@ -7,7 +7,7 @@ int __isnanf (float _x) { -#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) +#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) __mingw_flt_type_t hlp; int i; diff --git a/mingw-w64-crt/math/isnanl.c b/mingw-w64-crt/math/isnanl.c index cc8018d..5eb31d9 100644 --- a/mingw-w64-crt/math/isnanl.c +++ b/mingw-w64-crt/math/isnanl.c @@ -18,7 +18,7 @@ __isnanl (long double _x) signexp |= (unsigned int) (xx | (-xx)) >> 31; signexp = 0xfffe - signexp; return (int) ((unsigned int) signexp) >> 16; -#elif defined(__arm__) || defined(_ARM_) +#elif defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) return __isnan(_x); #elif defined(__i386__) || defined(_X86_) unsigned short _sw; diff --git a/mingw-w64-crt/math/lgammal.c b/mingw-w64-crt/math/lgammal.c index 13f367d..edb9a7e 100644 --- a/mingw-w64-crt/math/lgammal.c +++ b/mingw-w64-crt/math/lgammal.c @@ -198,11 +198,11 @@ static uLD C[] = { /* log( sqrt( 2*pi ) ) */ static const long double LS2PI = 0.91893853320467274178L; -#if defined(__arm__) || defined(_ARM_) +#if defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) #define MAXLGM 2.035093e36 #else #define MAXLGM 1.04848146839019521116e+4928L -#endif /* defined(__arm__) || defined(_ARM_) */ +#endif /* defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) */ /* Logarithm of gamma function */ /* Reentrant version */ diff --git a/mingw-w64-crt/math/lrintl.c b/mingw-w64-crt/math/lrintl.c index 94c4e49..d710fac 100644 --- a/mingw-w64-crt/math/lrintl.c +++ b/mingw-w64-crt/math/lrintl.c @@ -10,7 +10,7 @@ long lrintl (long double x) long retval = 0l; #if defined(_AMD64_) || defined(__x86_64__) || defined(_X86_) || defined(__i386__) __asm__ __volatile__ ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); -#elif defined(__arm__) || defined(_ARM_) +#elif defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) retval = lrint(x); #endif return retval; diff --git a/mingw-w64-crt/math/rintl.c b/mingw-w64-crt/math/rintl.c index 9ec159d..1c37803 100644 --- a/mingw-w64-crt/math/rintl.c +++ b/mingw-w64-crt/math/rintl.c @@ -9,7 +9,7 @@ long double rintl (long double x) { long double retval = 0.0L; #if defined(_AMD64_) || defined(__x86_64__) || defined(_X86_) || defined(__i386__) __asm__ __volatile__ ("frndint;": "=t" (retval) : "0" (x)); -#elif defined(__arm__) || defined(_ARM_) +#elif defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) retval = rint(x); #endif return retval; diff --git a/mingw-w64-crt/math/signbit.c b/mingw-w64-crt/math/signbit.c index 5b9c8cc..a97d8b9 100644 --- a/mingw-w64-crt/math/signbit.c +++ b/mingw-w64-crt/math/signbit.c @@ -16,7 +16,7 @@ typedef union __mingw_dbl_type_t { int __signbit (double x) { -#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) +#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) __mingw_dbl_type_t hlp; hlp.x = x; diff --git a/mingw-w64-crt/math/signbitf.c b/mingw-w64-crt/math/signbitf.c index 3745862..bda71a6 100644 --- a/mingw-w64-crt/math/signbitf.c +++ b/mingw-w64-crt/math/signbitf.c @@ -13,7 +13,7 @@ typedef union __mingw_flt_type_t { int __signbitf (float x) { -#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) +#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) __mingw_flt_type_t hlp; hlp.x = x; return ((hlp.val & 0x80000000) != 0); diff --git a/mingw-w64-crt/math/signbitl.c b/mingw-w64-crt/math/signbitl.c index 6bd3338..723933d 100644 --- a/mingw-w64-crt/math/signbitl.c +++ b/mingw-w64-crt/math/signbitl.c @@ -30,7 +30,7 @@ int __signbitl (long double x) { __mingw_fp_types_t ld; ld.ld = &x; return ((ld.ldt->lh.sign_exponent & 0x8000) != 0); -#elif defined(__arm__) || defined(_ARM_) +#elif defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) return __signbit(x); #elif defined(__i386__) || defined(_X86_) unsigned short sw; diff --git a/mingw-w64-crt/math/truncl.c b/mingw-w64-crt/math/truncl.c index ddc6af6..3b47e53 100644 --- a/mingw-w64-crt/math/truncl.c +++ b/mingw-w64-crt/math/truncl.c @@ -9,7 +9,7 @@ long double truncl (long double _x) { -#if defined(_ARM_) || defined(__arm__) +#if defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__) return trunc(_x); #else long double retval = 0.0L; @@ -22,5 +22,5 @@ truncl (long double _x) __asm__ __volatile__ ("frndint;" : "=t" (retval) : "0" (_x)); /* round towards zero */ __asm__ __volatile__ ("fldcw %0;" : : "m" (saved_cw) ); /* restore saved control word */ return retval; -#endif /* defined(_ARM_) || defined(__arm__) */ +#endif /* defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__) */ } diff --git a/mingw-w64-headers/crt/math.h b/mingw-w64-headers/crt/math.h index 6d82c9f..658abc8 100644 --- a/mingw-w64-headers/crt/math.h +++ b/mingw-w64-headers/crt/math.h @@ -207,7 +207,7 @@ extern "C" { #if !defined (__ia64__) __CRT_INLINE float __cdecl fabsf (float x) { -#if defined(__x86_64__) || defined(__arm__) +#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) return __builtin_fabsf (x); #else float res = 0.0F; @@ -218,7 +218,7 @@ extern "C" { __CRT_INLINE long double __cdecl fabsl (long double x) { -#ifdef __arm__ +#if defined(__arm__) || defined(__aarch64__) return __builtin_fabsl (x); #else long double res = 0.0l; @@ -229,7 +229,7 @@ extern "C" { __CRT_INLINE double __cdecl fabs (double x) { -#if defined(__x86_64__) || defined(__arm__) +#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) return __builtin_fabs (x); #else double res = 0.0; @@ -427,7 +427,7 @@ typedef long double double_t; return (((hlp.ldt->lh.high & 0x7fffffff) | hlp.ldt->lh.low) == 0 ? FP_INFINITE : FP_NAN); return FP_NORMAL; -#elif defined(__arm__) || defined(_ARM_) +#elif defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) return __fpclassify(x); #elif defined(__i386__) || defined(_X86_) unsigned short sw; @@ -436,7 +436,7 @@ typedef long double double_t; #endif } __CRT_INLINE int __cdecl __fpclassify (double x) { -#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) +#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) __mingw_fp_types_t hlp; unsigned int l, h; @@ -458,7 +458,7 @@ typedef long double double_t; #endif } __CRT_INLINE int __cdecl __fpclassifyf (float x) { -#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) +#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) __mingw_fp_types_t hlp; hlp.f = &x; @@ -524,7 +524,7 @@ __mingw_choose_expr ( \ #ifndef __CRT__NO_INLINE __CRT_INLINE int __cdecl __isnan (double _x) { -#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) +#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) __mingw_fp_types_t hlp; int l, h; @@ -545,7 +545,7 @@ __mingw_choose_expr ( \ __CRT_INLINE int __cdecl __isnanf (float _x) { -#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) +#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) __mingw_fp_types_t hlp; int i; @@ -574,7 +574,7 @@ __mingw_choose_expr ( \ signexp |= (unsigned int) (xx | (-xx)) >> 31; signexp = 0xfffe - signexp; return (int) ((unsigned int) signexp) >> 16; -#elif defined(__arm__) || defined(_ARM_) +#elif defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) return __isnan(_x); #elif defined(__i386__) || defined(_X86_) unsigned short sw; @@ -609,7 +609,7 @@ __mingw_choose_expr ( \ extern int __cdecl __signbitl (long double); #ifndef __CRT__NO_INLINE __CRT_INLINE int __cdecl __signbit (double x) { -#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) +#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) __mingw_fp_types_t hlp; hlp.d = &x; @@ -622,7 +622,7 @@ __mingw_choose_expr ( \ } __CRT_INLINE int __cdecl __signbitf (float x) { -#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) +#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) __mingw_fp_types_t hlp; hlp.f = &x; return ((hlp.ft->val & 0x80000000) != 0); @@ -638,7 +638,7 @@ __mingw_choose_expr ( \ __mingw_fp_types_t ld; ld.ld = &x; return ((ld.ldt->lh.sign_exponent & 0x8000) != 0); -#elif defined(__arm__) || defined(_ARM_) +#elif defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) return __signbit(x); #elif defined(__i386__) || defined(_X86_) unsigned short stw; @@ -788,7 +788,7 @@ __mingw_choose_expr ( \ #if 0 /*defined(__GNUC__) && defined(__FAST_MATH__)*/ __CRT_INLINE double __cdecl logb (double x) { -#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) +#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) __mingw_fp_types_t hlp; int lx, hx; @@ -812,7 +812,7 @@ __mingw_choose_expr ( \ __CRT_INLINE float __cdecl logbf (float x) { -#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) +#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) int v; __mingw_fp_types_t hlp; @@ -835,7 +835,7 @@ __mingw_choose_expr ( \ __CRT_INLINE long double __cdecl logbl (long double x) { -#if defined(__arm__) || defined(_ARM_) +#if defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) __mingw_fp_types_t hlp; int lx, hx; -- 2.7.4 ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public