Fix float build on aarch64 and loongarch64

mintsuki · mintsuki · commit d662ff1ddb67 · 2024-11-05T23:43:21.000+01:00
diff --git a/divxc3.c b/divxc3.c
@@ -17,6 +17,8 @@
 #include "int_lib.h"
 #include "int_math.h"
 
+#if HAS_80_BIT_LONG_DOUBLE == 1
+
 // Returns: the quotient of (a + ib) / (c + id)
 
 COMPILER_RT_ABI Lcomplex __divxc3(xf_float __a, xf_float __b, xf_float __c,
@@ -57,3 +59,5 @@ COMPILER_RT_ABI Lcomplex __divxc3(xf_float __a, xf_float __b, xf_float __c,
 #endif
 
 #endif
+
+#endif
diff --git a/fixunsxfdi.c b/fixunsxfdi.c
@@ -16,6 +16,8 @@
 
 #include "int_lib.h"
 
+#if HAS_80_BIT_LONG_DOUBLE == 1
+
 // Returns: convert a to a unsigned long long, rounding toward zero.
 //          Negative values all become zero.
 
@@ -49,6 +51,8 @@ COMPILER_RT_ABI du_int __fixunsxfdi(xf_float a) {
 #pragma warning(pop)
 #endif
 
+#endif
+
 #endif //!_ARCH_PPC
 
 #endif
diff --git a/fixunsxfsi.c b/fixunsxfsi.c
@@ -16,6 +16,8 @@
 
 #include "int_lib.h"
 
+#if HAS_80_BIT_LONG_DOUBLE == 1
+
 // Returns: convert a to a unsigned int, rounding toward zero.
 //          Negative values all become zero.
 
@@ -49,6 +51,8 @@ COMPILER_RT_ABI su_int __fixunsxfsi(xf_float a) {
 #pragma warning(pop)
 #endif
 
+#endif
+
 #endif // !_ARCH_PPC
 
 #endif
diff --git a/fixunsxfti.c b/fixunsxfti.c
@@ -14,6 +14,8 @@
 
 #include "int_lib.h"
 
+#if HAS_80_BIT_LONG_DOUBLE == 1
+
 #ifdef CRT_HAS_128BIT
 
 // Returns: convert a to a unsigned long long, rounding toward zero.
@@ -46,3 +48,5 @@ COMPILER_RT_ABI tu_int __fixunsxfti(xf_float a) {
 #endif // CRT_HAS_128BIT
 
 #endif
+
+#endif
diff --git a/fixxfdi.c b/fixxfdi.c
@@ -16,6 +16,8 @@
 
 #include "int_lib.h"
 
+#if HAS_80_BIT_LONG_DOUBLE == 1
+
 // Returns: convert a to a signed long long, rounding toward zero.
 
 // Assumption: long double is an intel 80 bit floating point type padded with 6
@@ -53,6 +55,8 @@ COMPILER_RT_ABI di_int __fixxfdi(xf_float a) {
 #pragma warning(pop)
 #endif
 
+#endif
+
 #endif // !_ARCH_PPC
 
 #endif
diff --git a/fixxfti.c b/fixxfti.c
@@ -14,6 +14,8 @@
 
 #include "int_lib.h"
 
+#if HAS_80_BIT_LONG_DOUBLE == 1
+
 #ifdef CRT_HAS_128BIT
 
 // Returns: convert a to a signed long long, rounding toward zero.
@@ -48,3 +50,5 @@ COMPILER_RT_ABI ti_int __fixxfti(xf_float a) {
 #endif // CRT_HAS_128BIT
 
 #endif
+
+#endif
diff --git a/floatdixf.c b/floatdixf.c
@@ -16,6 +16,8 @@
 
 #include "int_lib.h"
 
+#if HAS_80_BIT_LONG_DOUBLE == 1
+
 // Returns: convert a to a long double, rounding toward even.
 
 // Assumption: long double is a IEEE 80 bit floating point type padded to 128
@@ -40,6 +42,8 @@ COMPILER_RT_ABI xf_float __floatdixf(di_int a) {
   return fb.f;
 }
 
+#endif
+
 #endif // !_ARCH_PPC
 
 #endif
diff --git a/floattixf.c b/floattixf.c
@@ -14,6 +14,8 @@
 
 #include "int_lib.h"
 
+#if HAS_80_BIT_LONG_DOUBLE == 1
+
 #ifdef CRT_HAS_128BIT
 
 // Returns: convert a to a long double, rounding toward even.
@@ -75,3 +77,5 @@ COMPILER_RT_ABI xf_float __floattixf(ti_int a) {
 #endif // CRT_HAS_128BIT
 
 #endif
+
+#endif
diff --git a/floatundixf.c b/floatundixf.c
@@ -16,6 +16,8 @@
 
 #include "int_lib.h"
 
+#if HAS_80_BIT_LONG_DOUBLE == 1
+
 // Returns: convert a to a long double, rounding toward even.
 
 // Assumption: long double is a IEEE 80 bit floating point type padded to 128
@@ -36,6 +38,8 @@ COMPILER_RT_ABI xf_float __floatundixf(du_int a) {
   return fb.f;
 }
 
+#endif
+
 #endif // _ARCH_PPC
 
 #endif
diff --git a/floatuntixf.c b/floatuntixf.c
@@ -14,6 +14,8 @@
 
 #include "int_lib.h"
 
+#if HAS_80_BIT_LONG_DOUBLE == 1
+
 #ifdef CRT_HAS_128BIT
 
 // Returns: convert a to a long double, rounding toward even.
@@ -72,3 +74,5 @@ COMPILER_RT_ABI xf_float __floatuntixf(tu_int a) {
 #endif
 
 #endif
+
+#endif
diff --git a/int_types.h b/int_types.h
@@ -154,7 +154,7 @@ typedef struct {
 // be compatible with. On 32-bit x86 Android, long double is 64 bits, while on
 // x86_64 Android, long double is 128 bits.
 #if (defined(__i386__) || defined(__x86_64__)) &&                              \
-    !(defined(_MSC_VER) || defined(__ANDROID__))
+    !(defined(_MSC_VER))
 #define HAS_80_BIT_LONG_DOUBLE 1
 #elif defined(__m68k__) || defined(__ia64__)
 #define HAS_80_BIT_LONG_DOUBLE 1
diff --git a/mulxc3.c b/mulxc3.c
@@ -17,6 +17,8 @@
 #include "int_lib.h"
 #include "int_math.h"
 
+#if HAS_80_BIT_LONG_DOUBLE == 1
+
 // Returns: the product of a + ib and c + id
 
 COMPILER_RT_ABI Lcomplex __mulxc3(xf_float __a, xf_float __b, xf_float __c,
@@ -71,3 +73,5 @@ COMPILER_RT_ABI Lcomplex __mulxc3(xf_float __a, xf_float __b, xf_float __c,
 #endif
 
 #endif
+
+#endif
diff --git a/powixf2.c b/powixf2.c
@@ -16,6 +16,8 @@
 
 #include "int_lib.h"
 
+#if HAS_80_BIT_LONG_DOUBLE == 1
+
 // Returns: a ^ b
 
 COMPILER_RT_ABI xf_float __powixf2(xf_float a, int b) {
@@ -35,3 +37,5 @@ COMPILER_RT_ABI xf_float __powixf2(xf_float a, int b) {
 #endif
 
 #endif
+
+#endif
diff --git a/truncdfbf2.c b/truncdfbf2.c
@@ -8,10 +8,14 @@
 
 #ifndef CC_RUNTIME_NO_FLOAT
 
+#ifndef __loongarch64
+
 #define SRC_DOUBLE
 #define DST_BFLOAT
 #include "fp_trunc_impl.inc"
 
 COMPILER_RT_ABI dst_t __truncdfbf2(double a) { return __truncXfYf2__(a); }
 
 #endif
+
+#endif
diff --git a/truncsfbf2.c b/truncsfbf2.c
@@ -8,10 +8,14 @@
 
 #ifndef CC_RUNTIME_NO_FLOAT
 
+#ifndef __loongarch64
+
 #define SRC_SINGLE
 #define DST_BFLOAT
 #include "fp_trunc_impl.inc"
 
 COMPILER_RT_ABI dst_t __truncsfbf2(float a) { return __truncXfYf2__(a); }
 
 #endif
+
+#endif
