Skip to content

Commit e61375e

Browse files
committed
* configure.ac: Don't accept isl 0.10.
* configure: Regenerate.
1 parent d343367 commit e61375e

File tree

3 files changed

+8
-55
lines changed

3 files changed

+8
-55
lines changed

ChangeLog

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2014-07-05 Rainer Orth <[email protected]>
2+
3+
* configure.ac: Don't accept isl 0.10.
4+
* configure: Regenerate.
5+
16
2014-05-14 Sandra Loosemore <[email protected]>
27

38
* configure.ac (target_makefile_frag): Set for nios2-*-elf*.

configure

+1-50
Original file line numberDiff line numberDiff line change
@@ -5874,54 +5874,6 @@ $as_echo "$as_me: WARNING: using in-tree ISL, disabling version check" >&2;}
58745874

58755875

58765876

5877-
if test "${ENABLE_ISL_CHECK}" = yes ; then
5878-
_isl_saved_CFLAGS=$CFLAGS
5879-
_isl_saved_LDFLAGS=$LDFLAGS
5880-
_isl_saved_LIBS=$LIBS
5881-
5882-
CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}"
5883-
LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}"
5884-
LIBS="${_isl_saved_LIBS} -lisl"
5885-
5886-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.10 of ISL" >&5
5887-
$as_echo_n "checking for version 0.10 of ISL... " >&6; }
5888-
if test "$cross_compiling" = yes; then :
5889-
gcc_cv_isl=yes
5890-
else
5891-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5892-
/* end confdefs.h. */
5893-
#include <isl/version.h>
5894-
#include <string.h>
5895-
int
5896-
main ()
5897-
{
5898-
if (strncmp (isl_version (), "isl-0.10", strlen ("isl-0.10")) != 0)
5899-
return 1;
5900-
5901-
;
5902-
return 0;
5903-
}
5904-
_ACEOF
5905-
if ac_fn_c_try_run "$LINENO"; then :
5906-
gcc_cv_isl=yes
5907-
else
5908-
gcc_cv_isl=no
5909-
fi
5910-
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
5911-
conftest.$ac_objext conftest.beam conftest.$ac_ext
5912-
fi
5913-
5914-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_isl" >&5
5915-
$as_echo "$gcc_cv_isl" >&6; }
5916-
5917-
CFLAGS=$_isl_saved_CFLAGS
5918-
LDFLAGS=$_isl_saved_LDFLAGS
5919-
LIBS=$_isl_saved_LIBS
5920-
fi
5921-
5922-
5923-
if test "${gcc_cv_isl}" = no ; then
5924-
59255877
if test "${ENABLE_ISL_CHECK}" = yes ; then
59265878
_isl_saved_CFLAGS=$CFLAGS
59275879
_isl_saved_LDFLAGS=$LDFLAGS
@@ -5968,7 +5920,7 @@ $as_echo "$gcc_cv_isl" >&6; }
59685920
fi
59695921

59705922

5971-
if test "${gcc_cv_isl}" = no ; then
5923+
if test "${gcc_cv_isl}" = no ; then
59725924

59735925
if test "${ENABLE_ISL_CHECK}" = yes ; then
59745926
_isl_saved_CFLAGS=$CFLAGS
@@ -6016,7 +5968,6 @@ $as_echo "$gcc_cv_isl" >&6; }
60165968
fi
60175969

60185970

6019-
fi
60205971
fi
60215972

60225973

configure.ac

+2-5
Original file line numberDiff line numberDiff line change
@@ -1650,12 +1650,9 @@ if test "x$with_isl" != "xno" &&
16501650
dnl with user input.
16511651
ISL_INIT_FLAGS
16521652
dnl The versions of ISL that work for Graphite
1653-
ISL_CHECK_VERSION(0,10)
1653+
ISL_CHECK_VERSION(0,11)
16541654
if test "${gcc_cv_isl}" = no ; then
1655-
ISL_CHECK_VERSION(0,11)
1656-
if test "${gcc_cv_isl}" = no ; then
1657-
ISL_CHECK_VERSION(0,12)
1658-
fi
1655+
ISL_CHECK_VERSION(0,12)
16591656
fi
16601657
dnl Only execute fail-action, if ISL has been requested.
16611658
ISL_IF_FAILED([

0 commit comments

Comments
 (0)