Move shared native target specific code to gdb/nat

https://sourceware.org/gdb/wiki/Common describes the following
directory structure:

 gdb/nat/
   Native target backend files. Code that interfaces with the
   host debug API. E.g., ptrace code, Windows debug API code,
   procfs code should go here.

 gdb/target/
   Host-independent, target vector specific code (target_ops).

 gdb/common/
   All other shared code.

This commit moves all native target backend files currently in
gdb/common to gdb/nat.

gdb/
2014-06-20  Gary Benson  <gbenson@redhat.com>

	* common/gdb_thread_db.h: Moved to nat.  All includes updated.
	* common/glibc_thread_db.h: Likewise.
	* common/i386-cpuid.h: Likewise.
	* common/i386-gcc-cpuid.h: Likewise.
	* common/linux-btrace.h: Likewise.
	* common/linux-osdata.h: Likewise.
	* common/linux-procfs.h: Likewise.
	* common/linux-ptrace.h: Likewise.
	* common/mips-linux-watch.h: Likewise.
	* common/linux-btrace.c: Moved to nat.
	* common/linux-osdata.c: Likewise.
	* common/linux-procfs.c: Likewise.
	* common/linux-ptrace.c: Likewise.
	* common/mips-linux-watch.c: Likewise.
	* nat/gdb_thread_db.h: Moved from common.
	* nat/glibc_thread_db.h: Likewise.
	* nat/i386-cpuid.h: Likewise.
	* nat/i386-gcc-cpuid.h: Likewise.
	* nat/linux-btrace.c: Likewise.
	* nat/linux-btrace.h: Likewise.
	* nat/linux-osdata.c: Likewise.
	* nat/linux-osdata.h: Likewise.
	* nat/linux-procfs.c: Likewise.
	* nat/linux-procfs.h: Likewise.
	* nat/linux-ptrace.c: Likewise.
	* nat/linux-ptrace.h: Likewise.
	* nat/mips-linux-watch.c: Likewise.
	* nat/mips-linux-watch.h: Likewise.
	* Makefile.in (HFILES_NO_SRCDIR): Reflect new locations.
	(object file files): Reordered.
	* gdb/copyright.py (EXCLUDE_LIST): Reflect new location
	of glibc_thread_db.h.

gdb/gdbserver/
2014-06-20  Gary Benson  <gbenson@redhat.com>

	* Makefile.in (SFILES): Update locations for files moved
	from common to nat.
	(object file files): Reordered.

gdb/testsuite/
2014-06-20  Gary Benson  <gbenson@redhat.com>

	* gdb.arch/i386-avx.exp: Fix include file location.
	* gdb.arch/i386-sse.exp: Likewise.
This commit is contained in:
Gary Benson 2014-06-19 14:46:38 +01:00
parent 42995dbda6
commit 125f8a3dde
38 changed files with 118 additions and 75 deletions

View File

@ -1,3 +1,38 @@
2014-06-20 Gary Benson <gbenson@redhat.com>
* common/gdb_thread_db.h: Moved to nat. All includes updated.
* common/glibc_thread_db.h: Likewise.
* common/i386-cpuid.h: Likewise.
* common/i386-gcc-cpuid.h: Likewise.
* common/linux-btrace.h: Likewise.
* common/linux-osdata.h: Likewise.
* common/linux-procfs.h: Likewise.
* common/linux-ptrace.h: Likewise.
* common/mips-linux-watch.h: Likewise.
* common/linux-btrace.c: Moved to nat.
* common/linux-osdata.c: Likewise.
* common/linux-procfs.c: Likewise.
* common/linux-ptrace.c: Likewise.
* common/mips-linux-watch.c: Likewise.
* nat/gdb_thread_db.h: Moved from common.
* nat/glibc_thread_db.h: Likewise.
* nat/i386-cpuid.h: Likewise.
* nat/i386-gcc-cpuid.h: Likewise.
* nat/linux-btrace.c: Likewise.
* nat/linux-btrace.h: Likewise.
* nat/linux-osdata.c: Likewise.
* nat/linux-osdata.h: Likewise.
* nat/linux-procfs.c: Likewise.
* nat/linux-procfs.h: Likewise.
* nat/linux-ptrace.c: Likewise.
* nat/linux-ptrace.h: Likewise.
* nat/mips-linux-watch.c: Likewise.
* nat/mips-linux-watch.h: Likewise.
* Makefile.in (HFILES_NO_SRCDIR): Reflect new locations.
(object file files): Reordered.
* gdb/copyright.py (EXCLUDE_LIST): Reflect new location
of glibc_thread_db.h.
2014-06-20 Gary Benson <gbenson@redhat.com>
* i386-nat.h (debug_hw_points): Moved to nat/i386-dregs.c.

