Index: compiler-rt/lib/builtins/addtf3.c
===================================================================
--- compiler-rt/lib/builtins/addtf3.c
+++ compiler-rt/lib/builtins/addtf3.c
@@ -17,7 +17,7 @@
 #if defined(CRT_HAS_128BIT) && defined(CRT_LDBL_128BIT)
 #include "fp_add_impl.inc"
 
-COMPILER_RT_ABI long double __addtf3(long double a, long double b) {
+COMPILER_RT_ABI fp_t __addtf3(fp_t a, fp_t b) {
   return __addXf3__(a, b);
 }
 
Index: compiler-rt/lib/builtins/divtf3.c
===================================================================
--- compiler-rt/lib/builtins/divtf3.c
+++ compiler-rt/lib/builtins/divtf3.c
@@ -213,7 +213,7 @@
     // Round.
     absResult += round;
     // Insert the sign and return.
-    const long double result = fromRep(absResult | quotientSign);
+    const fp_t result = fromRep(absResult | quotientSign);
     return result;
   }
 }
Index: compiler-rt/lib/builtins/extenddftf2.c
===================================================================
--- compiler-rt/lib/builtins/extenddftf2.c
+++ compiler-rt/lib/builtins/extenddftf2.c
@@ -14,7 +14,7 @@
 #define DST_QUAD
 #include "fp_extend_impl.inc"
 
-COMPILER_RT_ABI long double __extenddftf2(double a) {
+COMPILER_RT_ABI fp_t __extenddftf2(double a) {
   return __extendXfYf2__(a);
 }
 
Index: compiler-rt/lib/builtins/extendsftf2.c
===================================================================
--- compiler-rt/lib/builtins/extendsftf2.c
+++ compiler-rt/lib/builtins/extendsftf2.c
@@ -14,7 +14,7 @@
 #define DST_QUAD
 #include "fp_extend_impl.inc"
 
-COMPILER_RT_ABI long double __extendsftf2(float a) {
+COMPILER_RT_ABI fp_t __extendsftf2(float a) {
   return __extendXfYf2__(a);
 }