From: Bin Cheng <bin.cheng@arm.com>
Date: Thu, 21 Aug 2014 09:35:52 +0000 (+0000)
Subject: configure: Regenerated.
X-Git-Tag: releases/gcc-5.1.0~5299
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=622dbadfab3efe2677b5e789b4e930482630a99e;p=thirdparty%2Fgcc.git

configure: Regenerated.


	* configure: Regenerated.

	config/ChangeLog
	* isl.m4 (ISL_CHECK_VERSION): Check link of isl library
	for cross_compiling.

From-SVN: r214263
---

diff --git a/ChangeLog b/ChangeLog
index 3265772827c6..5d70f1221053 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-21  Bin Cheng  <bin.cheng@arm.com>
+
+	* configure: Regenerated.
+
 2014-08-19  David Malcolm  <dmalcolm@redhat.com>
 
 	* rtx-classes-status.txt (TODO): Add SET_BND_TO
diff --git a/config/ChangeLog b/config/ChangeLog
index 3a0d438cd510..82c73bd5cde8 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-21  Bin Cheng  <bin.cheng@arm.com>
+
+	* isl.m4 (ISL_CHECK_VERSION): Check link of isl library
+	for cross_compiling.
+
 2014-08-18 Roman Gareev  <gareevroman@gmail.com>
 
 	* cloog.m4: Remove the path to isllibs from clooglibs.
diff --git a/config/isl.m4 b/config/isl.m4
index 9743aee0e130..57ae3c5f7406 100644
--- a/config/isl.m4
+++ b/config/isl.m4
@@ -122,7 +122,11 @@ AC_DEFUN([ISL_CHECK_VERSION],
     AC_RUN_IFELSE([_ISL_CHECK_CT_PROG($1,$2)],
 	[gcc_cv_isl=yes],
 	[gcc_cv_isl=no],
-	[gcc_cv_isl=yes])
+	[
+	  AC_LINK_IFELSE([_ISL_CHECK_CT_PROG($1,$2)],
+	      [gcc_cv_isl=yes],
+	      [gcc_cv_isl=no])
+	])
     AC_MSG_RESULT([$gcc_cv_isl])
 
     CFLAGS=$_isl_saved_CFLAGS
diff --git a/configure b/configure
index 6e24b556d85e..c292b095229d 100755
--- a/configure
+++ b/configure
@@ -5907,7 +5907,29 @@ $as_echo "$as_me: WARNING: using in-tree ISL, disabling version check" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.12 of ISL" >&5
 $as_echo_n "checking for version 0.12 of ISL... " >&6; }
     if test "$cross_compiling" = yes; then :
+
+	  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <isl/version.h>
+   #include <string.h>
+int
+main ()
+{
+if (strncmp (isl_version (), "isl-0.12", strlen ("isl-0.12")) != 0)
+     return 1;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
   gcc_cv_isl=yes
+else
+  gcc_cv_isl=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */