From 04d7ecfb9906417fe6b0ef82cfe99ffc067c77bc Mon Sep 17 00:00:00 2001
From: Simon Schubert <corecode@dragonflybsd.org>
Date: Thu, 31 Jan 2008 14:30:13 +0000
Subject: [PATCH] Remove tm.h and xm.h handling, as it wasn't used.  Use nm.h
 only when needed.

---
 gnu/usr.bin/gdb/libgdb/Makefile.amd64 | 11 +----------
 gnu/usr.bin/gdb/libgdb/Makefile.i386  |  8 ++------
 gnu/usr.bin/gdb/libgdb/config.h       |  4 ++--
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/gnu/usr.bin/gdb/libgdb/Makefile.amd64 b/gnu/usr.bin/gdb/libgdb/Makefile.amd64
index e151b280cd..d7b3680aee 100644
--- a/gnu/usr.bin/gdb/libgdb/Makefile.amd64
+++ b/gnu/usr.bin/gdb/libgdb/Makefile.amd64
@@ -1,4 +1,4 @@
-# $DragonFly: src/gnu/usr.bin/gdb/libgdb/Makefile.amd64,v 1.4 2008/01/14 21:36:38 corecode Exp $
+# $DragonFly: src/gnu/usr.bin/gdb/libgdb/Makefile.amd64,v 1.5 2008/01/31 14:30:13 corecode Exp $
 
 # TDEPFILES (part 2, cleaned)
 SRCS+=	amd64-tdep.o amd64fbsd-tdep.o \
@@ -6,12 +6,3 @@ SRCS+=	amd64-tdep.o amd64fbsd-tdep.o \
 
 # NATDEPFILES (part 2)
 SRCS+=	amd64-nat.o amd64bsd-nat.o amd64fbsd-nat.o
-
-nm.h:
-	echo '#include "i386/nm-fbsd64.h"' > ${.TARGET}
-
-tm.h:
-	echo '#include "i386/tm-fbsd.h"' > ${.TARGET}
-
-xm.h:
-	echo '#include "i386/xm-i386.h"' > ${.TARGET}
diff --git a/gnu/usr.bin/gdb/libgdb/Makefile.i386 b/gnu/usr.bin/gdb/libgdb/Makefile.i386
index a253c204ce..5cf2d696a1 100644
--- a/gnu/usr.bin/gdb/libgdb/Makefile.i386
+++ b/gnu/usr.bin/gdb/libgdb/Makefile.i386
@@ -1,4 +1,4 @@
-# $DragonFly: src/gnu/usr.bin/gdb/libgdb/Makefile.i386,v 1.4 2008/01/14 21:36:38 corecode Exp $
+# $DragonFly: src/gnu/usr.bin/gdb/libgdb/Makefile.i386,v 1.5 2008/01/31 14:30:13 corecode Exp $
 
 # TDEPFILES (part 2, cleaned)
 SRCS+=	i386-tdep.c i387-tdep.c i386bsd-tdep.c i386fbsd-tdep.c
@@ -9,8 +9,4 @@ SRCS+=	fbsd-nat.c i386-nat.c i386bsd-nat.c i386fbsd-nat.c
 nm.h:
 	echo '#include "i386/nm-fbsd.h"' > ${.TARGET}
 
-tm.h:
-	echo '#include "i386/tm-fbsd.h"' > ${.TARGET}
-
-xm.h:
-	echo '#include "i386/xm-i386.h"' > ${.TARGET}
+CFLAGS+= -DGDB_NM_FILE
diff --git a/gnu/usr.bin/gdb/libgdb/config.h b/gnu/usr.bin/gdb/libgdb/config.h
index 08f1919069..ad5c92db8f 100644
--- a/gnu/usr.bin/gdb/libgdb/config.h
+++ b/gnu/usr.bin/gdb/libgdb/config.h
@@ -1,4 +1,4 @@
-/* $DragonFly: src/gnu/usr.bin/gdb/libgdb/config.h,v 1.2 2008/01/14 21:36:38 corecode Exp $ */
+/* $DragonFly: src/gnu/usr.bin/gdb/libgdb/config.h,v 1.3 2008/01/31 14:30:13 corecode Exp $ */
 /* config.h.  Generated by configure.  */
 /* config.in.  Generated from configure.ac by autoheader.  */
 
@@ -44,7 +44,7 @@
 #define GDB_HOST_LONG_DOUBLE_FORMAT &floatformat_i387_ext
 
 /* nativefile */
-#define GDB_NM_FILE "config/i386/nm-fbsd.h"
+/* #define GDB_NM_FILE "config/i386/nm-fbsd.h"  defined via CFLAGS! */
 
 /* Define to the default OS ABI for this configuration. */
 /* #undef GDB_OSABI_DEFAULT */
-- 
2.41.0