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 6fdf10f88a7cf7be6f607bfc689de2d8a2c1bf35..72b095a964e596d2d1477b5a0dda897d9afd5fa2 100644 (file)
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -75,7 +75,6 @@ CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CXXFLAGS = @CXXFLAGS@
 LDFLAGS = @LDFLAGS@
-SIM_CFLAGS = @sim_cflags@
 SIM_DEBUG = @sim_debug@
 SIM_TRACE = @sim_trace@
 SIM_PROFILE = @sim_profile@
@@ -92,11 +91,9 @@ SIM_HW_OBJS = @sim_hw_objs@
 SIM_HW = @sim_hw@
 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@
@@ -228,7 +225,6 @@ CGEN_INCLUDE_DEPS = \
 
 CONFIG_CFLAGS = \
        @DEFS@ \
-       $(SIM_CFLAGS) \
        $(SIM_DEBUG) \
        $(SIM_DEFAULT_MODEL) \
        $(SIM_TRACE) \
@@ -242,11 +238,9 @@ CONFIG_CFLAGS = \
        $(SIM_HW_CFLAGS) \
        $(SIM_INLINE) \
        $(SIM_PACKAGES) \
-       $(SIM_REGPARM) \
        $(SIM_RESERVED_BITS) \
        $(SIM_SCACHE) \
        $(SIM_SMP) \
-       $(SIM_STDCALL) \
        $(SIM_WARN_CFLAGS) \
        $(SIM_WERROR_CFLAGS) \
        $(SIM_XOR_ENDIAN) \
@@ -299,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
@@ -357,7 +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 \
                $(sim-config_h) \
                $(callback_h) \
                $(sim-inline_h) \
@@ -533,7 +526,6 @@ distclean mostlyclean maintainer-clean realclean: clean $(SIM_EXTRA_DISTCLEAN)
        rm -f TAGS
        rm -f Makefile config.cache config.log config.status .gdbinit
        rm -f config.h stamp-h
-       rm -f targ-vals.def
 
 .c.o:
        $(COMPILE) $<