diff options
author | Bryan Hundven <bryanhundven@gmail.com> | 2015-11-23 03:13:53 (GMT) |
---|---|---|
committer | Bryan Hundven <bryanhundven@gmail.com> | 2015-11-30 01:36:58 (GMT) |
commit | 0e0ecc8bcf27d34c6564dcf990e1c7ef8c5acb4c (patch) | |
tree | 1073f7f21a9709d88ced72bcc196c8af571c7847 /config | |
parent | c0bd1bbc4c0beadf4e874112026bf93e9828720a (diff) |
PPL: Remove support for PPL and CLooG/PPL
Now that versions of gcc that required PPL are no longer supported
( >= gcc-4.5.x AND <= gcc-4.7.x )
...we no longer require PPL or CLooG/PPL.
This commit:
* Removes PPL
* Removes CLooG/PPL
* Updates the documentation
* Updates build script for CLooG and GCC
* Removes PPL and CLooG/PPL from scripts/addToolVersion.sh and
scripts/showSamples.sh
* Adds ISL to scripts/addToolVersion.sh and scripts/showSamples.sh
I know that sounds like a lot for one commit, but it was all kind of
inter-tangled.
Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Diffstat (limited to 'config')
-rw-r--r-- | config/cc/gcc.in | 7 | ||||
-rw-r--r-- | config/cc/gcc.in.2 | 2 | ||||
-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 |
5 files changed, 7 insertions, 80 deletions
diff --git a/config/cc/gcc.in b/config/cc/gcc.in index bbc46bc..4cf4628 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -156,7 +156,8 @@ 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 @@ -167,10 +168,12 @@ config CC_GCC_USE_GRAPHITE 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: diff --git a/config/cc/gcc.in.2 b/config/cc/gcc.in.2 index b947668..0ad40df 100644 --- a/config/cc/gcc.in.2 +++ b/config/cc/gcc.in.2 @@ -68,7 +68,7 @@ config CC_GCC_STATIC_LIBSTDCXX default y 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++ 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 |