diff options
| author |   Alexey Neyman <stilor@att.net> | 2017-01-13 17:53:18 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2017-01-13 17:53:18 (GMT) |
| commit | e282fd5551b35cba0c09b92efbe6fa17af7f80a8 (patch) | |
| tree | 8756cb14cbd408716759537a41fbb7e0e6b92e17 | |
| parent | dc9dac222045e68aeae5cfbbe04f2764afc33e46 (diff) | |
| parent | 168b5f8858af5ab889b95076ecb110d7aca94f67 (diff) | |
Merge pull request #524 from stilor/force-isl-0.15-for-gcc-4.x
Fix GCC4.x samples after ISL 0.16.1 import.
| -rw-r--r-- | config/companion_libs/cloog.in | 9 | ||||
| -rw-r--r-- | config/companion_libs/isl.in | 43 |
2 files changed, 43 insertions, 9 deletions
diff --git a/config/companion_libs/cloog.in b/config/companion_libs/cloog.in index dcac30d..d6e129d 100644 --- a/config/companion_libs/cloog.in +++ b/config/companion_libs/cloog.in @@ -1,31 +1,32 @@ # CLooG options +# CLooG 0.18.4 requires ISL 0.12 or newer +# CLooG 0.18.1/0.18.0 frequires ISL 0.12 or older choice bool prompt "CLooG version" -if ISL - # Don't remove next line # CT_INSERT_VERSION_BELOW config CLOOG_V_0_18_4 bool prompt "0.18.4" + depends on ISL_V_0_12_or_later select CLOOG_0_18_4_or_later config CLOOG_V_0_18_1 bool prompt "0.18.1" + depends on !ISL_V_0_14_or_later select CLOOG_0_18_or_later config CLOOG_V_0_18_0 bool prompt "0.18.0" + depends on !ISL_V_0_14_or_later select CLOOG_0_18_or_later -endif # ISL - endchoice config CLOOG_VERSION diff --git a/config/companion_libs/isl.in b/config/companion_libs/isl.in index 0584764..f1af3a0 100644 --- a/config/companion_libs/isl.in +++ b/config/companion_libs/isl.in @@ -1,39 +1,69 @@ # ISL options +# GCC 4.8 supports ISL 0.10 to 0.14 +# GCC 4.9 supports ISL 0.10 to 0.15 +# GCC 5 supports ISL 0.12 to 0.16 +# GCC 6 supports ISL 0.14 to 0.16 +# Starting with GCC 5, GCC's configure no longer checks the ISL version explicitly, +# despite what the configure's message says ("checking for isl 0.15 or 0.16"). +# Instead, it verifies that certain interfaces are available, so it accepts 0.17.1 +# or 0.18 under that check. Include them as experimental just in case anyone needs +# the bugfixes in these releases. choice bool prompt "ISL version" # Don't remove next line # CT_INSERT_VERSION_BELOW +config ISL_V_0_18 + bool + prompt "0.18" + depends on EXPERIMENTAL # Not officially recommended by GCC + depends on CC_GCC_5_or_later + select ISL_V_0_16_or_later + +config ISL_V_0_17_1 + bool + prompt "0.17.1" + depends on EXPERIMENTAL # Not officially recommended by GCC + depends on CC_GCC_5_or_later + select ISL_V_0_16_or_later + config ISL_V_0_16_1 bool prompt "0.16.1" - depends on CLOOG_0_18_4_or_later || CC_GCC_5_or_later + depends on CC_GCC_5_or_later select ISL_V_0_16_or_later +config ISL_V_0_15 + bool + prompt "0.15" + select ISL_V_0_15_or_later + config ISL_V_0_14 bool prompt "0.14" - depends on CLOOG_0_18_4_or_later || CC_GCC_5_or_later select ISL_V_0_14_or_later config ISL_V_0_12_2 bool prompt "0.12.2" - depends on ! CLOOG_0_18_4_or_later || CC_GCC_5_or_later + depends on !CC_GCC_6_or_later select ISL_V_0_12_or_later config ISL_V_0_11_1 bool prompt "0.11.1" - depends on ! CLOOG_0_18_4_or_later - depends on ! CC_GCC_5_or_later + depends on !CC_GCC_4_9_or_later endchoice config ISL_V_0_16_or_later bool + select ISL_V_0_15_or_later + +config ISL_V_0_15_or_later + bool select ISL_V_0_14_or_later config ISL_V_0_14_or_later @@ -47,7 +77,10 @@ config ISL_VERSION string # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW + default "0.18" if ISL_V_0_18 + default "0.17.1" if ISL_V_0_17_1 default "0.16.1" if ISL_V_0_16_1 + default "0.15" if ISL_V_0_15 default "0.14" if ISL_V_0_14 default "0.12.2" if ISL_V_0_12_2 default "0.11.1" if ISL_V_0_11_1 |