View File

@ -861,8 +861,8 @@ LINTFILES = $(SFILES) $(YYFILES) $(CONFIG_SRCS) init.c
# right, it is probably easiest just to list .h files here directly.
HFILES_NO_SRCDIR = \
common/gdb_signals.h common/gdb_thread_db.h common/gdb_vecs.h \
common/i386-xstate.h common/linux-ptrace.h common/mips-linux-watch.h \
common/gdb_signals.h nat/gdb_thread_db.h common/gdb_vecs.h \
common/i386-xstate.h nat/linux-ptrace.h nat/mips-linux-watch.h \
proc-utils.h aarch64-tdep.h arm-tdep.h ax-gdb.h ppcfbsd-tdep.h \
ppcnbsd-tdep.h cli-out.h gdb_expat.h breakpoint.h infcall.h obsd-tdep.h \
exec.h m32r-tdep.h osabi.h gdbcore.h solib-som.h amd64bsd-nat.h \
@ -930,9 +930,9 @@ gnulib/import/extra/snippet/warn-on-use.h \
gnulib/import/stddef.in.h gnulib/import/inttypes.in.h inline-frame.h skip.h \
common/common-utils.h common/xml-utils.h common/buffer.h common/ptid.h \
common/format.h common/host-defs.h utils.h common/queue.h \
common/linux-osdata.h gdb-dlfcn.h auto-load.h probe.h stap-probe.h \
gdb_bfd.h sparc-ravenscar-thread.h ppc-ravenscar-thread.h common/linux-btrace.h \
ctf.h common/i386-cpuid.h common/i386-gcc-cpuid.h target/resume.h \
nat/linux-osdata.h gdb-dlfcn.h auto-load.h probe.h stap-probe.h \
gdb_bfd.h sparc-ravenscar-thread.h ppc-ravenscar-thread.h nat/linux-btrace.h \
ctf.h nat/i386-cpuid.h nat/i386-gcc-cpuid.h target/resume.h \
target/wait.h target/waitstatus.h nat/linux-nat.h nat/linux-waitpid.h \
common/print-utils.h common/rsp-low.h nat/i386-dregs.h
@ -2127,18 +2127,6 @@ format.o: ${srcdir}/common/format.c
$(COMPILE) $(srcdir)/common/format.c
$(POSTCOMPILE)
linux-osdata.o: ${srcdir}/common/linux-osdata.c
$(COMPILE) $(srcdir)/common/linux-osdata.c
$(POSTCOMPILE)
linux-procfs.o: $(srcdir)/common/linux-procfs.c
$(COMPILE) $(srcdir)/common/linux-procfs.c
$(POSTCOMPILE)
linux-ptrace.o: $(srcdir)/common/linux-ptrace.c
$(COMPILE) $(srcdir)/common/linux-ptrace.c
$(POSTCOMPILE)
common-agent.o: $(srcdir)/common/agent.c
$(COMPILE) $(srcdir)/common/agent.c
$(POSTCOMPILE)
@ -2147,14 +2135,6 @@ vec.o: ${srcdir}/common/vec.c
$(COMPILE) $(srcdir)/common/vec.c
$(POSTCOMPILE)
linux-btrace.o: ${srcdir}/common/linux-btrace.c
$(COMPILE) $(srcdir)/common/linux-btrace.c
$(POSTCOMPILE)
mips-linux-watch.o: ${srcdir}/common/mips-linux-watch.c
$(COMPILE) $(srcdir)/common/mips-linux-watch.c
$(POSTCOMPILE)
print-utils.o: ${srcdir}/common/print-utils.c
$(COMPILE) $(srcdir)/common/print-utils.c
$(POSTCOMPILE)
@ -2182,10 +2162,30 @@ i386-dregs.o: ${srcdir}/nat/i386-dregs.c
$(COMPILE) $(srcdir)/nat/i386-dregs.c
$(POSTCOMPILE)
linux-btrace.o: ${srcdir}/nat/linux-btrace.c
$(COMPILE) $(srcdir)/nat/linux-btrace.c
$(POSTCOMPILE)
linux-osdata.o: ${srcdir}/nat/linux-osdata.c
$(COMPILE) $(srcdir)/nat/linux-osdata.c
$(POSTCOMPILE)
linux-procfs.o: $(srcdir)/nat/linux-procfs.c
$(COMPILE) $(srcdir)/nat/linux-procfs.c
$(POSTCOMPILE)
linux-ptrace.o: $(srcdir)/nat/linux-ptrace.c
$(COMPILE) $(srcdir)/nat/linux-ptrace.c
$(POSTCOMPILE)
linux-waitpid.o: ${srcdir}/nat/linux-waitpid.c
$(COMPILE) $(srcdir)/nat/linux-waitpid.c
$(POSTCOMPILE)
mips-linux-watch.o: ${srcdir}/nat/mips-linux-watch.c
$(COMPILE) $(srcdir)/nat/mips-linux-watch.c
$(POSTCOMPILE)
#
# gdb/tui/ dependencies
#

