diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 47b6afa915..455a6b42fc 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,16 @@
+Fri Apr 10 22:29:18 1992  Fred Fish  (fnf@cygnus.com)
+
+	* configure.in:  Recognize ncr3000 config
+	* Makefile.in (MINUS_G):  Pass on to recursive makes.
+	* hosts/ncr3000.h, config/ncr3000.mh:  Add host config files.
+
+Thu Apr  2 17:42:45 1992  John Gilmore  (gnu at cygnus.com)
+
+	* Makefile.in:  Now that we have sym.h and symconst.h, compile
+	coff-msym.c on all systems.
+	* config/{decstation.mh, irix3.mh, irix4.mh}:  Remove coff-msym.o dep.
+	* coff-msym.c:  Update include files and comments; add weakext bit.
+
 Wed Apr  1 23:16:38 1992  John Gilmore  (gnu at cygnus.com)
 
 	* archive.c, bfd.c, bout.c, coffcode.h, init.c, reloc.c,
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 1572e98944..7a4236caa1 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -1,5 +1,5 @@
 #    Makefile template for Configure for the BFD library.
-#    Copyright (C) 1990, 1991 Free Software Foundation, Inc.
+#    Copyright (C) 1990, 1991, 1992 Free Software Foundation, Inc.
 #    Written by Cygnus Support.
 # 
 # This file is part of BFD, the Binary File Descriptor library.
@@ -24,10 +24,12 @@ srcdir = .
 
 prefix = /usr/local
 
-bindir = $(prefix)/bin
+exec_prefix = $(prefix)
+bindir = $(exec_prefix)/bin
+libdir = $(exec_prefix)/lib
+
 datadir = $(prefix)/lib
-libdir = $(prefix)/lib
-mandir = $(datadir)/man
+mandir = $(prefix)/man
 man1dir = $(mandir)/man1
 man2dir = $(mandir)/man2
 man3dir = $(mandir)/man3
@@ -37,8 +39,9 @@ man6dir = $(mandir)/man6
 man7dir = $(mandir)/man7
 man8dir = $(mandir)/man8
 man9dir = $(mandir)/man9
-infodir = $(datadir)/info
+infodir = $(prefix)/info
 includedir = $(prefix)/include
+oldincludedir =
 docdir = $(srcdir)/doc
 
 SHELL = /bin/sh
@@ -48,7 +51,7 @@ INSTALL_PROGRAM = $(INSTALL)
 INSTALL_DATA = $(INSTALL)
 
 AR = ar
-AR_FLAGS = qv
+AR_FLAGS = qc
 BISON = bison
 MAKEINFO = makeinfo
 RANLIB = ranlib
@@ -78,7 +81,7 @@ BFD_MACHINES = cpu-h8300.o cpu-i960.o cpu-sparc.o cpu-m68k.o cpu-m88k.o \
 BFD_BACKENDS = oasys.o ieee.o srec.o elf.o stab-syms.o\
 	aout64.o aout32.o demo64.o sunos.o newsos3.o i386aout.o bout.o \
 	coff-i960.o coff-a29k.o coff-m68k.o coff-i386.o coff-m88k.o \
-	coff-mips.o coff-rs6000.o coff-h8300.o
+	coff-mips.o coff-rs6000.o coff-h8300.o coff-msym.o 
 
 OPTIONAL_BACKENDS = trad-core.o
 
@@ -90,7 +93,7 @@ BFD_H=$(INCDIR)/bfd.h
 # C source files that correspond to .o's.
 CFILES = libbfd.c opncls.c bfd.c archive.c targets.c cache.c archures.c \
 	 coff-i386.c aout64.c aout32.c sunos.c demo64.c coff-i960.c srec.c \
-	 oasys.c ieee.c coff-m68k.c coff-a29k.c coff-rs6000.c \
+	 oasys.c ieee.c coff-m68k.c coff-a29k.c coff-rs6000.c coff-msym.c \
 	 format.c section.c core.c syms.c stab-syms.c reloc.c init.c ctor.c seclet.c \
 	 coff-m88k.c coff-mips.c trad-core.c newsos3.c i386aout.c bout.c elf.c \
 	cpu-h8300.c cpu-i960.c cpu-sparc.c cpu-m68k.c cpu-m88k.c \
@@ -101,9 +104,14 @@ STAGESTUFF = $(TARGETLIB) $(OFILES)
 all: $(TARGETLIB) 
 	$(MAKE) subdir_do DO=all "DODIRS=$(SUBDIRS)"
 
-info: force
-	$(MAKE) subdir_do DO=info "DODIRS=$(SUBDIRS)"
+check:
 
+info: force
+	$(MAKE) subdir_do DO=info "DODIRS=$(SUBDIRS)" "MAKEINFO=$(MAKEINFO)"
+
+clean-info:
+	$(MAKE) subdir_do DO=clean-info "DODIRS=$(SUBDIRS)"
+	
 install-info: force
 	$(MAKE) subdir_do DO=install-info "DODIRS=$(SUBDIRS)"
 
@@ -121,14 +129,16 @@ targets.o: targets.c
 
 subdir_do: force
 	for i in $(DODIRS); do \
