* Makefile.in (CLIBS): Put XM_CLIBS and TM_CLIBS at end.
Pass MUNCH_DEFINE to munch whenever we run it. * munch: Cope with RT/PC putting fns in data segment. Restore ability to override `nm' by specifying MUNCH_NM.
This commit is contained in:
parent
7c18a68f00
commit
44f0c5db96
2 changed files with 11 additions and 7 deletions
|
@ -125,8 +125,8 @@ TERMCAP = -ltermcap
|
||||||
|
|
||||||
# Libraries and corresponding dependencies for compiling gdb.
|
# Libraries and corresponding dependencies for compiling gdb.
|
||||||
# {X,T}M_CLIBS, defined in *config files, have host- and target-dependent libs.
|
# {X,T}M_CLIBS, defined in *config files, have host- and target-dependent libs.
|
||||||
# TERMCAP comes last, since readline depends on it.
|
# TERMCAP comes after readline, since readline depends on it.
|
||||||
CLIBS = $(XM_CLIBS) ${TM_CLIBS} ${BFD_LIB} ${LIBIBERTY} ${RL_LIB} ${TERMCAP}
|
CLIBS = ${BFD_LIB} ${LIBIBERTY} ${RL_LIB} ${TERMCAP} ${XM_CLIBS} ${TM_CLIBS}
|
||||||
CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${BFD_LIB} ${LIBIBERTY} ${RL_LIB}
|
CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${BFD_LIB} ${LIBIBERTY} ${RL_LIB}
|
||||||
|
|
||||||
ADD_FILES = ${REGEX} ${ALLOCA} ${GNU_MALLOC} ${XM_ADD_FILES} ${TM_ADD_FILES}
|
ADD_FILES = ${REGEX} ${ALLOCA} ${GNU_MALLOC} ${XM_ADD_FILES} ${TM_ADD_FILES}
|
||||||
|
@ -316,7 +316,7 @@ gdb1: gdb
|
||||||
# remote support.
|
# remote support.
|
||||||
rapp: $(RAPP_OBS)
|
rapp: $(RAPP_OBS)
|
||||||
rm -f rapp_init.c
|
rm -f rapp_init.c
|
||||||
${srcdir}/munch ${RAPP_OBS} > rapp_init.c
|
${srcdir}/munch ${MUNCH_DEFINE} ${RAPP_OBS} > rapp_init.c
|
||||||
${CC-LD} $(LDFLAGS) -o $@ rapp_init.c $(RAPP_OBS)
|
${CC-LD} $(LDFLAGS) -o $@ rapp_init.c $(RAPP_OBS)
|
||||||
|
|
||||||
# Support for building Makefile out of configured pieces, automatically
|
# Support for building Makefile out of configured pieces, automatically
|
||||||
|
|
12
gdb/munch
12
gdb/munch
|
@ -7,12 +7,15 @@ echo 'void initialize_all_files () {'
|
||||||
|
|
||||||
NMOPT=""
|
NMOPT=""
|
||||||
case $1 in
|
case $1 in
|
||||||
-*) NMOPT=$1; shift ;;
|
MUNCH_NM=*)
|
||||||
|
MUNCH_NM=`echo $1 | sed 's/MUNCH_NM=//'`; shift ;;
|
||||||
|
-*)
|
||||||
|
NMOPT=$1; shift ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# make it easy to use a different nm, e.g. for cross-developing
|
# make it easy to use a different nm, e.g. for cross-developing
|
||||||
|
|
||||||
MUNCH_NM="nm $NMOPT"
|
MUNCH_NM="${MUNCH_NM-nm} $NMOPT"
|
||||||
if test "`$MUNCH_NM main.o | egrep 'T _?main$'`" = "" ; then
|
if test "`$MUNCH_NM main.o | egrep 'T _?main$'`" = "" ; then
|
||||||
# System V style nm
|
# System V style nm
|
||||||
shift;
|
shift;
|
||||||
|
@ -20,8 +23,9 @@ if test "`$MUNCH_NM main.o | egrep 'T _?main$'`" = "" ; then
|
||||||
sed -e 's/^.*\(_initialize_[a-zA-Z0-9_]*\)[^a-zA-Z0-9_].*$/ {extern void \1 (); \1 ();}/'
|
sed -e 's/^.*\(_initialize_[a-zA-Z0-9_]*\)[^a-zA-Z0-9_].*$/ {extern void \1 (); \1 ();}/'
|
||||||
else
|
else
|
||||||
# BSD style nm
|
# BSD style nm
|
||||||
$MUNCH_NM -p $* | egrep 'T *_?_initialize_' | \
|
# We now accept either text or data symbols, since the RT/PC uses data.
|
||||||
sed -e 's/^.*T *_*\(.*\)/ {extern void _\1 (); _\1 ();}/'
|
$MUNCH_NM -p $* | egrep '[TD] *_?_initialize_' | \
|
||||||
|
sed -e 's/^.*[TD] *_*\(.*\)/ {extern void _\1 (); _\1 ();}/'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo '}'
|
echo '}'
|
||||||
|
|
Loading…
Reference in a new issue