]> git.ipfire.org Git - thirdparty/binutils-gdb.git/blobdiff - sim/common/Make-common.in
sim: move sim-inline to the common code
[thirdparty/binutils-gdb.git] / sim / common / Make-common.in
index 4b0f1f487f9b0fb2d8063c72b6b69232832ef46c..b8116d8996ff4941a47500d5cc5193d46b61bcf0 100644 (file)
@@ -1,21 +1,19 @@
 # Makefile fragment for common parts of all simulators.
-# Copyright 1997, 1998, 1999, 2000, 2001, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright 1997-2021 Free Software Foundation, Inc.
 # Contributed by Cygnus Support.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # This Makefile fragment consists of two separate parts.
 # They are merged into the final Makefile at points denoted by
 
 ## COMMON_PRE_CONFIG_FRAG
 
-VPATH = @srcdir@
+VPATH = @srcdir@:$(srccom)
 srcdir = @srcdir@
 srccom = $(srcdir)/../common
 srcroot = $(srcdir)/../..
+srcsim = $(srcdir)/..
+
+include $(srcroot)/gdb/silent-rules.mk
+
+# Helper code from gnulib.
+GNULIB_PARENT_DIR = ../..
+include $(GNULIB_PARENT_DIR)/gnulib/Makefile.gnulib.inc
+
+# Settings from top-level configure.
+include ../arch-subdir.mk
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
-host_alias = @host_alias@
-target_alias = @target_alias@
-program_transform_name = @program_transform_name@
 bindir = @bindir@
 
 libdir = @libdir@
 tooldir = $(libdir)/$(target_alias)
 
 datadir = @datadir@
+datarootdir = @datarootdir@
 mandir = @mandir@
 man1dir = $(mandir)/man1
 infodir = @infodir@
@@ -61,55 +67,33 @@ includedir = @includedir@
 # This can be referenced by the gettext configuration code.
 top_builddir = ..
 
-EXEEXT = @EXEEXT@
 SHELL = @SHELL@
 
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-CC = @CC@
-CC_FOR_BUILD = @CC_FOR_BUILD@
-CFLAGS = @CFLAGS@
-SIM_BSWAP = @sim_bswap@
-SIM_CFLAGS = @sim_cflags@
-SIM_DEBUG = @sim_debug@
-SIM_TRACE = @sim_trace@
-SIM_PROFILE = @sim_profile@
-
-SIM_ASSERT = @sim_assert@
-SIM_ALIGNMENT = @sim_alignment@
 SIM_BITSIZE = @sim_bitsize@
 SIM_DEFAULT_MODEL = @sim_default_model@
-SIM_ENDIAN = @sim_endian@
-SIM_ENVIRONMENT = @sim_environment@
 SIM_FLOAT = @sim_float@
 SIM_HW_CFLAGS = @sim_hw_cflags@
 SIM_HW_OBJS = @sim_hw_objs@
 SIM_HW = @sim_hw@
-SIM_HOSTENDIAN = @sim_hostendian@
-SIM_INLINE = @sim_inline@
-SIM_PACKAGES = @sim_packages@
-SIM_REGPARM = @sim_regparm@
 SIM_RESERVED_BITS = @sim_reserved_bits@
 SIM_SCACHE = @sim_scache@
-SIM_SMP = @sim_smp@
-SIM_STDCALL = @sim_stdcall@
-SIM_XOR_ENDIAN = @sim_xor_endian@
-WARN_CFLAGS = @WARN_CFLAGS@
-WERROR_CFLAGS = @WERROR_CFLAGS@
 SIM_WARN_CFLAGS = $(WARN_CFLAGS)
 SIM_WERROR_CFLAGS = $(WERROR_CFLAGS)
 
-HDEFINES = @HDEFINES@
-TDEFINES =
+# Dependency tracking information.
+depcomp = $(SHELL) $(srcroot)/depcomp
 
-AR = @AR@
-AR_FLAGS = rc
-RANLIB = @RANLIB@
-MAKEINFO = makeinfo
+# Note that these are overridden by GNU make-specific code below if
+# GNU make is used.  The overrides implement dependency tracking.
+COMPILE.pre = $(CC) $(C_DIALECT)
+COMPILE.post = -c -o $@
+COMPILE = $(ECHO_CC) $(COMPILE.pre) $(ALL_CFLAGS) $(COMPILE.post)
+POSTCOMPILE = @true
 
