diff --git a/compiler-rt/lib/builtins/int_math.h b/compiler-rt/lib/builtins/int_math.h
index 08bfe922ffa1..c9c6bc83251c 100644
--- a/compiler-rt/lib/builtins/int_math.h
+++ b/compiler-rt/lib/builtins/int_math.h
@@ -31,8 +31,12 @@
 #if defined(_MSC_VER) && !defined(__clang__)
 #define CRT_INFINITY INFINITY
 #else
+#if defined(DOUBLE_PRECISION)
+#define CRT_INFINITY __builtin_huge_val()
+#else
 #define CRT_INFINITY __builtin_huge_valf()
 #endif
+#endif
 
 #if defined(_MSC_VER) && !defined(__clang__)
 #define crt_isfinite(x) _finite((x))
diff --git a/compiler-rt/lib/builtins/muldc3.c b/compiler-rt/lib/builtins/muldc3.c
index 0ea7041c3706..43dfcc7a580d 100644
--- a/compiler-rt/lib/builtins/muldc3.c
+++ b/compiler-rt/lib/builtins/muldc3.c
@@ -10,6 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#define DOUBLE_PRECISION
 #include "int_lib.h"
 #include "int_math.h"