View File

@ -25,7 +25,7 @@
#include "regset.h"
#include "linux-nat.h"
#include "amd64-linux-tdep.h"
#include "linux-btrace.h"
#include "nat/linux-btrace.h"
#include "btrace.h"
#include "gdb_assert.h"

View File

@ -171,7 +171,7 @@ def main ():
#
# Filenames are relative to the root directory.
EXCLUDE_LIST = (
'gdb/common/glibc_thread_db.h',
'gdb/nat/glibc_thread_db.h',
'gdb/CONTRIBUTE',
'gdb/gnulib/import'
)

View File

@ -1,3 +1,9 @@
2014-06-20 Gary Benson <gbenson@redhat.com>
* Makefile.in (SFILES): Update locations for files moved
from common to nat.
(object file files): Reordered.
2014-06-20 Gary Benson <gbenson@redhat.com>
* i386-low.h (i386_dr_low_can_set_addr): Removed.

View File

@ -165,10 +165,10 @@ SFILES= $(srcdir)/gdbreplay.c $(srcdir)/inferiors.c $(srcdir)/dll.c \
$(srcdir)/hostio.c $(srcdir)/hostio-errno.c \
$(srcdir)/common/vec.c $(srcdir)/common/gdb_vecs.c \
$(srcdir)/common/common-utils.c $(srcdir)/common/xml-utils.c \
$(srcdir)/common/linux-osdata.c $(srcdir)/common/ptid.c \
$(srcdir)/common/buffer.c $(srcdir)/common/linux-btrace.c \
$(srcdir)/nat/linux-osdata.c $(srcdir)/common/ptid.c \
$(srcdir)/common/buffer.c $(srcdir)/nat/linux-btrace.c \
$(srcdir)/common/filestuff.c $(srcdir)/target/waitstatus.c \
$(srcdir)/common/mips-linux-watch.c $(srcdir)/common/print-utils.c \
$(srcdir)/nat/mips-linux-watch.c $(srcdir)/common/print-utils.c \
$(srcdir)/common/rsp-low.c
DEPFILES = @GDBSERVER_DEPFILES@
@ -503,12 +503,6 @@ print-utils.o: ../common/print-utils.c
rsp-low.o: ../common/rsp-low.c
$(COMPILE) $<
$(POSTCOMPILE)
linux-procfs.o: ../common/linux-procfs.c
$(COMPILE) $<
$(POSTCOMPILE)
linux-ptrace.o: ../common/linux-ptrace.c
$(COMPILE) $<
$(POSTCOMPILE)
common-utils.o: ../common/common-utils.c
$(COMPILE) $<
$(POSTCOMPILE)
@ -521,9 +515,6 @@ gdb_vecs.o: ../common/gdb_vecs.c
xml-utils.o: ../common/xml-utils.c
$(COMPILE) $<
$(POSTCOMPILE)
linux-osdata.o: ../common/linux-osdata.c
$(COMPILE) $<
$(POSTCOMPILE)
ptid.o: ../common/ptid.c
$(COMPILE) $<
$(POSTCOMPILE)
@ -543,23 +534,29 @@ waitstatus.o: ../target/waitstatus.c
$(COMPILE) $<
$(POSTCOMPILE)
linux-btrace.o: ../common/linux-btrace.c
$(COMPILE) $<
$(POSTCOMPILE)
mips-linux-watch.o: ../common/mips-linux-watch.c
$(COMPILE) $<
$(POSTCOMPILE)
# Native object files rules from ../nat
i386-dregs.o: ../nat/i386-dregs.c
$(COMPILE) $<
$(POSTCOMPILE)
linux-btrace.o: ../nat/linux-btrace.c
$(COMPILE) $<
$(POSTCOMPILE)
linux-osdata.o: ../nat/linux-osdata.c
$(COMPILE) $<
$(POSTCOMPILE)
linux-procfs.o: ../nat/linux-procfs.c
$(COMPILE) $<
$(POSTCOMPILE)
linux-ptrace.o: ../nat/linux-ptrace.c
$(COMPILE) $<
$(POSTCOMPILE)
linux-waitpid.o: ../nat/linux-waitpid.c
$(COMPILE) $<
$(POSTCOMPILE)
mips-linux-watch.o: ../nat/mips-linux-watch.c
$(COMPILE) $<
$(POSTCOMPILE)
aarch64.c : $(srcdir)/../regformats/aarch64.dat $(regdat_sh)
$(SHELL) $(regdat_sh) $(srcdir)/../regformats/aarch64.dat aarch64.c

