sim: drop targ-vals.def->nltvals.def indirection

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

diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index aba97f7da1e95f6afc56e5b1e3ded31ff842bc0f..72b095a964e596d2d1477b5a0dda897d9afd5fa2 100644 (file)
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -1,5 +1,5 @@
 # Makefile fragment for common parts of all simulators.
-# Copyright 1997-2015 Free Software Foundation, Inc.
+# Copyright 1997-2016 Free Software Foundation, Inc.
 # Contributed by Cygnus Support.
 
 # This program is free software; you can redistribute it and/or modify
@@ -72,8 +72,9 @@ INSTALL_DATA = @INSTALL_DATA@
 CC = @CC@
 CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
-SIM_BSWAP = @sim_bswap@
-SIM_CFLAGS = @sim_cflags@
+CPPFLAGS = @CPPFLAGS@
+CXXFLAGS = @CXXFLAGS@
+LDFLAGS = @LDFLAGS@
 SIM_DEBUG = @sim_debug@
 SIM_TRACE = @sim_trace@
 SIM_PROFILE = @sim_profile@
@@ -88,14 +89,11 @@ 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@
@@ -182,15 +180,20 @@ SIM_NEW_COMMON_OBJS = \
        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 \
@@ -222,12 +225,10 @@ CGEN_INCLUDE_DEPS = \
 
 CONFIG_CFLAGS = \
        @DEFS@ \
-       $(SIM_CFLAGS) \
        $(SIM_DEBUG) \
        $(SIM_DEFAULT_MODEL) \
        $(SIM_TRACE) \
        $(SIM_PROFILE) \
-       $(SIM_BSWAP) \
        $(SIM_ASSERT) \
        $(SIM_ALIGNMENT) \
        $(SIM_BITSIZE) \
@@ -235,14 +236,11 @@ CONFIG_CFLAGS = \
        $(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) \
@@ -295,7 +293,7 @@ run$(EXEEXT): $(SIM_RUN_OBJS) libsim.a $(LIBDEPS)
 # devo/libremote because this directory would contain more than just
 # a library).
 
-gentmap: Makefile $(srccom)/gentmap.c targ-vals.def
+gentmap: Makefile $(srccom)/gentmap.c $(srccom)/nltvals.def
        $(CC_FOR_BUILD) $(srccom)/gentmap.c -o gentmap $(BUILD_CFLAGS) $(NL_TARGET)
 
 targ-vals.h targ-map.c: stamp-tvals
@@ -353,8 +351,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) \
@@ -529,8 +525,7 @@ clean: $(SIM_EXTRA_CLEAN)
 distclean mostlyclean 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
+       rm -f config.h stamp-h
 
 .c.o:
        $(COMPILE) $<