* configure.ac: Sync with GCC repo.
* configure: Ditto. * Makefile.def: Ditto. * Makefile.in: Ditto.
This commit is contained in:
Jan-Benedict Glaw
parent
1ed5917465
commit
3dae1673d0
5 changed files with 120 additions and 18 deletions
|
|
@ -1,3 +1,10 @@
|
|||
2013-01-15 Jan-Benedict Glaw <jbglaw@lug-owl.de>
|
||||
|
||||
* configure.ac: Sync with GCC repo.
|
||||
* configure: Ditto.
|
||||
* Makefile.def: Ditto.
|
||||
* Makefile.in: Ditto.
|
||||
|
||||
2013-01-11 Joel Brobecker <brobecker@adacore.com>
|
||||
|
||||
Sync with GCC, merge:
|
||||
|
|
|
|||
|
|
@ -524,6 +524,7 @@ dependencies = { module=all-target-libstdc++-v3; on=configure-target-libgomp; };
|
|||
dependencies = { module=install-target-libgo; on=install-target-libatomic; };
|
||||
dependencies = { module=install-target-libgfortran; on=install-target-libquadmath; };
|
||||
dependencies = { module=install-target-libgfortran; on=install-target-libgcc; };
|
||||
dependencies = { module=install-target-libsanitizer; on=install-target-libstdc++-v3; };
|
||||
dependencies = { module=install-target-libsanitizer; on=install-target-libgcc; };
|
||||
dependencies = { module=install-target-libjava; on=install-target-libgcc; };
|
||||
dependencies = { module=install-target-libitm; on=install-target-libgcc; };
|
||||
|
|
|
|||
|
|
@ -46216,6 +46216,7 @@ all-stagefeedback-target-libstdc++-v3: maybe-configure-stagefeedback-target-libg
|
|||
install-target-libgo: maybe-install-target-libatomic
|
||||
install-target-libgfortran: maybe-install-target-libquadmath
|
||||
install-target-libgfortran: maybe-install-target-libgcc
|
||||
install-target-libsanitizer: maybe-install-target-libstdc++-v3
|
||||
install-target-libsanitizer: maybe-install-target-libgcc
|
||||
install-target-libjava: maybe-install-target-libgcc
|
||||
install-target-libitm: maybe-install-target-libgcc
|
||||
|
|
|
|||
116
configure
vendored
116
configure
vendored
|
|
@ -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
|
||||
|
|
@ -5874,6 +5872,56 @@ $as_echo "$gcc_cv_isl" >&6; }
|
|||
fi
|
||||
|
||||
|
||||
if test "${gcc_cv_isl}" = no ; then
|
||||
|
||||
if test "${ENABLE_ISL_CHECK}" = yes ; then
|
||||
_isl_saved_CFLAGS=$CFLAGS
|
||||
_isl_saved_LDFLAGS=$LDFLAGS
|
||||
_isl_saved_LIBS=$LIBS
|
||||
|
||||
CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}"
|
||||
LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}"
|
||||
LIBS="${_isl_saved_LIBS} -lisl"
|
||||
echo $CFLAGS
|
||||
|
||||
{ $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 "$cross_compiling" = yes; then :
|
||||
gcc_cv_isl=yes
|
||||
else
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#include <isl/version.h>
|
||||
#include <string.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
if (strncmp (isl_version (), "isl-0.11", strlen ("isl-0.11")) != 0)
|
||||
return 1;
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_run "$LINENO"; then :
|
||||
gcc_cv_isl=yes
|
||||
else
|
||||
gcc_cv_isl=no
|
||||
fi
|
||||
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
||||
conftest.$ac_objext conftest.beam conftest.$ac_ext
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_isl" >&5
|
||||
$as_echo "$gcc_cv_isl" >&6; }
|
||||
|
||||
CFLAGS=$_isl_saved_CFLAGS
|
||||
LDFLAGS=$_isl_saved_LDFLAGS
|
||||
LIBS=$_isl_saved_LIBS
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
|
@ -5947,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}"
|
||||
|
|
@ -5969,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
|
||||
|
|
@ -5993,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
|
||||
|
|
@ -6002,6 +6049,49 @@ $as_echo "$gcc_cv_cloog" >&6; }
|
|||
fi
|
||||
|
||||
|
||||
if test "${gcc_cv_cloog}" = no ; then
|
||||
|
||||
|
||||
|
||||
if test "${ENABLE_CLOOG_CHECK}" = yes ; then
|
||||
_cloog_saved_CFLAGS=$CFLAGS
|
||||
_cloog_saved_LDFLAGS=$LDFLAGS
|
||||
|
||||
CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${islinc} ${gmpinc}"
|
||||
LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${isllibs} ${gmplib}"
|
||||
|
||||
{ $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; }
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#include "cloog/version.h"
|
||||
int
|
||||
main ()
|
||||
{
|
||||
#if CLOOG_VERSION_MAJOR != 0 \
|
||||
|| CLOOG_VERSION_MINOR != 18 \
|
||||
|| CLOOG_VERSION_REVISION < 0
|
||||
choke me
|
||||
#endif
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
gcc_cv_cloog=yes
|
||||
else
|
||||
gcc_cv_cloog=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
{ $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
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
13
configure.ac
13
configure.ac
|
|
@ -1606,8 +1606,11 @@ if test "x$with_isl" != "xno" &&
|
|||
dnl Provide configure switches and initialize islinc & isllibs
|
||||
dnl with user input.
|
||||
ISL_INIT_FLAGS
|
||||
dnl The minimal version of ISL required for Graphite.
|
||||
dnl The versions of ISL that work for Graphite
|
||||
ISL_CHECK_VERSION(0,10)
|
||||
if test "${gcc_cv_isl}" = no ; then
|
||||
ISL_CHECK_VERSION(0,11)
|
||||
fi
|
||||
dnl Only execute fail-action, if ISL has been requested.
|
||||
ISL_IF_FAILED([
|
||||
AC_MSG_ERROR([Unable to find a usable ISL. See config.log for details.])])
|
||||
|
|
@ -1617,11 +1620,11 @@ if test "x$with_isl" != "xno" &&
|
|||
dnl Provide configure switches and initialize clooginc & clooglibs
|
||||
dnl with user input.
|
||||
CLOOG_INIT_FLAGS
|
||||
dnl The minimal version of CLooG required for Graphite.
|
||||
dnl
|
||||
dnl If we use CLooG-Legacy, the provided version information is
|
||||
dnl ignored.
|
||||
dnl The versions of CLooG that work for Graphite.
|
||||
CLOOG_CHECK_VERSION(0,17,0)
|
||||
if test "${gcc_cv_cloog}" = no ; then
|
||||
CLOOG_CHECK_VERSION(0,18,0)
|
||||
fi
|
||||
|
||||
dnl Only execute fail-action, if CLooG has been requested.
|
||||
CLOOG_IF_FAILED([
|
||||
|
|
|
|||
Loading…
Reference in a new issue