View File

@ -18,7 +18,7 @@
#include "server.h"
#include "linux-low.h"
#include "linux-osdata.h"
#include "nat/linux-osdata.h"
#include "agent.h"
#include "nat/linux-nat.h"
@ -26,8 +26,8 @@
#include "gdb_wait.h"
#include <stdio.h>
#include <sys/ptrace.h>
#include "linux-ptrace.h"
#include "linux-procfs.h"
#include "nat/linux-ptrace.h"
#include "nat/linux-procfs.h"
#include <signal.h>
#include <sys/ioctl.h>
#include <fcntl.h>
@ -105,7 +105,7 @@
#endif
#ifdef HAVE_LINUX_BTRACE
# include "linux-btrace.h"
# include "nat/linux-btrace.h"
#endif
#ifndef HAVE_ELF32_AUXV_T

View File

@ -16,14 +16,14 @@
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 "gdb_thread_db.h"
#include "nat/gdb_thread_db.h"
#include <signal.h>
#include "gdbthread.h"
#include "gdb_proc_service.h"
/* Included for ptrace type definitions. */
#include "linux-ptrace.h"
#include "nat/linux-ptrace.h"
#define PTRACE_XFER_TYPE long

View File

@ -22,7 +22,7 @@
#include <sys/ptrace.h>
#include <endian.h>
#include "mips-linux-watch.h"
#include "nat/mips-linux-watch.h"
#include "gdb_proc_service.h"
/* Defined in auto-generated file mips-linux.c. */

View File

@ -27,7 +27,7 @@ extern int debug_threads;
static int thread_db_use_events;
#include "gdb_proc_service.h"
#include "gdb_thread_db.h"
#include "nat/gdb_thread_db.h"
#include "gdb_vecs.h"
#ifndef USE_LIBTHREAD_DB_DIRECTLY

View File

@ -97,7 +97,7 @@
#include "buildsym.h"
#include "i387-tdep.h"
#include "i386-tdep.h"
#include "i386-cpuid.h"
#include "nat/i386-cpuid.h"
#include "value.h"
#include "regcache.h"
#include <string.h>

View File

