2011-05-26 Yao Qi <yao@codesourcery.com>

	gdb/
	* gdb_thread_db.h: Delete.  Move to ...
	* common/gdb_thread_db.h: ... here.

	gdb/gdbserver/
	* Makefile.in (thread-db.o): Track dependence to
	common/gdb_thread_db.h.
	* thread-db.c: include gdb_thread_db.h from right place.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6dae1df..ad46da1 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-26  Yao Qi  <yao@codesourcery.com>
+
+       * gdb_thread_db.h: Delete.  Move to ...
+       * common/gdb_thread_db.h: ... here.
+
 2011-05-26  Pedro Alves  <pedro@codesourcery.com>
 
        * infcmd.c (finish_backward): Set a step-resume breakpoint at the

diff --git a/gdb/gdb_thread_db.h b/gdb/common/gdb_thread_db.h
similarity index 100%
rename from gdb/gdb_thread_db.h
rename to gdb/common/gdb_thread_db.h

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index ff5f71d..98c1100 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-26  Yao Qi  <yao@codesourcery.com>
+
+       * Makefile.in (thread-db.o): Track dependence to
+       common/gdb_thread_db.h.
+       * thread-db.c: include gdb_thread_db.h from right place.
+
 2011-05-16  Adrian Cornish  <gnu@bluedreamer.com>
 
        * linux-i386-ipa.c (supply_static_tracepoint_registers): Pass

diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 1e3781f..095c706 100644 (file)
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -339,6 +339,8 @@ linux_low_h = $(srcdir)/linux-low.h
 
 linux_ptrace_h = $(srcdir)/../common/linux-ptrace.h
 
+gdb_thread_db_h = $(srcdir)/../common/gdb_thread_db.h
+
 lynx_low_h = $(srcdir)/lynx-low.h $(srcdir)/server.h
 
 nto_low_h = $(srcdir)/nto-low.h
@@ -379,7 +381,8 @@ regcache.o: regcache.c $(server_h) $(regdef_h)
 remote-utils.o: remote-utils.c terminal.h $(server_h)
 server.o: server.c $(server_h)
 target.o: target.c $(server_h)
-thread-db.o: thread-db.c $(server_h) $(linux_low_h) $(gdb_proc_service_h)
+thread-db.o: thread-db.c $(server_h) $(linux_low_h) $(gdb_proc_service_h) \
+       $(gdb_thread_db_h)
 tracepoint.o: tracepoint.c $(server_h) $(srcdir)/../common/ax.def
 utils.o: utils.c $(server_h)
 gdbreplay.o: gdbreplay.c config.h

diff --git a/gdb/gdbserver/thread-db.c b/gdb/gdbserver/thread-db.c
index 515dff2..9bedd89 100644 (file)
--- a/gdb/gdbserver/thread-db.c
+++ b/gdb/gdbserver/thread-db.c
@@ -28,7 +28,7 @@ extern int debug_threads;
 static int thread_db_use_events;
 
 #include "gdb_proc_service.h"
-#include "../gdb_thread_db.h"
+#include "gdb_thread_db.h"
 
 #ifndef USE_LIBTHREAD_DB_DIRECTLY
 #include <dlfcn.h>