Fix patch conflict that occured during last commit.

4 files changed, 79 insertions, 17 deletions

diff --git a/devel/gdbada/distinfo b/devel/gdbada/distinfo
index 82ab5fd67e6..9b6269ef502 100644
--- a/devel/gdbada/distinfo
+++ b/devel/gdbada/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/11/13 14:16:05 shannonjr Exp $
+$NetBSD: distinfo,v 1.7 2005/11/13 14:45:13 shannonjr Exp $
 
 SHA1 (gdbada-6.3.tgz) = ac174c32d23c628521142f92b83c30a4a40b450b
 RMD160 (gdbada-6.3.tgz) = fb3cb09d29ce8c7c805737c7e9af9ccd5918773d
@@ -10,7 +10,6 @@ SHA1 (patch-ad) = dcc314966737fde5eec96ffa69da9c477ea9966f
 SHA1 (patch-ae) = b447679307afc81d16c065c21818f69123b6d96e
 SHA1 (patch-af) = 2e58c96e65b037d01b7fcade894f3202318837d9
 SHA1 (patch-ag) = b7bf4fbeb8f47ffea6752aa4887ee2b91a2d18ab
-SHA1 (patch-ah) = f351ea2c3d665934a4b85735f71663bda0f921a5
 SHA1 (patch-ai) = ed1333551ea787f6bc8bd1f06ca55bf7d72047dd
 SHA1 (patch-aj) = d07b552768afc72e8f3455bcbbc4a083b91d9334
 SHA1 (patch-ak) = d4875e7afba86aef57952ac350499c36d41e8ece
@@ -28,3 +27,4 @@ SHA1 (patch-av) = 59ae675caf65d1e873425ca7eab643558b45eb45
 SHA1 (patch-aw) = 44a28f2cb4b395442ba140269833dff87b83d821
 SHA1 (patch-ax) = 208ce114735cb39a422ef40edd739ab47ae68baf
 SHA1 (patch-ay) = e5b353114a4a71df83e562d42a62e24ac6ea79b6
+SHA1 (patch-ba) = f351ea2c3d665934a4b85735f71663bda0f921a5
diff --git a/devel/gdbada/files/nbsd-nat.c b/devel/gdbada/files/nbsd-nat.c
new file mode 100644
index 00000000000..a8dc399c1c0
--- /dev/null
+++ b/devel/gdbada/files/nbsd-nat.c
@@ -0,0 +1,54 @@
+/* Low level Unix child interface to ptrace, for GDB when running under Unix.
+   Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996,
+   1998, 1999, 2000, 2001, 2002
+   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.  */
+
+#include "defs.h"
+#include "frame.h"
+#include "inferior.h"
+#include "target.h"
+#include "gdb_string.h"
+#include "regcache.h"
+
+#include "gdb_wait.h"
+
+#include "command.h"
+
+#include <sys/types.h>
+#include "gdb_dirent.h"
+#include <sys/ptrace.h>
+#include <machine/reg.h>
+#include "i386-tdep.h"
+
+#define ATTACH_DETACH
+/* Start debugging the process whose number is PID.  */
+int
+attach (int pid)
+{
+  errno = 0;
+  if (pid == getpid())
+  	ptrace (PT_TRACE_ME, pid, (PTRACE_ARG3_TYPE) 0, 0);
+  else
+  	ptrace (PT_ATTACH, pid, (PTRACE_ARG3_TYPE) 0, 0);
+  if (errno)
+    perror_with_name ("ptrace");
+  attach_flag = 1;
+  return pid;
+}
diff --git a/devel/gdbada/patches/patch-ah b/devel/gdbada/patches/patch-ah
deleted file mode 100644
index 167e6af5b16..00000000000
--- a/devel/gdbada/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/10/20 17:49:27 wiz Exp $
-
---- ./gdb/defs.h.orig	2003-05-07 04:54:34.000000000 -0600
-+++ ./gdb/defs.h
-@@ -615,10 +615,6 @@ enum lval_type
- 
- struct frame_info;
- 
--/* From readline (but not in any readline .h files).  */
--
--extern char *tilde_expand (char *);
--
- /* Control types for commands */
- 
- enum misc_command_type
diff --git a/devel/gdbada/patches/patch-ba b/devel/gdbada/patches/patch-ba
new file mode 100644
index 00000000000..d1eab529469
--- /dev/null
+++ b/devel/gdbada/patches/patch-ba
@@ -0,0 +1,23 @@
+$NetBSD: patch-ba,v 1.1 2005/11/13 14:45:14 shannonjr Exp $
+
+--- gdb/config/nm-nbsd.h.orig	2004-10-20 17:12:53.000000000 -0600
++++ gdb/config/nm-nbsd.h
+@@ -22,3 +22,18 @@
+ #define FETCH_INFERIOR_REGISTERS
+ 
+ #include "solib.h"		/* Support for shared libraries. */
++
++#define PT_IO 1
++
++#define PTRACE_ARG3_TYPE caddr_t
++
++#include <signal.h>
++#ifdef SIGRTMIN
++#define REALTIME_LO SIGRTMIN
++#define REALTIME_HI SIGRTMAX
++#endif
++
++#include <sys/param.h>
++#include <sys/lock.h>
++#include <machine/vmparam.h>
++#define KERNEL_U_ADDR USRSTACK