aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorAndrew Cagney <cagney@redhat.com>2004-11-30 15:15:27 +0000
committerAndrew Cagney <cagney@redhat.com>2004-11-30 15:15:27 +0000
commita7711b1fd72c77ca107532e07fcd2f36f7e6ffce (patch)
treee07ad49e6dc72cb056065b17a3a75204801412a1 /gdb
parent80b93d6b1a619c5d81aeceaeb6794a16a0101442 (diff)
downloadgdb-a7711b1fd72c77ca107532e07fcd2f36f7e6ffce.zip
gdb-a7711b1fd72c77ca107532e07fcd2f36f7e6ffce.tar.gz
gdb-a7711b1fd72c77ca107532e07fcd2f36f7e6ffce.tar.bz2
2004-11-30 Andrew Cagney <cagney@gnu.org>
* config/nm-gnu.h: Delete file. * config/i386/nm-i386gnu.h: Inline "config/nm-gnu.h".
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog3
-rw-r--r--gdb/config/i386/nm-i386gnu.h17
-rw-r--r--gdb/config/nm-gnu.h41
3 files changed, 18 insertions, 43 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 015c43c..55d503a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
2004-11-30 Andrew Cagney <cagney@gnu.org>
+ * config/nm-gnu.h: Delete file.
+ * config/i386/nm-i386gnu.h: Inline "config/nm-gnu.h".
+
* config/nm-sysv4.h: Delete file.
* config/i386/nm-i386v4.h: Inline "config/nm-sysv4.h".
* config/i386/nm-i386v42mp.h: Inline "config/nm-sysv4.h".
diff --git a/gdb/config/i386/nm-i386gnu.h b/gdb/config/i386/nm-i386gnu.h
index 1f3cdb5..8fe4d3e 100644
--- a/gdb/config/i386/nm-i386gnu.h
+++ b/gdb/config/i386/nm-i386gnu.h
@@ -21,8 +21,21 @@
#ifndef NM_I386GNU_H
#define NM_I386GNU_H
-/* Include common definitions for GNU systems. */
-#include "config/nm-gnu.h"
+#include <unistd.h>
+#include <mach.h>
+#include <mach/exception.h>
+#include "regcache.h"
+
+extern char *gnu_target_pid_to_str (int pid);
+
+/* Before storing, we need to read all the registers. */
+#define CHILD_PREPARE_TO_STORE() deprecated_read_register_bytes (0, NULL, deprecated_register_bytes ())
+
+/* Don't do wait_for_inferior on attach. */
+#define ATTACH_NO_WAIT
+
+/* Use SVR4 style shared library support */
+#include "solib.h"
/* Thread flavors used in re-setting the T bit. */
#define THREAD_STATE_FLAVOR i386_REGS_SEGS_STATE
diff --git a/gdb/config/nm-gnu.h b/gdb/config/nm-gnu.h
deleted file mode 100644
index b64af73..0000000
--- a/gdb/config/nm-gnu.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Common declarations for the GNU Hurd
-
- Copyright 1995, 1996, 1998, 1999 Free Software Foundation, Inc.
-
- Written by Miles Bader <miles@gnu.ai.mit.edu>
-
- The GNU Hurd 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, or (at
- your option) any later version.
-
- The GNU Hurd 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. */
-
-#ifndef __NM_GNU_H__
-#define __NM_GNU_H__
-
-#include <unistd.h>
-#include <mach.h>
-#include <mach/exception.h>
-#include "regcache.h"
-
-extern char *gnu_target_pid_to_str (int pid);
-
-/* Before storing, we need to read all the registers. */
-#define CHILD_PREPARE_TO_STORE() deprecated_read_register_bytes (0, NULL, deprecated_register_bytes ())
-
-/* Don't do wait_for_inferior on attach. */
-#define ATTACH_NO_WAIT
-
-/* Use SVR4 style shared library support */
-#include "solib.h"
-
-#endif /* __NM_GNU_H__ */