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.
This commit is contained in:
Tom Tromey
Tom Tromey
parent
2111d5406a
commit
f9d09df0f3
10
ChangeLog
10
ChangeLog
@ -1,3 +1,13 @@
|
||||
2020-04-09 Tom Tromey <tom@tromey.com>
|
||||
|
||||
* 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.
|
||||
|
||||
2020-03-09 Tobias Burnus <tobias@codesourcery.com>
|
||||
|
||||
* configure.ac: Build libgomp by default for amdgcn.
|
||||
|
||||
16
Makefile.def
16
Makefile.def
@ -113,6 +113,8 @@ host_modules= { module= zlib; no_install=true; no_check=true;
|
||||
bootstrap=true;
|
||||
extra_configure_flags='@extra_host_zlib_configure_flags@';};
|
||||
host_modules= { module= gnulib; };
|
||||
host_modules= { module= gdbsupport; };
|
||||
host_modules= { module= gdbserver; };
|
||||
host_modules= { module= gdb; };
|
||||
host_modules= { module= expect; };
|
||||
host_modules= { module= guile; };
|
||||
@ -394,18 +396,27 @@ dependencies = { module=configure-gdb; on=all-intl; };
|
||||
dependencies = { module=configure-gdb; on=configure-sim; };
|
||||
dependencies = { module=configure-gdb; on=all-bfd; };
|
||||
dependencies = { module=configure-gdb; on=all-gnulib; };
|
||||
dependencies = { module=configure-gdb; on=all-gdbsupport; };
|
||||
// Depend on all-libiconv so that configure checks for iconv
|
||||
// functions will work.
|
||||
dependencies = { module=configure-gdb; on=all-libiconv; };
|
||||
dependencies = { module=all-gdb; on=all-libiberty; };
|
||||
dependencies = { module=all-gdb; on=all-libiconv; };
|
||||
dependencies = { module=all-gdb; on=all-gnulib; };
|
||||
dependencies = { module=all-gdb; on=all-gdbsupport; };
|
||||
dependencies = { module=all-gdb; on=all-opcodes; };
|
||||
dependencies = { module=all-gdb; on=all-readline; };
|
||||
dependencies = { module=all-gdb; on=all-build-bison; };
|
||||
dependencies = { module=all-gdb; on=all-sim; };
|
||||
dependencies = { module=all-gdb; on=all-libdecnumber; };
|
||||
dependencies = { module=all-gdb; on=all-libtermcap; };
|
||||
dependencies = { module=all-gdb; on=all-libctf; };
|
||||
|
||||
// Host modules specific to gdbserver.
|
||||
dependencies = { module=configure-gdbserver; on=all-gnulib; };
|
||||
dependencies = { module=all-gdbserver; on=all-gdbsupport; };
|
||||
dependencies = { module=all-gdbserver; on=all-gnulib; };
|
||||
dependencies = { module=all-gdbserver; on=all-libiberty; };
|
||||
|
||||
dependencies = { module=configure-libgui; on=configure-tcl; };
|
||||
dependencies = { module=configure-libgui; on=configure-tk; };
|
||||
@ -413,6 +424,11 @@ dependencies = { module=all-libgui; on=all-tcl; };
|
||||
dependencies = { module=all-libgui; on=all-tk; };
|
||||
dependencies = { module=all-libgui; on=all-itcl; };
|
||||
|
||||
dependencies = { module=configure-gdbsupport; on=configure-gnulib; };
|
||||
dependencies = { module=configure-gdbsupport; on=configure-intl; };
|
||||
dependencies = { module=all-gdbsupport; on=all-gnulib; };
|
||||
dependencies = { module=all-gdbsupport; on=all-intl; };
|
||||
|
||||
// Host modules specific to binutils.
|
||||
dependencies = { module=configure-bfd; on=configure-libiberty; hard=true; };
|
||||
dependencies = { module=configure-bfd; on=configure-intl; };
|
||||
|
||||
933
Makefile.in
933
Makefile.in
File diff suppressed because it is too large
Load Diff
39
configure
vendored
39
configure
vendored
@ -2793,7 +2793,7 @@ host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktr
|
||||
# binutils, gas and ld appear in that order because it makes sense to run
|
||||
# "make check" in that particular order.
|
||||
# If --enable-gold is used, "gold" may replace "ld".
|
||||
host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools libcc1 gotools"
|
||||
host_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"
|
||||
|
||||
# these libraries are built for the target environment, and are built after
|
||||
# the host libraries and the host tools (which may be a cross compiler)
|
||||
@ -3577,6 +3577,25 @@ case "${target}" in
|
||||
;;
|
||||
esac
|
||||
|
||||
# Only allow gdbserver on some systems.
|
||||
if test -d ${srcdir}/gdbserver; then
|
||||
if test x$enable_gdbserver = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdbserver support" >&5
|
||||
$as_echo_n "checking for gdbserver support... " >&6; }
|
||||
if (srcdir=${srcdir}/gdbserver; \
|
||||
. ${srcdir}/configure.srv; \
|
||||
test -n "$UNSUPPORTED")
|
||||
then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
noconfigdirs="$noconfigdirs gdbserver"
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# Disable libgo for some systems where it is known to not work.
|
||||
# For testing, you can easily override this with --enable-libgo.
|
||||
if test x$enable_libgo = x; then
|
||||
@ -7311,13 +7330,17 @@ esac
|
||||
CONFIGURE_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-configure-/g`
|
||||
INSTALL_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-install-/g`
|
||||
|
||||
# gdb depends on gnulib, but as nothing else does, only include it if
|
||||
# gdb is built.
|
||||
if echo " ${configdirs} " | grep " gdb " > /dev/null 2>&1 ; then
|
||||
# The Makefile provides the ordering, so it's enough here to add
|
||||
# gnulib to the list.
|
||||
configdirs="${configdirs} gnulib"
|
||||
fi
|
||||
# gdb and gdbserver depend on gnulib and gdbsupport, but as nothing
|
||||
# else does, only include them if one of these is built. The Makefile
|
||||
# provides the ordering, so it's enough here to add to the list.
|
||||
case " ${configdirs} " in
|
||||
*\ gdb\ *)
|
||||
configdirs="${configdirs} gnulib gdbsupport"
|
||||
;;
|
||||
*\ gdbserver\ *)
|
||||
configdirs="${configdirs} gnulib gdbsupport"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Strip out unwanted targets.
|
||||
|
||||
|
||||
36
configure.ac
36
configure.ac
@ -139,7 +139,7 @@ host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktr
|
||||
# binutils, gas and ld appear in that order because it makes sense to run
|
||||
# "make check" in that particular order.
|
||||
# If --enable-gold is used, "gold" may replace "ld".
|
||||
host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools libcc1 gotools"
|
||||
host_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"
|
||||
|
||||
# these libraries are built for the target environment, and are built after
|
||||
# the host libraries and the host tools (which may be a cross compiler)
|
||||
@ -855,6 +855,22 @@ case "${target}" in
|
||||
;;
|
||||
esac
|
||||
|
||||
# Only allow gdbserver on some systems.
|
||||
if test -d ${srcdir}/gdbserver; then
|
||||
if test x$enable_gdbserver = x; then
|
||||
AC_MSG_CHECKING([for gdbserver support])
|
||||
if (srcdir=${srcdir}/gdbserver; \
|
||||
. ${srcdir}/configure.srv; \
|
||||
test -n "$UNSUPPORTED")
|
||||
then
|
||||
AC_MSG_RESULT([no])
|
||||
noconfigdirs="$noconfigdirs gdbserver"
|
||||
else
|
||||
AC_MSG_RESULT([yes])
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# Disable libgo for some systems where it is known to not work.
|
||||
# For testing, you can easily override this with --enable-libgo.
|
||||
if test x$enable_libgo = x; then
|
||||
@ -2816,13 +2832,17 @@ esac
|
||||
CONFIGURE_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-configure-/g`
|
||||
INSTALL_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-install-/g`
|
||||
|
||||
# gdb depends on gnulib, but as nothing else does, only include it if
|
||||
# gdb is built.
|
||||
if echo " ${configdirs} " | grep " gdb " > /dev/null 2>&1 ; then
|
||||
# The Makefile provides the ordering, so it's enough here to add
|
||||
# gnulib to the list.
|
||||
configdirs="${configdirs} gnulib"
|
||||
fi
|
||||
# gdb and gdbserver depend on gnulib and gdbsupport, but as nothing
|
||||
# else does, only include them if one of these is built. The Makefile
|
||||
# provides the ordering, so it's enough here to add to the list.
|
||||
case " ${configdirs} " in
|
||||
*\ gdb\ *)
|
||||
configdirs="${configdirs} gnulib gdbsupport"
|
||||
;;
|
||||
*\ gdbserver\ *)
|
||||
configdirs="${configdirs} gnulib gdbsupport"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Strip out unwanted targets.
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user