Skip to content

R
riscv-gcc-1
Commit 2869f0ff by Richard Biener Committed by Richard Biener
Options

re PR other/55973 (r195150 doesn't properly handle out of tree isl 0.11.1) 

2013-01-15  Richard Biener  <rguenther@suse.de>

	PR other/55973
	* configure: Re-generate.

	config/
	* isl.m4 (ISL_INIT_FLAGS): Warn about disabled version check
	for in-tree build.
	(ISL_CHECK_VERSION): Do not use AC_CACHE_CHECK.
	* cloog.m4 (CLOOG_INIT_FLAGS): Disable version check for
	in-tree build and warn about that.
	(CLOOG_CHECK_VERSION): Do not use AC_CACHE_CHECK.

From-SVN: r195195
parent 783a3a05
Showing with 43 additions and 35 deletions
ChangeLog
2013-01-15 Richard Biener <rguenther@suse.de>
PR other/55973
* configure: Re-generate.
2013-01-14 Matthias Klose <doko@ubuntu.com>
* Makefile.def (install-target-libsanitizer): Depend on
......
config/ChangeLog
2013-01-15 Richard Biener <rguenther@suse.de>
PR other/55973
* isl.m4 (ISL_INIT_FLAGS): Warn about disabled version check
for in-tree build.
(ISL_CHECK_VERSION): Do not use AC_CACHE_CHECK.
* cloog.m4 (CLOOG_INIT_FLAGS): Disable version check for
in-tree build and warn about that.
(CLOOG_CHECK_VERSION): Do not use AC_CACHE_CHECK.
2013-01-07 H.J. Lu <hongjiu.lu@intel.com>
* libstdc++-raw-cxx.m4 (GCC_LIBSTDCXX_RAW_CXX_FLAGS): Remove
......
config/cloog.m4
......@@ -57,12 +57,15 @@ AC_DEFUN([CLOOG_INIT_FLAGS],
if test "x${with_cloog_lib}" != x; then
clooglibs="-L$with_cloog_lib"
fi
dnl If no --with-cloog flag was specified and there is in-tree ClooG
dnl source, set up flags to use that.
dnl If no --with-cloog flag was specified and there is in-tree CLooG
dnl source, set up flags to use that and skip any version tests
dnl as we cannot run them reliably before building CLooG
if test "x${clooginc}" = x && test "x${clooglibs}" = x \
&& test -d ${srcdir}/cloog; then
clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/'"$lt_cv_objdir"' '
clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include -I'${srcdir}'/cloog/include '
ENABLE_CLOOG_CHECK=no
AC_MSG_WARN([using in-tree CLooG, disabling version check])
fi
clooginc="-DCLOOG_INT_GMP ${clooginc}"
......@@ -115,11 +118,11 @@ AC_DEFUN([CLOOG_CHECK_VERSION],
CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${islinc} ${gmpinc}"
LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${isllibs} ${gmplib}"
AC_CACHE_CHECK([for version $1.$2.$3 of CLooG],
[gcc_cv_cloog],
[AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG($1,$2,$3)],
AC_MSG_CHECKING([for version $1.$2.$3 of CLooG])
AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG($1,$2,$3)],
[gcc_cv_cloog=yes],
[gcc_cv_cloog=no])])
[gcc_cv_cloog=no])
AC_MSG_RESULT([$gcc_cv_cloog])
CFLAGS=$_cloog_saved_CFLAGS
LDFLAGS=$_cloog_saved_LDFLAGS
......
config/isl.m4
......@@ -66,6 +66,7 @@ AC_DEFUN([ISL_INIT_FLAGS],
isllibs='-L$$r/$(HOST_SUBDIR)/isl/'"$lt_cv_objdir"' '
islinc='-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include'
ENABLE_ISL_CHECK=no
AC_MSG_WARN([using in-tree ISL, disabling version check])
fi
]
)
......@@ -115,12 +116,12 @@ AC_DEFUN([ISL_CHECK_VERSION],
LIBS="${_isl_saved_LIBS} -lisl"
echo $CFLAGS
AC_CACHE_CHECK([for version $1.$2 of ISL],
[gcc_cv_isl],
[AC_RUN_IFELSE([_ISL_CHECK_CT_PROG($1,$2)],
AC_MSG_CHECKING([for version $1.$2 of ISL])
AC_RUN_IFELSE([_ISL_CHECK_CT_PROG($1,$2)],
[gcc_cv_isl=yes],
[gcc_cv_isl=no],
[gcc_cv_isl=yes])])
[gcc_cv_isl=yes])
AC_MSG_RESULT([$gcc_cv_isl])
CFLAGS=$_isl_saved_CFLAGS
LDFLAGS=$_isl_saved_LDFLAGS
......
configure
......@@ -5819,6 +5819,8 @@ fi
isllibs='-L$$r/$(HOST_SUBDIR)/isl/'"$lt_cv_objdir"' '
islinc='-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include'
ENABLE_ISL_CHECK=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using in-tree ISL, disabling version check" >&5
$as_echo "$as_me: WARNING: using in-tree ISL, disabling version check" >&2;}
fi
......@@ -5835,10 +5837,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.10 of ISL" >&5
$as_echo_n "checking for version 0.10 of ISL... " >&6; }
if test "${gcc_cv_isl+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
if test "$cross_compiling" = yes; then :
gcc_cv_isl=yes
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
......@@ -5864,8 +5863,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_isl" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_isl" >&5
$as_echo "$gcc_cv_isl" >&6; }
CFLAGS=$_isl_saved_CFLAGS
......@@ -5888,10 +5886,7 @@ $as_echo "$gcc_cv_isl" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.11 of ISL" >&5
$as_echo_n "checking for version 0.11 of ISL... " >&6; }
if test "${gcc_cv_isl+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
if test "$cross_compiling" = yes; then :
gcc_cv_isl=yes
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
......@@ -5917,8 +5912,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_isl" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_isl" >&5
$as_echo "$gcc_cv_isl" >&6; }
CFLAGS=$_isl_saved_CFLAGS
......@@ -6001,10 +5995,13 @@ fi
if test "x${with_cloog_lib}" != x; then
clooglibs="-L$with_cloog_lib"
fi
if test "x${clooginc}" = x && test "x${clooglibs}" = x \
if test "x${clooginc}" = x && test "x${clooglibs}" = x \
&& test -d ${srcdir}/cloog; then
clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/'"$lt_cv_objdir"' '
clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include -I'${srcdir}'/cloog/include '
ENABLE_CLOOG_CHECK=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using in-tree CLooG, disabling version check" >&5
$as_echo "$as_me: WARNING: using in-tree CLooG, disabling version check" >&2;}
fi
clooginc="-DCLOOG_INT_GMP ${clooginc}"
......@@ -6023,10 +6020,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17.0 of CLooG" >&5
$as_echo_n "checking for version 0.17.0 of CLooG... " >&6; }
if test "${gcc_cv_cloog+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include "cloog/version.h"
int
......@@ -6047,8 +6041,7 @@ else
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" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog" >&5
$as_echo "$gcc_cv_cloog" >&6; }
CFLAGS=$_cloog_saved_CFLAGS
......@@ -6069,10 +6062,7 @@ $as_echo "$gcc_cv_cloog" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.18.0 of CLooG" >&5
$as_echo_n "checking for version 0.18.0 of CLooG... " >&6; }
if test "${gcc_cv_cloog+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include "cloog/version.h"
int
......@@ -6093,8 +6083,7 @@ else
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" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog" >&5
$as_echo "$gcc_cv_cloog" >&6; }
CFLAGS=$_cloog_saved_CFLAGS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment