aboutsummaryrefslogtreecommitdiff
path: root/gdb/Makefile.in
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2019-07-09 08:06:39 -0600
committerTom Tromey <tom@tromey.com>2020-01-14 16:25:02 -0700
commit01027315f54048dbaf03ac37455c2528c72a6d9b (patch)
treec7cab8f936383a1adcb5da0a9493808b643d16ed /gdb/Makefile.in
parentb2ceabe8f0c2056342834b2b3f52f3b015538df3 (diff)
downloadgdb-01027315f54048dbaf03ac37455c2528c72a6d9b.zip
gdb-01027315f54048dbaf03ac37455c2528c72a6d9b.tar.gz
gdb-01027315f54048dbaf03ac37455c2528c72a6d9b.tar.bz2
Move gdbsupport to the top level
This patch moves the gdbsupport directory to the top level. This is the next step in the ongoing project to move gdbserver to the top level. The bulk of this patch was created by "git mv gdb/gdbsupport gdbsupport". This patch then adds a build system to gdbsupport and wires it into the top level. Then it changes gdb to use the top-level build. gdbserver, on the other hand, is not yet changed. It still does its own build of gdbsupport. ChangeLog 2020-01-14 Tom Tromey <tom@tromey.com> * src-release.sh (GDB_SUPPORT_DIRS): Add gdbsupport. * MAINTAINERS: Add gdbsupport. * configure: Rebuild. * configure.ac (configdirs): Add gdbsupport. * gdbsupport: New directory, move from gdb/gdbsupport. * Makefile.def (host_modules, dependencies): Add gnulib. * Makefile.in: Rebuild. gdb/ChangeLog 2020-01-14 Tom Tromey <tom@tromey.com> * nat/x86-linux-dregs.c: Include configh.h. * nat/linux-ptrace.c: Include configh.h. * nat/linux-btrace.c: Include configh.h. * defs.h: Include config.h, bfd.h. * configure.ac: Don't source common.host. (CONFIG_OBS, CONFIG_SRCS): Remove gdbsupport files. * configure: Rebuild. * acinclude.m4: Update path. * Makefile.in (SUPPORT, LIBSUPPORT, INCSUPPORT): New variables. (CONFIG_SRC_SUBDIR): Remove gdbsupport. (INTERNAL_CFLAGS_BASE): Add INCSUPPORT. (CLIBS): Add LIBSUPPORT. (CDEPS): Likewise. (COMMON_SFILES): Remove gdbsupport files. (HFILES_NO_SRCDIR): Likewise. (stamp-version): Update path to create-version.sh. (ALLDEPFILES): Remove gdbsupport files. gdb/gdbserver/ChangeLog 2020-01-14 Tom Tromey <tom@tromey.com> * server.h: Include config.h. * gdbreplay.c: Include config.h. * configure: Rebuild. * configure.ac: Don't source common.host. * acinclude.m4: Update path. * Makefile.in (INCSUPPORT): New variable. (INCLUDE_CFLAGS): Add INCSUPPORT. (SFILES): Update paths. (version-generated.c): Update path to create-version.sh. (gdbsupport/%-ipa.o, gdbsupport/%.o): Update paths. gdbsupport/ChangeLog 2020-01-14 Tom Tromey <tom@tromey.com> * common-defs.h: Add GDBSERVER case. Update includes. * acinclude.m4, aclocal.m4, config.in, configure, configure.ac, Makefile.am, Makefile.in, README: New files. * Moved from ../gdb/gdbsupport/ Change-Id: I07632e7798635c1bab389bf885971e584fb4bb78
Diffstat (limited to 'gdb/Makefile.in')
-rw-r--r--gdb/Makefile.in99
1 files changed, 14 insertions, 85 deletions
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 6df0f46..5f63c61 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -238,6 +238,10 @@ GNULIB_BUILDDIR = ../gnulib
LIBGNU = $(GNULIB_BUILDDIR)/import/libgnu.a
INCGNU = -I$(srcdir)/../gnulib/import -I$(GNULIB_BUILDDIR)/import
+SUPPORT = ../gdbsupport
+LIBSUPPORT = $(SUPPORT)/libgdbsupport.a
+INCSUPPORT = -I$(srcdir)/.. -I..
+
#
# CLI sub directory definitons
#
@@ -547,7 +551,7 @@ CONFIG_INSTALL = @CONFIG_INSTALL@
CONFIG_UNINSTALL = @CONFIG_UNINSTALL@
HAVE_NATIVE_GCORE_TARGET = @HAVE_NATIVE_GCORE_TARGET@
-CONFIG_SRC_SUBDIR = arch cli mi gdbsupport compile tui unittests guile python \
+CONFIG_SRC_SUBDIR = arch cli mi compile tui unittests guile python \
target nat
CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR))
@@ -586,8 +590,8 @@ INTERNAL_CFLAGS_BASE = \
$(CXXFLAGS) $(GLOBAL_CFLAGS) $(PROFILE_CFLAGS) \
$(GDB_CFLAGS) $(OPCODES_CFLAGS) $(READLINE_CFLAGS) $(ZLIBINC) \
$(BFD_CFLAGS) $(INCLUDE_CFLAGS) $(LIBDECNUMBER_CFLAGS) \
- $(INTL_CFLAGS) $(INCGNU) $(ENABLE_CFLAGS) $(INTERNAL_CPPFLAGS) \
- $(SRCHIGH_CFLAGS) $(TOP_CFLAGS) $(PTHREAD_CFLAGS)
+ $(INTL_CFLAGS) $(INCGNU) $(INCSUPPORT) $(ENABLE_CFLAGS) \
+ $(INTERNAL_CPPFLAGS) $(SRCHIGH_CFLAGS) $(TOP_CFLAGS) $(PTHREAD_CFLAGS)
INTERNAL_WARN_CFLAGS = $(INTERNAL_CFLAGS_BASE) $(GDB_WARN_CFLAGS)
INTERNAL_CFLAGS = $(INTERNAL_WARN_CFLAGS) $(GDB_WERROR_CFLAGS)
@@ -607,14 +611,15 @@ INTERNAL_LDFLAGS = \
# XM_CLIBS, defined in *config files, have host-dependent libs.
# LIBIBERTY appears twice on purpose.
CLIBS = $(SIM) $(READLINE) $(OPCODES) $(BFD) $(LIBCTF) $(ZLIB) \
- $(INTL) $(LIBIBERTY) $(LIBDECNUMBER) \
+ $(LIBSUPPORT) $(INTL) $(LIBIBERTY) $(LIBDECNUMBER) \
$(XM_CLIBS) $(GDBTKLIBS) \
@LIBS@ @GUILE_LIBS@ @PYTHON_LIBS@ \
$(LIBEXPAT) $(LIBLZMA) $(LIBBABELTRACE) $(LIBIPT) \
- $(LIBIBERTY) $(WIN32LIBS) $(LIBGNU) $(LIBICONV) $(LIBMPFR) \
- $(SRCHIGH_LIBS) $(LIBXXHASH) $(PTHREAD_LIBS)
+ $(LIBIBERTY) $(WIN32LIBS) $(LIBGNU) $(LIBICONV) \
+ $(LIBMPFR) $(SRCHIGH_LIBS) $(LIBXXHASH) $(PTHREAD_LIBS)
CDEPS = $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) $(LIBCTF) \
- $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU)
+ $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU) \
+ $(LIBSUPPORT)
DIST = gdb
@@ -968,39 +973,6 @@ COMMON_SFILES = \
cli-out.c \
coff-pe-read.c \
coffread.c \
- gdbsupport/agent.c \
- gdbsupport/btrace-common.c \
- gdbsupport/buffer.c \
- gdbsupport/cleanups.c \
- gdbsupport/common-debug.c \
- gdbsupport/common-exceptions.c \
- gdbsupport/common-inferior.c \
- gdbsupport/common-regcache.c \
- gdbsupport/common-utils.c \
- gdbsupport/errors.c \
- gdbsupport/environ.c \
- gdbsupport/fileio.c \
- gdbsupport/filestuff.c \
- gdbsupport/format.c \
- gdbsupport/job-control.c \
- gdbsupport/gdb-dlfcn.c \
- gdbsupport/gdb_tilde_expand.c \
- gdbsupport/gdb_vecs.c \
- gdbsupport/gdb_wait.c \
- gdbsupport/netstuff.c \
- gdbsupport/new-op.c \
- gdbsupport/pathstuff.c \
- gdbsupport/print-utils.c \
- gdbsupport/ptid.c \
- gdbsupport/rsp-low.c \
- gdbsupport/run-time-clock.c \
- gdbsupport/safe-strerror.c \
- gdbsupport/scoped_mmap.c \
- gdbsupport/signals.c \
- gdbsupport/signals-state-save-restore.c \
- gdbsupport/tdesc.c \
- gdbsupport/thread-pool.c \
- gdbsupport/xml-utils.c \
complaints.c \
completer.c \
continuations.c \
@@ -1468,49 +1440,6 @@ HFILES_NO_SRCDIR = \
cli/cli-setshow.h \
cli/cli-style.h \
cli/cli-utils.h \
- gdbsupport/buffer.h \
- gdbsupport/cleanups.h \
- gdbsupport/common-debug.h \
- gdbsupport/common-defs.h \
- gdbsupport/common-exceptions.h \
- gdbsupport/common-gdbthread.h \
- gdbsupport/common-regcache.h \
- gdbsupport/common-types.h \
- gdbsupport/common-utils.h \
- gdbsupport/job-control.h \
- gdbsupport/errors.h \
- gdbsupport/environ.h \
- gdbsupport/fileio.h \
- gdbsupport/format.h \
- gdbsupport/gdb-dlfcn.h \
- gdbsupport/gdb-sigmask.h \
- gdbsupport/gdb_assert.h \
- gdbsupport/gdb_binary_search.h \
- gdbsupport/gdb_tilde_expand.h \
- gdbsupport/gdb_locale.h \
- gdbsupport/gdb_proc_service.h \
- gdbsupport/gdb_setjmp.h \
- gdbsupport/gdb_signals.h \
- gdbsupport/gdb_sys_time.h \
- gdbsupport/gdb_vecs.h \
- gdbsupport/gdb_wait.h \
- gdbsupport/common-inferior.h \
- gdbsupport/netstuff.h \
- gdbsupport/host-defs.h \
- gdbsupport/parallel-for.h \
- gdbsupport/pathstuff.h \
- gdbsupport/print-utils.h \
- gdbsupport/ptid.h \
- gdbsupport/queue.h \
- gdbsupport/rsp-low.h \
- gdbsupport/run-time-clock.h \
- gdbsupport/signals-state-save-restore.h \
- gdbsupport/symbol.h \
- gdbsupport/tdesc.h \
- gdbsupport/thread-pool.h \
- gdbsupport/version.h \
- gdbsupport/x86-xstate.h \
- gdbsupport/xml-utils.h \
compile/compile.h \
compile/compile-c.h \
compile/compile-cplus.h \
@@ -2131,8 +2060,8 @@ $(srcdir)/copying.c: @MAINTAINER_MODE_TRUE@ $(srcdir)/../COPYING3 $(srcdir)/copy
version.c: stamp-version; @true
# Note that the obvious names for the temp file are taken by
# create-version.sh.
-stamp-version: Makefile version.in $(srcdir)/../bfd/version.h $(srcdir)/gdbsupport/create-version.sh
- $(ECHO_GEN) $(SHELL) $(srcdir)/gdbsupport/create-version.sh $(srcdir) \
+stamp-version: Makefile version.in $(srcdir)/../bfd/version.h $(srcdir)/../gdbsupport/create-version.sh
+ $(ECHO_GEN) $(SHELL) $(srcdir)/../gdbsupport/create-version.sh $(srcdir) \
$(host_alias) $(target_alias) version-t.t
@$(SHELL) $(srcdir)/../move-if-change version-t.t version.c
@echo stamp > stamp-version