From e0c0c325357ae6b57a5648bdcf1c6af4c0a31572 Mon Sep 17 00:00:00 2001 From: Sebastian Pop Date: Thu, 28 Aug 2014 16:43:55 +0000 Subject: [PATCH] check functionality of isl version 0.12 * config/isl.m4 (_ISL_CHECK_CT_PROG): Removed. (ISL_CHECK_VERSION): Check for functionality added to ISL 0.12 instead of checking for version number. * configure: Regenerated. * configure.ac (ISL_CHECK_VERSION): Do not use ISL version number. From-SVN: r214683 --- ChangeLog | 8 +++++ config/isl.m4 | 26 ++++------------ configure | 82 ++++----------------------------------------------- configure.ac | 2 +- 4 files changed, 19 insertions(+), 99 deletions(-) diff --git a/ChangeLog b/ChangeLog index e083b523460..b2d59cc59be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2014-08-27 Sebastian Pop + + * config/isl.m4 (_ISL_CHECK_CT_PROG): Removed. + (ISL_CHECK_VERSION): Check for functionality added to ISL 0.12 instead + of checking for version number. + * configure: Regenerated. + * configure.ac (ISL_CHECK_VERSION): Do not use ISL version number. + 2014-08-27 David Malcolm * rtx-classes-status.txt: Phase 5 (additional rtx_def subclasses) diff --git a/config/isl.m4 b/config/isl.m4 index 57ae3c5f740..0eece37bc9a 100644 --- a/config/isl.m4 +++ b/config/isl.m4 @@ -93,20 +93,9 @@ AC_DEFUN([ISL_REQUESTED], ] ) -# _ISL_CHECK_CT_PROG(MAJOR, MINOR) -# -------------------------------------------- -# Helper for verifying ISL compile time version. -m4_define([_ISL_CHECK_CT_PROG],[AC_LANG_PROGRAM( - [#include - #include ], - [if (strncmp (isl_version (), "isl-$1.$2", strlen ("isl-$1.$2")) != 0) - return 1; - ])]) - -# ISL_CHECK_VERSION ISL_CHECK_VERSION (MAJOR, MINOR) +# ISL_CHECK_VERSION ISL_CHECK_VERSION () # ---------------------------------------------------------------- -# Test the found ISL to be exact of version MAJOR.MINOR and at least -# REVISION. +# Test that ISL contains functionality added to the minimum expected version. AC_DEFUN([ISL_CHECK_VERSION], [ if test "${ENABLE_ISL_CHECK}" = yes ; then @@ -118,15 +107,10 @@ AC_DEFUN([ISL_CHECK_VERSION], LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}" LIBS="${_isl_saved_LIBS} -lisl" - AC_MSG_CHECKING([for version $1.$2 of ISL]) - AC_RUN_IFELSE([_ISL_CHECK_CT_PROG($1,$2)], + AC_MSG_CHECKING([for compatible ISL]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[;]])], [gcc_cv_isl=yes], - [gcc_cv_isl=no], - [ - AC_LINK_IFELSE([_ISL_CHECK_CT_PROG($1,$2)], - [gcc_cv_isl=yes], - [gcc_cv_isl=no]) - ]) + [gcc_cv_isl=no]) AC_MSG_RESULT([$gcc_cv_isl]) CFLAGS=$_isl_saved_CFLAGS diff --git a/configure b/configure index c292b095229..55fca62a5d6 100755 --- a/configure +++ b/configure @@ -1874,48 +1874,6 @@ fi return $ac_retval } # ac_fn_c_try_link - -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_c_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval - -} # ac_fn_c_try_run cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. @@ -5904,20 +5862,15 @@ $as_echo "$as_me: WARNING: using in-tree ISL, disabling version check" >&2;} LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}" LIBS="${_isl_saved_LIBS} -lisl" - { $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 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compatible ISL" >&5 +$as_echo_n "checking for compatible ISL... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include - #include +#include int main () { -if (strncmp (isl_version (), "isl-0.12", strlen ("isl-0.12")) != 0) - return 1; - +; ; return 0; } @@ -5929,31 +5882,6 @@ else 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. */ -#include - #include -int -main () -{ -if (strncmp (isl_version (), "isl-0.12", strlen ("isl-0.12")) != 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; } diff --git a/configure.ac b/configure.ac index 8f747d62c72..2dc657f0f6a 100644 --- a/configure.ac +++ b/configure.ac @@ -1652,7 +1652,7 @@ if test "x$with_isl" != "xno"; then dnl with user input. ISL_INIT_FLAGS dnl The versions of ISL that work for Graphite - ISL_CHECK_VERSION(0,12) + ISL_CHECK_VERSION() dnl Only execute fail-action, if ISL has been requested. ISL_IF_FAILED([ AC_MSG_ERROR([Unable to find a usable ISL. See config.log for details.])]) -- 2.30.2