Merge pull request #282 from bhundven/less_gcc_versions_part2

Less gcc versions part2

1 files changed, 7 insertions, 144 deletions

diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index e67e435..4cf4628 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -64,60 +64,6 @@ config CC_GCC_V_4_8_5
     prompt "4.8.5"
     select CC_GCC_4_8
 
-config CC_GCC_V_linaro_4_7
-    bool
-    prompt "linaro-4.7-2014.06"
-    depends on CC_GCC_SHOW_LINARO
-    select CC_GCC_4_7
-
-config CC_GCC_V_4_7_4
-    bool
-    prompt "4.7.4"
-    select CC_GCC_4_7
-
-config CC_GCC_V_linaro_4_6
-    bool
-    prompt "linaro-4.6-2013.05"
-    depends on CC_GCC_SHOW_LINARO
-    select CC_GCC_4_6
-
-config CC_GCC_V_4_6_4
-    bool
-    prompt "4.6.4"
-    select CC_GCC_4_6
-
-config CC_GCC_V_linaro_4_5
-    bool
-    prompt "linaro-4.5-2012.03"
-    depends on CC_GCC_SHOW_LINARO
-    select CC_GCC_4_5
-
-config CC_GCC_V_4_5_4
-    bool
-    prompt "4.5.4"
-    select CC_GCC_4_5
-
-config CC_GCC_V_linaro_4_4
-    bool
-    prompt "linaro-4.4-2011.02-0"
-    depends on CC_GCC_SHOW_LINARO
-    select CC_GCC_4_4
-
-config CC_GCC_V_4_4_7
-    bool
-    prompt "4.4.7"
-    select CC_GCC_4_4
-
-config CC_GCC_V_4_3_6
-    bool
-    prompt "4.3.6"
-    select CC_GCC_4_3
-
-config CC_GCC_V_4_2_4
-    bool
-    prompt "4.2.4"
-    select CC_GCC_4_2
-
 endchoice
 
 config CC_GCC_CUSTOM
@@ -140,79 +86,6 @@ config CC_GCC_CUSTOM_LOCATION
 
 endif #CC_GCC_CUSTOM
 
-config CC_GCC_4_2
-    bool
-    select CC_GCC_4_2_or_later
-
-config CC_GCC_4_2_or_later
-    bool
-
-config CC_GCC_4_3
-    bool
-    select CC_GCC_4_3_or_later
-    select CC_GCC_USE_GMP_MPFR
-    select CC_GCC_HAS_PKGVERSION_BUGURL
-
-config CC_GCC_4_3_or_later
-    bool
-    select CC_GCC_4_2_or_later
-
-config CC_GCC_4_4
-    bool
-    select CC_GCC_4_4_or_later
-    select CC_GCC_USE_GMP_MPFR
-    select CC_GCC_HAS_GRAPHITE
-    select CC_GCC_HAS_PKGVERSION_BUGURL
-
-config CC_GCC_4_4_or_later
-    bool
-    select CC_GCC_4_3_or_later
-
-config CC_GCC_4_5
-    bool
-    select CC_GCC_4_5_or_later
-    select CC_GCC_USE_GMP_MPFR
-    select CC_GCC_USE_MPC
-    select CC_GCC_HAS_GRAPHITE
-    select CC_GCC_HAS_LTO
-    select CC_GCC_HAS_PKGVERSION_BUGURL
-    select CC_GCC_HAS_BUILD_ID
-
-config CC_GCC_4_5_or_later
-    bool
-    select CC_GCC_4_4_or_later
-
-config CC_GCC_4_6
-    bool
-    select CC_GCC_4_6_or_later
-    select CC_GCC_USE_GMP_MPFR
-    select CC_GCC_USE_MPC
-    select CC_GCC_HAS_GRAPHITE
-    select CC_GCC_HAS_LTO
-    select CC_GCC_HAS_PKGVERSION_BUGURL
-    select CC_GCC_HAS_BUILD_ID
-    select CC_GCC_HAS_LIBQUADMATH
-
-config CC_GCC_4_6_or_later
-    bool
-    select CC_GCC_4_5_or_later
-
-config CC_GCC_4_7
-    bool
-    select CC_GCC_4_7_or_later
-    select CC_GCC_USE_GMP_MPFR
-    select CC_GCC_USE_MPC
-    select CC_GCC_HAS_GRAPHITE
-    select CC_GCC_HAS_LTO
-    select CC_GCC_HAS_PKGVERSION_BUGURL
-    select CC_GCC_HAS_BUILD_ID
-    select CC_GCC_HAS_LNK_HASH_STYLE
-    select CC_GCC_HAS_LIBQUADMATH
-
-config CC_GCC_4_7_or_later
-    bool
-    select CC_GCC_4_6_or_later
-
 config CC_GCC_4_8
     bool
     select CC_GCC_4_8_or_later