-DEP = $(srcroot)/mkdep
+# igen leaks memory, and therefore makes AddressSanitizer unhappy.  Disable
+# leak detection while running it.
+IGEN = ../igen/igen$(EXEEXT)
+IGEN_RUN = ASAN_OPTIONS=detect_leaks=0 $(IGEN)
 
 # Each simulator's Makefile.in defines one or more of these variables
 # to override our settings as necessary.  There is no need to define these
@@ -125,12 +109,8 @@ SIM_EXTRA_DEPS =
 SIM_EXTRA_CFLAGS =
 # List of extra libraries to link with.
 SIM_EXTRA_LIBS =
-# List of extra program dependencies.
-SIM_EXTRA_LIBDEPS =
 # List of main object files for `run'.
-SIM_RUN_OBJS = run.o
-# Dependency of `all' to build any extra files.
-SIM_EXTRA_ALL =
+SIM_RUN_OBJS = nrun.o
 # Dependency of `install' to install any extra files.
 SIM_EXTRA_INSTALL =
 # Dependency of `clean' to clean any extra files.
@@ -162,33 +142,50 @@ 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-hload.o \
+       sim-hrw.o \
        sim-io.o \
        sim-info.o \
-       sim-load.o \
        sim-memopt.o \
+       sim-model.o \
        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 \
        \
        $(SIM_HW_OBJS) \
 
-# Add this to SIM_EXTRA_DEPS.
-CGEN_INCLUDE_DEPS = \
-       $(srccom)/cgen-cpu.h \
+# cgen-sim.h and the headers it includes
+CGEN_SIM_DEPS = \
+       $(srccom)/cgen-sim.h \
        $(srccom)/cgen-defs.h \
-       $(srccom)/cgen-engine.h \
        $(srccom)/cgen-scache.h \
-       $(srccom)/cgen-sim.h \
+       $(srccom)/cgen-fpu.h \
+       $(srccom)/cgen-par.h \
+       $(srccom)/cgen-cpu.h \
        $(srccom)/cgen-trace.h \
+       cpuall.h
+
+# Add this to SIM_EXTRA_DEPS.
+CGEN_INCLUDE_DEPS = \
+       $(CGEN_SIM_DEPS) \
+       $(srccom)/cgen-engine.h \
        $(srccom)/cgen-types.h \
        $(srcdir)/../../include/opcode/cgen.h
 
@@ -197,91 +194,74 @@ CGEN_INCLUDE_DEPS = \
 ## COMMON_POST_CONFIG_FRAG
 
 CONFIG_CFLAGS = \
-       @DEFS@ \
-       $(SIM_CFLAGS) \
-       $(SIM_DEBUG) \
+       -DHAVE_CONFIG_H \
        $(SIM_DEFAULT_MODEL) \
-       $(SIM_TRACE) \
-       $(SIM_PROFILE) \
-       $(SIM_BSWAP) \
-       $(SIM_ASSERT) \
-       $(SIM_ALIGNMENT) \
        $(SIM_BITSIZE) \
-       $(SIM_ENDIAN) \
-       $(SIM_ENVIRONMENT) \
        $(SIM_FLOAT) \
        $(SIM_HW_CFLAGS) \
-       $(SIM_HOSTENDIAN) \
        $(SIM_INLINE) \
-       $(SIM_PACKAGES) \
-       $(SIM_REGPARM) \
        $(SIM_RESERVED_BITS) \
        $(SIM_SCACHE) \
-       $(SIM_SMP) \
-       $(SIM_STDCALL) \
        $(SIM_WARN_CFLAGS) \
        $(SIM_WERROR_CFLAGS) \
-       $(SIM_XOR_ENDIAN) \
-       $(SIM_HARDWARE) \
-       $(SIM_EXTRA_CFLAGS) \
-       $(HDEFINES) $(TDEFINES)
+       $(SIM_HARDWARE)
 CSEARCH = -I. -I$(srcdir) -I../common -I$(srccom) \
   -I../../include -I$(srcroot)/include \
   -I../../bfd -I$(srcroot)/bfd \
   -I../../opcodes -I$(srcroot)/opcodes \
-  -I../../intl -I$(srcroot)/intl
-ALL_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(CFLAGS)
-BUILD_CFLAGS = -g -O $(CSEARCH)
+  -I../.. \
+  $(INTL_CFLAGS)
+ALL_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(INCGNU) $(SIM_EXTRA_CFLAGS) $(CFLAGS)
+BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(CSEARCH)
 
-COMMON_DEP_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH)
+COMMON_DEP_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(SIM_EXTRA_CFLAGS)
 
