From f8069d55c1c9fac14d68d22c6f7681055c0fd6e0 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 21 Feb 2021 19:02:47 -0500 Subject: [PATCH] sim: delete redundant SIM_EXTRA_ALL 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/ChangeLog | 4 ++++ sim/README-HACKING | 2 -- sim/common/ChangeLog | 5 +++++ sim/common/Make-common.in | 4 +--- sim/erc32/ChangeLog | 5 +++++ sim/erc32/Makefile.in | 2 +- sim/mips/ChangeLog | 5 +++++ sim/mips/Makefile.in | 2 +- sim/msp430/ChangeLog | 4 ++++ sim/msp430/Makefile.in | 2 -- 10 files changed, 26 insertions(+), 9 deletions(-) diff --git a/sim/ChangeLog b/sim/ChangeLog index f96a5dd93a2..102fdc6f181 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,3 +1,7 @@ +2021-02-27 Mike Frysinger + + * README-HACKING: Delete SIM_EXTRA_ALL. + 2021-02-21 Mike Frysinger * m4/sim_ac_common.m4, m4/sim_ac_option_alignment.m4, diff --git a/sim/README-HACKING b/sim/README-HACKING index 0b72d96f5c2..fcf30624140 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/ChangeLog b/sim/common/ChangeLog index 75df703075c..9ff2e7a1cab 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,8 @@ +2021-02-27 Mike Frysinger + + * Make-common.in (SIM_EXTRA_ALL): Delete. + (all): Delete $(SIM_EXTRA_ALL). + 2021-02-21 Mike Frysinger * acinclude.m4: Removed. diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 99d55fb2038..84bd1be37db 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/ChangeLog b/sim/erc32/ChangeLog index b518ae5fe07..75c80893a19 100644 --- a/sim/erc32/ChangeLog +++ b/sim/erc32/ChangeLog @@ -1,3 +1,8 @@ +2021-02-27 Mike Frysinger + + * Makefile.in (SIM_EXTRA_ALL): Delete. + (all): New target. + 2021-02-21 Mike Frysinger * configure.ac (AC_CONFIG_MACRO_DIRS): Replace common with m4. diff --git a/sim/erc32/Makefile.in b/sim/erc32/Makefile.in index 406af1e682c..0006922904b 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/ChangeLog b/sim/mips/ChangeLog index 5b3517648f0..c9abba95140 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,3 +1,8 @@ +2021-02-27 Mike Frysinger + + * Makefile.in (SIM_EXTRA_ALL): Delete. + (all): New target. + 2021-02-21 Mike Frysinger * configure.ac (AC_CONFIG_MACRO_DIRS): Replace common with m4. diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in index 7f1c9163b69..c94bd11282b 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/ChangeLog b/sim/msp430/ChangeLog index 0234fd4e022..0d99dbbf330 100644 --- a/sim/msp430/ChangeLog +++ b/sim/msp430/ChangeLog @@ -1,3 +1,7 @@ +2021-02-27 Mike Frysinger + + * Makefile.in (SIM_EXTRA_ALL): Delete. + 2021-02-21 Mike Frysinger * configure.ac (AC_CONFIG_MACRO_DIRS): Replace common with m4. diff --git a/sim/msp430/Makefile.in b/sim/msp430/Makefile.in index 3c7e5ef910d..4bb13681a1e 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.2