On Tue, Nov 11, 2014 at 02:01:47PM +0100, Tobias Burnus wrote:
> Now that CLooG is no longer used by GCC, it makes sense to also remove it from
> the main configure file. Especially as the in-tree build currently only works
> if also CLooG is available.
I saw that there were still some traces of CLooG in gcc/, which the patch now
removes.
OK for the trunk?
Roman/Tobias: A grep turns up several more CLooG in the *.c file comments;
I think it wouldn't harm to do some cleanup there as well.
Tobias
2014-11-12 Tobias Burnus <bur...@net-b.de>
* Makefile.in (CLOOGLIBS, CLOOGINC): Remove.
* configure.ac: Ditto.
* graphite-interchange.c: Remove HAVE_CLOOG block.
* config.in: Regenerate.
* configure: Regenerate.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 6f98ca1..3d671c2 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -349,10 +349,6 @@ GMPINC = @GMPINC@
ISLLIBS = @ISLLIBS@
ISLINC = @ISLINC@
-# How to find CLOOG
-CLOOGLIBS = @CLOOGLIBS@
-CLOOGINC = @CLOOGINC@
-
# Set to 'yes' if the LTO front end is enabled.
enable_lto = @enable_lto@
diff --git a/gcc/config.in b/gcc/config.in
index c4f9164..8b8c556 100644
--- a/gcc/config.in
+++ b/gcc/config.in
@@ -1700,12 +1700,6 @@
#endif
-/* Define if cloog is in use. */
-#ifndef USED_FOR_TARGET
-#undef HAVE_cloog
-#endif
-
-
/* Define if isl is in use. */
#ifndef USED_FOR_TARGET
#undef HAVE_isl
diff --git a/gcc/configure b/gcc/configure
index 7f1f47d..6459a8a 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -604,8 +604,6 @@ PICFLAG
enable_host_shared
enable_plugin
pluginlibs
-CLOOGINC
-CLOOGLIBS
ISLINC
ISLLIBS
GMPINC
@@ -952,9 +950,7 @@ CXXCPP
GMPLIBS
GMPINC
ISLLIBS
-ISLINC
-CLOOGLIBS
-CLOOGINC'
+ISLINC'
# Initialize some variables set by options.
@@ -1726,8 +1722,6 @@ Some influential environment variables:
GMPINC How to find GMP include files
ISLLIBS How to link ISL
ISLINC How to find ISL include files
- CLOOGLIBS How to link CLOOG
- CLOOGINC How to find CLOOG include files
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -18100,7 +18094,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 18103 "configure"
+#line 18097 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18206,7 +18200,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 18209 "configure"
+#line 18203 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -27974,14 +27968,6 @@ $as_echo "#define HAVE_isl 1" >>confdefs.h
fi
-
-
-if test "x${CLOOGLIBS}" != "x" ; then
-
-$as_echo "#define HAVE_cloog 1" >>confdefs.h
-
-fi
-
# Check for plugin support
# Check whether --enable-plugin was given.
if test "${enable_plugin+set}" = set; then :
diff --git a/gcc/configure.ac b/gcc/configure.ac
index ecb75be..ba2b387 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -5550,12 +5550,6 @@ if test "x${ISLLIBS}" != "x" ; then
AC_DEFINE(HAVE_isl, 1, [Define if isl is in use.])
fi
-AC_ARG_VAR(CLOOGLIBS,[How to link CLOOG])
-AC_ARG_VAR(CLOOGINC,[How to find CLOOG include files])
-if test "x${CLOOGLIBS}" != "x" ; then
- AC_DEFINE(HAVE_cloog, 1, [Define if cloog is in use.])
-fi
-
GCC_ENABLE_PLUGINS
AC_SUBST(pluginlibs)
AC_SUBST(enable_plugin)
diff --git a/gcc/graphite-interchange.c b/gcc/graphite-interchange.c
index a7222a5..81ba391 100644
--- a/gcc/graphite-interchange.c
+++ b/gcc/graphite-interchange.c
@@ -37,10 +37,6 @@ extern "C" {
#if defined(__cplusplus)
}
#endif
-#ifdef HAVE_cloog
-#include <cloog/cloog.h>
-#include <cloog/isl/domain.h>
-#endif
#endif
#include "system.h"