+ZLIB = $(zlibdir) -lz
 LIBIBERTY_LIB = ../../libiberty/libiberty.a
 BFD_LIB = ../../bfd/libbfd.a
 OPCODES_LIB = ../../opcodes/libopcodes.a
-INTLLIBS = @INTLLIBS@
-INTLDEPS = @INTLDEPS@
-CONFIG_LIBS = @LIBS@
-LIBDEPS = $(BFD_LIB) $(OPCODES_LIB) $(INTLDEPS) $(LIBIBERTY_LIB) \
-       $(SIM_EXTRA_LIBDEPS)
-EXTRA_LIBS = $(BFD_LIB) $(OPCODES_LIB) $(INTLLIBS) $(LIBIBERTY_LIB) \
-       $(CONFIG_LIBS) $(SIM_EXTRA_LIBS)
+CONFIG_LIBS = $(COMMON_LIBS) @LIBS@ $(ZLIB)
+LIBDEPS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL_DEP) $(LIBIBERTY_LIB)
+EXTRA_LIBS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL) $(LIBIBERTY_LIB) \
+       $(CONFIG_LIBS) $(SIM_EXTRA_LIBS) $(LIBDL) $(LIBGNU) $(LIBGNU_EXTRA_LIBS)
+
+COMMON_OBJS_NAMES = \
+       portability.o \
+       sim-load.o \
+       version.o
+COMMON_OBJS = $(COMMON_OBJS_NAMES:%=../common/common_libcommon_a-%)
 
-LIB_OBJS = callback.o syscall.o targ-map.o $(SIM_OBJS)
+LIB_OBJS = callback.o modules.o syscall.o targ-map.o $(COMMON_OBJS) $(SIM_OBJS)
+
+COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS)
+LINK_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(LDFLAGS_FOR_BUILD) -o $@
 
 RUNTESTFLAGS =
 
-callback_h = $(srcroot)/include/gdb/callback.h
-remote_sim_h = $(srcroot)/include/gdb/remote-sim.h
+callback_h = $(srcroot)/include/sim/callback.h
+remote_sim_h = $(srcroot)/include/sim/sim.h
 
-all: $(SIM_EXTRA_ALL) libsim.a run$(EXEEXT) .gdbinit
+all: libsim.a run$(EXEEXT) .gdbinit
 
 libsim.a: $(LIB_OBJS)
        rm -f libsim.a
-       $(AR) $(AR_FLAGS) libsim.a $(LIB_OBJS)
-       $(RANLIB) libsim.a
+       $(ECHO_AR) $(AR) $(AR_FLAGS) libsim.a $(LIB_OBJS)
+       $(ECHO_RANLIB) $(RANLIB) libsim.a
 
 run$(EXEEXT): $(SIM_RUN_OBJS) libsim.a $(LIBDEPS)
-       $(CC) $(ALL_CFLAGS) -o run$(EXEEXT) \
+       $(ECHO_CCLD) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o run$(EXEEXT) \
          $(SIM_RUN_OBJS) libsim.a $(EXTRA_LIBS)
 
-run.o: $(srccom)/run.c config.h tconfig.h $(remote_sim_h) $(callback_h)
-       $(CC) -c $(srccom)/run.c $(ALL_CFLAGS)
-
 # FIXME: Ideally, callback.o and friends live in a library outside of
 # both the gdb and simulator source trees (e.g. devo/remote.  Not
 # devo/libremote because this directory would contain more than just
 # a library).
 
-callback.o: $(srccom)/callback.c config.h tconfig.h $(callback_h) targ-vals.h
-       $(CC) -c $(srccom)/callback.c $(ALL_CFLAGS)
+gentmap.o: Makefile $(srccom)/gentmap.c $(srccom)/nltvals.def
+       $(ECHO_CC) $(COMPILE_FOR_BUILD) -o $@ -c $(srccom)/gentmap.c $(NL_TARGET)
 
-syscall.o: $(srccom)/syscall.c config.h tconfig.h $(callback_h) targ-vals.h
-       $(CC) -c $(srccom)/syscall.c $(ALL_CFLAGS)
-
-targ-map.o: targ-map.c targ-vals.h
-
-gentmap: Makefile $(srccom)/gentmap.c targ-vals.def
-       $(CC_FOR_BUILD) $(srccom)/gentmap.c -o gentmap $(BUILD_CFLAGS) $(NL_TARGET)
+gentmap: gentmap.o
+       $(ECHO_CC) $(LINK_FOR_BUILD) $<
 
 targ-vals.h targ-map.c: stamp-tvals
 stamp-tvals: gentmap