@ -25,7 +25,7 @@
#include "regset.h"
#include "target.h"
#include "linux-nat.h"
#include "linux-btrace.h"
#include "nat/linux-btrace.h"
#include "btrace.h"
#include "gdb_assert.h"

View File

@ -32,8 +32,8 @@
#endif
#include <sys/ptrace.h>
#include "linux-nat.h"
#include "linux-ptrace.h"
#include "linux-procfs.h"
#include "nat/linux-ptrace.h"
#include "nat/linux-procfs.h"
#include "linux-fork.h"
#include "gdbthread.h"
#include "gdbcmd.h"
@ -59,7 +59,7 @@
#include "terminal.h"
#include <sys/vfs.h>
#include "solib.h"
#include "linux-osdata.h"
#include "nat/linux-osdata.h"
#include "linux-tdep.h"
#include "symfile.h"
#include "agent.h"

View File

@ -22,7 +22,7 @@
#include "gdb_assert.h"
#include <dlfcn.h>
#include "gdb_proc_service.h"
#include "gdb_thread_db.h"
#include "nat/gdb_thread_db.h"
#include "gdb_vecs.h"
#include "bfd.h"
#include "command.h"
@ -40,8 +40,8 @@
#include "gdbcore.h"
#include "observer.h"
#include "linux-nat.h"
#include "linux-procfs.h"
#include "linux-osdata.h"
#include "nat/linux-procfs.h"
#include "nat/linux-osdata.h"
#include "auto-load.h"
#include "cli/cli-utils.h"

View File

@ -36,7 +36,7 @@
#include <sys/ptrace.h>
#include <asm/ptrace.h>
#include "mips-linux-watch.h"
#include "nat/mips-linux-watch.h"
#include "features/mips-linux.c"
#include "features/mips-dsp-linux.c"

View File

@ -23,7 +23,7 @@
#include "defs.h"
#include "inferior.h"
#endif
#include "nat/i386-dregs.h"
#include "i386-dregs.h"
/* Support for hardware watchpoints and breakpoints using the i386
debug registers.

View File

@ -25,7 +25,7 @@
#include "linux-ptrace.h"
#include "linux-procfs.h"
#include "nat/linux-waitpid.h"
#include "linux-waitpid.h"
#include "buffer.h"
#include "gdb_assert.h"
#include "gdb_wait.h"

View File

@ -24,8 +24,8 @@
#include "signal.h"
#endif
#include "nat/linux-nat.h"
#include "nat/linux-waitpid.h"
#include "linux-nat.h"
#include "linux-waitpid.h"
#include "gdb_wait.h"
#include <string.h>

View File

@ -1,3 +1,8 @@
2014-06-20 Gary Benson <gbenson@redhat.com>
* gdb.arch/i386-avx.exp: Fix include file location.
* gdb.arch/i386-sse.exp: Likewise.
2014-06-19 Iain Buclaw <ibuclaw@gdcproject.org>
* gdb.dlang/expression.exp: New file.

View File

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <stdio.h>
#include "i386-cpuid.h"
#include "nat/i386-cpuid.h"
typedef struct {
float f[8];

View File

@ -32,7 +32,7 @@ if [get_compiler_info] {
set additional_flags ""
if [test_compiler_info gcc*] {
set additional_flags "additional_flags=-mavx -I${srcdir}/../common"
set additional_flags "additional_flags=-mavx -I${srcdir}/.."
}
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug $additional_flags]] != "" } {

View File

@ -17,7 +17,7 @@
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 "i386-cpuid.h"
#include "nat/i386-cpuid.h"
typedef struct
{

View File

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <stdio.h>
#include "i386-cpuid.h"
#include "nat/i386-cpuid.h"
#ifndef NOINLINE
#define NOINLINE __attribute__ ((noinline))

View File

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <stdio.h>
#include "i386-cpuid.h"
#include "nat/i386-cpuid.h"
typedef struct {
float f[4];

View File

@ -32,7 +32,7 @@ if [get_compiler_info] {
set additional_flags ""
if [test_compiler_info gcc*] {
set additional_flags "additional_flags=-msse -I${srcdir}/../common"
set additional_flags "additional_flags=-msse -I${srcdir}/.."
}
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug $additional_flags]] != "" } {