4 files changed, 11 insertions, 30 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f817d38..b42dc5d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-22  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* config/i386/cygwin.mt (DEPRECATED_TM_FILE): Delete.
+	* config/i386/nm-cygwin.h: Add contents of tm-cygwin.h.
+	* config/i386/tm-cygwin.h: Delete file.
+
 2006-07-22  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* infrun.c (handle_inferior_event): Typo.
diff --git a/gdb/config/i386/cygwin.mt b/gdb/config/i386/cygwin.mt
index 745b13a..555b8bf 100644
--- a/gdb/config/i386/cygwin.mt
+++ b/gdb/config/i386/cygwin.mt
@@ -1,6 +1,2 @@
 # Target: Intel 386 run win32
 TDEPFILES= i386-tdep.o i386-cygwin-tdep.o i387-tdep.o
-DEPRECATED_TM_FILE= tm-cygwin.h
-
-
-
diff --git a/gdb/config/i386/nm-cygwin.h b/gdb/config/i386/nm-cygwin.h
index 7eac99b..ed730b8 100644
--- a/gdb/config/i386/nm-cygwin.h
+++ b/gdb/config/i386/nm-cygwin.h
@@ -1,5 +1,5 @@
 /* Native definitions for Intel x86 running CYGWIN.
-   Copyright 2002 Free Software Foundation, Inc.
+   Copyright 2002, 2006 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -18,6 +18,10 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#define ATTACH_NO_WAIT
+#define ADD_SHARED_SYMBOL_FILES dll_symbol_command
+void dll_symbol_command (char *, int);
+
 #define I386_USE_GENERIC_WATCHPOINTS
 
 #include "i386/nm-i386.h"
diff --git a/gdb/config/i386/tm-cygwin.h b/gdb/config/i386/tm-cygwin.h
deleted file mode 100644
index 48748cd..0000000
--- a/gdb/config/i386/tm-cygwin.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Macro definitions for i386 running under the win32 API Unix.
-
-   Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004 Free
-   Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#define ATTACH_NO_WAIT
-#define ADD_SHARED_SYMBOL_FILES dll_symbol_command
-void dll_symbol_command (char *, int);