@@ -318,8 +298,7 @@ SIM_MAIN_DEPS = \
        $(sim_main_headers)
 
 sim-alu_h = $(srccom)/sim-alu.h
-sim-arange_h = $(srccom)/sim-arange.h \
-               $(srccom)/sim-arange.c
+sim-arange_h = $(srccom)/sim-arange.h
 sim-assert_h = $(srccom)/sim-assert.h
 sim-base_h = $(srccom)/sim-base.h \
                $(sim-module_h) \
@@ -334,8 +313,6 @@ sim-base_h = $(srccom)/sim-base.h \
                $(sim-memopt_h) \
                $(sim-cpu_h)
 sim-basics_h = $(srccom)/sim-basics.h \
-               ../common/cconfig.h \
-               tconfig.h \
                $(sim-config_h) \
                $(callback_h) \
                $(sim-inline_h) \
@@ -393,232 +370,114 @@ hw_main_headers = \
        $(hw-ports_h) \
        $(hw-properties_h) \
 
-# FIXME: If this complicated way of building .o files from ../common is
-# necessary, the reason should be documented here.
-
-BUILT_SRC_FROM_COMMON= \
-       sim-inline.c
-
-sim-abort.o: $(srccom)/sim-abort.c \
-         $(SIM_EXTRA_DEPS)
-       $(CC) -c $(srccom)/sim-abort.c $(ALL_CFLAGS)
-
-sim-arange.o: $(srccom)/sim-arange.c $(sim-arange_h) $(SIM_EXTRA_DEPS)
-       $(CC) -c $(srccom)/sim-arange.c $(ALL_CFLAGS)
-
-sim-bits.o: $(srccom)/sim-bits.c $(sim-bits_h) $(sim-n-bits_h) \
-         $(SIM_EXTRA_DEPS)
-       $(CC) -c $(srccom)/sim-bits.c $(ALL_CFLAGS)
-
-sim-config.o: $(srccom)/sim-config.c $(sim-config_h) sim-main.h \
-         $(SIM_EXTRA_DEPS)
-       $(CC) -c $(srccom)/sim-config.c $(ALL_CFLAGS)
-
-sim-core.o: $(srccom)/sim-core.c $(sim_main_headers) \
-         $(sim-core_h) $(sim-n-core_h)
-       $(CC) -c $(srccom)/sim-core.c $(ALL_CFLAGS)
-
-sim-cpu.o: $(srccom)/sim-cpu.c $(sim_main_headers)
-       $(CC) -c $(srccom)/sim-cpu.c $(ALL_CFLAGS)
-
-sim-endian.o: $(srccom)/sim-endian.c $(sim-endian_h) $(sim-n-endian_h)
-       $(CC) -c $(srccom)/sim-endian.c $(ALL_CFLAGS)
-
-sim-engine.o: $(srccom)/sim-engine.c $(sim_main_headers) $(sim-engine_h)
-       $(CC) -c $(srccom)/sim-engine.c $(ALL_CFLAGS)
-
-sim-events.o: $(srccom)/sim-events.c $(sim-events_h) sim-main.h \
-         $(SIM_EXTRA_DEPS)
-       $(CC) -c $(srccom)/sim-events.c $(ALL_CFLAGS)
-
-sim-fpu.o: $(srccom)/sim-fpu.c $(sim-fpu_h) \
-         $(SIM_EXTRA_DEPS)
-       $(CC) -c $(srccom)/sim-fpu.c $(ALL_CFLAGS)
-
-sim-hload.o: $(srccom)/sim-hload.c $(sim-assert_h) $(remote_sim_h) \
-         $(SIM_EXTRA_DEPS)
-       $(CC) -c $(srccom)/sim-hload.c $(ALL_CFLAGS)
-
-sim-hrw.o: $(srccom)/sim-hrw.c $(sim-assert_h) $(sim_core_h) $(remote_sim_h) \
-         $(SIM_EXTRA_DEPS)
-       $(CC) -c $(srccom)/sim-hrw.c $(ALL_CFLAGS)
-
-sim-hw.o: $(srccom)/sim-hw.c $(sim_main_headers)
-       $(CC) -c $(srccom)/sim-hw.c $(ALL_CFLAGS)
-
-sim-info.o: $(srccom)/sim-info.c $(sim-assert_h) $(remote_sim_h) \
-         $(SIM_EXTRA_DEPS)
-       $(CC) -c $(srccom)/sim-info.c $(ALL_CFLAGS)
-
-sim-inline.c: $(srccom)/sim-inline.c
-       rm -f $@ tmp-$@
-       echo "# 1 \"$(srccom)/$@\"" > tmp-$@
-       cat $(srccom)/$@ >> tmp-$@
-       $(SHELL) $(srcdir)/../../move-if-change tmp-$@ $@
-
-sim-io.o: $(srccom)/sim-io.c $(sim_main_headers) $(sim-io_h) $(remote_sim_h) \
-         targ-vals.h
-       $(CC) -c $(srccom)/sim-io.c $(ALL_CFLAGS)
-
-sim-memopt.o: $(srccom)/sim-memopt.c $(sim_main_headers) \
-         $(sim-io_h)
-       $(CC) -c $(srccom)/sim-memopt.c $(ALL_CFLAGS)
-
-sim-module.o: $(srccom)/sim-module.c $(sim_main_headers) \
-         $(sim-io_h)
-       $(CC) -c $(srccom)/sim-module.c $(ALL_CFLAGS)
-
-sim-options.o: $(srccom)/sim-options.c $(sim_main_headers) \
-         $(sim-options_h) $(sim-io_h)
-       $(CC) -c $(srccom)/sim-options.c $(ALL_CFLAGS)
-
-sim-reason.o: $(srccom)/sim-reason.c $(sim_main_headers) $(remote_sim_h)
-       $(CC) -c $(srccom)/sim-reason.c $(ALL_CFLAGS)
-
-sim-reg.o: $(srccom)/sim-reg.c $(sim_main_headers) $(remote_sim_h)
-       $(CC) -c $(srccom)/sim-reg.c $(ALL_CFLAGS)
-
-sim-resume.o: $(srccom)/sim-resume.c $(sim_main_headers) $(remote_sim_h)
-       $(CC) -c $(srccom)/sim-resume.c $(ALL_CFLAGS)
-
-sim-run.o: $(srccom)/sim-run.c $(sim_main_headers)
-       $(CC) -c $(srccom)/sim-run.c $(ALL_CFLAGS)
-
-sim-signal.o: $(srccom)/sim-signal.c $(sim_main_headers) $(sim-signal_h)
-       $(CC) -c $(srccom)/sim-signal.c $(ALL_CFLAGS)
-
-sim-stop.o: $(srccom)/sim-stop.c $(sim_main_headers)
-       $(CC) -c $(srccom)/sim-stop.c $(ALL_CFLAGS)
-
-sim-trace.o: $(srccom)/sim-trace.c $(sim_main_headers) \
-         $(sim-options_h) $(sim-io_h)
-       $(CC) -c $(srccom)/sim-trace.c $(ALL_CFLAGS)
-
-sim-profile.o: $(srccom)/sim-profile.c $(sim_main_headers) \
-         $(sim-options_h) $(sim-io_h)
-       $(CC) -c $(srccom)/sim-profile.c $(ALL_CFLAGS)
-
-sim-model.o: $(srccom)/sim-model.c $(sim_main_headers) \
-         $(sim-io_h)
-       $(CC) -c $(srccom)/sim-model.c $(ALL_CFLAGS)
-
-sim-utils.o: $(srccom)/sim-utils.c $(sim_main_headers)
-       $(CC) -c $(srccom)/sim-utils.c $(ALL_CFLAGS)
-
-sim-watch.o: $(srccom)/sim-watch.c $(sim_main_headers)
-       $(CC) -c $(srccom)/sim-watch.c $(ALL_CFLAGS)
-
-sim-load.o: $(srccom)/sim-load.c $(callback_h) $(sim-basics_h) $(remote_sim_h)
-       $(CC) -c $(srccom)/sim-load.c $(ALL_CFLAGS)
+#
+# Dependency tracking.  Most of this is conditional on GNU Make being
+# found by configure; if GNU Make is not found, we fall back to a
+# simpler scheme.
+#
 
