aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog39
-rw-r--r--Makefile.def2
-rw-r--r--Makefile.in9
-rwxr-xr-xconfigure94
-rw-r--r--configure.ac101
5 files changed, 178 insertions, 67 deletions
diff --git a/ChangeLog b/ChangeLog
index f0893d7..469651a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,42 @@
+2012-09-28 Ian Lance Taylor <iant@google.com>
+
+ * Makefile.def: Make all-target-libgo depend on
+ all-target-libbacktrace.
+ * Makefile.in: Rebuild.
+
+2012-09-26 Ian Lance Taylor <iant@google.com>
+
+ * Makefile.def: Make all-gcc depend on all-libbacktrace.
+ * Makefile.in: Rebuild.
+
+2012-09-06 Diego Novillo <dnovillo@google.com>
+
+ * configure.ac: Bump minimum GMP version to 4.2.3.
+ * configure: Re-generate.
+
+2012-09-05 Georg-Johann Lay <avr@gjlay.de>
+
+ PR target/54461
+ * configure.ac (noconfigdirs,target=avr-*-*): Add target-newlib,
+ target-libgloss if not configured --with-avrlibc=no.
+ * configure: Regenerate.
+
+2012-09-04 Jason Merrill <jason@redhat.com>
+
+ * configure.ac: Fix --enable-languages=all.
+
+2012-09-03 Richard Guenther <rguenther@suse.de>
+
+ PR bootstrap/54138
+ * configure.ac: Re-organize ISL / CLOOG checks to allow
+ disabling with either --without-isl or --without-cloog.
+ * configure: Regenerated.
+
+2012-09-03 Georg-Johann Lay <avr@gjlay.de>
+
+ * configure.ac (noconfigdirs,target=avr): Add target-libquadmath.
+ * configure: Regenerate.
+
2012-09-21 Steve Ellcey <sellcey@mips.com>
* configure.ac: Add mips*-mti-elf* target.
diff --git a/Makefile.def b/Makefile.def
index f32ffb0..c22388a 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -305,6 +305,7 @@ dependencies = { module=all-gcc; on=all-build-flex; };
dependencies = { module=all-gcc; on=all-build-libiberty; };
dependencies = { module=all-gcc; on=all-build-fixincludes; };
dependencies = { module=all-gcc; on=all-zlib; };
+dependencies = { module=all-gcc; on=all-libbacktrace; hard=true; };
dependencies = { module=all-gcc; on=all-libcpp; hard=true; };
dependencies = { module=all-gcc; on=all-libdecnumber; hard=true; };
dependencies = { module=all-gcc; on=all-libiberty; };
@@ -490,6 +491,7 @@ dependencies = { module=configure-target-fastjar; on=configure-target-zlib; };
dependencies = { module=all-target-fastjar; on=all-target-zlib; };
dependencies = { module=configure-target-libgo; on=configure-target-libffi; };
dependencies = { module=configure-target-libgo; on=all-target-libstdc++-v3; };
+dependencies = { module=all-target-libgo; on=all-target-libbacktrace; };
dependencies = { module=all-target-libgo; on=all-target-libffi; };
dependencies = { module=configure-target-libjava; on=configure-target-zlib; };
dependencies = { module=configure-target-libjava; on=configure-target-boehm-gc; };
diff --git a/Makefile.in b/Makefile.in
index 4200d5d..9536afff 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -44825,6 +44825,14 @@ all-stage3-gcc: maybe-all-stage3-zlib
all-stage4-gcc: maybe-all-stage4-zlib
all-stageprofile-gcc: maybe-all-stageprofile-zlib
all-stagefeedback-gcc: maybe-all-stagefeedback-zlib
+all-gcc: all-libbacktrace
+
+all-stage1-gcc: all-stage1-libbacktrace
+all-stage2-gcc: all-stage2-libbacktrace
+all-stage3-gcc: all-stage3-libbacktrace
+all-stage4-gcc: all-stage4-libbacktrace
+all-stageprofile-gcc: all-stageprofile-libbacktrace
+all-stagefeedback-gcc: all-stagefeedback-libbacktrace
all-gcc: all-libcpp
all-stage1-gcc: all-stage1-libcpp
@@ -45340,6 +45348,7 @@ configure-target-fastjar: maybe-configure-target-zlib
all-target-fastjar: maybe-all-target-zlib
configure-target-libgo: maybe-configure-target-libffi
configure-target-libgo: maybe-all-target-libstdc++-v3
+all-target-libgo: maybe-all-target-libbacktrace
all-target-libgo: maybe-all-target-libffi
configure-target-libjava: maybe-configure-target-zlib
configure-target-libjava: maybe-configure-target-boehm-gc
diff --git a/configure b/configure
index 77397f3..8011d82 100755
--- a/configure
+++ b/configure
@@ -646,7 +646,6 @@ extra_host_libiberty_configure_flags
clooginc
clooglibs
islinc
-isllibs
poststage1_ldflags
poststage1_libs
stage1_libs
@@ -768,11 +767,11 @@ with_stage1_ldflags
with_stage1_libs
with_boot_libs
with_boot_ldflags
+with_cloog
with_isl
with_isl_include
with_isl_lib
enable_isl_version_check
-with_cloog
with_cloog_include
with_cloog_lib
enable_cloog_version_check
@@ -1521,16 +1520,16 @@ Optional Packages:
--with-boot-libs=LIBS libraries for stage2 and later
--with-boot-ldflags=FLAGS
linker flags for stage2 and later
+ --with-cloog=PATH Specify prefix directory for the installed CLooG-ISL
+ package. Equivalent to
+ --with-cloog-include=PATH/include plus
+ --with-cloog-lib=PATH/lib
--with-isl=PATH Specify prefix directory for the installed ISL
package. Equivalent to
--with-isl-include=PATH/include plus
--with-isl-lib=PATH/lib
--with-isl-include=PATH Specify directory for installed ISL include files
--with-isl-lib=PATH Specify the directory for the installed ISL library
- --with-cloog=PATH Specify prefix directory for the installed CLooG-PPL
- package. Equivalent to
- --with-cloog-include=PATH/include plus
- --with-cloog-lib=PATH/lib
--with-cloog-include=PATH
Specify directory for installed CLooG include files
--with-cloog-lib=PATH Specify the directory for the installed CLooG
@@ -3163,6 +3162,13 @@ case "${target}" in
;;
esac
+# Disable libquadmath for some systems.
+case "${target}" in
+ avr-*-*)
+ noconfigdirs="$noconfigdirs target-libquadmath"
+ ;;
+esac
+
# Disable libstdc++-v3 for some systems.
case "${target}" in
*-*-vxworks*)
@@ -3503,6 +3509,13 @@ case "${target}" in
arm-*-riscix*)
noconfigdirs="$noconfigdirs ld target-libgloss"
;;
+ avr-*-rtems*)
+ ;;
+ avr-*-*)
+ if test x${with_avrlibc} != xno; then
+ noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+ fi
+ ;;
c4x-*-* | tic4x-*-*)
noconfigdirs="$noconfigdirs target-libgloss"
;;
@@ -5315,7 +5328,7 @@ main ()
#define GCC_GMP_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
#define GCC_GMP_VERSION GCC_GMP_VERSION_NUM(__GNU_MP_VERSION,__GNU_MP_VERSION_MINOR,__GNU_MP_VERSION_PATCHLEVEL)
- #if GCC_GMP_VERSION < GCC_GMP_VERSION_NUM(4,2,0)
+ #if GCC_GMP_VERSION < GCC_GMP_VERSION_NUM(4,2,3)
choke me
#endif
@@ -5612,7 +5625,15 @@ fi
-# Check for ISL
+# GCC GRAPHITE dependences, ISL and CLOOG which in turn requires ISL.
+# Basic setup is inlined here, actual checks are in config/cloog.m4 and
+# config/isl.m4
+
+
+# Check whether --with-cloog was given.
+if test "${with_cloog+set}" = set; then :
+ withval=$with_cloog;
+fi
# Check whether --with-isl was given.
@@ -5621,6 +5642,13 @@ if test "${with_isl+set}" = set; then :
fi
+# Treat either --without-cloog or --without-isl as a request to disable
+# GRAPHITE support and skip all following checks.
+if test "x$with_isl" != "xno" &&
+ test "x$with_cloog" != "xno"; then
+ # Check for ISL
+
+
# Check whether --with-isl-include was given.
if test "${with_isl_include+set}" = set; then :
withval=$with_isl_include;
@@ -5667,14 +5695,8 @@ fi
ENABLE_ISL_CHECK=no
fi
- isllibs="${isllibs} -lisl"
-
-
-
-if test "x$with_isl" != "xno"; then
-
if test "${ENABLE_ISL_CHECK}" = yes ; then
_isl_saved_CFLAGS=$CFLAGS
_isl_saved_LDFLAGS=$LDFLAGS
@@ -5730,7 +5752,6 @@ $as_echo "$gcc_cv_isl" >&6; }
-
if test "x${with_isl}" = xno; then
graphite_requested=no
elif test "x${with_isl}" != x \
@@ -5756,15 +5777,9 @@ $as_echo "$gcc_cv_isl" >&6; }
fi
-fi
-
-# Check for CLOOG
-
-# Check whether --with-cloog was given.
-if test "${with_cloog+set}" = set; then :
- withval=$with_cloog;
-fi
+ if test "x$gcc_cv_isl" != "xno"; then
+ # Check for CLOOG
# Check whether --with-cloog-include was given.
@@ -5813,16 +5828,9 @@ fi
fi
clooginc="-DCLOOG_INT_GMP ${clooginc}"
- clooglibs="${clooglibs} -lcloog-isl ${isllibs}"
-
-
-
+ clooglibs="${clooglibs} -lcloog-isl ${isllibs} -lisl"
-if test "x$isllibs" = x && test "x$islinc" = x; then
- clooglibs=
- clooginc=
-elif test "x$with_cloog" != "xno"; then
@@ -5894,18 +5902,30 @@ $as_echo "$gcc_cv_cloog" >&6; }
&& test "x${clooglibs}" = x \
&& test "x${clooginc}" = x ; then
- as_fn_error "Unable to find a usable CLooG. See config.log for details." "$LINENO" 5
+ as_fn_error "Unable to find a usable CLooG. See config.log for details." "$LINENO" 5
fi
+ fi
fi
# If either the ISL or the CLooG check failed, disable builds of in-tree
# variants of both
-if test "x$clooglibs" = x && test "x$clooginc" = x; then
+if test "x$with_isl" = xno ||
+ test "x$with_cloog" = xno ||
+ test "x$gcc_cv_cloog" = xno ||
+ test "x$gcc_cv_isl" = xno; then
noconfigdirs="$noconfigdirs cloog isl"
+ islinc=
+ clooginc=
+ clooglibs=
fi
+
+
+
+
+
# Check for LTO support.
# Check whether --enable-lto was given.
if test "${enable_lto+set}" = set; then :
@@ -6109,6 +6129,7 @@ if test -d ${srcdir}/gcc; then
boot_language=yes
fi
+ add_this_lang=no
case ,${enable_languages}, in
*,${language},*)
# Language was explicitly selected; include it
@@ -6119,10 +6140,9 @@ if test -d ${srcdir}/gcc; then
;;
*,all,*)
# 'all' was selected, select it if it is a default language
- add_this_lang=${build_by_default}
- ;;
- *)
- add_this_lang=no
+ if test "$language" != "c"; then
+ add_this_lang=${build_by_default}
+ fi
;;
esac
diff --git a/configure.ac b/configure.ac
index aea8c17..f0d86d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -554,6 +554,13 @@ case "${target}" in
;;
esac
+# Disable libquadmath for some systems.
+case "${target}" in
+ avr-*-*)
+ noconfigdirs="$noconfigdirs target-libquadmath"
+ ;;
+esac
+
# Disable libstdc++-v3 for some systems.
case "${target}" in
*-*-vxworks*)
@@ -894,6 +901,13 @@ case "${target}" in
arm-*-riscix*)
noconfigdirs="$noconfigdirs ld target-libgloss"
;;
+ avr-*-rtems*)
+ ;;
+ avr-*-*)
+ if test x${with_avrlibc} != xno; then
+ noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+ fi
+ ;;
c4x-*-* | tic4x-*-*)
noconfigdirs="$noconfigdirs target-libgloss"
;;
@@ -1354,7 +1368,7 @@ if test -d ${srcdir}/gcc && test "x$have_gmp" = xno; then
AC_TRY_COMPILE([#include "gmp.h"],[
#define GCC_GMP_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
#define GCC_GMP_VERSION GCC_GMP_VERSION_NUM(__GNU_MP_VERSION,__GNU_MP_VERSION_MINOR,__GNU_MP_VERSION_PATCHLEVEL)
- #if GCC_GMP_VERSION < GCC_GMP_VERSION_NUM(4,2,0)
+ #if GCC_GMP_VERSION < GCC_GMP_VERSION_NUM(4,2,3)
choke me
#endif
], [AC_TRY_COMPILE([#include <gmp.h>],[
@@ -1516,44 +1530,71 @@ AC_ARG_WITH(boot-ldflags,
fi])
AC_SUBST(poststage1_ldflags)
-# Check for ISL
-dnl Provide configure switches and initialize islinc & isllibs
-dnl with user input.
-ISL_INIT_FLAGS
-if test "x$with_isl" != "xno"; then
+# GCC GRAPHITE dependences, ISL and CLOOG which in turn requires ISL.
+# Basic setup is inlined here, actual checks are in config/cloog.m4 and
+# config/isl.m4
+
+AC_ARG_WITH(cloog,
+ [AS_HELP_STRING(
+ [--with-cloog=PATH],
+ [Specify prefix directory for the installed CLooG-ISL package.
+ Equivalent to --with-cloog-include=PATH/include
+ plus --with-cloog-lib=PATH/lib])])
+AC_ARG_WITH(isl,
+ [AS_HELP_STRING(
+ [--with-isl=PATH],
+ [Specify prefix directory for the installed ISL package.
+ Equivalent to --with-isl-include=PATH/include
+ plus --with-isl-lib=PATH/lib])])
+
+# Treat either --without-cloog or --without-isl as a request to disable
+# GRAPHITE support and skip all following checks.
+if test "x$with_isl" != "xno" &&
+ test "x$with_cloog" != "xno"; then
+ # Check for ISL
+ dnl Provide configure switches and initialize islinc & isllibs
+ dnl with user input.
+ ISL_INIT_FLAGS
dnl The minimal version of ISL required for Graphite.
ISL_CHECK_VERSION(0,10)
-
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.])])
-fi
-# Check for CLOOG
-dnl Provide configure switches and initialize clooginc & clooglibs
-dnl with user input.
-CLOOG_INIT_FLAGS
-if test "x$isllibs" = x && test "x$islinc" = x; then
- clooglibs=
- clooginc=
-elif test "x$with_cloog" != "xno"; then
- dnl The minimal version of CLooG required for Graphite.
- dnl
- dnl If we use CLooG-Legacy, the provided version information is
- dnl ignored.
- CLOOG_CHECK_VERSION(0,17,0)
-
- dnl Only execute fail-action, if CLooG has been requested.
- CLOOG_IF_FAILED([
- AC_MSG_ERROR([Unable to find a usable CLooG. See config.log for details.])])
+ if test "x$gcc_cv_isl" != "xno"; then
+ # Check for CLOOG
+ 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.
+ CLOOG_CHECK_VERSION(0,17,0)
+
+ dnl Only execute fail-action, if CLooG has been requested.
+ CLOOG_IF_FAILED([
+ AC_MSG_ERROR([Unable to find a usable CLooG. See config.log for details.])])
+ fi
fi
# If either the ISL or the CLooG check failed, disable builds of in-tree
# variants of both
-if test "x$clooglibs" = x && test "x$clooginc" = x; then
+if test "x$with_isl" = xno ||
+ test "x$with_cloog" = xno ||
+ test "x$gcc_cv_cloog" = xno ||
+ test "x$gcc_cv_isl" = xno; then
noconfigdirs="$noconfigdirs cloog isl"
+ islinc=
+ clooginc=
+ clooglibs=
fi
+AC_SUBST(islinc)
+AC_SUBST(clooglibs)
+AC_SUBST(clooginc)
+
+
# Check for LTO support.
AC_ARG_ENABLE(lto,
[AS_HELP_STRING([--enable-lto], [enable link time optimization support])],
@@ -1734,6 +1775,7 @@ if test -d ${srcdir}/gcc; then
boot_language=yes
fi
+ add_this_lang=no
case ,${enable_languages}, in
*,${language},*)
# Language was explicitly selected; include it
@@ -1744,10 +1786,9 @@ if test -d ${srcdir}/gcc; then
;;
*,all,*)
# 'all' was selected, select it if it is a default language
- add_this_lang=${build_by_default}
- ;;
- *)
- add_this_lang=no
+ if test "$language" != "c"; then
+ add_this_lang=${build_by_default}
+ fi
;;
esac