[PATCH 1/2] sim: delete redundant SIM_EXTRA_ALL

[PATCH 1/2] sim: delete redundant SIM_EXTRA_ALL

[Mike Frysinger]

We don't need a variable to add a dependency to the "all" target, and
having one doesn't really add value.  Switch to the target directly for
the few ports that actually use this.
---
 sim/README-HACKING        | 2 --
 sim/common/Make-common.in | 4 +---
 sim/erc32/Makefile.in     | 2 +-
 sim/mips/Makefile.in      | 2 +-
 sim/msp430/Makefile.in    | 2 --
 5 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/sim/README-HACKING b/sim/README-HACKING
index 0b72d96f5c2f..fcf306241409 100644
--- a/sim/README-HACKING
+++ b/sim/README-HACKING
@@ -85,8 +85,6 @@ SIM_EXTRA_CFLAGS =
 SIM_EXTRA_LIBS =
 # List of extra program dependencies.
 SIM_EXTRA_LIBDEPS =
-# Dependency of `all' to build any extra files.
-SIM_EXTRA_ALL =
 # Dependency of `install' to install any extra files.
 SIM_EXTRA_INSTALL =
 # Dependency of `clean' to clean any extra files.
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 99d55fb20383..84bd1be37dba 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -128,8 +128,6 @@ SIM_EXTRA_LIBS =
 SIM_EXTRA_LIBDEPS =
 # List of main object files for `run'.
 SIM_RUN_OBJS = nrun.o
-# Dependency of `all' to build any extra files.
-SIM_EXTRA_ALL =
 # Dependency of `install' to install any extra files.
 SIM_EXTRA_INSTALL =
 # Dependency of `clean' to clean any extra files.
@@ -258,7 +256,7 @@ RUNTESTFLAGS =
 callback_h = $(srcroot)/include/gdb/callback.h
 remote_sim_h = $(srcroot)/include/gdb/remote-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
diff --git a/sim/erc32/Makefile.in b/sim/erc32/Makefile.in
index 406af1e682c3..0006922904b1 100644
--- a/sim/erc32/Makefile.in
+++ b/sim/erc32/Makefile.in
@@ -24,7 +24,6 @@ READLINE_LIB = @READLINE@
 SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o
 SIM_RUN_OBJS = sis.o
 SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm
-SIM_EXTRA_ALL = sis
 SIM_EXTRA_INSTALL = install-sis
 SIM_EXTRA_CLEAN = clean-sis
 
@@ -38,6 +37,7 @@ SIM_EXTRA_CFLAGS = -DFAST_UART -I$(srcroot)
 # `sis' doesn't need interf.o.
 SIS_OFILES = exec.o erc32.o func.o help.o float.o
 
+all: sis
 sis: sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS)
 	$(CC) $(ALL_CFLAGS) -o sis \
 	  sis.o $(SIS_OFILES) $(COMMON_OBJS) $(EXTRA_LIBS)
diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in
index 7f1c9163b696..c94bd11282b8 100644
--- a/sim/mips/Makefile.in
+++ b/sim/mips/Makefile.in
@@ -79,7 +79,7 @@ SIM_EXTRA_CFLAGS = $(SIM_SUBTARGET)
 SIM_EXTRA_CLEAN = clean-extra
 SIM_EXTRA_DISTCLEAN = distclean-extra
 
-SIM_EXTRA_ALL = $(SIM_@sim_gen@_ALL)
+all: $(SIM_@sim_gen@_ALL)
 
 SIM_EXTRA_LIBS = $(MIPS_EXTRA_LIBS)
 
diff --git a/sim/msp430/Makefile.in b/sim/msp430/Makefile.in
index 3c7e5ef910d1..4bb13681a1e2 100644
--- a/sim/msp430/Makefile.in
+++ b/sim/msp430/Makefile.in
@@ -38,8 +38,6 @@ SIM_EXTRA_CFLAGS =
 SIM_EXTRA_LIBS =
 # List of extra program dependencies.
 SIM_EXTRA_LIBDEPS =
-# Dependency of `all' to build any extra files.
-SIM_EXTRA_ALL =
 # Dependency of `install' to install any extra files.
 SIM_EXTRA_INSTALL =
 # Dependency of `clean' to clean any extra files.
-- 
2.30.0

[PATCH 2/2] sim: delete unused SIM_EXTRA_LIBDEPS

[Mike Frysinger]

This was last used 15 years ago, so clearly not important enough to
keep around.  Punt it.
---
 sim/README-HACKING        | 2 --
 sim/common/Make-common.in | 5 +----
 sim/msp430/Makefile.in    | 2 --
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/sim/README-HACKING b/sim/README-HACKING
index fcf306241409..0a1a3b55c1ef 100644
--- a/sim/README-HACKING
+++ b/sim/README-HACKING
@@ -83,8 +83,6 @@ SIM_EXTRA_DEPS =
 SIM_EXTRA_CFLAGS =
 # List of extra libraries to link with.
 SIM_EXTRA_LIBS =
-# List of extra program dependencies.
-SIM_EXTRA_LIBDEPS =
 # Dependency of `install' to install any extra files.
 SIM_EXTRA_INSTALL =
 # Dependency of `clean' to clean any extra files.
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 84bd1be37dba..3f16dc476ef5 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -124,8 +124,6 @@ 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 = nrun.o
 # Dependency of `install' to install any extra files.
@@ -244,8 +242,7 @@ OPCODES_LIB = ../../opcodes/libopcodes.a
 LIBINTL = @LIBINTL@
 LIBINTL_DEP = @LIBINTL_DEP@
 CONFIG_LIBS = @LIBS@ $(ZLIB)
-LIBDEPS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL_DEP) $(LIBIBERTY_LIB) \
-	$(SIM_EXTRA_LIBDEPS)
+LIBDEPS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL_DEP) $(LIBIBERTY_LIB)
 EXTRA_LIBS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL) $(LIBIBERTY_LIB) \
 	$(CONFIG_LIBS) $(SIM_EXTRA_LIBS) $(LIBDL)
 
diff --git a/sim/msp430/Makefile.in b/sim/msp430/Makefile.in
index 4bb13681a1e2..113f28d3c903 100644
--- a/sim/msp430/Makefile.in
+++ b/sim/msp430/Makefile.in
@@ -36,8 +36,6 @@ SIM_EXTRA_DEPS =
 SIM_EXTRA_CFLAGS =
 # List of extra libraries to link with.
 SIM_EXTRA_LIBS =
-# List of extra program dependencies.
-SIM_EXTRA_LIBDEPS =
 # Dependency of `install' to install any extra files.
 SIM_EXTRA_INSTALL =
 # Dependency of `clean' to clean any extra files.
-- 
2.30.0