+ifeq ($(DEPMODE),depmode=gcc3)
+# Note that we put the dependencies into a .Tpo file, then move them
+# into place if the compile succeeds.  We need this because gcc does
+# not atomically write the dependency output file.
+override COMPILE.post = -c -o $@ -MT $@ -MMD -MP \
+       -MF $(DEPDIR)/$(basename $(@F)).Tpo
+override POSTCOMPILE = @mv $(DEPDIR)/$(basename $(@F)).Tpo \
+       $(DEPDIR)/$(basename $(@F)).Po
+else
+override COMPILE.pre = source='$<' object='$@' libtool=no \
+       DEPDIR=$(DEPDIR) $(DEPMODE) $(depcomp) $(CC)
+# depcomp handles atomicity for us, so we don't need a postcompile
+# step.
+override POSTCOMPILE =
+endif
+
+all_object_files = $(LIB_OBJS) $(SIM_RUN_OBJS)
+generated_files = \
+       $(SIM_EXTRA_DEPS) \
+       hw-config.h \
+       modules.c \
+       targ-map.c \
+       targ-vals.h
+
+# Ensure that generated files are created early.  Use order-only
+# dependencies if available.  They require GNU make 3.80 or newer,
+# and the .VARIABLES variable was introduced at the same time.
+ifdef .VARIABLES
+$(all_object_files): | $(generated_files)
+else
+$(all_object_files) : $(generated_files)
+endif
+
+# Dependencies.
+-include $(patsubst %.o, $(DEPDIR)/%.Po, $(all_object_files))
 
 # 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
