* Makefile.in (VERSION): Bump to 4.9.1 after release and cvs

[binutils.git] / gdb / munch

diff --git a/gdb/munch b/gdb/munch
index 740c670b8d47201a106569e6498c399a8f298634..26405a8d7caf3d52fd5ed773c99a235a3a39b6bf 100755 (executable)
--- a/gdb/munch
+++ b/gdb/munch
@@ -18,18 +18,32 @@ 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 | \
-       sed -e 's/^.*\(_initialize_[a-zA-Z0-9_]*\).*$/   {extern void \1 (); \1 ();}/'
-elif test "`$MUNCH_NM main.o | egrep '[TD] _?main$'`" = "" ; then
-    # System V style nm
-    shift;
-    $MUNCH_NM $* | egrep '^(.*[^a-zA-Z_]_|_)_?initialize_.*' | egrep '\.text'|\
-       sed -e 's/^.*\(_initialize_[a-zA-Z0-9_]*\)/   {extern void \1 (); \1 ();}/'
+    $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 | egrep 'Type    Subspace'`" != "" ; then
+       # HP PA RISC compilers don't prepend underscores
+       shift;
+       $MUNCH_NM $* | egrep '_initialize_.*' | \
+         sed -e \
+           's/^.*\(_initialize_[a-zA-Z0-9_]*\).*/   {extern void \1 (); \1 ();}/' \
+           | sort -u
+     else
+       # System V style nm
+       shift;
+       $MUNCH_NM $* | egrep '_initialize_.*' | egrep '\.text'|\
+         sed -e \
+           's/^.*\(_initialize_[a-zA-Z0-9_]*\).*/  {extern void \1 (); \1 ();}/' \
+           | sort -u
+     fi
 else
     # BSD style nm
     # We now accept either text or data symbols, since the RT/PC uses data.
     $MUNCH_NM -p $* | egrep '[TD] *_?[_.]initialize_' | \
-       sed -e 's/^.*\(initialize_.*\)/    {extern void _\1 (); _\1 ();}/'
+       sed -e 's/^.*\(initialize_.*\)/  {extern void _\1 (); _\1 ();}/' \
+       | sort -u
 fi
 
 echo '}'