* configure: Regenerate after syncing config/.

This commit is contained in:
Alan Modra 2013-02-04 23:31:16 +00:00
parent cf4acdbc1f
commit 79a97aa5ea
5 changed files with 28 additions and 13 deletions

View File

@ -1,3 +1,7 @@
2013-02-05 Alan Modra <amodra@gmail.com>
* configure: Regenerate after syncing config/.
2013-01-15 Jan-Benedict Glaw <jbglaw@lug-owl.de> 2013-01-15 Jan-Benedict Glaw <jbglaw@lug-owl.de>
* configure.ac: Sync with GCC repo. * configure.ac: Sync with GCC repo.

View File

@ -1,3 +1,13 @@
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> 2013-01-07 H.J. Lu <hongjiu.lu@intel.com>
* libstdc++-raw-cxx.m4 (GCC_LIBSTDCXX_RAW_CXX_FLAGS): Remove * libstdc++-raw-cxx.m4 (GCC_LIBSTDCXX_RAW_CXX_FLAGS): Remove

View File

@ -57,12 +57,15 @@ AC_DEFUN([CLOOG_INIT_FLAGS],
if test "x${with_cloog_lib}" != x; then if test "x${with_cloog_lib}" != x; then
clooglibs="-L$with_cloog_lib" clooglibs="-L$with_cloog_lib"
fi fi
dnl If no --with-cloog flag was specified and there is in-tree ClooG dnl If no --with-cloog flag was specified and there is in-tree CLooG
dnl source, set up flags to use that. 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 \ if test "x${clooginc}" = x && test "x${clooglibs}" = x \
&& test -d ${srcdir}/cloog; then && test -d ${srcdir}/cloog; then
clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/'"$lt_cv_objdir"' ' clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/'"$lt_cv_objdir"' '
clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include -I'${srcdir}'/cloog/include ' 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 fi
clooginc="-DCLOOG_INT_GMP ${clooginc}" clooginc="-DCLOOG_INT_GMP ${clooginc}"
@ -115,11 +118,11 @@ AC_DEFUN([CLOOG_CHECK_VERSION],
CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${islinc} ${gmpinc}" CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${islinc} ${gmpinc}"
LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${isllibs} ${gmplib}" LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${isllibs} ${gmplib}"
AC_CACHE_CHECK([for version $1.$2.$3 of CLooG], AC_MSG_CHECKING([for version $1.$2.$3 of CLooG])
[gcc_cv_cloog], AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG($1,$2,$3)],
[AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG($1,$2,$3)],
[gcc_cv_cloog=yes], [gcc_cv_cloog=yes],
[gcc_cv_cloog=no])]) [gcc_cv_cloog=no])
AC_MSG_RESULT([$gcc_cv_cloog])
CFLAGS=$_cloog_saved_CFLAGS CFLAGS=$_cloog_saved_CFLAGS
LDFLAGS=$_cloog_saved_LDFLAGS LDFLAGS=$_cloog_saved_LDFLAGS

View File

@ -66,6 +66,7 @@ AC_DEFUN([ISL_INIT_FLAGS],
isllibs='-L$$r/$(HOST_SUBDIR)/isl/'"$lt_cv_objdir"' ' isllibs='-L$$r/$(HOST_SUBDIR)/isl/'"$lt_cv_objdir"' '
islinc='-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include' islinc='-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include'
ENABLE_ISL_CHECK=no ENABLE_ISL_CHECK=no
AC_MSG_WARN([using in-tree ISL, disabling version check])
fi fi
] ]
) )
@ -113,14 +114,13 @@ AC_DEFUN([ISL_CHECK_VERSION],
CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}" CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}"
LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}" LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}"
LIBS="${_isl_saved_LIBS} -lisl" LIBS="${_isl_saved_LIBS} -lisl"
echo $CFLAGS
AC_CACHE_CHECK([for version $1.$2 of ISL], AC_MSG_CHECKING([for version $1.$2 of ISL])
[gcc_cv_isl], AC_RUN_IFELSE([_ISL_CHECK_CT_PROG($1,$2)],
[AC_RUN_IFELSE([_ISL_CHECK_CT_PROG($1,$2)],
[gcc_cv_isl=yes], [gcc_cv_isl=yes],
[gcc_cv_isl=no], [gcc_cv_isl=no],
[gcc_cv_isl=yes])]) [gcc_cv_isl=yes])
AC_MSG_RESULT([$gcc_cv_isl])
CFLAGS=$_isl_saved_CFLAGS CFLAGS=$_isl_saved_CFLAGS
LDFLAGS=$_isl_saved_LDFLAGS LDFLAGS=$_isl_saved_LDFLAGS

2
configure vendored
View File

@ -5833,7 +5833,6 @@ $as_echo "$as_me: WARNING: using in-tree ISL, disabling version check" >&2;}
CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}" CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}"
LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}" LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}"
LIBS="${_isl_saved_LIBS} -lisl" LIBS="${_isl_saved_LIBS} -lisl"
echo $CFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.10 of ISL" >&5 { $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; } $as_echo_n "checking for version 0.10 of ISL... " >&6; }
@ -5882,7 +5881,6 @@ $as_echo "$gcc_cv_isl" >&6; }
CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}" CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}"
LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}" LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}"
LIBS="${_isl_saved_LIBS} -lisl" LIBS="${_isl_saved_LIBS} -lisl"
echo $CFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.11 of ISL" >&5 { $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; } $as_echo_n "checking for version 0.11 of ISL... " >&6; }