Fix from Cagney so that new common files do not show up when using psim on old gdbs

This commit is contained in:
Michael Meissner 1997-01-30 00:55:18 +00:00
parent 9073144e40
commit 54973b801f
4 changed files with 17 additions and 2 deletions

View file

@ -1,3 +1,11 @@
Thu Jan 30 11:23:20 1997 Andrew Cagney <cagney@kremvax.tpgi.com.au>
* Makefile.in (BUILT_SRC_WO_CONFIG): Change targ-vals.* to
@sim_targ_vals@
* configure.in (sim_callback, sim_targ_vals): Set sim_targ_valls
if common callback is present.
Wed Jan 29 12:32:41 1997 Michael Meissner <meissner@tiktok.cygnus.com> Wed Jan 29 12:32:41 1997 Michael Meissner <meissner@tiktok.cygnus.com>
* configure.in (sim_callback): If the gdb is post 4.16, configure * configure.in (sim_callback): If the gdb is post 4.16, configure

View file

@ -223,7 +223,7 @@ BUILT_SRC_WO_CONFIG = \
pk.h \ pk.h \
hw.h hw.c \ hw.h hw.c \
filter_host.c \ filter_host.c \
targ-vals.h targ-map.c targ-vals.def @sim_targ_vals@
BUILT_SRC = \ BUILT_SRC = \
$(BUILT_SRC_WO_CONFIG) \ $(BUILT_SRC_WO_CONFIG) \

6
sim/ppc/configure vendored
View file

@ -2835,9 +2835,11 @@ echo "configure:2835: checking for common simulator directory" >&5
if test -e "${srcdir}/../common/callback.c"; then if test -e "${srcdir}/../common/callback.c"; then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
sim_callback="callback.o targ-map.o" sim_callback="callback.o targ-map.o"
sim_targ_vals="targ-vals.h targ-map.c targ-vals.def"
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
sim_callback="" sim_callback=""
sim_targ_vals=""
fi fi
@ -2848,7 +2850,7 @@ AR=${AR-ar}
# Extract the first word of "ranlib", so it can be a program name with args. # Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2 set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2852: checking for $ac_word" >&5 echo "configure:2854: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -2913,6 +2915,7 @@ fi
trap '' 1 2 15 trap '' 1 2 15
@ -3110,6 +3113,7 @@ s%@sim_stdio@%$sim_stdio%g
s%@sim_termio@%$sim_termio%g s%@sim_termio@%$sim_termio%g
s%@sim_devzero@%$sim_devzero%g s%@sim_devzero@%$sim_devzero%g
s%@sim_callback@%$sim_callback%g s%@sim_callback@%$sim_callback%g
s%@sim_targ_vals@%$sim_targ_vals%g
CEOF CEOF
EOF EOF

View file

@ -661,9 +661,11 @@ AC_MSG_CHECKING(for common simulator directory)
if test -e "${srcdir}/../common/callback.c"; then if test -e "${srcdir}/../common/callback.c"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
sim_callback="callback.o targ-map.o" sim_callback="callback.o targ-map.o"
sim_targ_vals="targ-vals.h targ-map.c targ-vals.def"
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
sim_callback="" sim_callback=""
sim_targ_vals=""
fi fi
AC_SUBST(CC_FOR_BUILD) AC_SUBST(CC_FOR_BUILD)
@ -712,6 +714,7 @@ AC_SUBST(sim_stdio)
AC_SUBST(sim_termio) AC_SUBST(sim_termio)
AC_SUBST(sim_devzero) AC_SUBST(sim_devzero)
AC_SUBST(sim_callback) AC_SUBST(sim_callback)
AC_SUBST(sim_targ_vals)
AC_OUTPUT(Makefile, AC_OUTPUT(Makefile,
[case x$CONFIG_HEADERS in xconfig.h:config.in) echo > stamp-h ;; esac]) [case x$CONFIG_HEADERS in xconfig.h:config.in) echo > stamp-h ;; esac])