From a8ed311494c8cafaf3f7d8a5262037de8188a5cf Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sat, 12 Feb 2011 14:40:09 +0000 Subject: Sync toplevel and config/ from GCC. /: Sync from GCC: 2011-02-12 Alexandre Oliva PR lto/47225 * Makefile.def (lto-plugin): Double dash for enable-shared. (configure-gcc): Depend on all-lto-plugin. * Makefile.in: Rebuilt. 2011-02-11 Ralf Wildenhues * configure.ac: Remove extra bracket. * configure: Regenerate. 2011-02-06 Kai Tietz PR lto/47225 * Makefile.def: Add dependency for install-gcc on install-lto-plugin. * Makfile.in: Regenerated 2011-01-25 Jakub Jelinek * configure.ac: If with_ppl is no, move setting with_cloog=no after CLOOG_REQUESTED check. * configure: Regenerated. 2011-01-25 Sebastian Pop * configure.ac: Call AC_MSG_ERROR when PPL 0.11 is not present and CLooG has been requested. * configure: Regenerated. 2011-01-25 Sebastian Pop * configure: Regenerated. * configure.ac: Check for version 0.11 (or later revision) of PPL. 2011-01-25 Tobias Grosser * configure: Regenerated. * configure.ac: Use CLOOG_CHECK_VERSION(0,16,1). 2011-01-07 Jan Hubicka PR lto/47225 * Makefile.in: Regenerate. * Makefile.def (lto-plugin): Always pass enable-shared to the plugin configure. config/: 2011-01-25 Jakub Jelinek * cloog.m4 (CLOOG_REQUESTED): Use $2 if --without-cloog. 2011-01-10 Jan Hubicka * bootstrap-lto.mk: -fuse-linker-plugin is default now; pass -fno-lto to STAGEprofile. --- configure.ac | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index d2663898b..9121d65bd 100644 --- a/configure.ac +++ b/configure.ac @@ -1668,9 +1668,9 @@ ENABLE_PPL_CHECK=yes) if test "x$with_ppl" != "xno" -a "${ENABLE_PPL_CHECK}" = "yes"; then saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $pplinc $gmpinc" - AC_MSG_CHECKING([for version 0.10 (or later revision) of PPL]) + AC_MSG_CHECKING([for version 0.11 (or later revision) of PPL]) AC_TRY_COMPILE([#include "ppl_c.h"],[ - #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10 + #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 11 choke me #endif ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); ppllibs= ; pplinc= ; with_ppl=no ]) @@ -1688,6 +1688,11 @@ dnl Provide configure switches and initialize clooginc & clooglibs dnl with user input. CLOOG_INIT_FLAGS if test "x$with_ppl" = "xno"; then + dnl Only execute fail-action, if CLooG has been requested. + CLOOG_REQUESTED([graphite_requested=yes], [graphite_requested=no]) + if test "${graphite_requested}" = yes; then + AC_MSG_ERROR([Unable to find a usable PPL. See config.log for details.]) + fi with_cloog=no fi if test "x${with_cloog}" = x && test "x${with_cloog_include}" = x \ @@ -1696,24 +1701,15 @@ if test "x${with_cloog}" = x && test "x${with_cloog_include}" = x \ clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include ' fi if test "x$with_cloog" != "xno"; then - dnl Version check for CLooG-Org - dnl As long as there is no new release of CLooG, - dnl we will check for 0.14.0. - dnl - dnl The first git revision that will work with - dnl GCC is: bd91b845a65805c290d43fc1bef8139864a163fb - dnl This is enforced implictly, as this is the commit that - dnl introduced the versioning information used within our - dnl checks. + dnl The minimal version of CLooG required for Graphite. dnl - dnl If we're using CLooG-Legacy, the provided version information - dnl will be ignored. - CLOOG_CHECK_VERSION(0,14,0) + dnl If we use CLooG-Legacy, the provided version information is + dnl ignored. + CLOOG_CHECK_VERSION(0,16,1) - dnl Only execute fail-action, if CLooG has been - dnl requested. + dnl Only execute fail-action, if CLooG has been requested. CLOOG_IF_FAILED([ - AC_MSG_ERROR([Unable to find a usable CLooG. See config.log for details.])]) + AC_MSG_ERROR([Unable to find a usable CLooG. See config.log for details.])]) fi # Check for LTO support. -- cgit v1.2.3