+hw-config.h: stamp-hw ; @true
+stamp-hw: Makefile.in $(srccom)/Make-common.in config.status Makefile
        rm -f tmp-hw.h
        echo "/* generated by Makefile */" > tmp-hw.h
-       for hw in $(SIM_HW) ; do \
+       sim_hw="$(SIM_HW)"; \
+       for hw in $$sim_hw ; do \
          echo "extern const struct hw_descriptor dv_$${hw}_descriptor[];" ; \
        done >> tmp-hw.h
        echo "const struct hw_descriptor *hw_descriptors[] = {" >> tmp-hw.h
-       for hw in $(SIM_HW) ; do \
+       sim_hw="$(SIM_HW)"; \
+       for hw in $$sim_hw ; do \
          echo "  dv_$${hw}_descriptor," ; \
        done >> tmp-hw.h
        echo "  NULL," >> tmp-hw.h
        echo "};" >> tmp-hw.h
-       mv tmp-hw.h hw-config.h
-
-hw-alloc.o: $(srccom)/hw-alloc.c $(hw_main_headers)
-       $(CC) -c $(srccom)/hw-alloc.c $(ALL_CFLAGS)
-
-hw-base.o: $(srccom)/hw-base.c $(hw_main_headers) hw-config.h
-       $(CC) -c $(srccom)/hw-base.c $(ALL_CFLAGS)
-
-hw-device.o: $(srccom)/hw-device.c $(hw_main_headers)
-       $(CC) -c $(srccom)/hw-device.c $(ALL_CFLAGS)
-
-hw-events.o: $(srccom)/hw-events.c $(hw_main_headers) $(sim_main_headers)
-       $(CC) -c $(srccom)/hw-events.c $(ALL_CFLAGS)
+       $(SHELL) $(srcroot)/move-if-change tmp-hw.h hw-config.h
+       @echo stamp > stamp-hw
 
 test-hw-events: $(srccom)/hw-events.c libsim.a
        $(CC) $(ALL_CFLAGS) -DMAIN -o test-hw-events$(EXEEXT) \
                $(srccom)/hw-events.c libsim.a $(EXTRA_LIBS)
 
