diff options
| author | Tom Tromey <tom@tromey.com> | 2019-05-05 20:29:24 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-07-09 07:45:38 -0600 |
| commit | 268a13a5a3f7c6b9b6ffc5ac2d1b24eb41f3fbdc (patch) | |
| tree | 1008ee3d41f31bee0158dca43ab14915e3b412e8 /gdb/gdbserver | |
| parent | 5b0e2db4fa08b43e9ff78d6e9a45d496522bd241 (diff) | |
| download | gdb-268a13a5a3f7c6b9b6ffc5ac2d1b24eb41f3fbdc.zip gdb-268a13a5a3f7c6b9b6ffc5ac2d1b24eb41f3fbdc.tar.gz gdb-268a13a5a3f7c6b9b6ffc5ac2d1b24eb41f3fbdc.tar.bz2 | |
Rename common to gdbsupport
This is the next patch in the ongoing series to move gdbsever to the
top level.
This patch just renames the "common" directory. The idea is to do
this move in two parts: first rename the directory (this patch), then
move the directory to the top. This approach makes the patches a bit
more tractable.
I chose the name "gdbsupport" for the directory. However, as this
patch was largely written by sed, we could pick a new name without too
much difficulty.
Tested by the buildbot.
gdb/ChangeLog
2019-07-09 Tom Tromey <tom@tromey.com>
* contrib/ari/gdb_ari.sh: Change common to gdbsupport.
* configure: Rebuild.
* configure.ac: Change common to gdbsupport.
* gdbsupport: Rename from common.
* acinclude.m4: Change common to gdbsupport.
* Makefile.in (CONFIG_SRC_SUBDIR, COMMON_SFILES)
(HFILES_NO_SRCDIR, stamp-version, ALLDEPFILES): Change common to
gdbsupport.
* aarch64-tdep.c, ada-lang.c, ada-lang.h, agent.c, alloc.c,
amd64-darwin-tdep.c, amd64-dicos-tdep.c, amd64-fbsd-nat.c,
amd64-fbsd-tdep.c, amd64-linux-nat.c, amd64-linux-tdep.c,
amd64-nbsd-tdep.c, amd64-obsd-tdep.c, amd64-sol2-tdep.c,
amd64-tdep.c, amd64-windows-tdep.c, arch-utils.c,
arch/aarch64-insn.c, arch/aarch64.c, arch/aarch64.h, arch/amd64.c,
arch/amd64.h, arch/arm-get-next-pcs.c, arch/arm-linux.c,
arch/arm.c, arch/i386.c, arch/i386.h, arch/ppc-linux-common.c,
arch/riscv.c, arch/riscv.h, arch/tic6x.c, arm-tdep.c, auto-load.c,
auxv.c, ax-gdb.c, ax-general.c, ax.h, breakpoint.c, breakpoint.h,
btrace.c, btrace.h, build-id.c, build-id.h, c-lang.h, charset.c,
charset.h, cli/cli-cmds.c, cli/cli-cmds.h, cli/cli-decode.c,
cli/cli-dump.c, cli/cli-option.h, cli/cli-script.c,
coff-pe-read.c, command.h, compile/compile-c-support.c,
compile/compile-c.h, compile/compile-cplus-symbols.c,
compile/compile-cplus-types.c, compile/compile-cplus.h,
compile/compile-loc2c.c, compile/compile.c, completer.c,
completer.h, contrib/ari/gdb_ari.sh, corefile.c, corelow.c,
cp-support.c, cp-support.h, cp-valprint.c, csky-tdep.c, ctf.c,
darwin-nat.c, debug.c, defs.h, disasm-selftests.c, disasm.c,
disasm.h, dtrace-probe.c, dwarf-index-cache.c,
dwarf-index-cache.h, dwarf-index-write.c, dwarf2-frame.c,
dwarf2expr.c, dwarf2loc.c, dwarf2read.c, event-loop.c,
event-top.c, exceptions.c, exec.c, extension.h, fbsd-nat.c,
features/aarch64-core.c, features/aarch64-fpu.c,
features/aarch64-pauth.c, features/aarch64-sve.c,
features/i386/32bit-avx.c, features/i386/32bit-avx512.c,
features/i386/32bit-core.c, features/i386/32bit-linux.c,
features/i386/32bit-mpx.c, features/i386/32bit-pkeys.c,
features/i386/32bit-segments.c, features/i386/32bit-sse.c,
features/i386/64bit-avx.c, features/i386/64bit-avx512.c,
features/i386/64bit-core.c, features/i386/64bit-linux.c,
features/i386/64bit-mpx.c, features/i386/64bit-pkeys.c,
features/i386/64bit-segments.c, features/i386/64bit-sse.c,
features/i386/x32-core.c, features/riscv/32bit-cpu.c,
features/riscv/32bit-csr.c, features/riscv/32bit-fpu.c,
features/riscv/64bit-cpu.c, features/riscv/64bit-csr.c,
features/riscv/64bit-fpu.c, features/tic6x-c6xp.c,
features/tic6x-core.c, features/tic6x-gp.c, filename-seen-cache.h,
findcmd.c, findvar.c, fork-child.c, gcore.c, gdb_bfd.c, gdb_bfd.h,
gdb_proc_service.h, gdb_regex.c, gdb_select.h, gdb_usleep.c,
gdbarch-selftests.c, gdbthread.h, gdbtypes.h, gnu-nat.c,
go32-nat.c, guile/guile.c, guile/scm-ports.c,
guile/scm-safe-call.c, guile/scm-type.c, i386-fbsd-nat.c,
i386-fbsd-tdep.c, i386-go32-tdep.c, i386-linux-nat.c,
i386-linux-tdep.c, i386-tdep.c, i387-tdep.c,
ia64-libunwind-tdep.c, ia64-linux-nat.c, inf-child.c,
inf-ptrace.c, infcall.c, infcall.h, infcmd.c, inferior-iter.h,
inferior.c, inferior.h, inflow.c, inflow.h, infrun.c, infrun.h,
inline-frame.c, language.h, linespec.c, linux-fork.c, linux-nat.c,
linux-tdep.c, linux-thread-db.c, location.c, machoread.c,
macrotab.h, main.c, maint.c, maint.h, memattr.c, memrange.h,
mi/mi-cmd-break.h, mi/mi-cmd-env.c, mi/mi-cmd-stack.c,
mi/mi-cmd-var.c, mi/mi-interp.c, mi/mi-main.c, mi/mi-parse.h,
minsyms.c, mips-linux-tdep.c, namespace.h,
nat/aarch64-linux-hw-point.c, nat/aarch64-linux-hw-point.h,
nat/aarch64-linux.c, nat/aarch64-sve-linux-ptrace.c,
nat/amd64-linux-siginfo.c, nat/fork-inferior.c,
nat/linux-btrace.c, nat/linux-btrace.h, nat/linux-namespaces.c,
nat/linux-nat.h, nat/linux-osdata.c, nat/linux-personality.c,
nat/linux-procfs.c, nat/linux-ptrace.c, nat/linux-ptrace.h,
nat/linux-waitpid.c, nat/mips-linux-watch.c,
nat/mips-linux-watch.h, nat/ppc-linux.c, nat/x86-dregs.c,
nat/x86-dregs.h, nat/x86-linux-dregs.c, nat/x86-linux.c,
nto-procfs.c, nto-tdep.c, objfile-flags.h, objfiles.c, objfiles.h,
obsd-nat.c, observable.h, osdata.c, p-valprint.c, parse.c,
parser-defs.h, ppc-linux-nat.c, printcmd.c, probe.c, proc-api.c,
procfs.c, producer.c, progspace.h, psymtab.h,
python/py-framefilter.c, python/py-inferior.c, python/py-ref.h,
python/py-type.c, python/python.c, record-btrace.c, record-full.c,
record.c, record.h, regcache-dump.c, regcache.c, regcache.h,
remote-fileio.c, remote-fileio.h, remote-sim.c, remote.c,
riscv-tdep.c, rs6000-aix-tdep.c, rust-exp.y, s12z-tdep.c,
selftest-arch.c, ser-base.c, ser-event.c, ser-pipe.c, ser-tcp.c,
ser-unix.c, skip.c, solib-aix.c, solib-target.c, solib.c,
source-cache.c, source.c, source.h, sparc-nat.c, spu-linux-nat.c,
stack.c, stap-probe.c, symfile-add-flags.h, symfile.c, symfile.h,
symtab.c, symtab.h, target-descriptions.c, target-descriptions.h,
target-memory.c, target.c, target.h, target/waitstatus.c,
target/waitstatus.h, thread-iter.h, thread.c, tilegx-tdep.c,
top.c, top.h, tracefile-tfile.c, tracefile.c, tracepoint.c,
tracepoint.h, tui/tui-io.c, ui-file.c, ui-out.h,
unittests/array-view-selftests.c,
unittests/child-path-selftests.c, unittests/cli-utils-selftests.c,
unittests/common-utils-selftests.c,
unittests/copy_bitwise-selftests.c, unittests/environ-selftests.c,
unittests/format_pieces-selftests.c,
unittests/function-view-selftests.c,
unittests/lookup_name_info-selftests.c,
unittests/memory-map-selftests.c, unittests/memrange-selftests.c,
unittests/mkdir-recursive-selftests.c,
unittests/observable-selftests.c,
unittests/offset-type-selftests.c, unittests/optional-selftests.c,
unittests/parse-connection-spec-selftests.c,
unittests/ptid-selftests.c, unittests/rsp-low-selftests.c,
unittests/scoped_fd-selftests.c,
unittests/scoped_mmap-selftests.c,
unittests/scoped_restore-selftests.c,
unittests/string_view-selftests.c, unittests/style-selftests.c,
unittests/tracepoint-selftests.c, unittests/unpack-selftests.c,
unittests/utils-selftests.c, unittests/xml-utils-selftests.c,
utils.c, utils.h, valarith.c, valops.c, valprint.c, value.c,
value.h, varobj.c, varobj.h, windows-nat.c, x86-linux-nat.c,
xml-support.c, xml-support.h, xml-tdesc.h, xstormy16-tdep.c,
xtensa-linux-nat.c, dwarf2read.h: Change common to gdbsupport.
gdb/gdbserver/ChangeLog
2019-07-09 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
* configure.ac: Change common to gdbsupport.
* acinclude.m4: Change common to gdbsupport.
* Makefile.in (SFILES, OBS, GDBREPLAY_OBS, IPA_OBJS)
(version-generated.c, gdbsupport/%-ipa.o, gdbsupport/%.o): Change
common to gdbsupport.
* ax.c, event-loop.c, fork-child.c, gdb_proc_service.h,
gdbreplay.c, gdbthread.h, hostio-errno.c, hostio.c, i387-fp.c,
inferiors.c, inferiors.h, linux-aarch64-tdesc-selftest.c,
linux-amd64-ipa.c, linux-i386-ipa.c, linux-low.c,
linux-tic6x-low.c, linux-x86-low.c, linux-x86-tdesc-selftest.c,
linux-x86-tdesc.c, lynx-i386-low.c, lynx-low.c, mem-break.h,
nto-x86-low.c, regcache.c, regcache.h, remote-utils.c, server.c,
server.h, spu-low.c, symbol.c, target.h, tdesc.c, tdesc.h,
thread-db.c, tracepoint.c, win32-i386-low.c, win32-low.c: Change
common to gdbsupport.
Diffstat (limited to 'gdb/gdbserver')
40 files changed, 194 insertions, 175 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 0bd6113..0a48ad5 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,22 @@ +2019-07-09 Tom Tromey <tom@tromey.com> + + * configure: Rebuild. + * configure.ac: Change common to gdbsupport. + * acinclude.m4: Change common to gdbsupport. + * Makefile.in (SFILES, OBS, GDBREPLAY_OBS, IPA_OBJS) + (version-generated.c, gdbsupport/%-ipa.o, gdbsupport/%.o): Change + common to gdbsupport. + * ax.c, event-loop.c, fork-child.c, gdb_proc_service.h, + gdbreplay.c, gdbthread.h, hostio-errno.c, hostio.c, i387-fp.c, + inferiors.c, inferiors.h, linux-aarch64-tdesc-selftest.c, + linux-amd64-ipa.c, linux-i386-ipa.c, linux-low.c, + linux-tic6x-low.c, linux-x86-low.c, linux-x86-tdesc-selftest.c, + linux-x86-tdesc.c, lynx-i386-low.c, lynx-low.c, mem-break.h, + nto-x86-low.c, regcache.c, regcache.h, remote-utils.c, server.c, + server.h, spu-low.c, symbol.c, target.h, tdesc.c, tdesc.h, + thread-db.c, tracepoint.c, win32-i386-low.c, win32-low.c: Change + common to gdbsupport. + 2019-07-04 Alan Hayward <alan.hayward@arm.com> * linux-aarch32-low.c (arm_read_description, arm_regsets): Use new diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index b9df2be..ba0356b 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -198,29 +198,29 @@ SFILES = \ $(srcdir)/arch/arm-linux.c \ $(srcdir)/arch/ppc-linux-common.c \ $(srcdir)/../alloc.c \ - $(srcdir)/common/btrace-common.c \ - $(srcdir)/common/buffer.c \ - $(srcdir)/common/cleanups.c \ - $(srcdir)/common/common-debug.c \ - $(srcdir)/common/common-exceptions.c \ - $(srcdir)/common/common-regcache.c \ - $(srcdir)/common/common-utils.c \ - $(srcdir)/common/errors.c \ - $(srcdir)/common/environ.c \ - $(srcdir)/common/fileio.c \ - $(srcdir)/common/filestuff.c \ - $(srcdir)/common/job-control.c \ - $(srcdir)/common/gdb_tilde_expand.c \ - $(srcdir)/common/gdb_vecs.c \ - $(srcdir)/common/netstuff.c \ - $(srcdir)/common/new-op.c \ - $(srcdir)/common/pathstuff.c \ - $(srcdir)/common/print-utils.c \ - $(srcdir)/common/ptid.c \ - $(srcdir)/common/rsp-low.c \ - $(srcdir)/common/tdesc.c \ - $(srcdir)/common/vec.c \ - $(srcdir)/common/xml-utils.c \ + $(srcdir)/gdbsupport/btrace-common.c \ + $(srcdir)/gdbsupport/buffer.c \ + $(srcdir)/gdbsupport/cleanups.c \ + $(srcdir)/gdbsupport/common-debug.c \ + $(srcdir)/gdbsupport/common-exceptions.c \ + $(srcdir)/gdbsupport/common-regcache.c \ + $(srcdir)/gdbsupport/common-utils.c \ + $(srcdir)/gdbsupport/errors.c \ + $(srcdir)/gdbsupport/environ.c \ + $(srcdir)/gdbsupport/fileio.c \ + $(srcdir)/gdbsupport/filestuff.c \ + $(srcdir)/gdbsupport/job-control.c \ + $(srcdir)/gdbsupport/gdb_tilde_expand.c \ + $(srcdir)/gdbsupport/gdb_vecs.c \ + $(srcdir)/gdbsupport/netstuff.c \ + $(srcdir)/gdbsupport/new-op.c \ + $(srcdir)/gdbsupport/pathstuff.c \ + $(srcdir)/gdbsupport/print-utils.c \ + $(srcdir)/gdbsupport/ptid.c \ + $(srcdir)/gdbsupport/rsp-low.c \ + $(srcdir)/gdbsupport/tdesc.c \ + $(srcdir)/gdbsupport/vec.c \ + $(srcdir)/gdbsupport/xml-utils.c \ $(srcdir)/nat/aarch64-sve-linux-ptrace.c \ $(srcdir)/nat/linux-btrace.c \ $(srcdir)/nat/linux-namespaces.c \ @@ -241,33 +241,33 @@ TAGFILES = $(SOURCES) ${HFILES} ${ALLPARAM} ${POSSLIBS} OBS = \ alloc.o \ ax.o \ - common/agent.o \ - common/btrace-common.o \ - common/buffer.o \ - common/cleanups.o \ - common/common-debug.o \ - common/common-exceptions.o \ - common/job-control.o \ - common/common-regcache.o \ - common/common-utils.o \ - common/errors.o \ - common/environ.o \ - common/fileio.o \ - common/filestuff.o \ - common/format.o \ - common/gdb_tilde_expand.o \ - common/gdb_vecs.o \ - common/netstuff.o \ - common/new-op.o \ - common/pathstuff.o \ - common/print-utils.o \ - common/ptid.o \ - common/rsp-low.o \ - common/signals.o \ - common/signals-state-save-restore.o \ - common/tdesc.o \ - common/vec.o \ - common/xml-utils.o \ + gdbsupport/agent.o \ + gdbsupport/btrace-common.o \ + gdbsupport/buffer.o \ + gdbsupport/cleanups.o \ + gdbsupport/common-debug.o \ + gdbsupport/common-exceptions.o \ + gdbsupport/job-control.o \ + gdbsupport/common-regcache.o \ + gdbsupport/common-utils.o \ + gdbsupport/errors.o \ + gdbsupport/environ.o \ + gdbsupport/fileio.o \ + gdbsupport/filestuff.o \ + gdbsupport/format.o \ + gdbsupport/gdb_tilde_expand.o \ + gdbsupport/gdb_vecs.o \ + gdbsupport/netstuff.o \ + gdbsupport/new-op.o \ + gdbsupport/pathstuff.o \ + gdbsupport/print-utils.o \ + gdbsupport/ptid.o \ + gdbsupport/rsp-low.o \ + gdbsupport/signals.o \ + gdbsupport/signals-state-save-restore.o \ + gdbsupport/tdesc.o \ + gdbsupport/vec.o \ + gdbsupport/xml-utils.o \ debug.o \ dll.o \ event-loop.o \ @@ -290,13 +290,13 @@ OBS = \ $(XML_BUILTIN) GDBREPLAY_OBS = \ - common/cleanups.o \ - common/common-exceptions.o \ - common/common-utils.o \ - common/rsp-low.o \ - common/errors.o \ - common/netstuff.o \ - common/print-utils.o \ + gdbsupport/cleanups.o \ + gdbsupport/common-exceptions.o \ + gdbsupport/common-utils.o \ + gdbsupport/rsp-low.o \ + gdbsupport/errors.o \ + gdbsupport/netstuff.o \ + gdbsupport/print-utils.o \ gdbreplay.o \ utils.o \ version.o @@ -418,13 +418,13 @@ gdbreplay$(EXEEXT): $(sort $(GDBREPLAY_OBS)) $(LIBGNU) $(LIBIBERTY) IPA_OBJS = \ alloc-ipa.o \ ax-ipa.o \ - common/common-utils-ipa.o \ - common/errors-ipa.o \ - common/format-ipa.o \ - common/print-utils-ipa.o \ - common/rsp-low-ipa.o \ - common/tdesc-ipa.o \ - common/vec-ipa.o \ + gdbsupport/common-utils-ipa.o \ + gdbsupport/errors-ipa.o \ + gdbsupport/format-ipa.o \ + gdbsupport/print-utils-ipa.o \ + gdbsupport/rsp-low-ipa.o \ + gdbsupport/tdesc-ipa.o \ + gdbsupport/vec-ipa.o \ regcache-ipa.o \ remote-utils-ipa.o \ tdesc-ipa.o \ @@ -519,8 +519,8 @@ am--refresh: force: -version-generated.c: Makefile $(srcdir)/../version.in $(srcdir)/../../bfd/version.h $(srcdir)/../common/create-version.sh - $(ECHO_GEN) $(SHELL) $(srcdir)/../common/create-version.sh $(srcdir)/.. \ +version-generated.c: Makefile $(srcdir)/../version.in $(srcdir)/../../bfd/version.h $(srcdir)/../gdbsupport/create-version.sh + $(ECHO_GEN) $(SHELL) $(srcdir)/../gdbsupport/create-version.sh $(srcdir)/.. \ $(host_alias) $(target_alias) $@ xml-builtin-generated.c: stamp-xml; @true @@ -582,7 +582,7 @@ arch/%-ipa.o: ../arch/%.c $(IPAGENT_COMPILE) $< $(POSTCOMPILE) -common/%-ipa.o: ../common/%.c +gdbsupport/%-ipa.o: ../gdbsupport/%.c $(IPAGENT_COMPILE) $< $(POSTCOMPILE) @@ -611,7 +611,7 @@ arch/%.o: ../arch/%.c $(COMPILE) $< $(POSTCOMPILE) -common/%.o: ../common/%.c +gdbsupport/%.o: ../gdbsupport/%.c $(COMPILE) $< $(POSTCOMPILE) diff --git a/gdb/gdbserver/acinclude.m4 b/gdb/gdbserver/acinclude.m4 index fc3e344..96ded3d 100644 --- a/gdb/gdbserver/acinclude.m4 +++ b/gdb/gdbserver/acinclude.m4 @@ -21,7 +21,7 @@ m4_include(../../config/lead-dot.m4) dnl codeset.m4 is needed for common.m4, but not for dnl anything else in gdbserver. m4_include(../../config/codeset.m4) -m4_include(../common/common.m4) +m4_include(../gdbsupport/common.m4) dnl For libiberty_INIT. m4_include(../libiberty.m4) diff --git a/gdb/gdbserver/ax.c b/gdb/gdbserver/ax.c index 7b8df91..2c096ef 100644 --- a/gdb/gdbserver/ax.c +++ b/gdb/gdbserver/ax.c @@ -18,9 +18,9 @@ #include "server.h" #include "ax.h" -#include "common/format.h" +#include "gdbsupport/format.h" #include "tracepoint.h" -#include "common/rsp-low.h" +#include "gdbsupport/rsp-low.h" static void ax_vdebug (const char *, ...) ATTRIBUTE_PRINTF (1, 2); @@ -60,7 +60,7 @@ enum gdb_agent_op { #define DEFOP(NAME, SIZE, DATA_SIZE, CONSUMED, PRODUCED, VALUE) \ gdb_agent_op_ ## NAME = VALUE, -#include "common/ax.def" +#include "gdbsupport/ax.def" #undef DEFOP gdb_agent_op_last }; @@ -69,7 +69,7 @@ static const char *gdb_agent_op_names [gdb_agent_op_last] = { "?undef?" #define DEFOP(NAME, SIZE, DATA_SIZE, CONSUMED, PRODUCED, VALUE) , # NAME -#include "common/ax.def" +#include "gdbsupport/ax.def" #undef DEFOP }; @@ -78,7 +78,7 @@ static const unsigned char gdb_agent_op_sizes [gdb_agent_op_last] = { 0 #define DEFOP(NAME, SIZE, DATA_SIZE, CONSUMED, PRODUCED, VALUE) , SIZE -#include "common/ax.def" +#include "gdbsupport/ax.def" #undef DEFOP }; #endif diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure index e89f2d0..0c04fcc 100755 --- a/gdb/gdbserver/configure +++ b/gdb/gdbserver/configure @@ -5916,7 +5916,7 @@ if $enable_unittests; then $as_echo "#define GDB_SELF_TEST 1" >>confdefs.h - srv_selftest_objs="common/selftest.o" + srv_selftest_objs="gdbsupport/selftest.o" fi @@ -5958,7 +5958,7 @@ ac_config_commands="$ac_config_commands depdir" # Create sub-directories for objects and dependencies. -CONFIG_SRC_SUBDIR="arch common" +CONFIG_SRC_SUBDIR="arch gdbsupport" ac_config_commands="$ac_config_commands gdbdepdir" @@ -7892,7 +7892,7 @@ esac . ${srcdir}/configure.srv # Add in the common host objects. -. ${srcdir}/../common/common.host +. ${srcdir}/../gdbsupport/common.host srv_host_obs="$common_host_obs" if test "${srv_mingwce}" = "yes"; then diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac index d943269..574b7c5 100644 --- a/gdb/gdbserver/configure.ac +++ b/gdb/gdbserver/configure.ac @@ -55,7 +55,7 @@ fi GDB_AC_LIBMCHECK(${libmcheck_default}) GDB_AC_SELFTEST([ - srv_selftest_objs="common/selftest.o" + srv_selftest_objs="gdbsupport/selftest.o" ]) ACX_NONCANONICAL_TARGET @@ -65,7 +65,7 @@ ACX_NONCANONICAL_HOST ZW_CREATE_DEPDIR # Create sub-directories for objects and dependencies. -CONFIG_SRC_SUBDIR="arch common" +CONFIG_SRC_SUBDIR="arch gdbsupport" AC_SUBST(CONFIG_SRC_SUBDIR) AC_CONFIG_COMMANDS([gdbdepdir],[ @@ -255,7 +255,7 @@ esac . ${srcdir}/configure.srv # Add in the common host objects. -. ${srcdir}/../common/common.host +. ${srcdir}/../gdbsupport/common.host srv_host_obs="$common_host_obs" if test "${srv_mingwce}" = "yes"; then diff --git a/gdb/gdbserver/event-loop.c b/gdb/gdbserver/event-loop.c index 0442680..bcc496e 100644 --- a/gdb/gdbserver/event-loop.c +++ b/gdb/gdbserver/event-loop.c @@ -21,7 +21,7 @@ #include "server.h" #include <sys/types.h> -#include "common/gdb_sys_time.h" +#include "gdbsupport/gdb_sys_time.h" #ifdef USE_WIN32API #include <windows.h> diff --git a/gdb/gdbserver/fork-child.c b/gdb/gdbserver/fork-child.c index a8bd040..ddd7309 100644 --- a/gdb/gdbserver/fork-child.c +++ b/gdb/gdbserver/fork-child.c @@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "server.h" -#include "common/job-control.h" +#include "gdbsupport/job-control.h" #include "nat/fork-inferior.h" #ifdef HAVE_SIGNAL_H #include <signal.h> diff --git a/gdb/gdbserver/gdb_proc_service.h b/gdb/gdbserver/gdb_proc_service.h index 626bc16..f0d0c1b 100644 --- a/gdb/gdbserver/gdb_proc_service.h +++ b/gdb/gdbserver/gdb_proc_service.h @@ -19,7 +19,7 @@ #ifndef GDBSERVER_GDB_PROC_SERVICE_H #define GDBSERVER_GDB_PROC_SERVICE_H -#include "common/gdb_proc_service.h" +#include "gdbsupport/gdb_proc_service.h" /* Structure that identifies the target process. */ struct ps_prochandle diff --git a/gdb/gdbserver/gdbreplay.c b/gdb/gdbserver/gdbreplay.c index f4fd568..3252914 100644 --- a/gdb/gdbserver/gdbreplay.c +++ b/gdb/gdbserver/gdbreplay.c @@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "common/common-defs.h" -#include "common/version.h" +#include "gdbsupport/common-defs.h" +#include "gdbsupport/version.h" #if HAVE_SYS_FILE_H #include <sys/file.h> @@ -48,8 +48,8 @@ #include <ws2tcpip.h> #endif -#include "common/netstuff.h" -#include "common/rsp-low.h" +#include "gdbsupport/netstuff.h" +#include "gdbsupport/rsp-low.h" #ifndef HAVE_SOCKLEN_T typedef int socklen_t; diff --git a/gdb/gdbserver/gdbthread.h b/gdb/gdbserver/gdbthread.h index 44ed3c4..825a7f6 100644 --- a/gdb/gdbserver/gdbthread.h +++ b/gdb/gdbserver/gdbthread.h @@ -19,7 +19,7 @@ #ifndef GDBSERVER_GDBTHREAD_H #define GDBSERVER_GDBTHREAD_H -#include "common/common-gdbthread.h" +#include "gdbsupport/common-gdbthread.h" #include "inferiors.h" #include <list> diff --git a/gdb/gdbserver/hostio-errno.c b/gdb/gdbserver/hostio-errno.c index 6325fee..737331b 100644 --- a/gdb/gdbserver/hostio-errno.c +++ b/gdb/gdbserver/hostio-errno.c @@ -22,7 +22,7 @@ on top of errno. */ #include "server.h" -#include "common/fileio.h" +#include "gdbsupport/fileio.h" void hostio_last_error_from_errno (char *buf) diff --git a/gdb/gdbserver/hostio.c b/gdb/gdbserver/hostio.c index eedf6d9..e35a224 100644 --- a/gdb/gdbserver/hostio.c +++ b/gdb/gdbserver/hostio.c @@ -27,7 +27,7 @@ #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> -#include "common/fileio.h" +#include "gdbsupport/fileio.h" struct fd_list { diff --git a/gdb/gdbserver/i387-fp.c b/gdb/gdbserver/i387-fp.c index 7dde85a..3b92fee 100644 --- a/gdb/gdbserver/i387-fp.c +++ b/gdb/gdbserver/i387-fp.c @@ -18,7 +18,7 @@ #include "server.h" #include "i387-fp.h" -#include "common/x86-xstate.h" +#include "gdbsupport/x86-xstate.h" static const int num_mpx_bnd_registers = 4; static const int num_mpx_cfg_registers = 2; diff --git a/gdb/gdbserver/inferiors.c b/gdb/gdbserver/inferiors.c index 17bfd1f..e35186b 100644 --- a/gdb/gdbserver/inferiors.c +++ b/gdb/gdbserver/inferiors.c @@ -213,7 +213,7 @@ current_process (void) return get_thread_process (current_thread); } -/* See common/common-gdbthread.h. */ +/* See gdbsupport/common-gdbthread.h. */ void switch_to_thread (ptid_t ptid) @@ -222,7 +222,7 @@ switch_to_thread (ptid_t ptid) current_thread = find_thread_ptid (ptid); } -/* See common/common-inferior.h. */ +/* See gdbsupport/common-inferior.h. */ const char * get_inferior_cwd () @@ -230,7 +230,7 @@ get_inferior_cwd () return current_inferior_cwd; } -/* See common/common-inferior.h. */ +/* See gdbsupport/common-inferior.h. */ void set_inferior_cwd (const char *cwd) diff --git a/gdb/gdbserver/inferiors.h b/gdb/gdbserver/inferiors.h index cf284b8..f4ab9fd 100644 --- a/gdb/gdbserver/inferiors.h +++ b/gdb/gdbserver/inferiors.h @@ -19,7 +19,7 @@ #ifndef GDBSERVER_INFERIORS_H #define GDBSERVER_INFERIORS_H -#include "common/gdb_vecs.h" +#include "gdbsupport/gdb_vecs.h" #include <list> struct thread_info; diff --git a/gdb/gdbserver/linux-amd64-ipa.c b/gdb/gdbserver/linux-amd64-ipa.c index 9920653..6bab392 100644 --- a/gdb/gdbserver/linux-amd64-ipa.c +++ b/gdb/gdbserver/linux-amd64-ipa.c @@ -22,7 +22,7 @@ #include <sys/mman.h> #include "tracepoint.h" #include "linux-x86-tdesc.h" -#include "common/x86-xstate.h" +#include "gdbsupport/x86-xstate.h" /* Defined in auto-generated file amd64-linux.c. */ void init_registers_amd64_linux (void); diff --git a/gdb/gdbserver/linux-i386-ipa.c b/gdb/gdbserver/linux-i386-ipa.c index f5fd227..2e3d1ac 100644 --- a/gdb/gdbserver/linux-i386-ipa.c +++ b/gdb/gdbserver/linux-i386-ipa.c @@ -22,7 +22,7 @@ #include <sys/mman.h> #include "tracepoint.h" #include "linux-x86-tdesc.h" -#include "common/x86-xstate.h" +#include "gdbsupport/x86-xstate.h" /* GDB register numbers. */ diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index 917b1c2..3113017 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -19,13 +19,13 @@ #include "server.h" #include "linux-low.h" #include "nat/linux-osdata.h" -#include "common/agent.h" +#include "gdbsupport/agent.h" #include "tdesc.h" -#include "common/rsp-low.h" -#include "common/signals-state-save-restore.h" +#include "gdbsupport/rsp-low.h" +#include "gdbsupport/signals-state-save-restore.h" #include "nat/linux-nat.h" #include "nat/linux-waitpid.h" -#include "common/gdb_wait.h" +#include "gdbsupport/gdb_wait.h" #include "nat/gdb_ptrace.h" #include "nat/linux-ptrace.h" #include "nat/linux-procfs.h" @@ -43,14 +43,14 @@ #include <sys/stat.h> #include <sys/vfs.h> #include <sys/uio.h> -#include "common/filestuff.h" +#include "gdbsupport/filestuff.h" #include "tracepoint.h" #include "hostio.h" #include <inttypes.h> -#include "common/common-inferior.h" +#include "gdbsupport/common-inferior.h" #include "nat/fork-inferior.h" -#include "common/environ.h" -#include "common/scoped_restore.h" +#include "gdbsupport/environ.h" +#include "gdbsupport/scoped_restore.h" #ifndef ELFMAG0 /* Don't include <linux/elf.h> here. If it got included by gdb_proc_service.h then ELFMAG0 will have been defined. If it didn't get included by @@ -105,7 +105,7 @@ #ifdef HAVE_LINUX_BTRACE # include "nat/linux-btrace.h" -# include "common/btrace-common.h" +# include "gdbsupport/btrace-common.h" #endif #ifndef HAVE_ELF32_AUXV_T @@ -7189,7 +7189,7 @@ linux_low_encode_raw (struct buffer *buffer, const gdb_byte *data, if (size == 0) return; - /* We use hex encoding - see common/rsp-low.h. */ + /* We use hex encoding - see gdbsupport/rsp-low.h. */ buffer_grow_str (buffer, "<raw>\n"); while (size-- > 0) diff --git a/gdb/gdbserver/linux-tic6x-low.c b/gdb/gdbserver/linux-tic6x-low.c index 7eecdeb..6682e1b 100644 --- a/gdb/gdbserver/linux-tic6x-low.c +++ b/gdb/gdbserver/linux-tic6x-low.c @@ -424,7 +424,7 @@ struct linux_target_ops the_low_target = { }; #if GDB_SELF_TEST -#include "common/selftest.h" +#include "gdbsupport/selftest.h" namespace selftests { namespace tdesc { diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c index db240e2..cb0169c 100644 --- a/gdb/gdbserver/linux-x86-low.c +++ b/gdb/gdbserver/linux-x86-low.c @@ -24,7 +24,7 @@ #include "linux-low.h" #include "i387-fp.h" #include "x86-low.h" -#include "common/x86-xstate.h" +#include "gdbsupport/x86-xstate.h" #include "nat/gdb_ptrace.h" #ifdef __x86_64__ @@ -38,7 +38,7 @@ #include "elf/common.h" #endif -#include "common/agent.h" +#include "gdbsupport/agent.h" #include "tdesc.h" #include "tracepoint.h" #include "ax.h" diff --git a/gdb/gdbserver/linux-x86-tdesc.c b/gdb/gdbserver/linux-x86-tdesc.c index 8f24a3d..b39ed53 100644 --- a/gdb/gdbserver/linux-x86-tdesc.c +++ b/gdb/gdbserver/linux-x86-tdesc.c @@ -21,7 +21,7 @@ #include "tdesc.h" #include "linux-x86-tdesc.h" #include "arch/i386.h" -#include "common/x86-xstate.h" +#include "gdbsupport/x86-xstate.h" #ifdef __x86_64__ #include "arch/amd64.h" #endif diff --git a/gdb/gdbserver/lynx-i386-low.c b/gdb/gdbserver/lynx-i386-low.c index e47f6b9..ca707ac 100644 --- a/gdb/gdbserver/lynx-i386-low.c +++ b/gdb/gdbserver/lynx-i386-low.c @@ -19,7 +19,7 @@ #include "lynx-low.h" #include <limits.h> #include <sys/ptrace.h> -#include "common/x86-xstate.h" +#include "gdbsupport/x86-xstate.h" #include "arch/i386.h" #include "x86-tdesc.h" diff --git a/gdb/gdbserver/lynx-low.c b/gdb/gdbserver/lynx-low.c index 4f63146..0a8b258 100644 --- a/gdb/gdbserver/lynx-low.c +++ b/gdb/gdbserver/lynx-low.c @@ -25,10 +25,10 @@ #include <unistd.h> #include <sys/ioctl.h> #include <sys/types.h> -#include "common/gdb_wait.h" +#include "gdbsupport/gdb_wait.h" #include <signal.h> -#include "common/filestuff.h" -#include "common/common-inferior.h" +#include "gdbsupport/filestuff.h" +#include "gdbsupport/common-inferior.h" #include "nat/fork-inferior.h" int using_threads = 1; diff --git a/gdb/gdbserver/mem-break.h b/gdb/gdbserver/mem-break.h index d2d7510..4984a55 100644 --- a/gdb/gdbserver/mem-break.h +++ b/gdb/gdbserver/mem-break.h @@ -21,7 +21,7 @@ #ifndef GDBSERVER_MEM_BREAK_H #define GDBSERVER_MEM_BREAK_H -#include "common/break-common.h" +#include "gdbsupport/break-common.h" /* Breakpoints are opaque. */ struct breakpoint; diff --git a/gdb/gdbserver/nto-x86-low.c b/gdb/gdbserver/nto-x86-low.c index cfbe7ba..b51f424 100644 --- a/gdb/gdbserver/nto-x86-low.c +++ b/gdb/gdbserver/nto-x86-low.c @@ -23,7 +23,7 @@ #include "regcache.h" #include <x86/context.h> -#include "common/x86-xstate.h" +#include "gdbsupport/x86-xstate.h" #include "arch/i386.h" #include "x86-tdesc.h" diff --git a/gdb/gdbserver/regcache.c b/gdb/gdbserver/regcache.c index a56b580..98c7511 100644 --- a/gdb/gdbserver/regcache.c +++ b/gdb/gdbserver/regcache.c @@ -20,7 +20,7 @@ #include "regdef.h" #include "gdbthread.h" #include "tdesc.h" -#include "common/rsp-low.h" +#include "gdbsupport/rsp-low.h" #ifndef IN_PROCESS_AGENT struct regcache * @@ -63,7 +63,7 @@ get_thread_regcache (struct thread_info *thread, int fetch) return regcache; } -/* See common/common-regcache.h. */ +/* See gdbsupport/common-regcache.h. */ struct regcache * get_thread_regcache_for_ptid (ptid_t ptid) @@ -291,7 +291,7 @@ register_size (const struct target_desc *tdesc, int n) return find_register_by_number (tdesc, n).size / 8; } -/* See common/common-regcache.h. */ +/* See gdbsupport/common-regcache.h. */ int regcache_register_size (const struct regcache *regcache, int n) @@ -312,7 +312,7 @@ supply_register (struct regcache *regcache, int n, const void *buf) return regcache->raw_supply (n, buf); } -/* See common/common-regcache.h. */ +/* See gdbsupport/common-regcache.h. */ void regcache::raw_supply (int n, const void *buf) @@ -415,7 +415,7 @@ collect_register (struct regcache *regcache, int n, void *buf) regcache->raw_collect (n, buf); } -/* See common/common-regcache.h. */ +/* See gdbsupport/common-regcache.h. */ void regcache::raw_collect (int n, void *buf) const @@ -500,7 +500,7 @@ regcache_write_pc (struct regcache *regcache, CORE_ADDR pc) #endif -/* See common/common-regcache.h. */ +/* See gdbsupport/common-regcache.h. */ enum register_status regcache::get_register_status (int regnum) const @@ -513,7 +513,7 @@ regcache::get_register_status (int regnum) const #endif } -/* See common/common-regcache.h. */ +/* See gdbsupport/common-regcache.h. */ bool regcache::raw_compare (int regnum, const void *buf, int offset) const diff --git a/gdb/gdbserver/regcache.h b/gdb/gdbserver/regcache.h index 5ee4478..d3a350a 100644 --- a/gdb/gdbserver/regcache.h +++ b/gdb/gdbserver/regcache.h @@ -19,7 +19,7 @@ #ifndef GDBSERVER_REGCACHE_H #define GDBSERVER_REGCACHE_H -#include "common/common-regcache.h" +#include "gdbsupport/common-regcache.h" struct thread_info; struct target_desc; @@ -46,16 +46,16 @@ struct regcache : public reg_buffer_common unsigned char *register_status = nullptr; #endif - /* See common/common-regcache.h. */ + /* See gdbsupport/common-regcache.h. */ enum register_status get_register_status (int regnum) const override; - /* See common/common-regcache.h. */ + /* See gdbsupport/common-regcache.h. */ void raw_supply (int regnum, const void *buf) override; - /* See common/common-regcache.h. */ + /* See gdbsupport/common-regcache.h. */ void raw_collect (int regnum, void *buf) const override; - /* See common/common-regcache.h. */ + /* See gdbsupport/common-regcache.h. */ bool raw_compare (int regnum, const void *buf, int offset) const override; }; @@ -102,7 +102,7 @@ void registers_to_string (struct regcache *regcache, char *buf); void registers_from_string (struct regcache *regcache, char *buf); -/* For regcache_read_pc see common/common-regcache.h. */ +/* For regcache_read_pc see gdbsupport/common-regcache.h. */ void regcache_write_pc (struct regcache *regcache, CORE_ADDR pc); diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c index 7c495be..d965b6f 100644 --- a/gdb/gdbserver/remote-utils.c +++ b/gdb/gdbserver/remote-utils.c @@ -24,9 +24,9 @@ #include "gdbthread.h" #include "tdesc.h" #include "dll.h" -#include "common/rsp-low.h" -#include "common/netstuff.h" -#include "common/filestuff.h" +#include "gdbsupport/rsp-low.h" +#include "gdbsupport/netstuff.h" +#include "gdbsupport/filestuff.h" #include <ctype.h> #if HAVE_SYS_IOCTL_H #include <sys/ioctl.h> @@ -55,7 +55,7 @@ #if HAVE_FCNTL_H #include <fcntl.h> #endif -#include "common/gdb_sys_time.h" +#include "gdbsupport/gdb_sys_time.h" #include <unistd.h> #if HAVE_ARPA_INET_H #include <arpa/inet.h> diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c index 5e93a58..5b14883 100644 --- a/gdb/gdbserver/server.c +++ b/gdb/gdbserver/server.c @@ -18,32 +18,32 @@ #include "server.h" #include "gdbthread.h" -#include "common/agent.h" +#include "gdbsupport/agent.h" #include "notif.h" #include "tdesc.h" -#include "common/rsp-low.h" -#include "common/signals-state-save-restore.h" +#include "gdbsupport/rsp-low.h" +#include "gdbsupport/signals-state-save-restore.h" #include <ctype.h> #include <unistd.h> #if HAVE_SIGNAL_H #include <signal.h> #endif -#include "common/gdb_vecs.h" -#include "common/gdb_wait.h" -#include "common/btrace-common.h" -#include "common/filestuff.h" +#include "gdbsupport/gdb_vecs.h" +#include "gdbsupport/gdb_wait.h" +#include "gdbsupport/btrace-common.h" +#include "gdbsupport/filestuff.h" #include "tracepoint.h" #include "dll.h" #include "hostio.h" #include <vector> -#include "common/common-inferior.h" -#include "common/job-control.h" -#include "common/environ.h" +#include "gdbsupport/common-inferior.h" +#include "gdbsupport/job-control.h" +#include "gdbsupport/environ.h" #include "filenames.h" -#include "common/pathstuff.h" +#include "gdbsupport/pathstuff.h" -#include "common/selftest.h" -#include "common/scope-exit.h" +#include "gdbsupport/selftest.h" +#include "gdbsupport/scope-exit.h" #define require_running_or_return(BUF) \ if (!target_running ()) \ @@ -258,7 +258,7 @@ target_running (void) return get_first_thread () != NULL; } -/* See common/common-inferior.h. */ +/* See gdbsupport/common-inferior.h. */ const char * get_exec_wrapper () @@ -266,7 +266,7 @@ get_exec_wrapper () return !wrapper_argv.empty () ? wrapper_argv.c_str () : NULL; } -/* See common/common-inferior.h. */ +/* See gdbsupport/common-inferior.h. */ char * get_exec_file (int err) diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h index 400001a..5209694 100644 --- a/gdb/gdbserver/server.h +++ b/gdb/gdbserver/server.h @@ -19,7 +19,7 @@ #ifndef GDBSERVER_SERVER_H #define GDBSERVER_SERVER_H -#include "common/common-defs.h" +#include "gdbsupport/common-defs.h" gdb_static_assert (sizeof (CORE_ADDR) >= sizeof (void *)); @@ -27,7 +27,7 @@ gdb_static_assert (sizeof (CORE_ADDR) >= sizeof (void *)); #include "wincecompat.h" #endif -#include "common/version.h" +#include "gdbsupport/version.h" #if !HAVE_DECL_STRERROR #ifndef strerror @@ -54,13 +54,13 @@ int vsnprintf(char *str, size_t size, const char *format, va_list ap); # define PROG "gdbserver" #endif -#include "common/buffer.h" -#include "common/xml-utils.h" +#include "gdbsupport/buffer.h" +#include "gdbsupport/xml-utils.h" #include "regcache.h" -#include "common/gdb_signals.h" +#include "gdbsupport/gdb_signals.h" #include "target.h" #include "mem-break.h" -#include "common/environ.h" +#include "gdbsupport/environ.h" /* Target-specific functions */ @@ -104,7 +104,7 @@ extern int in_queued_stop_replies (ptid_t ptid); #include "utils.h" #include "debug.h" -#include "common/gdb_vecs.h" +#include "gdbsupport/gdb_vecs.h" /* Maximum number of bytes to read/write at once. The value here is chosen to fill up a packet (the headers account for the 32). */ diff --git a/gdb/gdbserver/spu-low.c b/gdb/gdbserver/spu-low.c index 97f985a..4930c59 100644 --- a/gdb/gdbserver/spu-low.c +++ b/gdb/gdbserver/spu-low.c @@ -20,12 +20,12 @@ #include "server.h" -#include "common/gdb_wait.h" +#include "gdbsupport/gdb_wait.h" #include <sys/ptrace.h> #include <fcntl.h> #include <unistd.h> #include <sys/syscall.h> -#include "common/filestuff.h" +#include "gdbsupport/filestuff.h" #include "hostio.h" #include "nat/fork-inferior.h" diff --git a/gdb/gdbserver/symbol.c b/gdb/gdbserver/symbol.c index 20eb492..56a5d3e 100644 --- a/gdb/gdbserver/symbol.c +++ b/gdb/gdbserver/symbol.c @@ -18,9 +18,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "server.h" -#include "common/symbol.h" +#include "gdbsupport/symbol.h" -/* See common/symbol.h. */ +/* See gdbsupport/symbol.h. */ int find_minimal_symbol_address (const char *name, CORE_ADDR *addr, diff --git a/gdb/gdbserver/target.h b/gdb/gdbserver/target.h index a4c9ad4..434bfa9 100644 --- a/gdb/gdbserver/target.h +++ b/gdb/gdbserver/target.h @@ -27,7 +27,7 @@ #include "target/wait.h" #include "target/waitstatus.h" #include "mem-break.h" -#include "common/btrace-common.h" +#include "gdbsupport/btrace-common.h" #include <vector> struct emit_ops; diff --git a/gdb/gdbserver/tdesc.c b/gdb/gdbserver/tdesc.c index 04c702f..92a0a60 100644 --- a/gdb/gdbserver/tdesc.c +++ b/gdb/gdbserver/tdesc.c @@ -122,7 +122,7 @@ current_target_desc (void) return current_process ()->tdesc; } -/* See common/tdesc.h. */ +/* See gdbsupport/tdesc.h. */ const char * tdesc_architecture_name (const struct target_desc *target_desc) @@ -130,7 +130,7 @@ tdesc_architecture_name (const struct target_desc *target_desc) return target_desc->arch; } -/* See common/tdesc.h. */ +/* See gdbsupport/tdesc.h. */ void set_tdesc_architecture (struct target_desc *target_desc, @@ -139,7 +139,7 @@ set_tdesc_architecture (struct target_desc *target_desc, target_desc->arch = xstrdup (name); } -/* See common/tdesc.h. */ +/* See gdbsupport/tdesc.h. */ const char * tdesc_osabi_name (const struct target_desc *target_desc) @@ -147,7 +147,7 @@ tdesc_osabi_name (const struct target_desc *target_desc) return target_desc->osabi; } -/* See common/tdesc.h. */ +/* See gdbsupport/tdesc.h. */ void set_tdesc_osabi (struct target_desc *target_desc, const char *name) @@ -155,7 +155,7 @@ set_tdesc_osabi (struct target_desc *target_desc, const char *name) target_desc->osabi = xstrdup (name); } -/* See common/tdesc.h. */ +/* See gdbsupport/tdesc.h. */ const char * tdesc_get_features_xml (const target_desc *tdesc) @@ -177,7 +177,7 @@ tdesc_get_features_xml (const target_desc *tdesc) } #endif -/* See common/tdesc.h. */ +/* See gdbsupport/tdesc.h. */ struct tdesc_feature * tdesc_create_feature (struct target_desc *tdesc, const char *name) diff --git a/gdb/gdbserver/tdesc.h b/gdb/gdbserver/tdesc.h index 8ccacbb..b93f53c 100644 --- a/gdb/gdbserver/tdesc.h +++ b/gdb/gdbserver/tdesc.h @@ -19,7 +19,7 @@ #ifndef GDBSERVER_TDESC_H #define GDBSERVER_TDESC_H -#include "common/tdesc.h" +#include "gdbsupport/tdesc.h" #include "regdef.h" #include <vector> diff --git a/gdb/gdbserver/thread-db.c b/gdb/gdbserver/thread-db.c index 387f22f..b2791b0 100644 --- a/gdb/gdbserver/thread-db.c +++ b/gdb/gdbserver/thread-db.c @@ -26,9 +26,9 @@ extern int debug_threads; #include "gdb_proc_service.h" #include "nat/gdb_thread_db.h" -#include "common/gdb_vecs.h" +#include "gdbsupport/gdb_vecs.h" #include "nat/linux-procfs.h" -#include "common/scoped_restore.h" +#include "gdbsupport/scoped_restore.h" #ifndef USE_LIBTHREAD_DB_DIRECTLY #include <dlfcn.h> diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c index 98d28e9..09e7d5f 100644 --- a/gdb/gdbserver/tracepoint.c +++ b/gdb/gdbserver/tracepoint.c @@ -19,7 +19,7 @@ #include "server.h" #include "tracepoint.h" #include "gdbthread.h" -#include "common/rsp-low.h" +#include "gdbsupport/rsp-low.h" #include <ctype.h> #include <fcntl.h> @@ -30,7 +30,7 @@ #include "tdesc.h" #define IPA_SYM_STRUCT_NAME ipa_sym_addresses -#include "common/agent.h" +#include "gdbsupport/agent.h" #define DEFAULT_TRACE_BUFFER_SIZE 5242880 /* 5*1024*1024 */ diff --git a/gdb/gdbserver/win32-i386-low.c b/gdb/gdbserver/win32-i386-low.c index 7b187d3..399520c 100644 --- a/gdb/gdbserver/win32-i386-low.c +++ b/gdb/gdbserver/win32-i386-low.c @@ -18,7 +18,7 @@ #include "server.h" #include "win32-low.h" #include "x86-low.h" -#include "common/x86-xstate.h" +#include "gdbsupport/x86-xstate.h" #ifdef __x86_64__ #include "arch/amd64.h" #endif diff --git a/gdb/gdbserver/win32-low.c b/gdb/gdbserver/win32-low.c index 1a50141..49c6cf1 100644 --- a/gdb/gdbserver/win32-low.c +++ b/gdb/gdbserver/win32-low.c @@ -32,8 +32,8 @@ #include <tlhelp32.h> #include <psapi.h> #include <process.h> -#include "common/gdb_tilde_expand.h" -#include "common/common-inferior.h" +#include "gdbsupport/gdb_tilde_expand.h" +#include "gdbsupport/common-inferior.h" #ifndef USE_WIN32API #include <sys/cygwin.h> |