aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2012-09-29 15:35:53 +0000
committerH.J. Lu <hjl.tools@gmail.com>2012-09-29 15:35:53 +0000
commit8e71395b076b6eca662b6280dc78fbaa83b306b7 (patch)
tree7d239148ea4fd07031d98d73870209aed63f811e /configure
parent0dab2e31e5ab493233daf8e2feab24c6053fcb95 (diff)
downloadgdb-8e71395b076b6eca662b6280dc78fbaa83b306b7.zip
gdb-8e71395b076b6eca662b6280dc78fbaa83b306b7.tar.gz
gdb-8e71395b076b6eca662b6280dc78fbaa83b306b7.tar.bz2
Sync toplevel files with GCC tree
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.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure94
1 files changed, 57 insertions, 37 deletions
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