use remote-utils facilities for baud_rate

[deliverable/binutils-gdb.git] / gdb / munch

diff --git a/gdb/munch b/gdb/munch
index 829dc4693b7dc6e69450e7a769ec706f97115571..26405a8d7caf3d52fd5ed773c99a235a3a39b6bf 100755 (executable)
--- a/gdb/munch
+++ b/gdb/munch
@@ -18,12 +18,12 @@ esac
 MUNCH_NM="${MUNCH_NM-nm} $NMOPT"
 if test "`$MUNCH_NM main.o | egrep main | egrep FUNC | egrep GLOB`" != "" ; then
     # System V Release 4 style nm
-    $MUNCH_NM $* | egrep '|__?initialize_' | egrep FUNC | \
+    $MUNCH_NM $* | egrep '\|__?initialize_' | egrep FUNC | \
       sed -e \
         's/^.*\(_initialize_[a-zA-Z0-9_]*\).*$/  {extern void \1 (); \1 ();}/'\
       | sort -u
 elif test "`$MUNCH_NM main.o | egrep '[TD] *_?main$'`" = "" ; then
-     if test "`$MUNCH_NM main.o | head -6 | egrep 'Subspace$'`" != "" ; then
+     if test "`$MUNCH_NM main.o | egrep 'Type    Subspace'`" != "" ; then
        # HP PA RISC compilers don't prepend underscores
        shift;
        $MUNCH_NM $* | egrep '_initialize_.*' | \