PlaneteCasio
/
libc
1
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

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

* configure: Regenerate.
This commit is contained in:
Rainer Orth 2014-07-05 21:09:07 +00:00
parent d34336767e
commit e61375e471
3 changed files with 8 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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-05-14 Sandra Loosemore <sandra@codesourcery.com>
* configure.ac (target_makefile_frag): Set for nios2-*-elf*.

51
configure vendored
View File

@ -5874,54 +5874,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
@ -5968,7 +5920,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
@ -6016,7 +5968,6 @@ $as_echo "$gcc_cv_isl" >&6; }
fi
fi
fi

7
configure.ac
View File

@ -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([