Merge the Cygnus 960904 sources

1 files changed, 11 insertions, 4 deletions

diff --git a/gnu/usr.bin/binutils/bfd/mpw-config.in b/gnu/usr.bin/binutils/bfd/mpw-config.in
index 9195d0e6454..cbd13dbbe69 100644
--- a/gnu/usr.bin/binutils/bfd/mpw-config.in
+++ b/gnu/usr.bin/binutils/bfd/mpw-config.in
@@ -17,17 +17,17 @@ Else If "{target_canonical}" =~ /powerpc-apple-macos/
 	Set selvecs '&pmac_xcoff_vec'
 	Set selarchs "&bfd_powerpc_arch"
 
-Else If "{target_canonical}" =~ /i386-unknown-go32/
+Else If "{target_canonical}" =~ /i386-\Option-x-go32/
 	Set BFD_BACKENDS '"{o}"coff-i386.c.o'
 	Set defvec i386coff_vec
 	Set selvecs '&i386coff_vec'
 
 Else If "{target_canonical}" =~ /mips-\Option-x-\Option-x/
-	Set BFD_BACKENDS '"{o}"coff-mips.c.o "{o}"ecoff.c.o "{o}"ecofflink.c.o'
+	Set BFD_BACKENDS '"{o}"coff-mips.c.o "{o}"ecoff.c.o "{o}"ecofflink.c.o "{o}"elf32.c.o "{o}"elf32-mips.c.o "{o}"elflink.c.o'
 	Set defvec ecoff_big_vec
-	Set selvecs '&ecoff_big_vec,&ecoff_little_vec'
+	Set selvecs '&ecoff_big_vec,&ecoff_little_vec,&bfd_elf32_bigmips_vec'
 
-Else If "{target_canonical}" =~ /sh-hitachi-hms/
+Else If "{target_canonical}" =~ /sh-\Option-x-hms/
 	Set BFD_BACKENDS '"{o}"coff-sh.c.o "{o}"cofflink.c.o'
 	Set defvec shcoff_vec
 	Set selvecs '&shcoff_vec,&shlcoff_vec'
@@ -54,12 +54,19 @@ MoveIfChange "{o}"config.new "{o}"config.h
 # We can only handle 32-bit targets right now.
 
 sed -e 's/@WORDSIZE@/32/' \Option-d
+    -e 's/@wordsize@/32/' \Option-d
     -e "s/@VERSION@/`Catenate {srcdir}VERSION`/" \Option-d
+    -e 's/@BFD_HOST_64_BIT_DEFINED@/0/' \Option-d
+    -e 's/@BFD_HOST_64_BIT@//' \Option-d
+    -e 's/@BFD_HOST_U_64_BIT@//' \Option-d
     -e 's/@BFD_HOST_64BIT_LONG@/0/' \Option-d
     "{srcdir}"bfd-in2.h >"{o}"bfd.h-new
 
 MoveIfChange "{o}"bfd.h-new "{o}"bfd.h
 
+sed -e 's/NN/32/g' "{srcdir}"elfxx-target.h >"{o}"elf32-target.h-new
+MoveIfChange "{o}"elf32-target.h-new "{o}"elf32-target.h
+
 # Pre-expand some macros in coffswap.h, so MPW C doesn't choke.
 
 sed -e 's/^  PUT_AOUTHDR_TSIZE (/  bfd_h_put_32 (/' \Option-d