summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2015-12-17 08:51:55 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2016-05-16 12:37:18 +0200
commit4aff44298c68f4878cf1bdfccacc8a696272eba5 (patch)
tree0e27f220c25a47cb1cfe02adc9a876e01710453f
parent35782e478f6fd3e2814e7306fc7fc6594b8ad55a (diff)
downloadOSELAS.Toolchain-4aff44298c68f4878cf1bdfccacc8a696272eba5.tar.gz
cross-gcc: add support for gcc-5.x
Based on a patch by Clemens Gruber <clemens.gruber@pqgruber.com> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/cross-gcc.in13
-rw-r--r--rules/cross-gcc.make2
2 files changed, 12 insertions, 3 deletions
diff --git a/rules/cross-gcc.in b/rules/cross-gcc.in
index 15d1a44..3511e31 100644
--- a/rules/cross-gcc.in
+++ b/rules/cross-gcc.in
@@ -10,7 +10,8 @@ menuconfig CROSS_GCC
select HOST_MPC if CROSS_GCC_43
select HOST_ZLIB if CROSS_GCC_43
select HOST_LIBELF if CROSS_GCC_45
- select HOST_CLOOG if CROSS_GCC_48
+ select HOST_CLOOG if CROSS_GCC_48 && ! CROSS_GCC_50
+ select HOST_ISL if CROSS_GCC_48
select CROSS_ECJ if CROSS_GCC_LANG_JAVA
if CROSS_GCC
@@ -59,6 +60,13 @@ config CROSS_GCC_48
help
Add new dependencies for gcc >= 4.8: "cloog"
+config CROSS_GCC_50
+ bool
+ prompt "additional deps for gcc >= 5.0"
+ select CROSS_GCC_48
+ help
+ Add new dependencies for gcc >= 5.0: "isl" but not "cloog"
+
config CROSS_GCC_SERIES
string
default "series"
@@ -206,5 +214,6 @@ config CROSS_GCC_FIRST
select HOST_MPC if CROSS_GCC_43
select HOST_ZLIB if CROSS_GCC_43
select HOST_LIBELF if CROSS_GCC_45
- select HOST_CLOOG if CROSS_GCC_48
+ select HOST_CLOOG if CROSS_GCC_48 && ! CROSS_GCC_50
+ select HOST_ISL if CROSS_GCC_48
diff --git a/rules/cross-gcc.make b/rules/cross-gcc.make
index 3df1a8a..f4dc127 100644
--- a/rules/cross-gcc.make
+++ b/rules/cross-gcc.make
@@ -96,7 +96,7 @@ CROSS_GCC_AUTOCONF_COMMON := \
$(call ptx/ifdef,PTXCONF_HOST_MPFR,--with-mpfr) \
$(call ptx/ifdef,PTXCONF_HOST_MPC,--with-mpc) \
$(call ptx/ifdef,PTXCONF_HOST_CLOOG,--with-cloog) \
- $(call ptx/ifdef,PTXCONF_HOST_CLOOG,--with-isl)
+ $(call ptx/ifdef,PTXCONF_HOST_ISL,--with-isl)
# --enable-tls enable or disable generation of tls code
# overriding the assembler check for tls support