From 4d723d08924a5746da2336410e39de5a7e363760 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Sat, 18 Feb 2017 23:14:52 -0800
Subject: More garbage collection

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

diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index 0cbf0b6..e2fb8db 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -7,6 +7,7 @@
 ## select CC_SUPPORT_ADA
 ## select CC_SUPPORT_OBJC
 ## select CC_SUPPORT_OBJCXX
+## select CC_SUPPORT_GOLANG
 ##
 ## help gcc is the full-blown GNU compiler. This is what most people will choose.
 ## help
@@ -128,9 +129,6 @@ endif # ! CC_GCC_CUSTOM
 config CC_GCC_4_8
     bool
     select CC_GCC_4_8_or_later
-    select CC_GCC_USE_GMP_MPFR
-    select CC_GCC_USE_MPC
-    select CC_SUPPORT_GOLANG
 
 config CC_GCC_4_8_or_later
     bool
@@ -138,9 +136,6 @@ config CC_GCC_4_8_or_later
 config CC_GCC_4_9
     bool
     select CC_GCC_4_9_or_later
-    select CC_GCC_USE_GMP_MPFR
-    select CC_GCC_USE_MPC
-    select CC_SUPPORT_GOLANG
 
 config CC_GCC_4_9_or_later
     bool
@@ -149,10 +144,7 @@ config CC_GCC_4_9_or_later
 config CC_GCC_5
     bool
     select CC_GCC_5_or_later
-    select CC_GCC_USE_GMP_MPFR
-    select CC_GCC_USE_MPC
     select CC_GCC_HAS_LIBMPX
-    select CC_SUPPORT_GOLANG
 
 config CC_GCC_5_or_later
     bool
@@ -161,10 +153,7 @@ config CC_GCC_5_or_later
 config CC_GCC_6
     bool
     select CC_GCC_6_or_later
-    select CC_GCC_USE_GMP_MPFR
-    select CC_GCC_USE_MPC
     select CC_GCC_HAS_LIBMPX
-    select CC_SUPPORT_GOLANG
 
 config CC_GCC_6_or_later
     bool
@@ -173,10 +162,7 @@ config CC_GCC_6_or_later
 config CC_GCC_latest
     bool
     select CC_GCC_6_or_later
-    select CC_GCC_USE_GMP_MPFR
-    select CC_GCC_USE_MPC
     select CC_GCC_HAS_LIBMPX
-    select CC_SUPPORT_GOLANG
 
 # 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
@@ -193,15 +179,6 @@ config CC_GCC_GOLD
     depends on BINUTILS_GOLD_INSTALLED
     default y
 
-config CC_GCC_USE_GMP_MPFR
-    bool
-    select GMP_NEEDED
-    select MPFR_NEEDED
-
-config CC_GCC_USE_MPC
-    bool
-    select MPC_NEEDED
-
 config CC_GCC_HAS_LIBMPX
     bool
 
@@ -227,8 +204,4 @@ config CC_LANG_JAVA_USE_ECJ
     default y
     depends on CC_LANG_JAVA
 
-# Fortran always requires GMP+MPFR, whatever the gcc version
-config CC_LANG_FORTRAN
-    select CC_GCC_USE_GMP_MPFR
-
 source "config/cc/gcc.in.2"
diff --git a/config/companion_libs.in b/config/companion_libs.in
index 02f2ecb..fae49ec 100644
--- a/config/companion_libs.in
+++ b/config/companion_libs.in
@@ -19,12 +19,12 @@ config GETTEXT_NEEDED
     select COMPLIBS_NEEDED
 
 config GMP_NEEDED
-    bool
+    def_bool y
     select GMP
     select COMPLIBS_NEEDED
 
 config MPFR_NEEDED
-    bool
+    def_bool y
     select MPFR
     select COMPLIBS_NEEDED
 
@@ -39,7 +39,7 @@ config CLOOG_NEEDED
     select COMPLIBS_NEEDED
 
 config MPC_NEEDED
-    bool
+    def_bool y
     select MPC
     select COMPLIBS_NEEDED
 
diff --git a/scripts/build/cc/100-gcc.sh b/scripts/build/cc/100-gcc.sh
index 91ddd3d..48f5122 100644
--- a/scripts/build/cc/100-gcc.sh
+++ b/scripts/build/cc/100-gcc.sh
@@ -476,13 +476,9 @@ do_gcc_core_backend() {
         core_LDFLAGS+=("-lm")
     fi
 
-    if [ "${CT_CC_GCC_USE_GMP_MPFR}" = "y" ]; then
-        extra_config+=("--with-gmp=${complibs}")
-        extra_config+=("--with-mpfr=${complibs}")
-    fi
-    if [ "${CT_CC_GCC_USE_MPC}" = "y" ]; then
-        extra_config+=("--with-mpc=${complibs}")
-    fi
+    extra_config+=("--with-gmp=${complibs}")
+    extra_config+=("--with-mpfr=${complibs}")
+    extra_config+=("--with-mpc=${complibs}")
     if [ "${CT_CC_GCC_USE_GRAPHITE}" = "y" ]; then
         if [ "${CT_ISL}" = "y" ]; then
             extra_config+=("--with-isl=${complibs}")
@@ -982,13 +978,9 @@ do_gcc_backend() {
         final_LDFLAGS+=("-lm")
     fi
 
-    if [ "${CT_CC_GCC_USE_GMP_MPFR}" = "y" ]; then
-        extra_config+=("--with-gmp=${complibs}")
-        extra_config+=("--with-mpfr=${complibs}")
-    fi
-    if [ "${CT_CC_GCC_USE_MPC}" = "y" ]; then
-        extra_config+=("--with-mpc=${complibs}")
-    fi
+    extra_config+=("--with-gmp=${complibs}")
+    extra_config+=("--with-mpfr=${complibs}")
+    extra_config+=("--with-mpc=${complibs}")
     if [ "${CT_CC_GCC_USE_GRAPHITE}" = "y" ]; then
         if [ "${CT_ISL}" = "y" ]; then
             extra_config+=("--with-isl=${complibs}")
-- 
cgit v0.10.2-6-g49f6