summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/binutils/bfd/aix386-core.c
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2000-09-12 19:13:03 +0000
committerMarc Espie <espie@cvs.openbsd.org>2000-09-12 19:13:03 +0000
commit1b50fce4c0ed748c156af3ac629e50cb5e4d0ef4 (patch)
treeedee61faabd18b4a5d84e8cdb679d7a8d1fe171f /gnu/usr.bin/binutils/bfd/aix386-core.c
parent9f1193e30b5f04af9ea81c644eec79b7b535b890 (diff)
Help stupid cvs fixing basic conflicts.
Diffstat (limited to 'gnu/usr.bin/binutils/bfd/aix386-core.c')
-rw-r--r--gnu/usr.bin/binutils/bfd/aix386-core.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/gnu/usr.bin/binutils/bfd/aix386-core.c b/gnu/usr.bin/binutils/bfd/aix386-core.c
index ce621c6225c..fb67b17081f 100644
--- a/gnu/usr.bin/binutils/bfd/aix386-core.c
+++ b/gnu/usr.bin/binutils/bfd/aix386-core.c
@@ -1,7 +1,8 @@
/* BFD back-end for AIX on PS/2 core files.
This was based on trad-core.c, which was written by John Gilmore of
Cygnus Support.
- Copyright 1988, 1989, 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
+ Copyright 1988, 89, 91, 92, 93, 94, 95, 96, 97, 1998
+ Free Software Foundation, Inc.
Written by Minh Tran-Le <TRANLE@INTELLICORP.COM>.
Converted to back end form by Ian Lance Taylor <ian@cygnus.com>.
@@ -24,17 +25,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "bfd.h"
#include "sysdep.h"
#include "libbfd.h"
-#include "obstack.h"
#include "coff/i386.h"
#include "coff/internal.h"
#include "libcoff.h"
-#include <stdio.h>
-#include <stddef.h>
#include <signal.h>
-#include <errno.h>
-
#if defined (_AIX) && defined (_I386)
#define NOCHECKS /* this is for coredump.h */
#define _h_USER /* avoid including user.h from coredump.h */
@@ -283,5 +279,7 @@ const bfd_target aix386_core_vec =
BFD_JUMP_TABLE_LINK (_bfd_nolink),
BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+ NULL,
+
(PTR) 0
};