Fix selected issues with non-4.9 gcc builds

Fix some issues that crop up when using build-gcc.sh on post-4.9
versions of GCC (for triage/bug-reproduction purposes): trunk gcc
calls isl directly, no longer through "cloog", and requires updated
version of ISL. Resulting build still fails compiling libatomic,
however the cross compiler itself is still usable.

Change-Id: Ieff549580777a01891ed62b59ff97db610eae42b

2 files changed, 14 insertions, 7 deletions

diff --git a/Makefile.in b/Makefile.in
index 7537a77..d8e2664 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -58,6 +58,7 @@ host_baseargs = @host_baseargs@
 GCC_MIN_VERSION_4_3_0:=@GCC_MIN_VERSION_4_3_0@
 GCC_MIN_VERSION_4_5_0:=@GCC_MIN_VERSION_4_5_0@
 GCC_MIN_VERSION_4_8_0:=@GCC_MIN_VERSION_4_8_0@
+GCC_POST_VERSION_4_X:=@GCC_POST_VERSION_4_X@
 GDB_MIN_VERSION_7_2:=@GDB_MIN_VERSION_7_2@
 BINUTILS_MIN_VERSION_2_21:=@BINUTILS_MIN_VERSION_2_21@
 GOLD_MIN_VERSION_2_21:=@GOLD_MIN_VERSION_2_21@
@@ -68,7 +69,7 @@ BUILD_ANDROID_GCC:=@BUILD_ANDROID_GCC@
 GDB_TARGET:=@GDB_TARGET@
 
 # We need to figure out how to get to top level source directory from
-# a package build directory. 
+# a package build directory.
 # For host modules, accept cache file option, or specification as blank.
 
 
@@ -157,7 +158,7 @@ export	CC_FOR_TARGET="$(TARGET_GCC_BUILDDIR)/gcc/xgcc \
 # We need -Os as the overrides below interfere with --enable-target-optspace.
 # We also need -mandroid for for target libraries to pass linking test
 # in configuration.
-# 
+#
 # To build libstdc++ with RTTI and exceptions do:
 #
 #export CFLAGS_FOR_TARGET=-fexceptions
@@ -306,7 +307,7 @@ BINUTILS_CONFIG_ARGS=--prefix=$(prefix) \
 	--target=${cur_target} --host=${cur_host} --build=${cur_build} \
 	$(baseargs) --disable-shared --disable-nls
 ifeq ($(ENABLE_GRAPHITE),yes)
-BINUTILS_CONFIG_ARGS+= --with-cloog=${CLOOG_DIR} --with-isl=${ISL_DIR} --with-isl=${ISL_DIR} --with-gmp=${GMP_DIR} \
+BINUTILS_CONFIG_ARGS+= --with-cloog=${CLOOG_DIR} --with-isl=${ISL_DIR} --with-gmp=${GMP_DIR} \
 	--disable-ppl-version-check --disable-cloog-version-check --disable-isl-version-check $(CLOOG_BACKEND)
 # links to the static C++ runtime to avoid depending on the host version
 ifneq ($(host_os),darwin)
@@ -513,7 +514,7 @@ install-target-gcc: install-target-gcc-gcc $(install-target-gcc-multilibs)
 # We use the full gcc configure rules.
 .PHONY: build-target-minimal-gcc install-target-minimal-gcc
 ifeq ("$(GCC_MIN_VERSION_4_3_0)","yes")
-MINIMAL_GCC_BUILD_TARGETS:= gcc target-libgcc 
+MINIMAL_GCC_BUILD_TARGETS:= gcc target-libgcc
 else
 MINIMAL_GCC_BUILD_TARGETS:= gcc
 endif
@@ -739,7 +740,7 @@ stmp-build-host-cloog: stmp-config-host-cloog
 	$(STAMP) $@
 build-host-cloog: stmp-build-host-cloog
 
-ifeq ($(ENABLE_GRAPHITE),yes)
+ifeq ($(ENABLE_GRAPHITE)$(GCC_POST_VERSION_4_X),yesno)
 stmp-install-host-cloog: stmp-build-host-cloog
 	$(MAKE) -C ${CLOOG_VERSION} install-libLTLIBRARIES \
 		install-pkgincludeHEADERS
diff --git a/configure b/configure
index f35cd7d..738b57a 100755
--- a/configure
+++ b/configure
@@ -575,6 +575,7 @@ NEWLIB_VERSION
 GCC_MIN_VERSION_4_8_0
 GCC_MIN_VERSION_4_5_0
 GCC_MIN_VERSION_4_3_0
+GCC_POST_VERSION_4_X
 GCC_VERSION
 GOLD_MIN_VERSION_2_21
 GOLD_VERSION
@@ -2449,11 +2450,17 @@ if test -f "${gcc_version_file}"; then
   else
     GCC_MIN_VERSION_4_8_0="no"
   fi
+  if test "$GCC_MAJOR" -gt 4 ; then
+    GCC_POST_VERSION_4_X=yes
+  else
+    GCC_POST_VERSION_4_X=no
+  fi
 else
   # No version file, assume it is trunk
   GCC_MIN_VERSION_4_3_0="yes"
   GCC_MIN_VERSION_4_5_0="yes"
   GCC_MIN_VERSION_4_8_0="yes"
+  GCC_POST_VERSION_4_X="yes"
 fi
 
 
@@ -2667,7 +2674,7 @@ fi
 fi
 
 
-if test "$ENABLE_GRAPHITE" == "yes"; then
+if [ "$ENABLE_GRAPHITE" == "yes" -a "$GCC_POST_VERSION_4_X" == "no" ]; then
 # cloog-ppl or cloog version (default is 0.15.9)
 # cloog is only used for gcc 4.5+ with graphite optimization.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking cloog version" >&5
@@ -4178,4 +4185,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
-