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 c11e51e3abbcda36387a19f2fc95b3d2a5b6e936..1766b83b8c16731ba044bceadf739c7ed8441218 100644 (file)
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -1,6 +1,5 @@
 # Makefile fragment for common parts of all simulators.
-# Copyright 1997-2001, 2004-2005, 2007-2012 Free Software Foundation,
-# Inc.
+# Copyright 1997-2015 Free Software Foundation, Inc.
 # Contributed by Cygnus Support.
 
 # This program is free software; you can redistribute it and/or modify
@@ -39,6 +38,7 @@ VPATH = @srcdir@:$(srccom)
 srcdir = @srcdir@
 srccom = $(srcdir)/../common
 srcroot = $(srcdir)/../..
+srcsim = $(srcdir)/..
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -58,6 +58,7 @@ man1dir = $(mandir)/man1
 infodir = @infodir@
 includedir = @includedir@
 
+lt_cv_dlopen_libs = @lt_cv_dlopen_libs@
 # This can be referenced by the gettext configuration code.
 top_builddir = ..
 
@@ -138,7 +139,7 @@ SIM_EXTRA_LIBS =
 # List of extra program dependencies.
 SIM_EXTRA_LIBDEPS =
 # List of main object files for `run'.
-SIM_RUN_OBJS = run.o
+SIM_RUN_OBJS = nrun.o
 # Dependency of `all' to build any extra files.
 SIM_EXTRA_ALL =
 # Dependency of `install' to install any extra files.
@@ -172,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 \
@@ -185,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 \
@@ -253,16 +262,18 @@ 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) \
-       $(CONFIG_LIBS) $(SIM_EXTRA_LIBS)
+       $(CONFIG_LIBS) $(SIM_EXTRA_LIBS) $(LIBDL)
 
 LIB_OBJS = callback.o syscall.o targ-map.o version.o $(SIM_OBJS)
 
@@ -299,12 +310,9 @@ stamp-tvals: gentmap
        $(SHELL) $(srcroot)/move-if-change tmp-tmap.c targ-map.c
        touch stamp-tvals
 
-version.c: Makefile ../../gdb/version.in
-       rm -f version.c-tmp version.c
-       echo '#include "version.h"' >> version.c-tmp
-       echo 'const char version[] = "'"`sed q ${srcdir}/../../gdb/version.in`"'";' >> version.c-tmp
-       mv version.c-tmp 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
@@ -449,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
@@ -518,7 +517,7 @@ tags etags: TAGS
 # And the sim-n-foo.h files create functions that can't be found either.
 TAGS: force
        cd $(srcdir) && \
-       etags --regex '/^\([a-z_]+\) (/\1/' --regex '/^\/[*] TAGS: .*/' \
+       etags --regex '/^\([[:lower:]_]+\) (/\1/' --regex '/^\/[*] TAGS: .*/' \
                *.[ch] ../common/*.[ch]
 
 clean: $(SIM_EXTRA_CLEAN)