From 1ba307084e002720491b3a3589c48ba492c1769b Mon Sep 17 00:00:00 2001
From: Stan Shebs <stanshebs@google.com>
Date: Tue, 23 Jan 2018 09:41:49 -0800
Subject: Add workarounds for incomplete float128 support in clang

---
 sysdeps/ieee754/float128/Makeconfig |  2 +-
 sysdeps/ieee754/float128/Makefile   |  2 ++
 sysdeps/x86/bits/floatn.h           | 27 +++++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/sysdeps/ieee754/float128/Makeconfig b/sysdeps/ieee754/float128/Makeconfig
index a493ff1d41..99ae5e07bb 100644
--- a/sysdeps/ieee754/float128/Makeconfig
+++ b/sysdeps/ieee754/float128/Makeconfig
@@ -1,4 +1,4 @@
 # Include this earlier so it can be used earlier in Makefiles,
 # and sysdep/ makefiles.
-float128-fcts = yes
+float128-fcts = $(enable-float128)
 float64x-alias-fcts = yes
diff --git a/sysdeps/ieee754/float128/Makefile b/sysdeps/ieee754/float128/Makefile
index 571a841809..70bb3ac406 100644
--- a/sysdeps/ieee754/float128/Makefile
+++ b/sysdeps/ieee754/float128/Makefile
@@ -1,3 +1,4 @@
+ifeq ($(enable-float128),yes)
 ifeq ($(subdir),stdlib)
 routines += float1282mpn strfromf128
 routines += strtof128 strtof128_l strtof128_nan mpn2float128
@@ -10,3 +11,4 @@ endif
 ifeq ($(subdir),wcsmbs)
 routines += wcstof128_l wcstof128 wcstof128_nan
 endif
+endif # enable-float128
diff --git a/sysdeps/x86/bits/floatn.h b/sysdeps/x86/bits/floatn.h
index d157c926ad..2a2cd2b1fb 100644
--- a/sysdeps/x86/bits/floatn.h
+++ b/sysdeps/x86/bits/floatn.h
@@ -21,6 +21,8 @@
 
 #include <features.h>
 
+#define capture(sym, val) extern int sym[val]
+
 /* Defined to 1 if the current compiler invocation provides a
    floating-point type with the IEEE 754 binary128 format, and this
    glibc includes corresponding *f128 interfaces for it.  The required
@@ -55,6 +57,9 @@
 
 #ifndef __ASSEMBLER__
 
+capture(i_have_float128, __HAVE_FLOAT128);
+capture(i_have_distinct_float128, __HAVE_DISTINCT_FLOAT128);
+
 /* Defined to concatenate the literal suffix to be used with _Float128
    types, if __HAVE_FLOAT128 is 1. */
 # if __HAVE_FLOAT128
@@ -83,9 +88,25 @@ typedef _Complex float __cfloat128 __attribute__ ((__mode__ (__TC__)));
 
 /* The type _Float128 exists only since GCC 7.0.  */
 #  if !__GNUC_PREREQ (7, 0) || defined __cplusplus
+/* need a clang 5.0 case here? */
 typedef __float128 _Float128;
 #  endif
 
+#if defined __clang__
+
+#if 0 /* clang 5.0 or less */
+#define __builtin_huge_valf128() ((_Float128) __builtin_huge_val ())
+#define __builtin_inff128() ((_Float128) __builtin_inf ())
+#define __builtin_nanf128(x) ((_Float128) __builtin_nan (x))
+#define __builtin_nansf128(x) ((_Float128) __builtin_nans (x))
+
+#define __builtin_copysignf128(x,y) ((_Float128) __builtin_copysign ((double)(x),(double)(y)))
+#define __builtin_fabsf128(x) ((_Float128) __builtin_fabs ((double)(x)))
+#endif
+#define __builtin_signbitf128(x) (__builtin_signbit (x))
+
+#else /* GCC */
+
 /* __builtin_huge_valf128 doesn't exist before GCC 7.0.  */
 #  if !__GNUC_PREREQ (7, 0)
 #   define __builtin_huge_valf128() ((_Float128) __builtin_huge_val ())
@@ -112,8 +133,14 @@ typedef __float128 _Float128;
 #   define __builtin_signbitf128 __signbitf128
 #  endif
 
+#endif /* clang or GCC */
+
 # endif
 
+#if !__HAVE_FLOAT128 && defined __clang__
+typedef long double _Float128;
+#endif
+
 #endif /* !__ASSEMBLER__.  */
 
 #include <bits/floatn-common.h>
-- 
cgit 1.4.1