-hw-instances.o: $(srccom)/hw-instances.c $(hw_main_headers)
-       $(CC) -c $(srccom)/hw-instances.c $(ALL_CFLAGS)
-
-hw-handles.o: $(srccom)/hw-handles.c $(hw_main_headers)
-       $(CC) -c $(srccom)/hw-handles.c $(ALL_CFLAGS)
-
-hw-ports.o: $(srccom)/hw-ports.c $(hw_main_headers)
-       $(CC) -c $(srccom)/hw-ports.c $(ALL_CFLAGS)
-
-hw-properties.o: $(srccom)/hw-properties.c $(hw_main_headers)
-       $(CC) -c $(srccom)/hw-properties.c $(ALL_CFLAGS)
-
-hw-tree.o: $(srccom)/hw-tree.c $(hw_main_headers) $(hw-tree_h)
-       $(CC) -c $(srccom)/hw-tree.c $(ALL_CFLAGS)
-
-# Devices.
-
-dv-core.o: $(srccom)/dv-core.c $(hw_main_headers) $(sim_main_headers)
-       $(CC) -c $(srccom)/dv-core.c $(ALL_CFLAGS)
-
-dv-glue.o: $(srccom)/dv-glue.c $(hw_main_headers) $(sim_main_headers)
-       $(CC) -c $(srccom)/dv-glue.c $(ALL_CFLAGS)
-
-dv-pal.o: $(srccom)/dv-pal.c $(hw_main_headers) $(sim_main_headers)
-       $(CC) -c $(srccom)/dv-pal.c $(ALL_CFLAGS)
-
-dv-sockser.o: $(srccom)/dv-sockser.h $(sim_main_headers)
-       $(CC) -c $(srccom)/dv-sockser.c $(ALL_CFLAGS)
-
-
-nrun.o: $(srccom)/nrun.c config.h tconfig.h $(remote_sim_h) $(callback_h) \
-         $(sim_main_headers)
-       $(CC) -c $(srccom)/nrun.c $(ALL_CFLAGS)
+# See sim_pre_argv_init and sim_module_install in sim-module.c for more details.
+modules.c: stamp-modules ; @true
+stamp-modules: Makefile $(SIM_OBJS:.o=.c)
+       @echo Generating $@
+       @LANG=C ; export LANG ; \
+       LC_ALL=C ; export LC_ALL ; \
+       sed -n -e '/^sim_install_/{s/^\(sim_install_[a-z_0-9A-Z]*\).*/\1/;p}' $^ | sort >$@.l-tmp
+       @set -e; (\
+       echo '/* Do not modify this file.  */'; \
+       echo '/* It is created automatically by the Makefile.  */'; \
+       echo '#include "libiberty.h"'; \
+       echo '#include "sim-module.h"'; \
+       sed -e 's:\(.*\):extern __attribute__((__weak__)) MODULE_INIT_FN \1;:' $@.l-tmp; \
+       echo 'MODULE_INSTALL_FN * const sim_modules_detected[] = {'; \
+       sed -e 's:\(.*\):  \1,:' $@.l-tmp; \
+       echo '};'; \
+       echo 'const int sim_modules_detected_len = ARRAY_SIZE (sim_modules_detected);'; \
+       ) >$@.tmp
+       $(SHELL) $(srcroot)/move-if-change $@.tmp modules.c
+       @rm -f $@.l-tmp $@.tmp
+       touch $@
 
 # CGEN support.
 
 # For use in Makefile.in for cpu-specific files.
 CGEN_MAIN_CPU_DEPS = \
        $(SIM_MAIN_DEPS) \
-       $(CGEN_INCLUDE_DEPS) \
        $(srccom)/cgen-ops.h \
-       $(srccom)/cgen-mem.h \
-       $(srccom)/cgen-par.h \
-       $(srccom)/cgen-fpu.h
-
-cgen-run.o: $(srccom)/cgen-run.c $(sim_main_headers)
-       $(CC) -c $(srccom)/cgen-run.c $(ALL_CFLAGS)
-
-cgen-scache.o: $(srccom)/cgen-scache.c $(sim_main_headers)
-       $(CC) -c $(srccom)/cgen-scache.c $(ALL_CFLAGS)
-
-cgen-trace.o: $(srccom)/cgen-trace.c $(sim_main_headers)
-       $(CC) -c $(srccom)/cgen-trace.c $(ALL_CFLAGS)
-
-cgen-fpu.o: $(srccom)/cgen-fpu.c $(sim_main_headers) $(sim-fpu_h)
-       $(CC) -c $(srccom)/cgen-fpu.c $(ALL_CFLAGS)
-
-cgen-accfp.o: $(srccom)/cgen-accfp.c $(sim_main_headers) $(sim-fpu_h)
-       $(CC) -c $(srccom)/cgen-accfp.c $(ALL_CFLAGS)
-
-cgen-utils.o: $(srccom)/cgen-utils.c $(sim_main_headers) \
-         $(srccom)/cgen-mem.h $(srccom)/cgen-ops.h $(srccom)/cgen-engine.h
-       $(CC) -c $(srccom)/cgen-utils.c $(ALL_CFLAGS)
-
-cgen-par.o: $(srccom)/cgen-par.c $(sim_main_headers) \
-         $(srccom)/cgen-mem.h $(srccom)/cgen-par.h
-       $(CC) -c $(srccom)/cgen-par.c $(ALL_CFLAGS)
+       $(srccom)/cgen-mem.h
 
 # Support targets.
 
 install: install-common $(SIM_EXTRA_INSTALL)
 
 install-common: installdirs
+       a=`basename "$$(pwd)"`; \
        n=`echo run | sed '$(program_transform_name)'`; \
+       [ "$(SIM_PRIMARY_TARGET)" = "$$a" ] || n="$$n-$$a"; \
        $(INSTALL_PROGRAM) run$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT)