@@ -229,7 +102,6 @@ config CC_GCC_4_8
 
 config CC_GCC_4_8_or_later
     bool
-    select CC_GCC_4_7_or_later
 
 config CC_GCC_4_9
     bool
@@ -284,22 +156,24 @@ config CC_GCC_latest
 config CC_GCC_HAS_GRAPHITE
     bool
 
-# For graphite: gcc 4.4..4.7 need ppl, while 4.8.. need isl
+# For graphite: gcc needs cloog and isl
+# In >= gcc-5.x, cloog is no longer needed, but isl is.
 # Prompt in config/cc/gcc.in.2
 config CC_GCC_USE_GRAPHITE
     bool
     default y
     depends on CC_GCC_HAS_GRAPHITE
     select CLOOG_NEEDED if !CC_GCC_5_or_later
-    select PPL_NEEDED if !CC_GCC_4_8_or_later
-    select ISL_NEEDED if CC_GCC_4_8_or_later
+    select ISL_NEEDED
     help
       Enable the GRAPHITE loop optimsations.
       
-      On some systems (eg. Cygwin), PPL and/or CLooG (required to enable
+      On some systems (eg. Cygwin), CLooG and ISL (required to enable
       GRAPHITE) may not build properly (yet), so you'll have to say 'N'
       here (or help debug the issues)
 
+      TODO: Is this still true on Cygwin?
+
 # The way LTO works is a bit twisted.
 # See: http://gcc.gnu.org/wiki/LinkTimeOptimization#Requirements
 # Basically:
@@ -316,7 +190,7 @@ config CC_GCC_USE_LTO
     bool
     default y
     depends on CC_GCC_HAS_LTO
-    select CC_GCC_USE_LIBELF if CC_GCC_4_5
+    select CC_GCC_USE_LIBELF
     help
       Enable the Link Time Optimisations.
 
@@ -372,22 +246,11 @@ config CC_GCC_VERSION
     default "4.9.3" if CC_GCC_V_4_9_3
     default "linaro-4.8-2015.06" if CC_GCC_V_linaro_4_8
     default "4.8.5" if CC_GCC_V_4_8_5
-    default "linaro-4.7-2014.06" if CC_GCC_V_linaro_4_7
-    default "4.7.4" if CC_GCC_V_4_7_4
-    default "linaro-4.6-2013.05" if CC_GCC_V_linaro_4_6
-    default "4.6.4" if CC_GCC_V_4_6_4
-    default "linaro-4.5-2012.03" if CC_GCC_V_linaro_4_5
-    default "4.5.4" if CC_GCC_V_4_5_4
-    default "linaro-4.4-2011.02-0" if CC_GCC_V_linaro_4_4
-    default "4.4.7" if CC_GCC_V_4_4_7
-    default "4.3.6" if CC_GCC_V_4_3_6
-    default "4.2.4" if CC_GCC_V_4_2_4
 
 config CC_LANG_JAVA_USE_ECJ
     bool
     default y
     depends on CC_LANG_JAVA
-    depends on CC_GCC_4_3_or_later
 
 # Fortran always requires GMP+MPFR, whatever the gcc version
 config CC_LANG_FORTRAN