diff options
Diffstat (limited to 'gdb/gdbserver')
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/gdbserver/Makefile.in | 37 | ||||
| -rw-r--r-- | gdb/gdbserver/linux-low.c | 8 | ||||
| -rw-r--r-- | gdb/gdbserver/linux-low.h | 4 | ||||
| -rw-r--r-- | gdb/gdbserver/linux-mips-low.c | 2 | ||||
| -rw-r--r-- | gdb/gdbserver/thread-db.c | 2 |
6 files changed, 31 insertions, 28 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index cde9c0a..753a0c2 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,5 +1,11 @@ 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. (i386_dr_low_set_addr): Likewise. (i386_dr_low_get_addr): Likewise. diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index 3674aed..f9a2f17 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -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 +# Native object files rules from ../nat + +i386-dregs.o: ../nat/i386-dregs.c $(COMPILE) $< $(POSTCOMPILE) - -mips-linux-watch.o: ../common/mips-linux-watch.c +linux-btrace.o: ../nat/linux-btrace.c $(COMPILE) $< $(POSTCOMPILE) - -# Native object files rules from ../nat - -i386-dregs.o: ../nat/i386-dregs.c +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 diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index 1932ff2..61552f4 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -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 diff --git a/gdb/gdbserver/linux-low.h b/gdb/gdbserver/linux-low.h index 498b221..4820929 100644 --- a/gdb/gdbserver/linux-low.h +++ b/gdb/gdbserver/linux-low.h @@ -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 diff --git a/gdb/gdbserver/linux-mips-low.c b/gdb/gdbserver/linux-mips-low.c index 320e2b1..1b2160b 100644 --- a/gdb/gdbserver/linux-mips-low.c +++ b/gdb/gdbserver/linux-mips-low.c @@ -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. */ diff --git a/gdb/gdbserver/thread-db.c b/gdb/gdbserver/thread-db.c index 3ea0cc3..d69c9e4 100644 --- a/gdb/gdbserver/thread-db.c +++ b/gdb/gdbserver/thread-db.c @@ -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 |