diff options
| -rw-r--r-- | sim/ppc/Makefile.in | 11 | ||||
| -rwxr-xr-x | sim/ppc/configure | 18 | ||||
| -rw-r--r-- | sim/ppc/configure.ac | 14 |
3 files changed, 6 insertions, 37 deletions
diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index 8f4cd997d30..2f8fe9b20b0 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -430,7 +430,7 @@ BUILT_SRC_WO_CONFIG = \ pk.h \ hw.h hw.c \ filter_host.c \ - @sim_targ_vals@ + targ-vals.h targ-map.c targ-vals.def BUILT_SRC = \ $(BUILT_SRC_WO_CONFIG) \ @@ -469,6 +469,10 @@ MAIN_SRC = \ sim_calls.c COMMON_OBJS_NAMES = \ + callback.o \ + target-newlib-errno.o \ + target-newlib-open.o \ + target-newlib-signal.o \ version.o COMMON_OBJS = $(COMMON_OBJS_NAMES:%=../common/common_libcommon_a-%) @@ -511,7 +515,7 @@ LIB_OBJ = \ options.o -GDB_OBJ = gdb-sim.o sim_calls.o @sim_callback@ +GDB_OBJ = gdb-sim.o sim_calls.o targ-map.o HW_SRC = @sim_hw_src@ HW_OBJ = @sim_hw_obj@ @@ -616,9 +620,6 @@ stamp-map: Makefile gentmap $(srcroot)/move-if-change $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-map.c targ-map.c $(SILENCE) touch $@ -callback.o: $(srcdir)/../common/callback.c $(TARG_VALS_H) $(CONFIG_H) - $(ECHO_CC) $(CC) -c $(STD_CFLAGS) -DHAVE_CONFIG_H $(srcdir)/../common/callback.c - targ-map.o: targ-map.c $(ANSIDECL_H) $(GDB_CALLBACK_H) $(TARG_VALS_H) sim-fpu.o: $(srcdir)/../common/sim-fpu.c $(CONFIG_H) diff --git a/sim/ppc/configure b/sim/ppc/configure index 619f1d7330a..24531ee1820 100755 --- a/sim/ppc/configure +++ b/sim/ppc/configure @@ -623,8 +623,6 @@ ac_subst_vars='LTLIBOBJS LIBOBJS sim_fpu sim_fpu_cflags -sim_targ_vals -sim_callback sim_devzero sim_termio sim_model_issue @@ -4123,20 +4121,6 @@ else sim_devzero="" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for common simulator directory" >&5 -$as_echo_n "checking for common simulator directory... " >&6; } -if test -f "${srcdir}/../common/callback.c"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - sim_callback="callback.o targ-map.o" - sim_targ_vals="targ-vals.h targ-map.c targ-vals.def" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - sim_callback="" - sim_targ_vals="" -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for common simulator directory fpu implementation" >&5 $as_echo_n "checking for common simulator directory fpu implementation... " >&6; } if test -f "${srcdir}/../common/sim-fpu.c"; then @@ -4211,8 +4195,6 @@ fi - - ac_config_files="$ac_config_files Makefile" ac_config_commands="$ac_config_commands default" diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac index b837c5b8609..8d5d78ce1dc 100644 --- a/sim/ppc/configure.ac +++ b/sim/ppc/configure.ac @@ -545,18 +545,6 @@ else sim_devzero="" fi -dnl Figure out if we are in the new Cygnus tree with a common directory or not -AC_MSG_CHECKING(for common simulator directory) -if test -f "${srcdir}/../common/callback.c"; then - AC_MSG_RESULT(yes) - sim_callback="callback.o targ-map.o" - sim_targ_vals="targ-vals.h targ-map.c targ-vals.def" -else - AC_MSG_RESULT(no) - sim_callback="" - sim_targ_vals="" -fi - AC_MSG_CHECKING(for common simulator directory fpu implementation) if test -f "${srcdir}/../common/sim-fpu.c"; then AC_MSG_RESULT(yes) @@ -624,8 +612,6 @@ AC_SUBST(sim_default_model) AC_SUBST(sim_model_issue) AC_SUBST(sim_termio) AC_SUBST(sim_devzero) -AC_SUBST(sim_callback) -AC_SUBST(sim_targ_vals) AC_SUBST(sim_fpu_cflags) AC_SUBST(sim_fpu) |