Bring Cygnus versions into the trunk, keeping our local patches

1 files changed, 25 insertions, 0 deletions

diff --git a/gnu/usr.bin/binutils/gas/mpw-make.sed b/gnu/usr.bin/binutils/gas/mpw-make.sed
index 4f2d5530045..e40bf746876 100644
--- a/gnu/usr.bin/binutils/gas/mpw-make.sed
+++ b/gnu/usr.bin/binutils/gas/mpw-make.sed
@@ -18,6 +18,13 @@ LOCAL_LOADLIBES = \
 /@OPCODES_LIB@/s/@OPCODES_LIB@/::opcodes:libopcodes.o/
 /@BFDLIB@/s/@BFDLIB@/::bfd:libbfd.o/
 
+# Point at the libraries directly.
+/@OPCODES_DEP@/s/@OPCODES_DEP@/::opcodes:libopcodes.o/
+/@BFDDEP@/s/@BFDDEP@/::bfd:libbfd.o/
+
+# Don't need this.
+/@HLDFLAGS@/s/@HLDFLAGS@//
+
 /extra_objects@/s/extra_objects@/{EXTRA_OBJECTS}/
 
 /LOADLIBES/s/{LOADLIBES}/{EXTRALIBS}/
@@ -53,6 +60,9 @@ LOCAL_LOADLIBES = \
 /{OBJS}/s/{OBJS} \\Option-f "{o}"config.h/{OBJS} \\Option-f/
 /gasp.c/s/gasp\.c "{o}"config.h/gasp.c/
 
+# ALL_CFLAGS includes TDEFINES, which is not desirable at link time.
+/CC_LD/s/ALL_CFLAGS/CFLAGS/g
+
 # The resource file is called mac-as.r.
 /as.new.r/s/as\.new\.r/mac-as.r/
 /gasp.new.r/s/gasp\.new\.r/mac-as.r/
@@ -74,6 +84,21 @@ LOCAL_LOADLIBES = \
 $a\
 stamps \\Option-f config-stamp\
 
+/^install \\Option-f/,/^$/c\
+install \\Option-f all install-only\
+\
+install-only \\Option-f\
+	If "`Exists "{prefix}"`" == ""\
+		Echo "{prefix}" does not exist, cannot install anything\
+		Exit 1\
+	End If\
+	If "`Exists "{bindir}"`" == ""\
+		NewFolder "{bindir}"\
+	End If\
+	Duplicate -y :as.new "{bindir}"as\
+	Duplicate -y :gasp.new "{bindir}"gasp\
+
+
 # Whack out config-rebuilding targets, they won't work.
 /^Makefile \\Option-f/,/^$/d
 /^config.status \\Option-f/,/^$/d