aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2015-07-14 07:49:50 -0700
committerH.J. Lu <hjl.tools@gmail.com>2015-07-14 07:49:50 -0700
commitce6c656dcb8257b7c05975039700e3c9f4c3af3b (patch)
tree14a2f3c6097afe203c9d448b5c252ee38b2a731b /configure.ac
parentRemove extraneous whitespace from ARM sim sources. (diff)
downloadbinutils-gdb-ce6c656dcb8257b7c05975039700e3c9f4c3af3b.tar.gz
binutils-gdb-ce6c656dcb8257b7c05975039700e3c9f4c3af3b.tar.bz2
binutils-gdb-ce6c656dcb8257b7c05975039700e3c9f4c3af3b.zip
Sync toplevel configure.ac with GCC
Sync with GCC 2015-06-02 Jason Merrill <jason@redhat.com> PR bootstrap/66319 * configure.ac: Use -std=gnu++98. 2015-05-28 Mike Frysinger <vapier@gentoo.org> * configure.ac (--vtable-verify): Use AS_HELP_STRING for help. * configure: Regenerate. 2015-05-11 Paulo Matos <paulo@matos-sorge.com> * configure.ac: Fix typo. * configure: Regenerate. 2015-05-03 Matthias Klose <doko@ubuntu.com> * configure.ac: Match $host configured with triplets. * configure: Regenerate. 2015-04-17 Jakub Jelinek <jakub@redhat.com> PR bootstrap/62077 * configure.ac (--enable-stage1-checking): Default to release,misc,gimple,rtlflag,tree,types if --disable-checking or --enable-checking is not specified and DEV-PHASE is not experimental. * configure: Regenerated. 2015-03-27 Uros Bizjak <ubizjak@gmail.com> Install back PR target/47230 fix (Revert the revert). config/ Sync with GCC * mh-alpha-linux: Restored.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac30
1 files changed, 26 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 159f96814af..743d20820cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1308,6 +1308,9 @@ case "${host}" in
*-mingw*)
host_makefile_frag="config/mh-mingw"
;;
+ alpha*-linux*)
+ host_makefile_frag="config/mh-alpha-linux"
+ ;;
hppa*-hp-hpux10*)
host_makefile_frag="config/mh-pa-hpux10"
;;
@@ -1447,6 +1450,12 @@ case "$have_compiler:$host:$target:$enable_bootstrap" in
;;
esac
+# When bootstrapping with GCC, build stage 1 in C++98 mode to ensure that a
+# C++98 compiler can still start the bootstrap.
+if test "$enable_bootstrap:$GXX" = "yes:yes"; then
+ CXX="$CXX -std=gnu++98"
+fi
+
# Used for setting $lt_cv_objdir
_LT_CHECK_OBJDIR
@@ -2694,7 +2703,8 @@ AC_SUBST(BUILD_CONFIG)
# Use same top-level configure hooks in libgcc/libstdc++/libvtv.
AC_MSG_CHECKING([for --enable-vtable-verify])
AC_ARG_ENABLE(vtable-verify,
-[ --enable-vtable-verify Enable vtable verification feature ],
+[AS_HELP_STRING([--enable-vtable-verify],
+ [Enable vtable verification feature])],
[case "$enableval" in
yes) enable_vtable_verify=yes ;;
no) enable_vtable_verify=no ;;
@@ -3089,7 +3099,7 @@ fi
# multilib is not explicitly enabled.
case "$target:$have_compiler:$host:$target:$enable_multilib" in
x86_64-*linux*:yes:$build:$build:)
- # Make sure we have a developement environment that handles 32-bit
+ # Make sure we have a development environment that handles 32-bit
dev64=no
echo "int main () { return 0; }" > conftest.c
${CC} -m32 -o conftest ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} conftest.c
@@ -3100,7 +3110,7 @@ case "$target:$have_compiler:$host:$target:$enable_multilib" in
fi
rm -f conftest*
if test x${dev64} != xyes ; then
- AC_MSG_ERROR([I suspect your system does not have 32-bit developement libraries (libc and headers). If you have them, rerun configure with --enable-multilib. If you do not have them, and want to build a 64-bit-only compiler, rerun configure with --disable-multilib.])
+ AC_MSG_ERROR([I suspect your system does not have 32-bit development libraries (libc and headers). If you have them, rerun configure with --enable-multilib. If you do not have them, and want to build a 64-bit-only compiler, rerun configure with --disable-multilib.])
fi
;;
esac
@@ -3508,7 +3518,19 @@ AC_ARG_ENABLE(stage1-checking,
[choose additional checking for stage1 of the compiler])],
[stage1_checking=--enable-checking=${enable_stage1_checking}],
[if test "x$enable_checking" = xno || test "x$enable_checking" = x; then
- stage1_checking=--enable-checking=yes,types
+ # For --disable-checking or implicit --enable-checking=release, avoid
+ # setting --enable-checking=gc in the default stage1 checking for LTO
+ # bootstraps. See PR62077.
+ stage1_checking=--enable-checking=release,misc,gimple,rtlflag,tree,types
+ case $BUILD_CONFIG in
+ *lto*)
+ if test "x$enable_checking" = x && \
+ test -d ${srcdir}/gcc && \
+ test x"`cat ${srcdir}/gcc/DEV-PHASE`" = xexperimental; then
+ stage1_checking=--enable-checking=yes,types
+ fi;;
+ *) stage1_checking=--enable-checking=yes,types;;
+ esac
else
stage1_checking=--enable-checking=$enable_checking,types
fi])