* linux-thread-db.c: New file, renamed from thread-db.c.

	* thread-db.c: Remove.
	* Makefile.in (linux-thread-db.o): Rename from thread-db.o rule.
	* config/alpha/alpha-linux.mh (NATDEPFILES): Rename thread-db.o
	to linux-thread-db.o.
	* config/arm/linux.mh (NATDEPFILES): Likewise.
	* config/i386/linux.mh (NATDEPFILES): Likewise.
	* config/i386/linux64.mh (NATDEPFILES): Likewise.
	* config/ia64/linux.mh (NATDEPFILES): Likewise.
	* config/m32r/linux.mh (NATDEPFILES): Likewise.
	* config/m68k/linux.mh (NATDEPFILES): Likewise.
	* config/mips/linux.mh (NATDEPFILES): Likewise.
	* config/pa/linux.mh (NATDEPFILES): Likewise.
	* config/powerpc/linux.mh (NATDEPFILES): Likewise.
	* config/powerpc/ppc64-linux.mh (NATDEPFILES): Likewise.
	* config/s390/s390.mh (NATDEPFILES): Likewise.
	* config/sparc/linux.mh (NATDEPFILES): Likewise.
	* config/sparc/linux64.mh (NATDEPFILES): Likewise.

17 files changed, 41 insertions, 19 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4b241a8..0977177 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,24 @@
+2004-11-14  Daniel Jacobowitz  <dan@debian.org>
+
+	* linux-thread-db.c: New file, renamed from thread-db.c.
+	* thread-db.c: Remove.
+	* Makefile.in (linux-thread-db.o): Rename from thread-db.o rule.
+	* config/alpha/alpha-linux.mh (NATDEPFILES): Rename thread-db.o
+	to linux-thread-db.o.
+	* config/arm/linux.mh (NATDEPFILES): Likewise.
+	* config/i386/linux.mh (NATDEPFILES): Likewise.
+	* config/i386/linux64.mh (NATDEPFILES): Likewise.
+	* config/ia64/linux.mh (NATDEPFILES): Likewise.
+	* config/m32r/linux.mh (NATDEPFILES): Likewise.
+	* config/m68k/linux.mh (NATDEPFILES): Likewise.
+	* config/mips/linux.mh (NATDEPFILES): Likewise.
+	* config/pa/linux.mh (NATDEPFILES): Likewise.
+	* config/powerpc/linux.mh (NATDEPFILES): Likewise.
+	* config/powerpc/ppc64-linux.mh (NATDEPFILES): Likewise.
+	* config/s390/s390.mh (NATDEPFILES): Likewise.
+	* config/sparc/linux.mh (NATDEPFILES): Likewise.
+	* config/sparc/linux64.mh (NATDEPFILES): Likewise.
+
 2004-11-13  Andrew Cagney  <cagney@gnu.org>
 
 	* config/i386/i386lynx.mh: Delete file.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 0be8693..cada3d1 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1474,9 +1474,9 @@ procfs.o: $(srcdir)/procfs.c
 
 # FIXME: Thread-db.o gets warnings because the definitions of the register
 # sets are different from kernel to kernel.
-thread-db.o: $(srcdir)/thread-db.c
+linux-thread-db.o: $(srcdir)/linux-thread-db.c
 	$(CC) -c $(INTERNAL_WARN_CFLAGS) $(NO_WERROR_CFLAGS) \
