From 264b0c8686051f6a8fe08cc41a34d5225d83e7a6 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Sat, 18 Feb 2017 18:41:04 -0800
Subject: More GC

Signed-off-by: Alexey Neyman <stilor@att.net>

diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index 99bd3d2..a2f75ee 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -130,8 +130,6 @@ config CC_GCC_4_8
     select CC_GCC_4_8_or_later
     select CC_GCC_USE_GMP_MPFR
     select CC_GCC_USE_MPC
-    select CC_GCC_HAS_LIBQUADMATH
-    select CC_GCC_HAS_LIBSANITIZER
     select CC_SUPPORT_GOLANG
 
 config CC_GCC_4_8_or_later
@@ -142,8 +140,6 @@ config CC_GCC_4_9
     select CC_GCC_4_9_or_later
     select CC_GCC_USE_GMP_MPFR
     select CC_GCC_USE_MPC
-    select CC_GCC_HAS_LIBQUADMATH
-    select CC_GCC_HAS_LIBSANITIZER
     select CC_SUPPORT_GOLANG
 
 config CC_GCC_4_9_or_later
@@ -155,8 +151,6 @@ config CC_GCC_5
     select CC_GCC_5_or_later
     select CC_GCC_USE_GMP_MPFR
     select CC_GCC_USE_MPC
-    select CC_GCC_HAS_LIBQUADMATH
-    select CC_GCC_HAS_LIBSANITIZER
     select CC_GCC_HAS_LIBMPX
     select CC_SUPPORT_GOLANG
 
@@ -169,8 +163,6 @@ config CC_GCC_6
     select CC_GCC_6_or_later
     select CC_GCC_USE_GMP_MPFR
     select CC_GCC_USE_MPC
-    select CC_GCC_HAS_LIBQUADMATH
-    select CC_GCC_HAS_LIBSANITIZER
     select CC_GCC_HAS_LIBMPX
     select CC_SUPPORT_GOLANG
 
@@ -183,8 +175,6 @@ config CC_GCC_latest
     select CC_GCC_6_or_later
     select CC_GCC_USE_GMP_MPFR
     select CC_GCC_USE_MPC
-    select CC_GCC_HAS_LIBQUADMATH
-    select CC_GCC_HAS_LIBSANITIZER
 
 # Only enable gcc's support for plugins if binutils has it as well
 # They are useful only when doing LTO, but it does no harm enabling
diff --git a/config/cc/gcc.in.2 b/config/cc/gcc.in.2
index 6c99f20..8818de6 100644
--- a/config/cc/gcc.in.2
+++ b/config/cc/gcc.in.2
@@ -177,7 +177,6 @@ config CC_GCC_LIBSSP
 config CC_GCC_LIBQUADMATH
     bool
     prompt "Compile libquadmath"
-    depends on CC_GCC_HAS_LIBQUADMATH
     help
       libquadmath is a library which provides quad-precision mathematical
       functions on targets supporting the __float128 datatype. See:
@@ -188,7 +187,6 @@ config CC_GCC_LIBQUADMATH
 config CC_GCC_LIBSANITIZER
     bool
     prompt "Compile libsanitizer"
-    depends on CC_GCC_HAS_LIBSANITIZER
     depends on THREADS_NATIVE
     depends on ! LIBC_uClibc && ! LIBC_musl # Currently lacks required headers (like netrom.h)
     help
diff --git a/scripts/build/cc/100-gcc.sh b/scripts/build/cc/100-gcc.sh
index e14b510..43488a2 100644
--- a/scripts/build/cc/100-gcc.sh
+++ b/scripts/build/cc/100-gcc.sh
@@ -434,14 +434,12 @@ do_gcc_core_backend() {
     else
         extra_config+=(--disable-libssp)
     fi
-    if [ "${CT_CC_GCC_HAS_LIBQUADMATH}" = "y" ]; then
-        if [ "${CT_CC_GCC_LIBQUADMATH}" = "y" ]; then
-            extra_config+=(--enable-libquadmath)
-            extra_config+=(--enable-libquadmath-support)
-        else
-            extra_config+=(--disable-libquadmath)
-            extra_config+=(--disable-libquadmath-support)
-        fi
+    if [ "${CT_CC_GCC_LIBQUADMATH}" = "y" ]; then
+        extra_config+=(--enable-libquadmath)
+        extra_config+=(--enable-libquadmath-support)
+    else
+        extra_config+=(--disable-libquadmath)
+        extra_config+=(--disable-libquadmath-support)
     fi
 
     core_LDFLAGS+=("${ldflags}")
@@ -928,22 +926,18 @@ do_gcc_backend() {
     else
         extra_config+=(--disable-libssp)
     fi
-    if [ "${CT_CC_GCC_HAS_LIBQUADMATH}" = "y" ]; then
-        if [ "${CT_CC_GCC_LIBQUADMATH}" = "y" ]; then
-            extra_config+=(--enable-libquadmath)
-            extra_config+=(--enable-libquadmath-support)
-        else
-            extra_config+=(--disable-libquadmath)
-            extra_config+=(--disable-libquadmath-support)
-        fi
+    if [ "${CT_CC_GCC_LIBQUADMATH}" = "y" ]; then
+        extra_config+=(--enable-libquadmath)
+        extra_config+=(--enable-libquadmath-support)
+    else
+        extra_config+=(--disable-libquadmath)
+        extra_config+=(--disable-libquadmath-support)
     fi
 
-    if [ "${CT_CC_GCC_HAS_LIBSANITIZER}" = "y" ]; then
-        if [ "${CT_CC_GCC_LIBSANITIZER}" = "y" ]; then
-            extra_config+=(--enable-libsanitizer)
-        else
-            extra_config+=(--disable-libsanitizer)
-        fi
+    if [ "${CT_CC_GCC_LIBSANITIZER}" = "y" ]; then
+        extra_config+=(--enable-libsanitizer)
+    else
+        extra_config+=(--disable-libsanitizer)
     fi
 
     if [ "${CT_CC_GCC_HAS_LIBMPX}" = "y" ]; then
-- 
cgit v0.10.2-6-g49f6