[01/11] Make CLooG-ISL the only supported CLooG version.

Message ID	1313102679-32012-2-git-send-email-sebpop@gmail.com
State	New
Headers	show Return-Path: <gcc-patches-return-299596-incoming=patchwork.ozlabs.org@gcc.gnu.org> From: Sebastian Pop <sebpop@gmail.com> To: skimo@kotnet.org, tobias@grosser.es Cc: gcc-patches@gcc.gnu.org, Sebastian Pop <sebpop@gmail.com> Subject: [PATCH 01/11] Make CLooG-ISL the only supported CLooG version. Date: Thu, 11 Aug 2011 17:44:29 -0500 Message-Id: <1313102679-32012-2-git-send-email-sebpop@gmail.com> In-Reply-To: <1313102679-32012-1-git-send-email-sebpop@gmail.com> References: <20110811220610.GN14955MdfPADPa@purples> <1313102679-32012-1-git-send-email-sebpop@gmail.com> Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk Sender: gcc-patches-owner@gcc.gnu.org

diff --git a/ChangeLog b/ChangeLog index 2b062cc..aeb3f14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-07-21 Tobias Grosser <tobias@grosser.es> + + * configure: Regenerated. + * config/cloog.m4: Remove support for CLooG-ppl and CLooG-parma, + both cloog.org and legacy versions. The only supported version will + be CLooG with the isl backend. + 2011-07-26 Ian Lance Taylor <iant@google.com> * configure.ac: Set have_compiler based on whether gcc directory diff --git a/config/cloog.m4 b/config/cloog.m4 index e95b98d..8662acd 100644 --- a/config/cloog.m4 +++ b/config/cloog.m4 @@ -37,17 +37,6 @@ AC_DEFUN([CLOOG_INIT_FLAGS], [--with-cloog-lib=PATH], [Specify the directory for the installed CLooG library])]) - AC_ARG_ENABLE(cloog-backend, - [AS_HELP_STRING( - [--enable-cloog-backend[[=BACKEND]]], - [set the CLooG BACKEND used to either isl, ppl or ppl-legacy (default)])], - [ if test "x${enableval}" = "xisl"; then - cloog_backend=isl - elif test "x${enableval}" = "xppl"; then - cloog_backend=ppl - else - cloog_backend=ppl-legacy - fi], cloog_backend=ppl-legacy) AC_ARG_ENABLE(cloog-version-check, [AS_HELP_STRING( [--disable-cloog-version-check], @@ -107,23 +96,6 @@ m4_define([_CLOOG_ORG_PROG_ISL],[AC_LANG_PROGRAM( [#include "cloog/cloog.h" ], [cloog_version ()])]) -# _CLOOG_ORG_PROG_PPL () -# ------------------ -# Helper for detecting CLooG.org's PPL backend. -m4_define([_CLOOG_ORG_PROG_PPL],[AC_LANG_PROGRAM( - [#include "cloog/cloog.h" - #include "cloog/ppl/cloog.h"], - [cloog_version ()])]) - -# _CLOOG_PPL_LEGACY_PROG () -# ------------------------- -# Helper for detecting CLooG-Legacy (CLooG-PPL). -m4_define([_CLOOG_PPL_LEGACY_PROG], [AC_LANG_PROGRAM( - [#include "cloog/cloog.h"], - [#ifndef CLOOG_PPL_BACKEND - choke me - #endif ])]) - # CLOOG_FIND_FLAGS () # ------------------ # Detect the used CLooG-backend and set clooginc/clooglibs/cloog_org. @@ -144,49 +116,17 @@ AC_DEFUN([CLOOG_FIND_FLAGS], CPPFLAGS="${CPPFLAGS} ${_cloogorginc}" LDFLAGS="${LDFLAGS} ${clooglibs}" - case $cloog_backend in - "ppl-legacy") - CFLAGS="${CFLAGS} ${pplinc}" - LDFLAGS="${LDFLAGS} ${ppllibs}" - AC_CACHE_CHECK([for installed CLooG PPL Legacy], [gcc_cv_cloog_type], - [LIBS="-lcloog ${_cloog_saved_LIBS}" - AC_LINK_IFELSE([_CLOOG_PPL_LEGACY_PROG], [gcc_cv_cloog_type="PPL Legacy"], - [gcc_cv_cloog_type=no])]) - ;; - "isl") - AC_CACHE_CHECK([for installed CLooG ISL], [gcc_cv_cloog_type], - [LIBS="-lcloog-isl ${_cloog_saved_LIBS}" - AC_LINK_IFELSE([_CLOOG_ORG_PROG_ISL], [gcc_cv_cloog_type="ISL"], - [gcc_cv_cloog_type=no])]) - ;; - "ppl") - CFLAGS="${CFLAGS} ${pplinc}" - LDFLAGS="${LDFLAGS} ${ppllibs}" - AC_CACHE_CHECK([for installed CLooG PPL], [gcc_cv_cloog_type], - [LIBS="-lcloog-ppl ${_cloog_saved_LIBS}" - AC_LINK_IFELSE([_CLOOG_ORG_PROG_PPL], [gcc_cv_cloog_type="PPL"], - [gcc_cv_cloog_type=no])]) - ;; - *) - gcc_cv_cloog_type="" - esac + AC_CACHE_CHECK([for installed CLooG ISL], [gcc_cv_cloog_type], + [LIBS="-lcloog-isl ${_cloog_saved_LIBS}" + AC_LINK_IFELSE([_CLOOG_ORG_PROG_ISL], [gcc_cv_cloog_type="ISL"], + [gcc_cv_cloog_type=no])]) case $gcc_cv_cloog_type in - "PPL Legacy") - clooginc="${clooginc}" - clooglibs="${clooglibs} -lcloog" - cloog_org=no - ;; "ISL") clooginc="${clooginc} ${_cloogorginc}" clooglibs="${clooglibs} -lcloog-isl -lisl" cloog_org=yes ;; - "PPL") - clooginc="${clooginc} ${_cloogorginc}" - clooglibs="${clooglibs} -lcloog-ppl" - cloog_org=yes - ;; *) clooglibs= clooginc= @@ -212,25 +152,10 @@ m4_define([_CLOOG_CHECK_CT_PROG],[AC_LANG_PROGRAM( choke me #endif])]) -# _CLOOG_CHECK_RT_PROG () -# ----------------------- -# Helper for verifying that CLooG's compile time version -# matches the run time version. -m4_define([_CLOOG_CHECK_RT_PROG],[AC_LANG_PROGRAM( - [#include "cloog/cloog.h"], - [if ((cloog_version_major () != CLOOG_VERSION_MAJOR) - && (cloog_version_minor () != CLOOG_VERSION_MINOR) - && (cloog_version_revision () != CLOOG_VERSION_REVISION)) - { - return 1; - }])]) - # CLOOG_CHECK_VERSION CLOOG_CHECK_VERSION (MAJOR, MINOR, REVISION) # ---------------------------------------------------------------- # Test the found CLooG to be exact of version MAJOR.MINOR and at least # REVISION. -# If we're using the old CLooG-PPL (Legacy), the old version check will -# be executed (Ignores the provided version information). AC_DEFUN([CLOOG_CHECK_VERSION], [ AC_REQUIRE([CLOOG_FIND_FLAGS]) @@ -242,21 +167,11 @@ AC_DEFUN([CLOOG_CHECK_VERSION], CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${pplinc} ${gmpinc}" LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}" - if test "${cloog_org}" = yes ; then - AC_CACHE_CHECK([for version $1.$2.$3 of CLooG], - [gcc_cv_cloog_ct_0_14_0], - [AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG($1,$2,$3)], - [gcc_cv_cloog_ct_0_14_0=yes], - [gcc_cv_cloog_ct_0_14_0=no])]) - elif test "${cloog_org}" = no ; then - AC_CACHE_CHECK([for version 0.15.5 (or later revision) of CLooG], - [gcc_cv_cloog_ct_0_15_5], - [AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG(0,15,5)], - [AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG(0,15,9)], - [gcc_cv_cloog_ct_0_15_5=yes], - [gcc_cv_cloog_ct_0_15_5="buggy but acceptable"])], - [gcc_cv_cloog_ct_0_15_5=no])]) - fi + AC_CACHE_CHECK([for version $1.$2.$3 of CLooG], + [gcc_cv_cloog], + [AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG($1,$2,$3)], + [gcc_cv_cloog=yes], + [gcc_cv_cloog=no])]) CFLAGS=$_cloog_saved_CFLAGS LDFLAGS=$_cloog_saved_LDFLAGS @@ -272,9 +187,7 @@ AC_DEFUN([CLOOG_IF_FAILED], [ CLOOG_REQUESTED([graphite_requested=yes], [graphite_requested=no]) - if test "${gcc_cv_cloog_ct_0_14_0}" = no \ - || test "${gcc_cv_cloog_rt_0_14_0}" = no \ - || test "${gcc_cv_cloog_ct_0_15_5}" = no; then + if test "${gcc_cv_cloog}" = no ; then clooglibs= clooginc= fi diff --git a/configure b/configure index 5366d71..fbb29e0 100755 --- a/configure +++ b/configure @@ -775,7 +775,6 @@ enable_ppl_version_check with_cloog with_cloog_include with_cloog_lib -enable_cloog_backend enable_cloog_version_check enable_lto enable_stage1_languages @@ -1472,9 +1471,6 @@ Optional Features: build stages 2 and 3 with C++, not C --disable-ppl-version-check disable check for PPL version - --enable-cloog-backend[=BACKEND] - set the CLooG BACKEND used to either isl, ppl or - ppl-legacy (default) --disable-cloog-version-check disable check for CLooG version --enable-lto enable link time optimization support @@ -5710,19 +5706,6 @@ if test "${with_cloog_lib+set}" = set; then : fi - # Check whether --enable-cloog-backend was given. -if test "${enable_cloog_backend+set}" = set; then : - enableval=$enable_cloog_backend; if test "x${enableval}" = "xisl"; then - cloog_backend=isl - elif test "x${enableval}" = "xppl"; then - cloog_backend=ppl - else - cloog_backend=ppl-legacy - fi -else - cloog_backend=ppl-legacy -fi - # Check whether --enable-cloog-version-check was given. if test "${enable_cloog_version_check+set}" = set; then : enableval=$enable_cloog_version_check; ENABLE_CLOOG_CHECK=$enableval @@ -5795,48 +5778,13 @@ if test "x$with_cloog" != "xno"; then CPPFLAGS="${CPPFLAGS} ${_cloogorginc}" LDFLAGS="${LDFLAGS} ${clooglibs}" - case $cloog_backend in - "ppl-legacy") - CFLAGS="${CFLAGS} ${pplinc}" - LDFLAGS="${LDFLAGS} ${ppllibs}" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed CLooG PPL Legacy" >&5 -$as_echo_n "checking for installed CLooG PPL Legacy... " >&6; } -if test "${gcc_cv_cloog_type+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - LIBS="-lcloog ${_cloog_saved_LIBS}" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include "cloog/cloog.h" -int -main () -{ -#ifndef CLOOG_PPL_BACKEND - choke me - #endif - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gcc_cv_cloog_type="PPL Legacy" -else - gcc_cv_cloog_type=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_type" >&5 -$as_echo "$gcc_cv_cloog_type" >&6; } - ;; - "isl") - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed CLooG ISL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed CLooG ISL" >&5 $as_echo_n "checking for installed CLooG ISL... " >&6; } if test "${gcc_cv_cloog_type+set}" = set; then : $as_echo_n "(cached) " >&6 else LIBS="-lcloog-isl ${_cloog_saved_LIBS}" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "cloog/cloog.h" int @@ -5857,59 +5805,13 @@ rm -f core conftest.err conftest.$ac_objext \ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_type" >&5 $as_echo "$gcc_cv_cloog_type" >&6; } - ;; - "ppl") - CFLAGS="${CFLAGS} ${pplinc}" - LDFLAGS="${LDFLAGS} ${ppllibs}" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed CLooG PPL" >&5 -$as_echo_n "checking for installed CLooG PPL... " >&6; } -if test "${gcc_cv_cloog_type+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - LIBS="-lcloog-ppl ${_cloog_saved_LIBS}" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include "cloog/cloog.h" - #include "cloog/ppl/cloog.h" -int -main () -{ -cloog_version () - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gcc_cv_cloog_type="PPL" -else - gcc_cv_cloog_type=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_type" >&5 -$as_echo "$gcc_cv_cloog_type" >&6; } - ;; - *) - gcc_cv_cloog_type="" - esac case $gcc_cv_cloog_type in - "PPL Legacy") - clooginc="${clooginc}" - clooglibs="${clooglibs} -lcloog" - cloog_org=no - ;; "ISL") clooginc="${clooginc} ${_cloogorginc}" clooglibs="${clooglibs} -lcloog-isl -lisl" cloog_org=yes ;; - "PPL") - clooginc="${clooginc} ${_cloogorginc}" - clooglibs="${clooglibs} -lcloog-ppl" - cloog_org=yes - ;; *) clooglibs= clooginc= @@ -5933,10 +5835,9 @@ $as_echo "$gcc_cv_cloog_type" >&6; } CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${pplinc} ${gmpinc}" LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}" - if test "${cloog_org}" = yes ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5 $as_echo_n "checking for version 0.16.1 of CLooG... " >&6; } -if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then : +if test "${gcc_cv_cloog+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5955,65 +5856,14 @@ main () } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - gcc_cv_cloog_ct_0_14_0=yes -else - gcc_cv_cloog_ct_0_14_0=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_ct_0_14_0" >&5 -$as_echo "$gcc_cv_cloog_ct_0_14_0" >&6; } - elif test "${cloog_org}" = no ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.15.5 (or later revision) of CLooG" >&5 -$as_echo_n "checking for version 0.15.5 (or later revision) of CLooG... " >&6; } -if test "${gcc_cv_cloog_ct_0_15_5+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include "cloog/cloog.h" -int -main () -{ -#if CLOOG_VERSION_MAJOR != 0 \ - || CLOOG_VERSION_MINOR != 15 \ - || CLOOG_VERSION_REVISION < 5 - choke me - #endif - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include "cloog/cloog.h" -int -main () -{ -#if CLOOG_VERSION_MAJOR != 0 \ - || CLOOG_VERSION_MINOR != 15 \ - || CLOOG_VERSION_REVISION < 9 - choke me - #endif - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gcc_cv_cloog_ct_0_15_5=yes -else - gcc_cv_cloog_ct_0_15_5="buggy but acceptable" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + gcc_cv_cloog=yes else - gcc_cv_cloog_ct_0_15_5=no + gcc_cv_cloog=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_ct_0_15_5" >&5 -$as_echo "$gcc_cv_cloog_ct_0_15_5" >&6; } - fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog" >&5 +$as_echo "$gcc_cv_cloog" >&6; } CFLAGS=$_cloog_saved_CFLAGS LDFLAGS=$_cloog_saved_LDFLAGS @@ -6037,9 +5887,7 @@ $as_echo "$gcc_cv_cloog_ct_0_15_5" >&6; } - if test "${gcc_cv_cloog_ct_0_14_0}" = no \ - || test "${gcc_cv_cloog_rt_0_14_0}" = no \ - || test "${gcc_cv_cloog_ct_0_15_5}" = no; then + if test "${gcc_cv_cloog}" = no ; then clooglibs= clooginc= fi

[01/11] Make CLooG-ISL the only supported CLooG version.

Commit Message

Patch