summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2020-04-09 06:52:55 -0600
committerTom Tromey <tromey@adacore.com>2020-04-09 06:52:55 -0600
commitf9d09df0f3552b6f179edeb038844bda40fc7534 (patch)
tree7a857d756a32841ce37e9a5aca79fca6c91491d6 /configure.ac
parentsra: Fix sra_modify_expr handling of partial writes (PR 94482) (diff)
downloadgcc-f9d09df0f3552b6f179edeb038844bda40fc7534.tar.gz
gcc-f9d09df0f3552b6f179edeb038844bda40fc7534.tar.bz2
gcc-f9d09df0f3552b6f179edeb038844bda40fc7534.tar.xz
Merge top-level configury changes from gdb
We recently rearranged the gdb source tree to move a common library and gdbserver to the top-level. This made the build more uniform and also a bit faster (due to sharing of built objects). This patch re-syncs these changes the top-level configury back to gcc. ChangeLog: * configure: Rebuild. * Makefile.in: Rebuild. * Makefile.def (gdbsupport, gdbserver): New host modules. (configure-gdb): Depend on all-gdbsupport. (all-gdb): Depend on all-gdbsupport, all-libctf. * configure.ac (host_tools): Add gdbserver. Conditionally build gdbserver and gdbsupport.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac36
1 files changed, 28 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index d06c72c877e..8d2b3d31ae0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,7 +139,7 @@ host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktr
139# binutils, gas and ld appear in that order because it makes sense to run 139# binutils, gas and ld appear in that order because it makes sense to run
140# "make check" in that particular order. 140# "make check" in that particular order.
141# If --enable-gold is used, "gold" may replace "ld". 141# If --enable-gold is used, "gold" may replace "ld".
142host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools libcc1 gotools" 142host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gdbserver gprof etc expect dejagnu m4 utils guile fastjar gnattools libcc1 gotools"
143 143
144# these libraries are built for the target environment, and are built after 144# these libraries are built for the target environment, and are built after
145# the host libraries and the host tools (which may be a cross compiler) 145# the host libraries and the host tools (which may be a cross compiler)
@@ -855,6 +855,22 @@ case "${target}" in
855 ;; 855 ;;
856esac 856esac
857 857
858# Only allow gdbserver on some systems.
859if test -d ${srcdir}/gdbserver; then
860 if test x$enable_gdbserver = x; then
861 AC_MSG_CHECKING([for gdbserver support])
862 if (srcdir=${srcdir}/gdbserver; \
863 . ${srcdir}/configure.srv; \
864 test -n "$UNSUPPORTED")
865 then
866 AC_MSG_RESULT([no])
867 noconfigdirs="$noconfigdirs gdbserver"
868 else
869 AC_MSG_RESULT([yes])
870 fi
871 fi
872fi
873
858# Disable libgo for some systems where it is known to not work. 874# Disable libgo for some systems where it is known to not work.
859# For testing, you can easily override this with --enable-libgo. 875# For testing, you can easily override this with --enable-libgo.
860if test x$enable_libgo = x; then 876if test x$enable_libgo = x; then
@@ -2816,13 +2832,17 @@ esac
2816CONFIGURE_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-configure-/g` 2832CONFIGURE_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-configure-/g`
2817INSTALL_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-install-/g` 2833INSTALL_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-install-/g`
2818 2834
2819# gdb depends on gnulib, but as nothing else does, only include it if 2835# gdb and gdbserver depend on gnulib and gdbsupport, but as nothing
2820# gdb is built. 2836# else does, only include them if one of these is built. The Makefile
2821if echo " ${configdirs} " | grep " gdb " > /dev/null 2>&1 ; then 2837# provides the ordering, so it's enough here to add to the list.
2822 # The Makefile provides the ordering, so it's enough here to add 2838case " ${configdirs} " in
2823 # gnulib to the list. 2839 *\ gdb\ *)
2824 configdirs="${configdirs} gnulib" 2840 configdirs="${configdirs} gnulib gdbsupport"
2825fi 2841 ;;
2842 *\ gdbserver\ *)
2843 configdirs="${configdirs} gnulib gdbsupport"
2844 ;;
2845esac
2826 2846
2827# Strip out unwanted targets. 2847# Strip out unwanted targets.
2828 2848