From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 560E23861881 for ; Mon, 22 Feb 2021 00:11:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 560E23861881 Received: from vapier.lan (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 9FE9C340F8C for ; Mon, 22 Feb 2021 00:11:22 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 1/2] sim: delete redundant SIM_EXTRA_ALL Date: Sun, 21 Feb 2021 19:11:16 -0500 Message-Id: <20210222001117.7973-1-vapier@gentoo.org> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Feb 2021 00:11:24 -0000 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