-		$(srcdir)/thread-db.c
+		$(srcdir)/linux-thread-db.c
 
 v850ice.o: $(srcdir)/v850ice.c
 	$(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \
@@ -2612,9 +2612,10 @@ target.o: target.c $(defs_h) $(gdb_string_h) $(target_h) $(gdbcmd_h) \
 thread.o: thread.c $(defs_h) $(symtab_h) $(frame_h) $(inferior_h) \
 	$(environ_h) $(value_h) $(target_h) $(gdbthread_h) $(command_h) \
 	$(gdbcmd_h) $(regcache_h) $(gdb_h) $(gdb_string_h) $(ui_out_h)
-thread-db.o: thread-db.c $(defs_h) $(gdb_assert_h) $(gdb_proc_service_h) \
-	$(gdb_thread_db_h) $(bfd_h) $(gdbthread_h) $(inferior_h) \
-	$(symfile_h) $(objfiles_h) $(target_h) $(regcache_h) $(solib_svr4_h)
+linux-thread-db.o: linux-thread-db.c $(defs_h) $(gdb_assert_h)
+	$(gdb_proc_service_h) $(gdb_thread_db_h) $(bfd_h) $(gdbthread_h) \
+	$(inferior_h) $(symfile_h) $(objfiles_h) $(target_h) $(regcache_h) \
+	$(solib_svr4_h)
 top.o: top.c $(defs_h) $(gdbcmd_h) $(call_cmds_h) $(cli_cmds_h) \
 	$(cli_script_h) $(cli_setshow_h) $(cli_decode_h) $(symtab_h) \
 	$(inferior_h) $(target_h) $(breakpoint_h) $(gdbtypes_h) \
diff --git a/gdb/config/alpha/alpha-linux.mh b/gdb/config/alpha/alpha-linux.mh
index 4983441..1650d79 100644
--- a/gdb/config/alpha/alpha-linux.mh
+++ b/gdb/config/alpha/alpha-linux.mh
@@ -1,7 +1,7 @@
 # Host: Little-endian Alpha running Linux
 NAT_FILE= nm-linux.h
 NATDEPFILES= infptrace.o inftarg.o corelow.o alpha-nat.o \
-	fork-child.o proc-service.o thread-db.o gcore.o \
+	fork-child.o proc-service.o linux-thread-db.o gcore.o \
 	linux-nat.o
 
 # The dynamically loaded libthread_db needs access to symbols in the
diff --git a/gdb/config/arm/linux.mh b/gdb/config/arm/linux.mh
index 386f681..ee2ae54 100644
--- a/gdb/config/arm/linux.mh
+++ b/gdb/config/arm/linux.mh
@@ -3,7 +3,7 @@
 NAT_FILE= nm-linux.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o	\
 	core-regset.o arm-linux-nat.o gcore.o	\
-	proc-service.o thread-db.o linux-nat.o
+	proc-service.o linux-thread-db.o linux-nat.o
 
 LOADLIBES= -ldl -rdynamic
 
diff --git a/gdb/config/i386/linux.mh b/gdb/config/i386/linux.mh
index bfe29c1..84c92cf 100644
--- a/gdb/config/i386/linux.mh
+++ b/gdb/config/i386/linux.mh
@@ -3,7 +3,7 @@
 NAT_FILE= nm-linux.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o \
 	core-aout.o i386-nat.o i386-linux-nat.o \
-	proc-service.o thread-db.o gcore.o \
+	proc-service.o linux-thread-db.o gcore.o \
 	linux-nat.o
 
 # The dynamically loaded libthread_db needs access to symbols in the
diff --git a/gdb/config/i386/linux64.mh b/gdb/config/i386/linux64.mh
index e9117cf..8124ee3 100644
--- a/gdb/config/i386/linux64.mh
+++ b/gdb/config/i386/linux64.mh
@@ -1,7 +1,7 @@
 # Host: GNU/Linux x86-64
 NATDEPFILES= infptrace.o inftarg.o fork-child.o \
 	i386-nat.o amd64-nat.o amd64-linux-nat.o linux-nat.o \
-	proc-service.o thread-db.o gcore.o 
+	proc-service.o linux-thread-db.o gcore.o 
 NAT_FILE= nm-linux64.h
 
 # The dynamically loaded libthread_db needs access to symbols in the
diff --git a/gdb/config/ia64/linux.mh b/gdb/config/ia64/linux.mh
index 5ad3145..35b7289 100644
--- a/gdb/config/ia64/linux.mh
+++ b/gdb/config/ia64/linux.mh
@@ -3,6 +3,6 @@
 NAT_FILE= nm-linux.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o gcore.o \
 	core-aout.o core-regset.o ia64-linux-nat.o \
-	proc-service.o thread-db.o linux-nat.o
+	proc-service.o linux-thread-db.o linux-nat.o
 
 LOADLIBES = -ldl -rdynamic
diff --git a/gdb/config/m32r/linux.mh b/gdb/config/m32r/linux.mh
index bfa8cf6..12d2877 100644
--- a/gdb/config/m32r/linux.mh
+++ b/gdb/config/m32r/linux.mh
@@ -2,7 +2,7 @@
 
 NAT_FILE= nm-linux.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o	\
-	m32r-linux-nat.o gcore.o proc-service.o thread-db.o	\
+	m32r-linux-nat.o gcore.o proc-service.o linux-thread-db.o	\
 	linux-nat.o
 
 LOADLIBES= -ldl -rdynamic
diff --git a/gdb/config/m68k/linux.mh b/gdb/config/m68k/linux.mh
index 9e3e898..ee5a992 100644
--- a/gdb/config/m68k/linux.mh
+++ b/gdb/config/m68k/linux.mh
@@ -3,7 +3,7 @@
 NAT_FILE= nm-linux.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o \
 	corelow.o core-aout.o m68klinux-nat.o gcore.o \
-	proc-service.o thread-db.o linux-nat.o
+	proc-service.o linux-thread-db.o linux-nat.o
 
 # The dynamically loaded libthread_db needs access to symbols in the
 # gdb executable.
diff --git a/gdb/config/mips/linux.mh b/gdb/config/mips/linux.mh
index 44bac25..a92b9c6 100644
--- a/gdb/config/mips/linux.mh
+++ b/gdb/config/mips/linux.mh
@@ -1,7 +1,7 @@
 # Host: Linux/MIPS
 NAT_FILE= nm-linux.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o mips-linux-nat.o \
-	thread-db.o proc-service.o gcore.o \
+	linux-thread-db.o proc-service.o gcore.o \
 	linux-nat.o
 
 LOADLIBES = -ldl -rdynamic
diff --git a/gdb/config/pa/linux.mh b/gdb/config/pa/linux.mh
index bc5a001..212084e 100644
--- a/gdb/config/pa/linux.mh
+++ b/gdb/config/pa/linux.mh
@@ -3,6 +3,6 @@ XDEPFILES=
 NAT_FILE= nm-linux.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o gcore.o \
 	core-regset.o hppa-linux-nat.o \
-	proc-service.o thread-db.o linux-nat.o
+	proc-service.o linux-thread-db.o linux-nat.o
 
 LOADLIBES = -ldl -rdynamic
diff --git a/gdb/config/powerpc/linux.mh b/gdb/config/powerpc/linux.mh
index a7be199..3a2d04e 100644
--- a/gdb/config/powerpc/linux.mh
+++ b/gdb/config/powerpc/linux.mh
@@ -4,7 +4,7 @@ XM_CLIBS=
 
 NAT_FILE= nm-linux.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o \
-	ppc-linux-nat.o proc-service.o thread-db.o \
+	ppc-linux-nat.o proc-service.o linux-thread-db.o \
 	gcore.o linux-nat.o
 
 LOADLIBES = -ldl -rdynamic
diff --git a/gdb/config/powerpc/ppc64-linux.mh b/gdb/config/powerpc/ppc64-linux.mh
index 2c42fc7..e4bc79c 100644
--- a/gdb/config/powerpc/ppc64-linux.mh
+++ b/gdb/config/powerpc/ppc64-linux.mh
@@ -4,7 +4,7 @@ XM_CLIBS=
 
 NAT_FILE= nm-ppc64-linux.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o \
-	ppc-linux-nat.o proc-service.o thread-db.o \
+	ppc-linux-nat.o proc-service.o linux-thread-db.o \
 	gcore.o linux-nat.o
 
 # The PowerPC has severe limitations on TOC size, and uses them even
diff --git a/gdb/config/s390/s390.mh b/gdb/config/s390/s390.mh
index 2b5f190..d197161 100644
--- a/gdb/config/s390/s390.mh
+++ b/gdb/config/s390/s390.mh
@@ -1,5 +1,5 @@
 # Host: S390, running Linux
 NAT_FILE= nm-linux.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o s390-nat.o \
-	gcore.o thread-db.o proc-service.o linux-nat.o
+	gcore.o linux-thread-db.o proc-service.o linux-nat.o
 LOADLIBES = -ldl -rdynamic
diff --git a/gdb/config/sparc/linux.mh b/gdb/config/sparc/linux.mh
index abd3ed8..6d9e5a4 100644
--- a/gdb/config/sparc/linux.mh
+++ b/gdb/config/sparc/linux.mh
@@ -3,7 +3,7 @@ NAT_FILE= nm-linux.h
 NATDEPFILES= sparc-nat.o sparc-sol2-nat.o \
 	corelow.o core-regset.o fork-child.o inf-ptrace.o \
 	infptrace.o inftarg.o \
-	proc-service.o thread-db.o \
+	proc-service.o linux-thread-db.o \
 	gcore.o linux-nat.o
 
 # The dynamically loaded libthread_db needs access to symbols in the
diff --git a/gdb/config/sparc/linux64.mh b/gdb/config/sparc/linux64.mh
index 05a63b0..af8c70f 100644
--- a/gdb/config/sparc/linux64.mh
+++ b/gdb/config/sparc/linux64.mh
@@ -3,7 +3,7 @@ NAT_FILE= nm-linux.h
 NATDEPFILES= sparc-nat.o sparc64-nat.o sparc-sol2-nat.o sparc64-linux-nat.o \
 	corelow.o core-regset.o \
 	fork-child.o inf-ptrace.o infptrace.o inftarg.o \
-	proc-service.o thread-db.o \
+	proc-service.o linux-thread-db.o \
 	gcore.o linux-nat.o
 
 # The dynamically loaded libthread_db needs access to symbols in the
diff --git a/gdb/thread-db.c b/gdb/linux-thread-db.c
index 65d9fd5..65d9fd5 100644
--- a/gdb/thread-db.c
+++ b/gdb/linux-thread-db.c