callfuncs.exp: avoid spurious register differences in sparc64 targets.

[deliverable/binutils-gdb.git] / sim / common / Make-common.in

diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 2004abb5fd46c6a26fc28b5a06c6a48499a2e4a8..1766b83b8c16731ba044bceadf739c7ed8441218 100644 (file)
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -173,12 +173,16 @@ SIM_COMMON_HW_OBJS = \
 SIM_NEW_COMMON_OBJS = \
        sim-arange.o \
        sim-bits.o \
+       sim-close.o \
        sim-command.o \
        sim-config.o \
        sim-core.o \
+       sim-cpu.o \
        sim-endian.o \
+       sim-engine.o \
        sim-events.o \
        sim-fpu.o \
+       sim-hrw.o \
        sim-io.o \
        sim-info.o \
        sim-load.o \
@@ -186,7 +190,11 @@ SIM_NEW_COMMON_OBJS = \
        sim-module.o \
        sim-options.o \
        sim-profile.o \
+       sim-reason.o \
+       sim-reg.o \
        sim-signal.o \
+       sim-stop.o \
+       sim-syscall.o \
        sim-trace.o \
        sim-utils.o \
        sim-watch.o \
@@ -254,13 +262,14 @@ BUILD_CFLAGS = -g -O $(CSEARCH)
 
 COMMON_DEP_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH)
 
+ZLIB = @zlibdir@ -lz
 LIBIBERTY_LIB = ../../libiberty/libiberty.a
 BFD_LIB = ../../bfd/libbfd.a
 @PLUGINS_TRUE@LIBDL = @lt_cv_dlopen_libs@
 OPCODES_LIB = ../../opcodes/libopcodes.a
 LIBINTL = @LIBINTL@
 LIBINTL_DEP = @LIBINTL_DEP@
-CONFIG_LIBS = @LIBS@
+CONFIG_LIBS = @LIBS@ $(ZLIB)
 LIBDEPS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL_DEP) $(LIBIBERTY_LIB) \
        $(SIM_EXTRA_LIBDEPS)
 EXTRA_LIBS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL) $(LIBIBERTY_LIB) \
@@ -301,8 +310,9 @@ stamp-tvals: gentmap
        $(SHELL) $(srcroot)/move-if-change tmp-tmap.c targ-map.c
        touch stamp-tvals
 
-version.c: Makefile $(srccom)/create-version.sh ../../bfd/version.h ../../gdb/version.in
-       $(SHELL) $(srccom)/create-version.sh $(srcsim) $(host_alias) $(target_alias) version.c
+version.c: Makefile $(srcroot)/gdb/version.in $(srcroot)/bfd/version.h $(srcroot)/gdb/common/create-version.sh
+       $(SHELL) $(srcroot)/gdb/common/create-version.sh $(srcroot)/gdb \
+           $(host_alias) $(target_alias) version.c
 
 #
 # Rules for building sim-* components.  Triggered by listing the corresponding
@@ -447,15 +457,6 @@ $(all_object_files) : $(generated_files)
 # Dependencies.
 @GMAKE_TRUE@-include $(patsubst %.o, $(DEPDIR)/%.Po, $(all_object_files))
 
-BUILT_SRC_FROM_COMMON= \
-       sim-inline.c
-
-sim-inline.c: $(srccom)/sim-inline.c
-       rm -f $@ tmp-$@
-       echo "# 1 \"$(srccom)/$@\"" > tmp-$@
-       cat $(srccom)/$@ >> tmp-$@
-       $(SHELL) $(srcdir)/../../move-if-change tmp-$@ $@
-
 # FIXME This is one very simple-minded way of generating the file hw-config.h
 hw-config.h: Makefile.in $(srccom)/Make-common.in config.status Makefile
        rm -f tmp-hw.h