From 6fd7bec86f7f155e44b79c91fae3722464ce8910 Mon Sep 17 00:00:00 2001
From: Stan Shebs <stanshebs@google.com>
Date: Wed, 26 Sep 2018 13:36:42 -0700
Subject: [PATCH] Disable more attempts to pass -mlong-double-128 to clang

---
 sysdeps/powerpc/powerpc64le/configure        | 3 +++
 sysdeps/powerpc/powerpc64le/configure.ac     | 4 ++++
 sysdeps/unix/sysv/linux/powerpc/configure    | 3 +++
 sysdeps/unix/sysv/linux/powerpc/configure.ac | 4 ++++
 4 files changed, 14 insertions(+)

diff --git a/sysdeps/powerpc/powerpc64le/configure b/sysdeps/powerpc/powerpc64le/configure
index 66bb5dcc1a..d40221b774 100644
--- a/sysdeps/powerpc/powerpc64le/configure
+++ b/sysdeps/powerpc/powerpc64le/configure
@@ -1,6 +1,7 @@
 # This file is generated from configure.ac by Autoconf.  DO NOT EDIT!
  # Local configure fragment for sysdeps/powerpc/powerpc64le.
 
+if test "$with_clang" = no; then
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports binary128 floating point type" >&5
 $as_echo_n "checking if $CC supports binary128 floating point type... " >&6; }
@@ -42,6 +43,8 @@ if test "$libc_cv_compiler_powerpc64le_binary128_ok" != "yes"; then :
   critic_missing="$critic_missing binary128 floating point type (GCC >= 6.2) is required on powerpc64le."
 fi
 
+fi # clang
+
 OLD_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $libc_cv_cc_submachine"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the target machine is at least POWER8" >&5
diff --git a/sysdeps/powerpc/powerpc64le/configure.ac b/sysdeps/powerpc/powerpc64le/configure.ac
index 20a49d89e8..d00a0044b4 100644
--- a/sysdeps/powerpc/powerpc64le/configure.ac
+++ b/sysdeps/powerpc/powerpc64le/configure.ac
@@ -1,6 +1,8 @@
 GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
 # Local configure fragment for sysdeps/powerpc/powerpc64le.
 
+if test "$with_clang" = no; then
+
 dnl Require binary128 floating point support on powerpc64le (available in
 dnl GCC 6.2).
 AC_CACHE_CHECK([if $CC supports binary128 floating point type],
@@ -29,6 +31,8 @@ CFLAGS="$save_CFLAGS"])
 AS_IF([test "$libc_cv_compiler_powerpc64le_binary128_ok" != "yes"],
       [critic_missing="$critic_missing binary128 floating point type (GCC >= 6.2) is required on powerpc64le."])
 
+fi # clang
+
 dnl Require at least POWER8 on powerpc64le
 OLD_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $libc_cv_cc_submachine"
diff --git a/sysdeps/unix/sysv/linux/powerpc/configure b/sysdeps/unix/sysv/linux/powerpc/configure
index 6f883de396..6d2465fcac 100644
--- a/sysdeps/unix/sysv/linux/powerpc/configure
+++ b/sysdeps/unix/sysv/linux/powerpc/configure
@@ -1,6 +1,7 @@
 # This file is generated from configure.ac by Autoconf.  DO NOT EDIT!
  # Local configure fragment for sysdeps/unix/sysv/linux/powerpc/.
 
+if test "$with_clang" = no; then
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC $CFLAGS -mlong-double-128 uses IBM extended format" >&5
 $as_echo_n "checking whether $CC $CFLAGS -mlong-double-128 uses IBM extended format... " >&6; }
@@ -76,4 +77,6 @@ $as_echo "$libc_cv_mabi_ibmlongdouble" >&6; }
   fi
 fi
 
+fi # clang
+
 ldd_rewrite_script=sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed
diff --git a/sysdeps/unix/sysv/linux/powerpc/configure.ac b/sysdeps/unix/sysv/linux/powerpc/configure.ac
index b8e5f9ac32..d3e12079ee 100644
--- a/sysdeps/unix/sysv/linux/powerpc/configure.ac
+++ b/sysdeps/unix/sysv/linux/powerpc/configure.ac
@@ -2,6 +2,8 @@ sinclude(./aclocal.m4)dnl Autoconf lossage
 GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
 # Local configure fragment for sysdeps/unix/sysv/linux/powerpc/.
 
+if test "$with_clang" = no; then
+
 AC_CACHE_CHECK(whether $CC $CFLAGS -mlong-double-128 uses IBM extended format,
 	       libc_cv_mlong_double_128ibm, [dnl
 save_CFLAGS="$CFLAGS"
@@ -36,4 +38,6 @@ long double foobar (long double x) { return x; }],
   fi
 fi
 
+fi # clang
+
 ldd_rewrite_script=sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed