* mpw-make.sed: Update init.c editing to work with Oct 8 change.

	(@HLDFLAGS@): Always edit out.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b13a267bddf72b0034e2991db8941eb90ea22096..c5dc0c44fe50ff0d3ac60f62493847fe66f5785c 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 22 10:32:46 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+       * mpw-make.sed: Update init.c editing to work with Oct 8 change.
+       (@HLDFLAGS@): Always edit out.
+
 Mon Oct 21 18:17:08 1996  Mark Alexander  <marka@cygnus.com>
 
        * mdebugread.c (parse_partial_symbols): Fix 64-bit
@@ -7,8 +12,6 @@ Mon Oct 21 18:17:08 1996  Mark Alexander  <marka@cygnus.com>
 Mon Oct 21 14:40:50 1996  Stu Grossman  (grossman@critters.cygnus.com)
 
        * v850-tdep.c:  Cleanup lots of things.  Add many comments.
-       * testsuite/gdb.base/nodebug.exp:  Whack out -g options by hand so
-       that cflags can contains -gstabs, and work correctly for other tests.
 
 Mon Oct 21 14:01:38 1996  Michael Snyder  <msnyder@cleaver.cygnus.com>
 
@@ -38,13 +41,6 @@ Thu Oct 17 18:18:20 1996  Stan Shebs  <shebs@andros.cygnus.com>
        * configure.in: Remove host and target mapping.
        * configure: Rebuild.
 
-Wed Oct 16 19:03:54 1996  Stu Grossman  (grossman@critters.cygnus.com)
-
-       * testsuite/gdb.base/break.exp:  Make backtrace from factorial
-       errors unique.
-       * testsuite/gdb.base/nodebug.exp:  Whack out all -g options
-       explicitly.
-
 start-sanitize-v850
        * v850-tdep.c (v850_init_extra_frame_info v850_frame_chain):  Fix
        sign bugs with scanning prologues.  Get a little smarter about

diff --git a/gdb/mpw-make.sed b/gdb/mpw-make.sed
index ad62071996730f117bd5e3383f05f2c74350faac..e5c61c93be696172f50f8b3849bec142a802e078 100644 (file)
--- a/gdb/mpw-make.sed
+++ b/gdb/mpw-make.sed
@@ -34,6 +34,7 @@
 
 # Whack out various autoconf vars that we don't need.
 /@CONFIG_LDFLAGS@/s/@CONFIG_LDFLAGS@//g
+/@HLDFLAGS@/s/@HLDFLAGS@//g
 /@DEFS@/s/@DEFS@//g
 /@YACC@/s/@YACC@/byacc/g
 /@ENABLE_OBS@/s/@ENABLE_OBS@//g
@@ -115,8 +116,9 @@ readline_headers =\
        open-brace >> "{o}"init.c-tmp
 
 # Replace the whole sed bit for init.c; it's simpler that way...
-/filename=`echo $i | sed/,/esac/c\
-          set filename "`Echo {i} | sed \\Option-d\
+/echo {OBS} {TSOBS}/,/echo '}'/c\
+       For i in {OBS} {TSOBS}\
+          Set filename "`Echo {i} | sed \\Option-d\
             -e '/^Onindy.c.o/d' \\Option-d\
             -e '/^nindy.c.o/d' \\Option-d\
             -e '/ttyflush.c.o/d' \\Option-d\
@@ -133,7 +135,9 @@ readline_headers =\
           If "{filename}" != ""\
             sed <"{s}""{filename}" >>"{o}"init.c-tmp -n \\Option-d\
             -e '/^_initialize_[a-z_0-9A-Z]* *(/s/^\\([a-z_0-9A-Z]*\\).*/  {extern void \\1 (); \\1 ();}/p'\
-          End If
+          End If\
+       End For\
+       Echo '}' >>"{o}"init.c-tmp
 
 # Fix the main compile/link command.
 /{CC_LD} {INTERNAL_LDFLAGS} -o gdb/,/"{o}"init.c.o {OBS} {TSOBS} {ADD_FILES} {CLIBS} {LOADLIBES}/c\