Resolve conflicts for GDB 6.1. Add local patches.

ok deraadt@

1 files changed, 22 insertions, 22 deletions

diff --git a/gnu/usr.bin/binutils/gdb/config/m68k/nm-delta68.h b/gnu/usr.bin/binutils/gdb/config/m68k/nm-delta68.h
index 32af87b5651..e27bb69a449 100644
--- a/gnu/usr.bin/binutils/gdb/config/m68k/nm-delta68.h
+++ b/gnu/usr.bin/binutils/gdb/config/m68k/nm-delta68.h
@@ -1,22 +1,22 @@
-/* Macro definitions for a Delta.
-   Copyright (C) 1993 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.  */
-
-/* Motorola Delta Series sysV68 R3V7.1.  */
-
-#define	NO_PTRACE_H
+// OBSOLETE /* Macro definitions for a Motorola Delta Series sysV68 R3V7.1.
+// OBSOLETE    Copyright 1993, 1998 Free Software Foundation, Inc.
+// OBSOLETE 
+// OBSOLETE    This file is part of GDB.
+// OBSOLETE 
+// OBSOLETE    This program is free software; you can redistribute it and/or modify
+// OBSOLETE    it under the terms of the GNU General Public License as published by
+// OBSOLETE    the Free Software Foundation; either version 2 of the License, or
+// OBSOLETE    (at your option) any later version.
+// OBSOLETE 
+// OBSOLETE    This program is distributed in the hope that it will be useful,
+// OBSOLETE    but WITHOUT ANY WARRANTY; without even the implied warranty of
+// OBSOLETE    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// OBSOLETE    GNU General Public License for more details.
+// OBSOLETE 
+// OBSOLETE    You should have received a copy of the GNU General Public License
+// OBSOLETE    along with this program; if not, write to the Free Software
+// OBSOLETE    Foundation, Inc., 59 Temple Place - Suite 330,
+// OBSOLETE    Boston, MA 02111-1307, USA.  */
+// OBSOLETE 
+// OBSOLETE 
+// OBSOLETE #define KERNEL_U_SIZE kernel_u_size()