aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2015-03-16 08:51:37 -0700
committerH.J. Lu <hjl.tools@gmail.com>2015-03-16 08:51:37 -0700
commitd9a4c83b863d32a86f82ff0c4d3c99d639cc52c5 (patch)
tree3f0bcad0e0dd3c82e53314255e7e3713d8a9eca8
parent51f374927b3e417179af92a9be91a0f6c99b8173 (diff)
downloadgdb-d9a4c83b863d32a86f82ff0c4d3c99d639cc52c5.zip
gdb-d9a4c83b863d32a86f82ff0c4d3c99d639cc52c5.tar.gz
gdb-d9a4c83b863d32a86f82ff0c4d3c99d639cc52c5.tar.bz2
Sync isl.m4 with GCC tree
* isl.m4: Sync with GCC tree.
-rw-r--r--config/ChangeLog4
-rw-r--r--config/isl.m424
2 files changed, 11 insertions, 17 deletions
diff --git a/config/ChangeLog b/config/ChangeLog
index 96a788d..8a8386d 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,5 +1,9 @@
2015-03-16 H.J. Lu <hongjiu.lu@intel.com>
+ * isl.m4: Sync with GCC tree.
+
+2015-03-16 H.J. Lu <hongjiu.lu@intel.com>
+
Sync with GCC
2015-02-18 Thomas Schwinge <thomas@codesourcery.com>
diff --git a/config/isl.m4 b/config/isl.m4
index f45854d..459fac1 100644
--- a/config/isl.m4
+++ b/config/isl.m4
@@ -68,6 +68,8 @@ AC_DEFUN([ISL_INIT_FLAGS],
ENABLE_ISL_CHECK=no
AC_MSG_WARN([using in-tree ISL, disabling version check])
fi
+
+ isllibs="${isllibs} -lisl"
]
)
@@ -90,20 +92,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 <isl/version.h>
- #include <string.h>],
- [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
@@ -115,11 +106,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 <isl/val.h>]], [[;]])],
[gcc_cv_isl=yes],
- [gcc_cv_isl=no],
- [gcc_cv_isl=yes])
+ [gcc_cv_isl=no])
AC_MSG_RESULT([$gcc_cv_isl])
CFLAGS=$_isl_saved_CFLAGS