sim: m32r: unify ELF & Linux traps logic

[thirdparty/binutils-gdb.git] / sim / m32r / Makefile.in

diff --git a/sim/m32r/Makefile.in b/sim/m32r/Makefile.in
index eb9641ee8e679f5da3a22e2a0b7ff8a2d894fec8..8877edcf4ae6a6cd93b70d478d2da053e266d373 100644 (file)
--- a/sim/m32r/Makefile.in
+++ b/sim/m32r/Makefile.in
@@ -22,7 +22,6 @@
 M32R_OBJS = m32r.o cpu.o decode.o sem.o model.o mloop.o
 M32RX_OBJS = m32rx.o cpux.o decodex.o modelx.o mloopx.o
 M32R2_OBJS = m32r2.o cpu2.o decode2.o model2.o mloop2.o
-TRAPS_OBJ = @traps_obj@
 
 SIM_OBJS = \
        $(SIM_NEW_COMMON_OBJS) \
@@ -32,7 +31,7 @@ SIM_OBJS = \
        $(M32R_OBJS) \
        $(M32RX_OBJS) \
        $(M32R2_OBJS) \
-       $(TRAPS_OBJ)
+       traps.o
 
 SIM_EXTRA_HW_DEVICES = m32r_cache m32r_uart
 
@@ -42,8 +41,6 @@ SIM_EXTRA_DEPS = \
        arch.h cpuall.h m32r-sim.h $(srcdir)/../../opcodes/m32r-desc.h \
        eng.h engx.h eng2.h
 
-SIM_EXTRA_CFLAGS = @sim_extra_cflags@
-
 SIM_EXTRA_CLEAN = m32r-clean
 
 # Code doesn't build cleanly yet.