From d5632bcfd465b7f980c0e0d2ef0d3a7438c98878 Mon Sep 17 00:00:00 2001 From: Anton Kolesov Date: Tue, 17 May 2016 14:08:32 +0300 Subject: [PATCH] Sync toplevel configure with upstream GCC. This fixes a problem, where libgloss wouldn't be built for ARC processors, even though it is actually supported. The original patch that introduced support for ARC in libgloss hasn't been submitted to GCC maillist, hence when top-level configure has been synced with GCC - this libgloss patch has been effectively reverted. Libgloss support for ARC has been accepted in GCC: https://gcc.gnu.org/ml/gcc-patches/2016-05/msg01148.html ChangeLog 2016-05-17 Anton Kolesov * configure.ac: Sync with upstream GCC. * configure: Regenerate. Signed-off-by: Anton Kolesov --- configure | 35 ++++++++++++----------------------- configure.ac | 35 ++++++++++++----------------------- 2 files changed, 24 insertions(+), 46 deletions(-) diff --git a/configure b/configure index 35f231ea9..ea63784be 100755 --- a/configure +++ b/configure @@ -3446,8 +3446,6 @@ case "${target}" in ;; sh-*-* | sh[34]*-*-*) ;; - sh64-*-* | sh5*-*-*) - ;; sparc*-*-*) ;; x86_64-*-*) @@ -3758,9 +3756,6 @@ case "${target}" in sh*-*-pe|mips*-*-pe|*arm-wince-pe) noconfigdirs="$noconfigdirs tcl tk itcl libgui sim" ;; - arc-*-*|arceb-*-*) - noconfigdirs="$noconfigdirs target-libgloss" - ;; arm-*-pe*) noconfigdirs="$noconfigdirs target-libgloss" ;; @@ -3946,7 +3941,7 @@ case "${target}" in or1k*-*-*) noconfigdirs="$noconfigdirs gdb" ;; - sh-*-* | sh64-*-*) + sh-*-*) case "${target}" in sh*-*-elf) ;; @@ -5570,16 +5565,9 @@ if test "x$with_mpfr_lib" != x; then gmplibs="-L$with_mpfr_lib $gmplibs" fi if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then - # MPFR v3.1.0 moved the sources into a src sub-directory. - if test -d ${srcdir}/mpfr/src; then - gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir $gmplibs" - gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr/src -I$$s/mpfr/src '"$gmpinc" - extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr/src --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir" - else - gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir $gmplibs" - gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc" - extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir" - fi + gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir $gmplibs" + gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr/src -I$$s/mpfr/src '"$gmpinc" + extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr/src --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir" # Do not test the mpfr version. Assume that it is sufficient, since # it is in the source tree, and the library has not been built yet # but it would be included on the link line in the version check below @@ -14850,16 +14838,17 @@ else # 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;; + stage1_checking=--enable-checking=release,misc,gimple,rtlflag,tree,types;; + *) + stage1_checking=--enable-checking=yes,types;; esac + 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,extra + fi else stage1_checking=--enable-checking=$enable_checking,types fi diff --git a/configure.ac b/configure.ac index 74bf58aad..54558df98 100644 --- a/configure.ac +++ b/configure.ac @@ -782,8 +782,6 @@ case "${target}" in ;; sh-*-* | sh[[34]]*-*-*) ;; - sh64-*-* | sh5*-*-*) - ;; sparc*-*-*) ;; x86_64-*-*) @@ -1094,9 +1092,6 @@ case "${target}" in sh*-*-pe|mips*-*-pe|*arm-wince-pe) noconfigdirs="$noconfigdirs tcl tk itcl libgui sim" ;; - arc-*-*|arceb-*-*) - noconfigdirs="$noconfigdirs target-libgloss" - ;; arm-*-pe*) noconfigdirs="$noconfigdirs target-libgloss" ;; @@ -1282,7 +1277,7 @@ case "${target}" in or1k*-*-*) noconfigdirs="$noconfigdirs gdb" ;; - sh-*-* | sh64-*-*) + sh-*-*) case "${target}" in sh*-*-elf) ;; @@ -1550,16 +1545,9 @@ if test "x$with_mpfr_lib" != x; then gmplibs="-L$with_mpfr_lib $gmplibs" fi if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then - # MPFR v3.1.0 moved the sources into a src sub-directory. - if test -d ${srcdir}/mpfr/src; then - gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir $gmplibs" - gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr/src -I$$s/mpfr/src '"$gmpinc" - extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr/src --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir" - else - gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir $gmplibs" - gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc" - extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir" - fi + gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir $gmplibs" + gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr/src -I$$s/mpfr/src '"$gmpinc" + extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr/src --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir" # Do not test the mpfr version. Assume that it is sufficient, since # it is in the source tree, and the library has not been built yet # but it would be included on the link line in the version check below @@ -3530,16 +3518,17 @@ AC_ARG_ENABLE(stage1-checking, # 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;; + stage1_checking=--enable-checking=release,misc,gimple,rtlflag,tree,types;; + *) + stage1_checking=--enable-checking=yes,types;; esac + 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,extra + fi else stage1_checking=--enable-checking=$enable_checking,types fi])