diff options
Diffstat (limited to 'config')
-rw-r--r-- | config/cc/gcc.in | 151 | ||||
-rw-r--r-- | config/cc/gcc.in.2 | 12 | ||||
-rw-r--r-- | config/companion_libs.in | 17 | ||||
-rw-r--r-- | config/companion_libs/cloog.in | 10 | ||||
-rw-r--r-- | config/companion_libs/ppl.in | 51 | ||||
-rw-r--r-- | config/global/paths.in | 1 | ||||
-rw-r--r-- | config/libc/glibc.in | 10 |
7 files changed, 17 insertions, 235 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 diff --git a/config/cc/gcc.in.2 b/config/cc/gcc.in.2 index 577bf42..b3bfecc 100644 --- a/config/cc/gcc.in.2 +++ b/config/cc/gcc.in.2 @@ -59,16 +59,16 @@ config CC_GCC_TARGET_FINAL tricks are not done and the compiler is build with all/install. config STATIC_TOOLCHAIN - select CC_GCC_STATIC_LIBSTDCXX if CC_GCC_4_4_or_later + bool + select CC_GCC_STATIC_LIBSTDCXX config CC_GCC_STATIC_LIBSTDCXX bool prompt "Link libstdc++ statically into the gcc binary" default y - depends on CC_GCC_4_4_or_later select WANTS_STATIC_LINK help - Newer gcc versions use the PPL library which is C++ code. Statically + Newer gcc versions require some c++ libraries. So statically linking libstdc++ increases the likeliness that the gcc binary will run on machines other than the one which it was built on, without having to worry about distributing the matching version of libstdc++ @@ -137,12 +137,15 @@ config CC_GCC_LIBMUDFLAP config CC_GCC_LIBGOMP bool prompt "Compile libgomp" + depends on !THREADS_NONE help libgomp is "the GNU implementation of the OpenMP Application Programming Interface (API) for multi-platform shared-memory parallel programming in C/C++ and Fortran". See: http://gcc.gnu.org/onlinedocs/libgomp/ - + + GNU OpenMP support requires threading. + The default is 'N'. Say 'Y' if you need it, and report success/failure. config CC_GCC_LIBSSP @@ -229,7 +232,6 @@ config CC_GCC_LDBL_128 tristate prompt "Enable 128-bit long doubles" default m - depends on CC_GCC_4_2_or_later help Saying 'Y' will force gcc to use 128-bit wide long doubles Saying 'N' will force gcc to use 64-bit wide long doubles diff --git a/config/companion_libs.in b/config/companion_libs.in index 3567512..67094cb 100644 --- a/config/companion_libs.in +++ b/config/companion_libs.in @@ -28,11 +28,6 @@ config MPFR_NEEDED select MPFR select COMPLIBS_NEEDED -config PPL_NEEDED - bool - select PPL - select COMPLIBS_NEEDED - config ISL_NEEDED bool select ISL @@ -83,11 +78,6 @@ config MPFR select GMP select COMPLIBS -config PPL - bool - select GMP - select COMPLIBS - config ISL bool select GMP @@ -137,9 +127,6 @@ endif if MPFR source "config/companion_libs/mpfr.in" endif -if PPL -source "config/companion_libs/ppl.in" -endif if ISL source "config/companion_libs/isl.in" endif @@ -182,9 +169,7 @@ config COMPLIBS_CHECK If you suspect that one (or more) of your companion libraries is the cause for incorrectly generated code, you should answer 'Y' here. - Note however that this will take a really long time. For example, - building PPL on my machine takes roughly 1'40", while checking it takes - about 1h40'... + Note however that this will take a really long time. endif # COMPLIBS diff --git a/config/companion_libs/cloog.in b/config/companion_libs/cloog.in index 6fb522a..dcac30d 100644 --- a/config/companion_libs/cloog.in +++ b/config/companion_libs/cloog.in @@ -26,15 +26,6 @@ config CLOOG_V_0_18_0 endif # ISL -if PPL - -config CLOOG_V_0_15_11 - bool - prompt "0.15.11" - select CLOOG_NEEDS_AUTORECONF - -endif # PPL - endchoice config CLOOG_VERSION @@ -44,7 +35,6 @@ config CLOOG_VERSION default "0.18.4" if CLOOG_V_0_18_4 default "0.18.1" if CLOOG_V_0_18_1 default "0.18.0" if CLOOG_V_0_18_0 - default "0.15.11" if CLOOG_V_0_15_11 config CLOOG_0_18_4_or_later bool diff --git a/config/companion_libs/ppl.in b/config/companion_libs/ppl.in deleted file mode 100644 index 1861e7a..0000000 --- a/config/companion_libs/ppl.in +++ /dev/null @@ -1,51 +0,0 @@ -# PPL options - -choice - bool - prompt "PPL version" -# Don't remove next line -# CT_INSERT_VERSION_BELOW - -config PPL_V_0_11_2 - bool - prompt "0.11.2" - select PPL_0_11 - -config PPL_V_0_11_1 - bool - prompt "0.11.1" - select PPL_0_11 - -config PPL_V_0_11 - bool - prompt "0.11" - select PPL_0_11 - -config PPL_V_0_10_2 - bool - prompt "0.10.2" - select PPL_NEEDS_FPERMISSIVE - -endchoice - -config PPL_VERSION - string -# Don't remove next line -# CT_INSERT_VERSION_STRING_BELOW - default "0.11.2" if PPL_V_0_11_2 - default "0.11.1" if PPL_V_0_11_1 - default "0.11" if PPL_V_0_11 - default "0.10.2" if PPL_V_0_10_2 - -# For PPL 0.10, we need -fpermissive to build on gcc 4.7+ -# (even gcc-4.6+ ?) -config PPL_NEEDS_FPERMISSIVE - bool - -# For PPL 0.11, we need to pull libpwl if configured static -config PPL_0_11 - bool - select PPL_NEEDS_LIBPWL if ! COMPLIBS_SHARED - -config PPL_NEEDS_LIBPWL - bool diff --git a/config/global/paths.in b/config/global/paths.in index f3059b9..96319fa 100644 --- a/config/global/paths.in +++ b/config/global/paths.in @@ -130,7 +130,6 @@ config STRIP_HOST_TOOLCHAIN_EXECUTABLES config STRIP_TARGET_TOOLCHAIN_EXECUTABLES bool prompt "Strip target toolchain executables" - depends on CC_GCC_4_6_or_later help It means using install-strip target for GCC 4.6 or later. An install-strip make target is provided that installs stripped diff --git a/config/libc/glibc.in b/config/libc/glibc.in index 71df501..c2ba7b9 100644 --- a/config/libc/glibc.in +++ b/config/libc/glibc.in @@ -38,12 +38,12 @@ choice config LIBC_GLIBC_V_2_22 bool prompt "2.22" - select LIBC_GLIBC_2_21_or_later + select LIBC_GLIBC_2_20_or_later config LIBC_GLIBC_V_2_21 bool prompt "2.21" - select LIBC_GLIBC_2_21_or_later + select LIBC_GLIBC_2_20_or_later config LIBC_GLIBC_LINARO_V_2_20 bool @@ -141,12 +141,6 @@ config LIBC_GLIBC_CUSTOM endchoice -# glibc 2.21 depends on gcc >= 4.6 -config LIBC_GLIBC_2_21_or_later - bool - depends on CC_GCC_4_6_or_later - select LIBC_GLIBC_2_20_or_later - config LIBC_GLIBC_2_20_or_later bool select LIBC_GLIBC_2_17_or_later |