-		if [ -d $(unsubdir)/$$i ] ; then \
-			if (cd $(unsubdir)/$$i$(subdir); \
+		if [ -d ./$$i ] ; then \
+			if (cd ./$$i; \
 				$(MAKE) \
 					"against=$(against)" \
 					"AR=$(AR)" \
 					"AR_FLAGS=$(AR_FLAGS)" \
 					"CC=$(CC)" \
+					"MINUS_G=$(MINUS_G)" \
 					"RANLIB=$(RANLIB)" \
+					"MAKEINFO=$(MAKEINFO)" \
 					"BISON=$(BISON)" $(DO)) ; then true ; \
 			else exit 1 ; fi ; \
 		else true ; fi ; \
@@ -245,6 +255,7 @@ install:
 	$(INSTALL_DATA) libbfd.a $(libdir)/libbfd.a
 	$(RANLIB) $(libdir)/libbfd.a
 	$(INSTALL_DATA) $(INCDIR)/bfd.h $(includedir)/bfd.h
+	[ -z "$(oldincludedir)" ] || $(INSTALL_DATA) $(INCDIR)/bfd.h $(oldincludedir)/bfd.h
 	$(MAKE) subdir_do DO=install "DODIRS=$(SUBDIRS)"
 
 # Target to uncomment host-specific lines in this makefile.  Such lines must
@@ -275,13 +286,14 @@ Makefile: $(srcdir)/Makefile.in $(host_makefile_frag) $(target_makefile_frag)
 dep: $(CFILES)
 	mkdep $(CFLAGS) $?
 
-gen-aout:  $(srcdir)/gen-aout.c
-	$(CC) -o gen-aout $(CFLAGS) $(LFLAGS) $(srcdir)/gen-aout.c
+host-aout.o: Makefile
 
+# The following program can be used to generate a simple config file
+# which can be folded into an h-XXX file for a new host, with some editing.
 aout-params.h: gen-aout
 	./gen-aout > aout-params.h
-
-host-aout.o:  aout-params.h
+gen-aout: $(srcdir)/gen-aout.c Makefile
+	$(CC) -o gen-aout $(CFLAGS) $(LFLAGS) $(srcdir)/gen-aout.c
 
 headers:
 	(cd $(docdir); $(MAKE) protos)
@@ -356,6 +368,10 @@ reloc.o : reloc.c $(INCDIR)/bfd.h \
 
 trad-core.o : trad-core.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h \
   libbfd.h libaout.h 
+
+coff-msym.o: coff-msym.c $(INCDIR)/bfd.h  $(INCDIR)/coff/ecoff-ext.h \
+  $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h
+
 newsos3.o : newsos3.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h \
   $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \
   $(INCDIR)/aout/ar.h libaout.h 
diff --git a/bfd/configure.in b/bfd/configure.in
index 2eceb21557..8d488bff52 100644
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -18,7 +18,12 @@ rs6000)	my_host=rs6000
 mips)
 	case "${host_vendor}" in
 	dec)	my_host=decstation ;;
-	sgi)	my_host=irix3 ;;
+	sgi)
+		case "${host_os}" in
+		irix3)	my_host=irix3 ;;
+		irix4)	my_host=irix4 ;;
+		esac
+		;;
 	esac
 	;;
 
@@ -54,7 +59,7 @@ m68k)
 	sun)	my_host=sun3 ;;
 	apollo*)
 		case "${host_os}" in
-		sysv*)	my_host=apollo68v ;;
+		sysv*)	my_host=apollov68 ;;
 		esac
 		;;
 	esac
@@ -65,6 +70,11 @@ i860)	my_host=stratus
 
 i386)
 	case "${host_vendor}" in
+	ncr*)
+		case "${host_os}" in
+		sysv4*)	my_host=ncr3000 ;;
+		esac
+		;;
 	*)
 		case "${host_os}" in
 		sysv4*)	my_host=i386v4 ;;
@@ -79,6 +89,8 @@ i386)
 sparc)
 	case "${host_os}" in
 	sunos64)	my_host=sparc-ll ;;
+	sysv4)		my_host=sysv4 ;;
+	sysv64)		my_host=sysv4-ll ;;
 	*)		my_host=sparc ;;
 	esac
 	;;
@@ -102,7 +114,7 @@ vax)
 esac
 
 # Set up to make a link between the host's include file and "sysdep.h".
-files="hosts/h-${my_host}.h"
+files="hosts/${my_host}.h"
 links="sysdep.h"
 
 if [ ! -f ${srcdir}/${files} ] ; then
@@ -114,8 +126,8 @@ if [ ! -f ${srcdir}/${files} ] ; then
 fi
 
 host_makefile_frag=
-if [ -f ${srcdir}/config/mh-${my_host} ] ; then
-	host_makefile_frag=config/mh-${my_host}
+if [ -f ${srcdir}/config/${my_host}.mh ] ; then
+	host_makefile_frag=config/${my_host}.mh
 fi
 
 # per-target:
@@ -167,7 +179,11 @@ wrs)
 sun)
 	case "${target_cpu}" in
 	m68k)	bfd_target=m68k-aout ;;
-	sparc)	bfd_target=sparc-aout ;;
+	sparc)	case "${target_os}" in
+		sysv4)	bfd_target=sparc-elf ;;
+		*)	bfd_target=sparc-aout ;;
+		esac
+		;;
 	esac
 	;;
 dec)
@@ -236,15 +252,15 @@ motorola)
 	;;
 esac
 
-if [ ! -f ${srcdir}/config/mt-${bfd_target} ] ; then
+if [ ! -f ${srcdir}/config/${bfd_target}.mt ] ; then
 	if [ -n "${bfd_target}" ] ; then
-		echo '***' No file ${srcdir}/config/mt-${bfd_target}
+		echo '***' No file ${srcdir}/config/${bfd_target}.mt
 	fi
 	echo '***' BFD does not support target ${target}
 	echo '***' Look in bfd/configure.in for supported targets
 	exit 1
 fi
-target_makefile_frag=config/mt-${bfd_target}
+target_makefile_frag=config/${bfd_target}.mt
 
 # We don't do any links based on the target system, just very minor makefile
 # config.