From d2dfd2424284bedaade2a203a51ea82364270a92 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 15 Nov 2015 02:43:11 -0500 Subject: [PATCH] sim: clean up redundant objects Some of the target makefiles listed objects that were already pulled in via SIM_NEW_COMMON_OBJS. Clean those up. --- sim/ft32/ChangeLog | 5 +++++ sim/ft32/Makefile.in | 17 +---------------- sim/h8300/ChangeLog | 4 ++++ sim/h8300/Makefile.in | 3 +-- sim/lm32/ChangeLog | 4 ++++ sim/lm32/Makefile.in | 1 - sim/m68hc11/ChangeLog | 4 ++++ sim/m68hc11/Makefile.in | 1 - 8 files changed, 19 insertions(+), 20 deletions(-) diff --git a/sim/ft32/ChangeLog b/sim/ft32/ChangeLog index bb41fb80030..00ddbddeed5 100644 --- a/sim/ft32/ChangeLog +++ b/sim/ft32/ChangeLog @@ -1,3 +1,8 @@ +2015-11-14 Mike Frysinger + + * Makefile.in (SIM_OBJS): Delete objects listed in + SIM_NEW_COMMON_OBJS. + 2015-11-14 Mike Frysinger * interp.c (sim_close): Delete. diff --git a/sim/ft32/Makefile.in b/sim/ft32/Makefile.in index 69bf0609004..13dcfcbb7e4 100644 --- a/sim/ft32/Makefile.in +++ b/sim/ft32/Makefile.in @@ -21,25 +21,10 @@ SIM_OBJS = \ $(SIM_NEW_COMMON_OBJS) \ interp.o \ - sim-bits.o \ - sim-config.o \ - sim-core.o \ - sim-endian.o \ - sim-events.o \ - sim-fpu.o \ sim-hload.o \ - sim-io.o \ - sim-load.o \ - sim-memopt.o \ - sim-module.o \ - sim-options.o \ - sim-profile.o \ sim-reason.o \ sim-reg.o \ sim-resume.o \ - sim-signal.o \ - sim-stop.o \ - sim-trace.o \ - sim-utils.o + sim-stop.o ## COMMON_POST_CONFIG_FRAG diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog index b50c1a1e893..2a12f28df79 100644 --- a/sim/h8300/ChangeLog +++ b/sim/h8300/ChangeLog @@ -1,3 +1,7 @@ +2015-11-14 Mike Frysinger + + * Makefile.in (SIM_OBJS): Delete sim-load.o. + 2015-11-14 Mike Frysinger * compile.c (sim_close): Delete. diff --git a/sim/h8300/Makefile.in b/sim/h8300/Makefile.in index da68255b6bc..c8e2ac7e16c 100644 --- a/sim/h8300/Makefile.in +++ b/sim/h8300/Makefile.in @@ -18,8 +18,7 @@ ## COMMON_PRE_CONFIG_FRAG SIM_OBJS = compile.o \ - $(SIM_NEW_COMMON_OBJS) \ - sim-load.o + $(SIM_NEW_COMMON_OBJS) ## COMMON_POST_CONFIG_FRAG diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog index 59d3aa12509..e55d42fa2b6 100644 --- a/sim/lm32/ChangeLog +++ b/sim/lm32/ChangeLog @@ -1,3 +1,7 @@ +2015-11-14 Mike Frysinger + + * Makefile.in (SIM_OBJS): Delete sim-signal.o. + 2015-11-14 Mike Frysinger * sim-if.c (sim_close): Delete. diff --git a/sim/lm32/Makefile.in b/sim/lm32/Makefile.in index 8bbe01463dc..64e74838126 100644 --- a/sim/lm32/Makefile.in +++ b/sim/lm32/Makefile.in @@ -9,7 +9,6 @@ SIM_OBJS = \ sim-hload.o \ sim-model.o \ sim-reg.o \ - sim-signal.o \ cgen-utils.o cgen-trace.o cgen-scache.o \ cgen-run.o sim-reason.o sim-stop.o \ sim-if.o arch.o \ diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog index ba2db62b6e2..ba8df9616a8 100644 --- a/sim/m68hc11/ChangeLog +++ b/sim/m68hc11/ChangeLog @@ -1,3 +1,7 @@ +2015-11-14 Mike Frysinger + + * Makefile.in (SIM_OBJS): Delete sim-load.o. + 2015-11-14 Mike Frysinger * interp.c (sim_close): Delete. diff --git a/sim/m68hc11/Makefile.in b/sim/m68hc11/Makefile.in index 98b811a2648..f1c80484bf8 100644 --- a/sim/m68hc11/Makefile.in +++ b/sim/m68hc11/Makefile.in @@ -22,7 +22,6 @@ M68HC11_OBJS = interp.o m68hc11int.o m68hc12int.o \ SIM_OBJS = $(M68HC11_OBJS) \ $(SIM_NEW_COMMON_OBJS) \ - sim-load.o \ sim-hload.o \ sim-stop.o \ sim-reason.o \ -- 2.30.2