This is the third and final batch of makefile changes this round.

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

diff --git a/gdb/munch b/gdb/munch
index eef3927fd1e82bf8694ed74a87cc366e0f46fa66..7d96a476a4fa768bc3bcc73c3742fe4217fce7d4 100755 (executable)
--- a/gdb/munch
+++ b/gdb/munch
@@ -1,17 +1,35 @@
-#! /bin/sh
+#!/bin/sh
 
 # create an initialization procedure from a list of .o files
 
 echo '/* Do not modify this file.  It is created automatically by "munch". */'
 echo 'void initialize_all_files () {'
 
-if test "$1" = "-DSYSV" ; then
+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} $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;
-    nm $* | egrep '^(.*[^a-zA-Z_]_|_)initialize_' | \
-       sed -e 's/^.*\(_initialize_[a-zA-Z0-9_]*\)[^a-zA-Z0-9_].*$/   \1 ();/'
+    $MUNCH_NM $* | egrep '^(.*[^a-zA-Z_]_|_)_?initialize_.*\.text' | \
+       sed -e 's/^.*\(_initialize_[a-zA-Z0-9_]*\)[^a-zA-Z0-9_].*$/   {extern void \1 (); \1 ();}/'
 else
-    nm -p $* | egrep 'T *__initialize_' | \
-       sed -e 's/^.*T *_*\(.*\)/    _\1 ();/'
+    # 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 ();}/'
 fi
 
 echo '}'