@@ -1,3 +1,13 @@
+2020-01-19 Tom Tromey <tom@tromey.com>
+
+ * src-release.sh (GDB_SUPPORT_DIRS): Add gdbserver.
+ * gdbserver: New directory, moved from gdb/gdbserver.
+ * configure.ac (host_tools): Add gdbserver.
+ Only build gdbserver on certain systems.
+ * Makefile.in, configure: Rebuild.
+ * Makefile.def (host_modules, dependencies): Add gdbserver.
+ * MAINTAINERS: Add gdbserver.
+
2020-01-18 Nick Clifton <nickc@redhat.com>
Binutils 2.34 branch created.
@@ -41,7 +41,7 @@ config.guess; config.sub; readline/support/config.{sub,guess}
depcomp; mkinstalldirs
Send bug reports and patches to bug-automake@gnu.org.
-gdb/; gdbsupport/; gnulib/; readline/; sim/; GDB's part of include/
+gdb/; gdbserver/; gdbsupport/; gnulib/; readline/; sim/; GDB's part of include/
GDB: http://www.gnu.org/software/gdb/
Patches to gdb-patches@sourceware.org.
See also gdb/MAINTAINERS and sim/MAINTAINERS.
@@ -114,6 +114,7 @@ host_modules= { module= zlib; no_install=true; no_check=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; };
@@ -409,6 +410,12 @@ 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-intl; };
+// Depend on all-libiconv so that configure checks for iconv
+// functions will work.
+dependencies = { module=configure-gdbserver; on=all-libiconv; };
+
dependencies = { module=configure-libgui; on=configure-tcl; };
dependencies = { module=configure-libgui; on=configure-tk; };
dependencies = { module=all-libgui; on=all-tcl; };
@@ -140,7 +140,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)
@@ -782,6 +782,110 @@ case "${target}" in
;;
esac
+# Only allow gdbserver on some systems.
+build_gdbserver=
+case "$host" in
+aarch64*-*-linux*)
+ # Target: AArch64 linux
+ build_gdbserver=yes
+ ;;
+
+arm*-wince-pe | arm*-*-mingw32ce*)
+ # Target: ARM based machine running Windows CE (win32)
+ build_gdbserver=yes
+ ;;
+arm*-*-linux*)
+ # Target: ARM based machine running GNU/Linux
+ build_gdbserver=yes
+ ;;
+bfin-*-*linux*)
+ # Target: Blackfin Linux
+ gdb_target_obs="bfin-tdep.o bfin-linux-tdep.o linux-tdep.o"
+ build_gdbserver=yes
+ ;;
+i[34567]86-*-nto*)
+ # Target: Intel 386 running qnx6.
+ build_gdbserver=yes
+ ;;
+i[34567]86-*-linux*)
+ # Target: Intel 386 running GNU/Linux
+ build_gdbserver=yes
+ ;;
+i[34567]86-*-cygwin*)
+ # Target: Intel 386 running win32
+ build_gdbserver=yes
+ ;;
+i[34567]86-*-mingw32*)
+ # Target: Intel 386 running win32
+ build_gdbserver=yes
+ ;;
+ia64-*-linux*)
+ # Target: Intel IA-64 running GNU/Linux
+ build_gdbserver=yes
+ ;;
+m32r*-*-linux*)
+ # Target: Renesas M32R running GNU/Linux
+ build_gdbserver=yes
+ ;;
+m68*-*-linux*)
+ # Target: Motorola m68k with a.out and ELF
+ build_gdbserver=yes
+ ;;
+mips*-*-linux*)
+ # Target: Linux/MIPS
+ build_gdbserver=yes
+ ;;
+or1k*-*-linux*)
+ # Target: OpenCores OpenRISC 1000 32-bit running Linux
+ build_gdbserver=yes
+ ;;
+
+powerpc*-*-linux*)
+ # Target: PowerPC running Linux
+ build_gdbserver=yes
+ ;;
+s390*-*-linux*)
+ # Target: S390 running Linux
+ build_gdbserver=yes
+ ;;
+score-*-*)
+ # Target: S+core embedded system
+ build_gdbserver=yes
+ ;;
+sh*-*-linux*)
+ # Target: GNU/Linux Super-H
+ build_gdbserver=yes
+ ;;
+sparc-*-linux*)
+ # Target: GNU/Linux SPARC
+ build_gdbserver=yes
+ ;;
+sparc64-*-linux*)
+ # Target: GNU/Linux UltraSPARC
+ build_gdbserver=yes
+ ;;
+tilegx-*-linux*)
+ # Target: TILE-Gx
+ build_gdbserver=yes
+ ;;
+x86_64-*-linux*)
+ # Target: GNU/Linux x86-64
+ build_gdbserver=yes
+ ;;
+x86_64-*-mingw* | x86_64-*-cygwin*)
+ # Target: MingW/amd64
+ build_gdbserver=yes
+ ;;
+xtensa*-*-*linux*)
+ # Target: GNU/Linux Xtensa
+ build_gdbserver=yes
+ ;;
+esac
+
+if test "x$build_gdbserver" = x; then
+ noconfigdirs="$noconfigdirs gdbserver"
+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
@@ -1,3 +1,11 @@
+2020-01-19 Tom Tromey <tom@tromey.com>
+
+ * gdbserver: Move to top level.
+ * configure.tgt (build_gdbserver): Remove.
+ * configure.ac: Remove --enable-gdbserver.
+ * configure: Rebuild.
+ * Makefile.in (distclean): Don't mention gdbserver.
+
2020-01-19 Simon Marchi <simon.marchi@polymtl.ca>
* linux-fork.c (one_fork_p): Simplify.
@@ -1898,13 +1898,8 @@ clean mostlyclean: $(CONFIG_CLEAN)
# I believe this is wrong; the makefile standards for distclean just
# describe removing files; the only sort of "re-create a distribution"
# functionality described is if the distributed files are unmodified.
-# NB: While GDBSERVER might be configured on native systems, it isn't
-# always included in SUBDIRS. Remove the gdbserver files explicitly.
distclean: clean
@$(MAKE) $(FLAGS_TO_PASS) DO=distclean "DODIRS=$(CLEANDIRS)" subdir_do
- rm -f gdbserver/config.status gdbserver/config.log
- rm -f gdbserver/tm.h gdbserver/xm.h gdbserver/nm.h
- rm -f gdbserver/Makefile gdbserver/config.cache
rm -f nm.h config.status config.h stamp-h b jit-reader.h
rm -f gdb-gdb.py gdb-gdb.gdb
rm -f y.output yacc.acts yacc.tmp y.tab.h
@@ -254,7 +254,6 @@ AC_SUBST(HAVE_NATIVE_GCORE_TARGET)
# For other settings, only the main target counts.
gdb_sim=
gdb_osabi=
-build_gdbserver=
targ=$target; . ${srcdir}/configure.tgt
# Fetch the default architecture and default target vector from BFD.
@@ -2001,33 +2000,6 @@ if test x"${gdb_osabi}" != x ; then
[Define to the default OS ABI for this configuration.])
fi
-AC_ARG_ENABLE(gdbserver,
-AS_HELP_STRING([--enable-gdbserver],
- [automatically build gdbserver (yes/no/auto, default is auto)]),
-[case "${enableval}" in
- yes| no|auto) ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-gdbserver option) ;;
-esac],[enable_gdbserver=auto])
-
-# We only build gdbserver automatically in a native configuration, and
-# only if the user did not explicitly disable its build.
-if test "$gdb_native" = "yes" -a "$enable_gdbserver" != "no"; then
- AC_MSG_CHECKING(whether gdbserver is supported on this host)
- if test "x$build_gdbserver" = xyes; then
- AC_MSG_RESULT(yes)
- AC_CONFIG_SUBDIRS(gdbserver)
- gdbserver_build_enabled=yes
- else
- AC_MSG_RESULT(no)
- fi
-fi
-
-# If the user explicitly request the gdbserver to be built, verify that
-# we were in fact able to enable it.
-if test "$enable_gdbserver" = "yes" -a "$gdbserver_build_enabled" != "yes"; then
- AC_MSG_ERROR(Automatic gdbserver build is not supported for this configuration)
-fi
-
# Check for babeltrace and babeltrace-ctf
AC_ARG_WITH(babeltrace,
AC_HELP_STRING([--with-babeltrace], [include babeltrace support (auto/yes/no)]),
@@ -5,7 +5,6 @@
# gdb_target_obs target-specific object files to use
# gdb_sim simulator library for target
# gdb_osabi default OS ABI to use with target
-# build_gdbserver set to "yes" if gdbserver supports target
# gdb_have_gcore set to "true"/"false" if this target can run gcore
# NOTE: Every file added to a gdb_target_obs variable for any target here
@@ -129,7 +128,6 @@ aarch64*-*-linux*)
arm-tdep.o arm-linux-tdep.o \
glibc-tdep.o linux-tdep.o solib-svr4.o \
symfile-mem.o linux-record.o"
- build_gdbserver=yes
;;
alpha*-*-linux*)
@@ -162,13 +160,11 @@ arc*-*-elf32)
arm*-wince-pe | arm*-*-mingw32ce*)
# Target: ARM based machine running Windows CE (win32)
gdb_target_obs="arm-wince-tdep.o windows-tdep.o"
- build_gdbserver=yes
;;
arm*-*-linux*)
# Target: ARM based machine running GNU/Linux
gdb_target_obs="arch/arm-linux.o arm-linux-tdep.o glibc-tdep.o \
solib-svr4.o symfile-mem.o linux-tdep.o linux-record.o"
- build_gdbserver=yes
;;
arm*-*-freebsd*)
# Target: FreeBSD/arm
@@ -202,7 +198,6 @@ bfin-*-*linux*)
# Target: Blackfin Linux
gdb_target_obs="bfin-tdep.o bfin-linux-tdep.o linux-tdep.o"
gdb_sim=../sim/bfin/libsim.a
- build_gdbserver=yes
;;
bfin-*-*)
# Target: Blackfin processor
@@ -285,7 +280,6 @@ i[34567]86-*-nto*)
# Target: Intel 386 running qnx6.
gdb_target_obs="solib-svr4.o \
i386-nto-tdep.o nto-tdep.o"
- build_gdbserver=yes
;;
i[34567]86-*-solaris2* | x86_64-*-solaris2*)
# Target: Solaris x86_64
@@ -303,7 +297,6 @@ i[34567]86-*-linux*)
# Target: GNU/Linux x86-64
gdb_target_obs="amd64-linux-tdep.o ${gdb_target_obs}"
fi
- build_gdbserver=yes
;;
i[34567]86-*-gnu*)
# Target: Intel 386 running the GNU Hurd
@@ -312,12 +305,10 @@ i[34567]86-*-gnu*)
i[34567]86-*-cygwin*)
# Target: Intel 386 running win32
gdb_target_obs="i386-cygwin-tdep.o windows-tdep.o"
- build_gdbserver=yes
;;
i[34567]86-*-mingw32*)
# Target: Intel 386 running win32
gdb_target_obs="i386-cygwin-tdep.o windows-tdep.o"
- build_gdbserver=yes
;;
i[34567]86-*-go32* | i[34567]86-*-msdosdjgpp*)
# Target: i386 running DJGPP/go32.
@@ -328,7 +319,6 @@ ia64-*-linux*)
# Target: Intel IA-64 running GNU/Linux
gdb_target_obs="ia64-linux-tdep.o linux-tdep.o \
solib-svr4.o symfile-mem.o"
- build_gdbserver=yes
;;
ia64-*-*vms*)
# Target: Intel IA-64 running OpenVMS
@@ -359,7 +349,6 @@ m32r*-*-linux*)
glibc-tdep.o solib-svr4.o symfile-mem.o \
linux-tdep.o"
gdb_sim=../sim/m32r/libsim.a
- build_gdbserver=yes
;;
m32r*-*-*)
# Target: Renesas m32r processor
@@ -382,7 +371,6 @@ m68*-*-linux*)
# Target: Motorola m68k with a.out and ELF
gdb_target_obs="m68k-tdep.o m68k-linux-tdep.o solib-svr4.o \
linux-tdep.o glibc-tdep.o symfile-mem.o"
- build_gdbserver=yes
;;
m68*-*-netbsd* | m68*-*-knetbsd*-gnu)
# Target: NetBSD/m68k
@@ -416,7 +404,6 @@ mips*-*-linux*)
gdb_target_obs="mips-tdep.o mips-linux-tdep.o glibc-tdep.o \
solib-svr4.o symfile-mem.o linux-tdep.o"
gdb_sim=../sim/mips/libsim.a
- build_gdbserver=yes
;;
mips*-*-netbsd* | mips*-*-knetbsd*-gnu)
# Target: MIPS running NetBSD
@@ -480,7 +467,6 @@ or1k*-*-linux*)
gdb_target_obs="or1k-tdep.o or1k-linux-tdep.o solib-svr4.o \
symfile-mem.o glibc-tdep.o linux-tdep.o"
gdb_sim=../sim/or1k/libsim.a
- build_gdbserver=yes
;;
or1k-*-* | or1knd-*-*)
@@ -522,7 +508,6 @@ powerpc*-*-linux*)
linux-record.o \
arch/ppc-linux-common.o"
gdb_sim=../sim/ppc/libsim.a
- build_gdbserver=yes
;;
powerpc-*-lynx*178)
# Target: PowerPC running Lynx178.
@@ -541,7 +526,6 @@ s390*-*-linux*)
# Target: S390 running Linux
gdb_target_obs="s390-linux-tdep.o s390-tdep.o solib-svr4.o \
linux-tdep.o linux-record.o symfile-mem.o"
- build_gdbserver=yes
;;
riscv*-*-freebsd*)
@@ -575,7 +559,6 @@ rx-*-elf)
score-*-*)
# Target: S+core embedded system
gdb_target_obs="score-tdep.o"
- build_gdbserver=yes
;;
sh*-*-linux*)
@@ -584,7 +567,6 @@ sh*-*-linux*)
solib-svr4.o symfile-mem.o \
glibc-tdep.o linux-tdep.o"
gdb_sim=../sim/sh/libsim.a
- build_gdbserver=yes
;;
sh*-*-netbsdelf* | sh*-*-knetbsd*-gnu)
# Target: NetBSD/sh
@@ -612,7 +594,6 @@ sparc-*-linux*)
gdb_target_obs="sparc64-tdep.o sparc64-sol2-tdep.o \
sparc64-linux-tdep.o ${gdb_target_obs}"
fi
- build_gdbserver=yes
;;
sparc64-*-linux*)
# Target: GNU/Linux UltraSPARC
@@ -620,7 +601,6 @@ sparc64-*-linux*)
sparc64-linux-tdep.o sparc-tdep.o sparc-sol2-tdep.o \
sparc-linux-tdep.o solib-svr4.o linux-tdep.o \
ravenscar-thread.o sparc-ravenscar-thread.o"
- build_gdbserver=yes
;;
sparc*-*-freebsd* | sparc*-*-kfreebsd*-gnu)
# Target: FreeBSD/sparc64
@@ -689,7 +669,6 @@ tilegx-*-linux*)
# Target: TILE-Gx
gdb_target_obs="tilegx-tdep.o tilegx-linux-tdep.o solib-svr4.o \
symfile-mem.o glibc-tdep.o linux-tdep.o"
- build_gdbserver=yes
;;
xstormy16-*-*)
@@ -742,7 +721,6 @@ x86_64-*-linux*)
gdb_target_obs="amd64-linux-tdep.o ${i386_tobjs} \
i386-linux-tdep.o glibc-tdep.o \
solib-svr4.o symfile-mem.o linux-tdep.o linux-record.o"
- build_gdbserver=yes
;;
x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
# Target: FreeBSD/amd64
@@ -754,7 +732,6 @@ x86_64-*-mingw* | x86_64-*-cygwin*)
gdb_target_obs="amd64-windows-tdep.o \
${i386_tobjs} i386-cygwin-tdep.o \
windows-tdep.o"
- build_gdbserver=yes
;;
x86_64-*-netbsd* | x86_64-*-knetbsd*-gnu)
# Target: NetBSD/amd64
@@ -772,7 +749,6 @@ x86_64-*-rtems*)
xtensa*-*-*linux*)
# Target: GNU/Linux Xtensa
gdb_target_obs="xtensa-linux-tdep.o symfile-mem.o linux-tdep.o"
- build_gdbserver=yes
;;
esac
similarity index 100%
rename from gdb/gdbserver/.gitignore
rename to gdbserver/.gitignore
similarity index 99%
rename from gdb/gdbserver/ChangeLog
rename to gdbserver/ChangeLog
@@ -1,3 +1,16 @@
+2020-01-19 Tom Tromey <tom@tromey.com>
+
+ * configure.ac: Update paths.
+ * configure: Rebuild.
+ * acinclude.m4: Update paths.
+ * Makefile.in: Update include paths.
+ (depcomp, INCLUDE_DIR, INCGNU, INCSUPPORT, INCLUDE_CFLAGS)
+ (SFILES, XML_DIR, n, $(GNULIB_BUILDDIR)/Makefile, config.status)
+ (version-generated.c, stamp-xml, regdat_sh, arch/%-ipa.o)
+ (gdbsupport/%-ipa.o, %-ipa.o, arch/%.o, gdbsupport/%.o, %.o)
+ (%-generated.c): Update paths.
+ * Move entire directory from ../gdb/gdbserver.
+
2020-01-14 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
similarity index 87%
rename from gdb/gdbserver/Makefile.in
rename to gdbserver/Makefile.in
@@ -62,7 +62,7 @@ AR_FLAGS = rc
# Dependency tracking information.
DEPMODE = @CCDEPMODE@
DEPDIR = @DEPDIR@
-depcomp = $(SHELL) $(srcdir)/../../depcomp
+depcomp = $(SHELL) $(srcdir)/../depcomp
# Directory containing source files. Don't clean up the spacing,
# this exact string is matched for by the "configure" script.
@@ -71,7 +71,7 @@ abs_top_srcdir = @abs_top_srcdir@
abs_srcdir = @abs_srcdir@
VPATH = @srcdir@
-include $(srcdir)/../silent-rules.mk
+include $(srcdir)/../gdb/silent-rules.mk
# Note that these are overridden by GNU make-specific code below if
# GNU make is used. The overrides implement dependency tracking.
@@ -90,7 +90,7 @@ POSTCOMPILE = @true
CC_LD = $(CXX) $(CXX_DIALECT)
# Where is the "include" directory? Traditionally ../include or ./include
-INCLUDE_DIR = ${srcdir}/../../include
+INCLUDE_DIR = ${srcdir}/../include
INCLUDE_DEP = $$(INCLUDE_DIR)
LIBIBERTY_BUILDDIR = build-libiberty-gdbserver
@@ -103,26 +103,26 @@ ustinc = @ustinc@
# gnulib
GNULIB_BUILDDIR = build-gnulib-gdbserver
LIBGNU = $(GNULIB_BUILDDIR)/import/libgnu.a
-INCGNU = -I$(srcdir)/../../gnulib/import -I$(GNULIB_BUILDDIR)/import
+INCGNU = -I$(srcdir)/../gnulib/import -I$(GNULIB_BUILDDIR)/import
# Generated headers in the gnulib directory. These must be listed
# so that they are generated before other files are compiled.
GNULIB_H = $(GNULIB_BUILDDIR)/import/string.h @GNULIB_STDINT_H@
-INCSUPPORT = -I$(srcdir)/../.. -I../..
+INCSUPPORT = -I$(srcdir)/.. -I..
# All the includes used for CFLAGS and for lint.
# -I. for config files.
# -I${srcdir} for our headers.
-# -I$(srcdir)/../regformats for regdef.h.
+# -I$(srcdir)/../gdb/regformats for regdef.h.
#
# We do not include ../target or ../nat in here because headers
# in those directories should be included with the subdirectory.
# e.g.: "target/wait.h".
#
INCLUDE_CFLAGS = -I. -I${srcdir} \
- -I$(srcdir)/../regformats -I$(srcdir)/.. -I$(INCLUDE_DIR) \
- $(INCGNU) $(INCSUPPORT)
+ -I$(srcdir)/../gdb/regformats -I$(srcdir)/.. -I$(INCLUDE_DIR) \
+ -I$(srcdir)/../gdb $(INCGNU) $(INCSUPPORT)
# M{H,T}_CFLAGS, if defined, has host- and target-dependent CFLAGS
# from the config/ directory.
@@ -202,33 +202,33 @@ SFILES = \
$(srcdir)/arch/arm-get-next-pcs.c \
$(srcdir)/arch/arm-linux.c \
$(srcdir)/arch/ppc-linux-common.c \
- $(srcdir)/../alloc.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-inferior.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-dlfcn.c \
- $(srcdir)/../../gdbsupport/gdb_tilde_expand.c \
- $(srcdir)/../../gdbsupport/gdb_vecs.c \
- $(srcdir)/../../gdbsupport/gdb_wait.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/safe-strerror.c \
- $(srcdir)/../../gdbsupport/tdesc.c \
- $(srcdir)/../../gdbsupport/xml-utils.c \
+ $(srcdir)/../gdb/alloc.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-inferior.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-dlfcn.c \
+ $(srcdir)/../gdbsupport/gdb_tilde_expand.c \
+ $(srcdir)/../gdbsupport/gdb_vecs.c \
+ $(srcdir)/../gdbsupport/gdb_wait.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/safe-strerror.c \
+ $(srcdir)/../gdbsupport/tdesc.c \
+ $(srcdir)/../gdbsupport/xml-utils.c \
$(srcdir)/nat/aarch64-sve-linux-ptrace.c \
$(srcdir)/nat/linux-btrace.c \
$(srcdir)/nat/linux-namespaces.c \
@@ -318,7 +318,7 @@ XM_CLIBS = @LIBS@
CDEPS = $(srcdir)/proc-service.list
# XML files to compile in to gdbserver, if any.
-XML_DIR = $(srcdir)/../features
+XML_DIR = $(srcdir)/../gdb/features
XML_FILES = @srv_xmlfiles@
XML_BUILTIN = @srv_xmlbuiltin@
@@ -384,10 +384,10 @@ install-only:
n=`echo gdbserver | sed '$(program_transform_name)'`; \
if [ x$$n = x ]; then n=gdbserver; else true; fi; \
if [ x"$(IPA_DEPFILES)" != x ]; then \
- $(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(libdir); \
+ $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(libdir); \
$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $(IPA_LIB) $(DESTDIR)$(libdir)/$(IPA_LIB); \
fi; \
- $(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(bindir); \
+ $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir); \
$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) gdbserver$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT)
# Note that we run install and not install-only, as the latter
# is not part of GNU standards and in particular not provided
@@ -512,14 +512,14 @@ stamp-h: config.in config.status
Makefile: Makefile.in config.status
$(SHELL) ./config.status $@
-$(GNULIB_BUILDDIR)/Makefile: $(srcdir)/../../gnulib/Makefile.in config.status
+$(GNULIB_BUILDDIR)/Makefile: $(srcdir)/../gnulib/Makefile.in config.status
@cd $(GNULIB_BUILDDIR); CONFIG_FILES="Makefile" \
CONFIG_COMMANDS="depfiles" \
CONFIG_HEADERS= \
CONFIG_LINKS= \
$(SHELL) config.status
-config.status: configure configure.srv $(srcdir)/../../bfd/development.sh
+config.status: configure configure.srv $(srcdir)/../bfd/development.sh
$(SHELL) ./config.status --recheck
# automatic rebuilding in automake-generated Makefiles requires
@@ -531,8 +531,8 @@ am--refresh:
force:
-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)/.. \
+version-generated.c: Makefile $(srcdir)/../gdb/version.in $(srcdir)/../bfd/version.h $(srcdir)/../gdbsupport/create-version.sh
+ $(ECHO_GEN) $(SHELL) $(srcdir)/../gdbsupport/create-version.sh $(srcdir)/../gdb \
$(host_alias) $(target_alias) $@
xml-builtin-generated.c: stamp-xml; @true
@@ -540,7 +540,7 @@ stamp-xml: $(XML_DIR)/feature_to_c.sh Makefile $(XML_FILES)
$(SILENCE) rm -f xml-builtin.tmp
$(ECHO_GEN_XML_BUILTIN_GENERATED) $(SHELL) $(XML_DIR)/feature_to_c.sh \
xml-builtin.tmp $(XML_FILES)
- $(SILENCE) $(SHELL) $(srcdir)/../../move-if-change xml-builtin.tmp xml-builtin-generated.c
+ $(SILENCE) $(SHELL) $(srcdir)/../move-if-change xml-builtin.tmp xml-builtin-generated.c
$(SILENCE) echo stamp > stamp-xml
.PRECIOUS: xml-builtin.c
@@ -556,7 +556,7 @@ stamp-xml: $(XML_DIR)/feature_to_c.sh Makefile $(XML_FILES)
# will remove them.
MAKEOVERRIDES =
-regdat_sh = $(srcdir)/../regformats/regdat.sh
+regdat_sh = $(srcdir)/../gdb/regformats/regdat.sh
UST_CFLAGS = $(ustinc) -DCONFIG_UST_GDB_INTEGRATION
@@ -586,11 +586,11 @@ ax.o: ax.c
# Rules for objects that go in the in-process agent.
-arch/%-ipa.o: ../arch/%.c
+arch/%-ipa.o: ../gdb/arch/%.c
$(IPAGENT_COMPILE) $<
$(POSTCOMPILE)
-gdbsupport/%-ipa.o: ../../gdbsupport/%.c
+gdbsupport/%-ipa.o: ../gdbsupport/%.c
$(IPAGENT_COMPILE) $<
$(POSTCOMPILE)
@@ -602,7 +602,7 @@ gdbsupport/%-ipa.o: ../../gdbsupport/%.c
$(IPAGENT_COMPILE) $<
$(POSTCOMPILE)
-%-ipa.o: ../%.c
+%-ipa.o: ../gdb/%.c
$(IPAGENT_COMPILE) $<
$(POSTCOMPILE)
@@ -619,11 +619,11 @@ gdbsupport/%-ipa.o: ../../gdbsupport/%.c
# Rules for objects that go in the gdbserver binary.
-arch/%.o: ../arch/%.c
+arch/%.o: ../gdb/arch/%.c
$(COMPILE) $<
$(POSTCOMPILE)
-gdbsupport/%.o: ../../gdbsupport/%.c
+gdbsupport/%.o: ../gdbsupport/%.c
$(COMPILE) $<
$(POSTCOMPILE)
@@ -635,28 +635,28 @@ gdbsupport/%.o: ../../gdbsupport/%.c
$(COMPILE) $<
$(POSTCOMPILE)
-%.o: ../nat/%.c
+%.o: ../gdb/nat/%.c
$(COMPILE) $<
$(POSTCOMPILE)
-%.o: ../target/%.c
+%.o: ../gdb/target/%.c
$(COMPILE) $<
$(POSTCOMPILE)
-%.o: ../%.c
+%.o: ../gdb/%.c
$(COMPILE) $<
$(POSTCOMPILE)
# Rules for register format descriptions. Suffix destination files with
# -generated to identify and clean them easily.
-%-generated.c: ../regformats/%.dat $(regdat_sh)
+%-generated.c: ../gdb/regformats/%.dat $(regdat_sh)
$(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@
-%-generated.c: ../regformats/arm/%.dat $(regdat_sh)
+%-generated.c: ../gdb/regformats/arm/%.dat $(regdat_sh)
$(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@
-%-generated.c: ../regformats/rs6000/%.dat $(regdat_sh)
+%-generated.c: ../gdb/regformats/rs6000/%.dat $(regdat_sh)
$(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@
#
@@ -701,7 +701,7 @@ all_deps_files = $(foreach dep,$(patsubst %.o,%.Po,$(all_object_files)),\
-include $(all_deps_files)
# Disable implicit make rules.
-include $(srcdir)/../disable-implicit-rules.mk
+include $(srcdir)/../gdb/disable-implicit-rules.mk
# Do not delete intermediate files (e.g. *-generated.c).
.SECONDARY:
similarity index 100%
rename from gdb/gdbserver/README
rename to gdbserver/README
similarity index 70%
rename from gdb/gdbserver/acinclude.m4
rename to gdbserver/acinclude.m4
@@ -1,19 +1,19 @@
dnl gdb/gdbserver/configure.in uses BFD_HAVE_SYS_PROCFS_TYPE.
-m4_include(../../bfd/bfd.m4)
+m4_include(../bfd/bfd.m4)
-m4_include(../acx_configure_dir.m4)
+m4_include(../gdb/acx_configure_dir.m4)
# This gets AM_GDB_WARNINGS.
-m4_include(../warning.m4)
+m4_include(../gdb/warning.m4)
dnl This gets autoconf bugfixes
-m4_include(../../config/override.m4)
+m4_include(../config/override.m4)
dnl For ACX_PKGVERSION and ACX_BUGURL.
-m4_include(../../config/acx.m4)
+m4_include(../config/acx.m4)
-m4_include(../../config/depstand.m4)
-m4_include(../../config/lead-dot.m4)
+m4_include(../config/depstand.m4)
+m4_include(../config/lead-dot.m4)
dnl Needed for common.m4
dnl For AC_LIB_HAVE_LINKFLAGS.
@@ -22,21 +22,21 @@ m4_include(../../config/lib-prefix.m4)
m4_include(../../config/lib-link.m4)
dnl codeset.m4 is needed for common.m4, but not for
dnl anything else in gdbserver.
-m4_include(../../config/codeset.m4)
-m4_include(../../gdbsupport/common.m4)
+m4_include(../config/codeset.m4)
+m4_include(../gdbsupport/common.m4)
dnl For libiberty_INIT.
-m4_include(../libiberty.m4)
+m4_include(../gdb/libiberty.m4)
dnl For GDB_AC_PTRACE.
-m4_include(../ptrace.m4)
+m4_include(../gdb/ptrace.m4)
-m4_include(../ax_cxx_compile_stdcxx.m4)
+m4_include(../gdb/ax_cxx_compile_stdcxx.m4)
dnl For GDB_AC_SELFTEST.
-m4_include(../selftest.m4)
+m4_include(../gdb/selftest.m4)
-m4_include([../../config/ax_pthread.m4])
+m4_include([../config/ax_pthread.m4])
dnl Check for existence of a type $1 in libthread_db.h
dnl Based on BFD_HAVE_SYS_PROCFS_TYPE in bfd/bfd.m4.
similarity index 100%
rename from gdb/gdbserver/aclocal.m4
rename to gdbserver/aclocal.m4
similarity index 100%
rename from gdb/gdbserver/ax.c
rename to gdbserver/ax.c
similarity index 100%
rename from gdb/gdbserver/ax.h
rename to gdbserver/ax.h
similarity index 100%
rename from gdb/gdbserver/config.in
rename to gdbserver/config.in
similarity index 99%
rename from gdb/gdbserver/configure
rename to gdbserver/configure
similarity index 98%
rename from gdb/gdbserver/configure.ac
rename to gdbserver/configure.ac
@@ -43,7 +43,7 @@ AX_CXX_COMPILE_STDCXX(11, , mandatory)
AC_HEADER_STDC
# Set the 'development' global.
-. $srcdir/../../bfd/development.sh
+. $srcdir/../bfd/development.sh
GDB_AC_SELFTEST([
srv_selftest_objs="gdbsupport/selftest.o"
@@ -79,10 +79,10 @@ fi
# gdbserver/. We need to build gnulib under some other directory not
# "gnulib", to avoid the problem of both GDB and GDBserver wanting to
# build it in the same directory, when building in the source dir.
-ACX_CONFIGURE_DIR(["../../gnulib"], ["build-gnulib-gdbserver"],
+ACX_CONFIGURE_DIR(["../gnulib"], ["build-gnulib-gdbserver"],
["$gnulib_extra_configure_args"])
-ACX_CONFIGURE_DIR(["../../libiberty"], ["build-libiberty-gdbserver"])
+ACX_CONFIGURE_DIR(["../libiberty"], ["build-libiberty-gdbserver"])
AC_CHECK_HEADERS(termios.h sys/reg.h string.h dnl
sys/procfs.h linux/elf.h dnl
similarity index 100%
rename from gdb/gdbserver/configure.srv
rename to gdbserver/configure.srv
similarity index 100%
rename from gdb/gdbserver/debug.c
rename to gdbserver/debug.c
similarity index 100%
rename from gdb/gdbserver/debug.h
rename to gdbserver/debug.h
similarity index 100%
rename from gdb/gdbserver/dll.c
rename to gdbserver/dll.c
similarity index 100%
rename from gdb/gdbserver/dll.h
rename to gdbserver/dll.h
similarity index 100%
rename from gdb/gdbserver/event-loop.c
rename to gdbserver/event-loop.c
similarity index 100%
rename from gdb/gdbserver/event-loop.h
rename to gdbserver/event-loop.h
similarity index 100%
rename from gdb/gdbserver/fork-child.c
rename to gdbserver/fork-child.c
similarity index 100%
rename from gdb/gdbserver/gdb_proc_service.h
rename to gdbserver/gdb_proc_service.h
similarity index 100%
rename from gdb/gdbserver/gdbreplay.c
rename to gdbserver/gdbreplay.c
similarity index 100%
rename from gdb/gdbserver/gdbthread.h
rename to gdbserver/gdbthread.h
similarity index 100%
rename from gdb/gdbserver/hostio-errno.c
rename to gdbserver/hostio-errno.c
similarity index 100%
rename from gdb/gdbserver/hostio.c
rename to gdbserver/hostio.c
similarity index 100%
rename from gdb/gdbserver/hostio.h
rename to gdbserver/hostio.h
similarity index 100%
rename from gdb/gdbserver/i387-fp.c
rename to gdbserver/i387-fp.c
similarity index 100%
rename from gdb/gdbserver/i387-fp.h
rename to gdbserver/i387-fp.h
similarity index 100%
rename from gdb/gdbserver/inferiors.c
rename to gdbserver/inferiors.c
similarity index 100%
rename from gdb/gdbserver/inferiors.h
rename to gdbserver/inferiors.h
similarity index 100%
rename from gdb/gdbserver/linux-aarch32-low.c
rename to gdbserver/linux-aarch32-low.c
similarity index 100%
rename from gdb/gdbserver/linux-aarch32-low.h
rename to gdbserver/linux-aarch32-low.h
similarity index 100%
rename from gdb/gdbserver/linux-aarch32-tdesc.c
rename to gdbserver/linux-aarch32-tdesc.c
similarity index 100%
rename from gdb/gdbserver/linux-aarch32-tdesc.h
rename to gdbserver/linux-aarch32-tdesc.h
similarity index 100%
rename from gdb/gdbserver/linux-aarch64-ipa.c
rename to gdbserver/linux-aarch64-ipa.c
similarity index 100%
rename from gdb/gdbserver/linux-aarch64-low.c
rename to gdbserver/linux-aarch64-low.c
similarity index 100%
rename from gdb/gdbserver/linux-aarch64-tdesc.c
rename to gdbserver/linux-aarch64-tdesc.c
similarity index 100%
rename from gdb/gdbserver/linux-aarch64-tdesc.h
rename to gdbserver/linux-aarch64-tdesc.h
similarity index 100%
rename from gdb/gdbserver/linux-amd64-ipa.c
rename to gdbserver/linux-amd64-ipa.c
similarity index 100%
rename from gdb/gdbserver/linux-arm-low.c
rename to gdbserver/linux-arm-low.c
similarity index 100%
rename from gdb/gdbserver/linux-arm-tdesc.c
rename to gdbserver/linux-arm-tdesc.c
similarity index 100%
rename from gdb/gdbserver/linux-arm-tdesc.h
rename to gdbserver/linux-arm-tdesc.h
similarity index 100%
rename from gdb/gdbserver/linux-bfin-low.c
rename to gdbserver/linux-bfin-low.c
similarity index 100%
rename from gdb/gdbserver/linux-cris-low.c
rename to gdbserver/linux-cris-low.c
similarity index 100%
rename from gdb/gdbserver/linux-crisv32-low.c
rename to gdbserver/linux-crisv32-low.c
similarity index 100%
rename from gdb/gdbserver/linux-i386-ipa.c
rename to gdbserver/linux-i386-ipa.c
similarity index 100%
rename from gdb/gdbserver/linux-ia64-low.c
rename to gdbserver/linux-ia64-low.c
similarity index 100%
rename from gdb/gdbserver/linux-low.c
rename to gdbserver/linux-low.c
similarity index 100%
rename from gdb/gdbserver/linux-low.h
rename to gdbserver/linux-low.h
similarity index 100%
rename from gdb/gdbserver/linux-m32r-low.c
rename to gdbserver/linux-m32r-low.c
similarity index 100%
rename from gdb/gdbserver/linux-m68k-low.c
rename to gdbserver/linux-m68k-low.c
similarity index 100%
rename from gdb/gdbserver/linux-mips-low.c
rename to gdbserver/linux-mips-low.c
similarity index 100%
rename from gdb/gdbserver/linux-nios2-low.c
rename to gdbserver/linux-nios2-low.c
similarity index 100%
rename from gdb/gdbserver/linux-ppc-ipa.c
rename to gdbserver/linux-ppc-ipa.c
similarity index 100%
rename from gdb/gdbserver/linux-ppc-low.c
rename to gdbserver/linux-ppc-low.c
similarity index 100%
rename from gdb/gdbserver/linux-ppc-tdesc-init.h
rename to gdbserver/linux-ppc-tdesc-init.h
similarity index 100%
rename from gdb/gdbserver/linux-s390-ipa.c
rename to gdbserver/linux-s390-ipa.c
similarity index 100%
rename from gdb/gdbserver/linux-s390-low.c
rename to gdbserver/linux-s390-low.c
similarity index 100%
rename from gdb/gdbserver/linux-s390-tdesc.h
rename to gdbserver/linux-s390-tdesc.h
similarity index 100%
rename from gdb/gdbserver/linux-sh-low.c
rename to gdbserver/linux-sh-low.c
similarity index 100%
rename from gdb/gdbserver/linux-sparc-low.c
rename to gdbserver/linux-sparc-low.c
similarity index 100%
rename from gdb/gdbserver/linux-tic6x-low.c
rename to gdbserver/linux-tic6x-low.c
similarity index 100%
rename from gdb/gdbserver/linux-tile-low.c
rename to gdbserver/linux-tile-low.c
similarity index 100%
rename from gdb/gdbserver/linux-x86-low.c
rename to gdbserver/linux-x86-low.c
similarity index 100%
rename from gdb/gdbserver/linux-x86-tdesc.c
rename to gdbserver/linux-x86-tdesc.c
similarity index 100%
rename from gdb/gdbserver/linux-x86-tdesc.h
rename to gdbserver/linux-x86-tdesc.h
similarity index 100%
rename from gdb/gdbserver/linux-xtensa-low.c
rename to gdbserver/linux-xtensa-low.c
similarity index 100%
rename from gdb/gdbserver/lynx-i386-low.c
rename to gdbserver/lynx-i386-low.c
similarity index 100%
rename from gdb/gdbserver/lynx-low.c
rename to gdbserver/lynx-low.c
similarity index 100%
rename from gdb/gdbserver/lynx-low.h
rename to gdbserver/lynx-low.h
similarity index 100%
rename from gdb/gdbserver/lynx-ppc-low.c
rename to gdbserver/lynx-ppc-low.c
similarity index 100%
rename from gdb/gdbserver/mem-break.c
rename to gdbserver/mem-break.c
similarity index 100%
rename from gdb/gdbserver/mem-break.h
rename to gdbserver/mem-break.h
similarity index 100%
rename from gdb/gdbserver/notif.c
rename to gdbserver/notif.c
similarity index 100%
rename from gdb/gdbserver/notif.h
rename to gdbserver/notif.h
similarity index 100%
rename from gdb/gdbserver/nto-low.c
rename to gdbserver/nto-low.c
similarity index 100%
rename from gdb/gdbserver/nto-low.h
rename to gdbserver/nto-low.h
similarity index 100%
rename from gdb/gdbserver/nto-x86-low.c
rename to gdbserver/nto-x86-low.c
similarity index 100%
rename from gdb/gdbserver/proc-service.c
rename to gdbserver/proc-service.c
similarity index 100%
rename from gdb/gdbserver/proc-service.list
rename to gdbserver/proc-service.list
similarity index 100%
rename from gdb/gdbserver/regcache.c
rename to gdbserver/regcache.c
similarity index 100%
rename from gdb/gdbserver/regcache.h
rename to gdbserver/regcache.h
similarity index 100%
rename from gdb/gdbserver/remote-utils.c
rename to gdbserver/remote-utils.c
similarity index 100%
rename from gdb/gdbserver/remote-utils.h
rename to gdbserver/remote-utils.h
similarity index 100%
rename from gdb/gdbserver/server.c
rename to gdbserver/server.c
similarity index 100%
rename from gdb/gdbserver/server.h
rename to gdbserver/server.h
similarity index 100%
rename from gdb/gdbserver/symbol.c
rename to gdbserver/symbol.c
similarity index 100%
rename from gdb/gdbserver/target.c
rename to gdbserver/target.c
similarity index 100%
rename from gdb/gdbserver/target.h
rename to gdbserver/target.h
similarity index 100%
rename from gdb/gdbserver/tdesc.c
rename to gdbserver/tdesc.c
similarity index 100%
rename from gdb/gdbserver/tdesc.h
rename to gdbserver/tdesc.h
similarity index 100%
rename from gdb/gdbserver/thread-db.c
rename to gdbserver/thread-db.c
similarity index 100%
rename from gdb/gdbserver/tracepoint.c
rename to gdbserver/tracepoint.c
similarity index 100%
rename from gdb/gdbserver/tracepoint.h
rename to gdbserver/tracepoint.h
similarity index 100%
rename from gdb/gdbserver/utils.c
rename to gdbserver/utils.c
similarity index 100%
rename from gdb/gdbserver/utils.h
rename to gdbserver/utils.h
similarity index 100%
rename from gdb/gdbserver/win32-arm-low.c
rename to gdbserver/win32-arm-low.c
similarity index 100%
rename from gdb/gdbserver/win32-i386-low.c
rename to gdbserver/win32-i386-low.c
similarity index 100%
rename from gdb/gdbserver/win32-low.c
rename to gdbserver/win32-low.c
similarity index 100%
rename from gdb/gdbserver/win32-low.h
rename to gdbserver/win32-low.h
similarity index 100%
rename from gdb/gdbserver/wincecompat.c
rename to gdbserver/wincecompat.c
similarity index 100%
rename from gdb/gdbserver/wincecompat.h
rename to gdbserver/wincecompat.h
similarity index 100%
rename from gdb/gdbserver/x86-low.c
rename to gdbserver/x86-low.c
similarity index 100%
rename from gdb/gdbserver/x86-low.h
rename to gdbserver/x86-low.h
similarity index 100%
rename from gdb/gdbserver/x86-tdesc.h
rename to gdbserver/x86-tdesc.h
similarity index 100%
rename from gdb/gdbserver/xtensa-xtregs.c
rename to gdbserver/xtensa-xtregs.c
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# Copyright (C) 1990-2019 Free Software Foundation
+# Copyright (C) 1990-2020 Free Software Foundation
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -315,7 +315,7 @@ gas_release()
tar_compress $package $tool "$GAS_SUPPORT_DIRS" "$compressors"
}
-GDB_SUPPORT_DIRS="bfd include libiberty libctf opcodes readline sim intl libdecnumber cpu zlib contrib gnulib gdbsupport"
+GDB_SUPPORT_DIRS="bfd include libiberty libctf opcodes readline sim intl libdecnumber cpu zlib contrib gnulib gdbsupport gdbserver"
gdb_release()
{
compressors=$1