Merge devo/bfd with GDB's bfd.

diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 607a26cb980cd5bf52d05b08593ac6cef073cb47..9d51b024c8e0fc5f75f6057cd9d21e18351a349e 100644 (file)
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -34,17 +34,18 @@ CFLAGS = -g $(HDEFINES) $(TDEFINES) $(CSEARCH) $(CSWITCHES) # -DINTEL960VERSION
 
 
 BFD_LIBS = libbfd.o opncls.o bfd.o archive.o targets.o cache.o \
-       archures.o obstack.o
+       archures.o 
 
 BFD_BACKENDS = oasys.o ieee.o srec.o  sunos.o icoff.o b.out.o \
-       m88k-bcs.o
+       m88k-bcs.o coffswap.o # trad-core.o
 
 BFD_H=$(INCDIR)/bfd.h
 SYSDEP_H=$(INCDIR)/sysdep.h
 
 # C source files that correspond to .o's.
 CFILES = libbfd.c opncls.c bfd.c archive.c targets.c cache.c archures.c \
-        sunos.c icoff.c b.out.c  srec.c oasys.c ieee.c m88k-bcs.c
+        sunos.c icoff.c b.out.c  srec.c oasys.c ieee.c m88k-bcs.c \
+        coffswap.c trad-core.c
 
 STAGESTUFF = $(TARGETLIB) $(OFILES)
 
@@ -111,7 +112,6 @@ saber:
        #suppress 590 on abfd 
        #setopt load_flags $(CFLAGS)
        #load $(CFILES)
-obstack.o : obstack.c
 m88k-bcs.o : m88k-bcs.c
 ieee.o : ieee.c
 srec.o : srec.c
@@ -120,7 +120,7 @@ oasys.o : oasys.c
 archive.o : archive.c libbfd.h $(BFD_H) $(SYSDEP_H)  
 archures.o : archures.c $(BFD_H) $(SYSDEP_H) archures.h 
 b.out.o : b.out.c libbfd.h $(BFD_H) $(SYSDEP_H) liba.out.h archures.h 
-bcs88kcoff.o : bcs88kcoff.c libbfd.h $(BFD_H) $(SYSDEP_H) libcoff.h coff-code.h archures.h 
+m88k-bcs.o : m88k-bcs.c libbfd.h $(BFD_H) $(SYSDEP_H) libcoff.h coff-code.h archures.h 
 bfd.o : bfd.c libbfd.h $(BFD_H) $(SYSDEP_H)     
 cache.o : cache.c libbfd.h $(BFD_H) $(SYSDEP_H)     
 coff.o : coff.c  

diff --git a/bfd/bfd.doc b/bfd/bfd.doc
index 3e3183e1ca400e4344e09bf90cec469b7d1b3e63..ca5f9fab91363620c2998f652ed2bc5dccf38658 100755 (executable)
--- a/bfd/bfd.doc
+++ b/bfd/bfd.doc
@@ -93,7 +93,7 @@ char * bfd_format_string (bfd_format format)
 Error handling
 
 General rules:
-funtions which are boolean return true on success and false on failure
+functions which are boolean return true on success and false on failure
 (unless they're a predicate).  Functions which return pointers to
 objects return NULL on error.  The specifics are documented with each
 function.