Skip to content

Commit

Permalink
Don't accept isl 0.10.
Browse files Browse the repository at this point in the history
	* configure.ac: Don't accept isl 0.10.
	* configure: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@212306 138bc75d-0d04-0410-961f-82ee72b054a4
  • Loading branch information
ro committed Jul 5, 2014
1 parent 2d43c83 commit 2063246
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 55 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2014-07-05 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>

* configure.ac: Don't accept isl 0.10.
* configure: Regenerate.

2014-06-23 Bernd Edlinger <bernd.edlinger@hotmail.de>

Fix include path for in-tree cloog.
Expand Down
51 changes: 1 addition & 50 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -5889,54 +5889,6 @@ $as_echo "$as_me: WARNING: using in-tree ISL, disabling version check" >&2;}



if test "${ENABLE_ISL_CHECK}" = yes ; then
_isl_saved_CFLAGS=$CFLAGS
_isl_saved_LDFLAGS=$LDFLAGS
_isl_saved_LIBS=$LIBS

CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}"
LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}"
LIBS="${_isl_saved_LIBS} -lisl"

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.10 of ISL" >&5
$as_echo_n "checking for version 0.10 of ISL... " >&6; }
if test "$cross_compiling" = yes; then :
gcc_cv_isl=yes
else
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.10", strlen ("isl-0.10")) != 0)
return 1;
;
return 0;
}
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
gcc_cv_isl=yes
else
gcc_cv_isl=no
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_isl" >&5
$as_echo "$gcc_cv_isl" >&6; }

CFLAGS=$_isl_saved_CFLAGS
LDFLAGS=$_isl_saved_LDFLAGS
LIBS=$_isl_saved_LIBS
fi


if test "${gcc_cv_isl}" = no ; then

if test "${ENABLE_ISL_CHECK}" = yes ; then
_isl_saved_CFLAGS=$CFLAGS
_isl_saved_LDFLAGS=$LDFLAGS
Expand Down Expand Up @@ -5983,7 +5935,7 @@ $as_echo "$gcc_cv_isl" >&6; }
fi


if test "${gcc_cv_isl}" = no ; then
if test "${gcc_cv_isl}" = no ; then

if test "${ENABLE_ISL_CHECK}" = yes ; then
_isl_saved_CFLAGS=$CFLAGS
Expand Down Expand Up @@ -6031,7 +5983,6 @@ $as_echo "$gcc_cv_isl" >&6; }
fi


fi
fi


Expand Down
7 changes: 2 additions & 5 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -1650,12 +1650,9 @@ if test "x$with_isl" != "xno" &&
dnl with user input.
ISL_INIT_FLAGS
dnl The versions of ISL that work for Graphite
ISL_CHECK_VERSION(0,10)
ISL_CHECK_VERSION(0,11)
if test "${gcc_cv_isl}" = no ; then
ISL_CHECK_VERSION(0,11)
if test "${gcc_cv_isl}" = no ; then
ISL_CHECK_VERSION(0,12)
fi
ISL_CHECK_VERSION(0,12)
fi
dnl Only execute fail-action, if ISL has been requested.
ISL_IF_FAILED([
Expand Down

0 comments on commit 2063246

Please sign in to comment.