* core.c (dis_asm_read_memory): drop fourth arg which conflicts with

[binutils.git] / gdb / munch

diff --git a/gdb/munch b/gdb/munch
index 8b59ed00682845bef932c31957dded80b54a5244..a3d7ad0e4fb607ba7c74b2d2ed887c719d8f656d 100755 (executable)
--- a/gdb/munch
+++ b/gdb/munch
@@ -5,17 +5,45 @@
 echo '/* Do not modify this file.  It is created automatically by "munch". */'
 echo 'void initialize_all_files () {'
 
+NMOPT=""
+case $1 in
+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=${MUNCH_NM-nm}
-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 '}'