diff --git a/gas/Makefile.in b/gas/Makefile.in
index 5a10d55d29..267f4d8b96 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -242,8 +242,7 @@ dvi info install-info clean-info:
 # Now figure out from those variables how to compile and link.
 
 # This is the variable actually used when we compile.
-ALL_CFLAGS = $(INTERNAL_CFLAGS) $(CROSS) $(CFLAGS) $(HDEFINES) $(TDEFINES) \
-	$(BFDDEF)
+ALL_CFLAGS = $(INTERNAL_CFLAGS) $(CROSS) $(CFLAGS) $(HDEFINES) $(TDEFINES)
 
 # How to link with both our special library facilities
 # and the system's installed libraries.
@@ -286,10 +285,13 @@ config.status:
 config.h: config-stamp ; @true
 config-stamp: Makefile
 	-rm -f config.new config-stamp
-	echo '#define TARGET_CPU       "$(target_cpu)"'        > config.new
+	echo '#ifndef TARGET_CPU'			       > config.new
+	echo '#define TARGET_CPU       "$(target_cpu)"'       >> config.new
 	echo '#define TARGET_ALIAS     "$(target_alias)"'     >> config.new
 	echo '#define TARGET_CANONICAL "$(target_canonical)"' >> config.new
 	echo '#define GAS_VERSION      "$(VERSION)"'          >> config.new
+	echo '#$(BFDDEF) BFD_ASSEMBLER'			      >> config.new
+	echo '#endif /* TARGET_CPU */'			      >> config.new
 	$(srcdir)/../move-if-change config.new config.h
 	touch config-stamp
 
@@ -345,7 +347,7 @@ input-scrub.o : input-scrub.c /usr/include/errno.h /usr/include/sys/errno.h \
   input-file.h 
 listing.o : listing.c as.h host.h targ-env.h flonum.h bignum.h \
   listing.h obj-format.h targ-cpu.h struc-symbol.h write.h expr.h \
-  frags.h hash.h read.h symbols.h tc.h obj.h input-file.h
+  frags.h hash.h read.h symbols.h tc.h obj.h input-file.h subsegs.h
 messages.o : messages.c as.h host.h targ-env.h obj-format.h \
   targ-cpu.h  struc-symbol.h \
   write.h flonum.h bignum.h expr.h frags.h hash.h read.h symbols.h tc.h obj.h
diff --git a/gas/configure.in b/gas/configure.in
index 6a44bacce0..dcb2e72db7 100644
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -128,7 +128,7 @@ case ${generic_target} in
 
   alpha-*-osf*)		obj_format=ecoff dev=yes ;;
 
-  hppa-*-osf)		obj_format=elf emulation=hppa dev=yes ;;
+  hppa-*-osf)		obj_format=elf emulation=hppa ;;
   hppa-*-hpux*)		obj_format=som emulation=hppa ;;
   hppa-*-bsd*)		obj_format=som emulation=hppa ;;
 
@@ -137,6 +137,8 @@ case ${generic_target} in
   i386-ibm-aix*)	obj_format=coffbfd gas_target=i386coff
 			 emulation=i386aix ;;
   i386-*-bsd*)		obj_format=aout emulation=386bsd ;;
+  i386-*-netbsd0.8)	obj_format=aout emulation=netbsd ;;
+  i386-*-netbsd*)	obj_format=aout emulation=netbsd ;;
   i386-*-linux*elf*)	obj_format=elf  emulation=linux ;;
   i386-*-linux*coff*)	obj_format=coffbfd emulation=linux
 			 gas_target=i386coff ;;
@@ -147,6 +149,7 @@ case ${generic_target} in
 			obj_format=elf ;;
   i386-*-coff | i386-*-sysv* | i386-*-sco* | i386-*-isc*)
 			obj_format=coffbfd gas_target=i386coff ;;
+  i386-*-vsta)		obj_format=aout ;;
   i386-*-go32)		obj_format=aout ;;
 
   i960-wrs-vxworks | i960-*-nindy*)
@@ -284,7 +287,7 @@ case ${with_bfd_assembler}-${bfd_gas} in
     ;;
 esac
 
-reject_dev_configs=yes
+reject_dev_configs=no
 
 case ${reject_dev_configs}-${dev} in
   yes-yes) # Oops.
@@ -303,8 +306,8 @@ links="host.h targ-cpu.c targ-cpu.h targ-env.h obj-format.h obj-format.c atof-ta
 # post-target:
 
 case ${bfd_gas} in
-  yes)	bfddef="BFDDEF=-DBFD_ASSEMBLER" need_bfd=yes	;;
-  *)    bfddef=""					;;
+  yes)	bfddef="BFDDEF=define" need_bfd=yes		;;
+  *)    bfddef="BFDDEF=undef"				;;
 esac
 
 case ${need_bfd} in