-       n=`echo libsim.a | sed s/libsim.a/lib$(target_alias)-sim.a/`; \
+       n="$(target_alias)-sim"; \
+       a=`basename "$$(pwd)"`; \
+       [ "$(SIM_PRIMARY_TARGET)" = "$$a" ] || n="$$n-$$a"; \
+       n="lib$$n.a"; \
        $(INSTALL_DATA) libsim.a $(DESTDIR)$(libdir)/$$n ; \
        ( cd $(DESTDIR)$(libdir) ; $(RANLIB) $$n )
 
@@ -627,12 +486,19 @@ installdirs:
        $(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(libdir)
 
 check:
-       cd ../testsuite && $(MAKE) check RUNTESTFLAGS="$(RUNTESTFLAGS)"
+
+html:
+clean-html:
+install-html:
 
 info:
 clean-info:
 install-info:
 
+pdf:
+clean-pdf:
+install-pdf:
+
 .NOEXPORT:
 MAKEOVERRIDES=
 
@@ -642,26 +508,24 @@ 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)
+mostlyclean clean: $(SIM_EXTRA_CLEAN)
        rm -f *.[oa] *~ core
        rm -f run$(EXEEXT) libsim.a
+       rm -f hw-config.h stamp-hw
+       rm -f modules.c stamp-modules
        rm -f gentmap targ-map.c targ-vals.h stamp-tvals
-       if [ ! -f Make-common.in ] ; then \
-               rm -f $(BUILT_SRC_FROM_COMMON) ; \
-       fi
        rm -f tmp-mloop.hin tmp-mloop.h tmp-mloop.cin tmp-mloop.c
 
-distclean mostlyclean maintainer-clean realclean: clean $(SIM_EXTRA_DISTCLEAN)
+distclean maintainer-clean realclean: clean $(SIM_EXTRA_DISTCLEAN)
        rm -f TAGS
        rm -f Makefile config.cache config.log config.status .gdbinit
-       rm -f tconfig.h config.h stamp-h
-       rm -f targ-vals.def
 
 .c.o:
-       $(CC) -c $(ALL_CFLAGS) $<
+       $(COMPILE) $<
+       $(POSTCOMPILE)
 
 # Dummy target to force execution of dependent targets.
 force:
@@ -672,10 +536,6 @@ Makefile: Makefile.in $(srccom)/Make-common.in config.status
 config.status: configure
        $(SHELL) ./config.status --recheck
 
-config.h: stamp-h ; @true
-stamp-h: config.in config.status
-       CONFIG_FILES= CONFIG_HEADERS=config.h:config.in $(SHELL) ./config.status
-
 .gdbinit: # config.status $(srccom)/gdbinit.in
        CONFIG_FILES=$@:../common/gdbinit.in CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -687,6 +547,9 @@ CGEN = "`if [ -f ../../guile/libguile/guile ]; then echo ../../guile/libguile/gu
 CGENFLAGS = -v
 CGEN_CPU_DIR = $(CGENDIR)/cpu
 
+# Most ports use the files here instead of cgen/cpu.
+CPU_DIR = $(srcroot)/cpu
+
 CGEN_READ_SCM = $(CGENDIR)/sim.scm
 CGEN_ARCH_SCM = $(CGENDIR)/sim-arch.scm
 CGEN_CPU_SCM = $(CGENDIR)/sim-cpu.scm $(CGENDIR)/sim-model.scm
@@ -694,11 +557,12 @@ CGEN_DECODE_SCM = $(CGENDIR)/sim-decode.scm
 CGEN_DESC_SCM = $(CGENDIR)/desc.scm $(CGENDIR)/desc-cpu.scm
 
 # Various choices for which cpu specific files to generate.
-CGEN_CPU_EXTR = -E tmp-ext.c1
-CGEN_CPU_READ = -R tmp-read.c1
-CGEN_CPU_WRITE = -W tmp-write.c1
-CGEN_CPU_SEM = -S tmp-sem.c1
-CGEN_CPU_SEMSW = -X tmp-semsw.c1
+# These are passed to cgen.sh in the "extrafiles" argument.
+CGEN_CPU_EXTR = /extr/
+CGEN_CPU_READ = /read/
+CGEN_CPU_WRITE = /write/
+CGEN_CPU_SEM = /sem/
+CGEN_CPU_SEMSW = /semsw/
 
 CGEN_FLAGS_TO_PASS = \
        CGEN='$(CGEN)' \