From: Stan Shebs <shebs@codesourcery.com>
Date: Thu, 15 Aug 1996 19:41:17 +0000 (+0000)
Subject: 	* mpw-config.in: Update editing of autoconf vars to reflect
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=22edd5473227bc0e89c19d04022727f62dfd514c;p=binutils-gdb.git

	* mpw-config.in: Update editing of autoconf vars to reflect
	Jul 18 configure.in change.
	* mpw-make.sed: Update editing of include pathnames to be
	more general, add @DASH_C_FLAG@ to explicit compile rule edit.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index de4f7364a0f..016ef815307 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,15 @@
+Thu Aug 15 12:33:29 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-config.in: Update editing of autoconf vars to reflect
+	Jul 18 configure.in change.
+	* mpw-make.sed: Update editing of include pathnames to be
+	more general, add @DASH_C_FLAG@ to explicit compile rule edit.
+
+Thu Aug 15 10:35:13 1996  Richard Henderson  <rth@tamu.edu>
+
+	* elf64-alpha.c (elf64_alpha_output_extsym): The section from
+	which to offset to get the .plt entry address is ".plt".
+
 Thu Aug 15 16:40:30 1996  James G. Smith  <jsmith@cygnus.co.uk>
 
 	* reloc.c: (BFD_RELOC_ARM_THUMB_ADD, BFD_RELOC_ARM_THUMB_IMM,
diff --git a/bfd/mpw-config.in b/bfd/mpw-config.in
index c053db0947e..cbd13dbbe69 100644
--- a/bfd/mpw-config.in
+++ b/bfd/mpw-config.in
@@ -54,7 +54,11 @@ 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
 
diff --git a/bfd/mpw-make.sed b/bfd/mpw-make.sed
index aaf4aca037c..72485694d79 100644
--- a/bfd/mpw-make.sed
+++ b/bfd/mpw-make.sed
@@ -4,13 +4,16 @@
 /HDEFINES/s/@HDEFINES@//
 /TDEFINES/s/@TDEFINES@//
 
-/INCDIR=/s/"{srcdir}":/"{topsrcdir}"/
-/^CSEARCH = .*$/s/$/ -i "{INCDIR}":mpw: -i ::extra-include:/
+# Fix pathnames to include directories.
+/^INCDIR = /s/^INCDIR = .*$/INCDIR = "{topsrcdir}"include/
+/^CSEARCH = /s/$/ -i "{INCDIR}":mpw: -i ::extra-include:/
 
-/WORDSIZE/s/^WORDSIZE = /#WORDSIZE = /
-/BFD_MACHINES/s/^BFD_MACHINES = /#BFD_MACHINES = /
-/BFD_BACKENDS/s/^BFD_BACKENDS = /#BFD_BACKENDS = /
-/TDEFAULTS/s/^TDEFAULTS = /#TDEFAULTS = /
+# Comment out setting of vars, configure script will add these itself.
+/^WORDSIZE =/s/^/#/
+# /^ALL_BACKENDS/s/^/#/
+/^BFD_BACKENDS/s/^/#/
+/^BFD_MACHINES/s/^/#/
+/^TDEFAULTS/s/^/#/
 
 # Remove extra, useless, "all".
 /^all \\Option-f _oldest/,/^$/d
@@ -59,11 +62,11 @@
 # MPW Make doesn't know about $<.
 /"{o}"targets.c.o \\Option-f "{s}"targets.c Makefile/,/^$/c\
 "{o}"targets.c.o \\Option-f "{s}"targets.c Makefile\
-	{CC} {ALL_CFLAGS} {TDEFAULTS} "{s}"targets.c -o "{o}"targets.c.o
+	{CC} @DASH_C_FLAG@ {ALL_CFLAGS} {TDEFAULTS} "{s}"targets.c -o "{o}"targets.c.o
 
 /"{o}"archures.c.o \\Option-f "{s}"archures.c Makefile/,/^$/c\
 "{o}"archures.c.o \\Option-f "{s}"archures.c Makefile\
-	{CC} {ALL_CFLAGS} {TDEFAULTS} "{s}"archures.c -o "{o}"archures.c.o
+	{CC} @DASH_C_FLAG@ {ALL_CFLAGS} {TDEFAULTS} "{s}"archures.c -o "{o}"archures.c.o
 
 # Remove the .h rebuilding rules, we don't currently have a doc subdir,
 # or a way to build the prototype-hacking tool that's in it.