A ton of changes to improve C++ debugging. See ChangeLog.

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

diff --git a/gdb/munch b/gdb/munch
index 92929eada19229b9689be91fe839c6b3ea0a7cb7..62c4cd3fbb64e81a63a441e2280235695dbedeec 100755 (executable)
--- a/gdb/munch
+++ b/gdb/munch
@@ -7,21 +7,43 @@ echo 'void initialize_all_files () {'
 
 NMOPT=""
 case $1 in
--*)    NMOPT=$1; shift ;;
+MUNCH_NM=*)
+       MUNCH_NM=`echo $1 | sed 's/MUNCH_NM=//'`; shift ;;
+-*)
+       NMOPT=$1; shift ;;
 esac
 
 # make it easy to use a different nm, e.g. for cross-developing
 
-MUNCH_NM="nm $NMOPT"
-if test "`$MUNCH_NM main.o | egrep 'T _?main$'`" = "" ; then
-    # System V style nm
-    shift;
-    $MUNCH_NM $* | egrep '^(.*[^a-zA-Z_]_|_)_?initialize_.*\.text' | \
-       sed -e 's/^.*\(_initialize_[a-zA-Z0-9_]*\)[^a-zA-Z0-9_].*$/   {extern void \1 (); \1 ();}/'
+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 ();}/'\
+      | sort -u
+elif test "`$MUNCH_NM main.o | egrep '[TD] _?main$'`" = "" ; then
+     if test "`$MUNCH_NM main.o | head -6 | egrep '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
-    $MUNCH_NM -p $* | egrep 'T *_?_initialize_' | \
-       sed -e 's/^.*T *_*\(.*\)/    {extern void _\1 (); _\1 ();}/'
+    # 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 ();}/' \
+       | sort -u
 fi
 
 echo '}'