From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 2B4713844007 for ; Tue, 3 Jan 2023 07:58:49 +0000 (GMT) Received: by smtp.gentoo.org (Postfix, from userid 559) id D578C340CE1; Tue, 3 Jan 2023 07:58:48 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 75/83] sim: build: drop AM_MAKEFLAGS settings Date: Tue, 3 Jan 2023 02:55:57 -0500 Message-Id: <20230103075605.13606-76-vapier@gentoo.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230103075605.13606-1-vapier@gentoo.org> References: <20230103075605.13606-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: We don't have any recursive builds anymore, so we can drop this logic. --- sim/Makefile.in | 335 +++++++++++++++++++++---------------------- sim/bfin/local.mk | 1 - sim/common/local.mk | 4 - sim/cris/local.mk | 1 - sim/lm32/local.mk | 1 - sim/m32r/local.mk | 1 - sim/m68hc11/local.mk | 1 - sim/mips/local.mk | 1 - sim/mn10300/local.mk | 1 - 9 files changed, 162 insertions(+), 184 deletions(-) diff --git a/sim/bfin/local.mk b/sim/bfin/local.mk index 90b697e9dcb0..17a5047fa240 100644 --- a/sim/bfin/local.mk +++ b/sim/bfin/local.mk @@ -78,7 +78,6 @@ noinst_PROGRAMS += %D%/run bfin_wdog \ bfin_wp \ eth_phy -AM_MAKEFLAGS += %C%_SIM_EXTRA_HW_DEVICES="$(%C%_SIM_EXTRA_HW_DEVICES)" %D%/linux-fixed-code.h: @MAINT@ $(srcdir)/%D%/linux-fixed-code.s %D%/local.mk %D%/$(am__dirstamp) $(AM_V_GEN)$(AS_FOR_TARGET_BFIN) $(srcdir)/%D%/linux-fixed-code.s -o %D%/linux-fixed-code.o diff --git a/sim/common/local.mk b/sim/common/local.mk index 0ed18359ae43..2c68f668d37c 100644 --- a/sim/common/local.mk +++ b/sim/common/local.mk @@ -106,16 +106,12 @@ SIM_NEW_COMMON_OBJS = \ sim-utils.o \ sim-watch.o -AM_MAKEFLAGS += SIM_NEW_COMMON_OBJS_="$(SIM_NEW_COMMON_OBJS)" - SIM_HW_DEVICES = cfi core pal glue if SIM_ENABLE_HW SIM_NEW_COMMON_OBJS += \ $(SIM_COMMON_HW_OBJS) \ $(SIM_HW_SOCKSER) - -AM_MAKEFLAGS += SIM_HW_DEVICES_="$(SIM_HW_DEVICES)" endif # FIXME This is one very simple-minded way of generating the file hw-config.h. diff --git a/sim/cris/local.mk b/sim/cris/local.mk index 78f40e03ec49..ef78c63062c2 100644 --- a/sim/cris/local.mk +++ b/sim/cris/local.mk @@ -59,7 +59,6 @@ noinst_LIBRARIES += %D%/libsim.a noinst_PROGRAMS += %D%/run %C%_SIM_EXTRA_HW_DEVICES = rv cris cris_900000xx -AM_MAKEFLAGS += %C%_SIM_EXTRA_HW_DEVICES="$(%C%_SIM_EXTRA_HW_DEVICES)" ## rvdummy is just used for testing -- it runs on the same host as `run`. ## It does nothing if --enable-sim-hardware isn't active. diff --git a/sim/lm32/local.mk b/sim/lm32/local.mk index f3e0567d73bf..1c286245cca1 100644 --- a/sim/lm32/local.mk +++ b/sim/lm32/local.mk @@ -56,7 +56,6 @@ noinst_LIBRARIES += %D%/libsim.a noinst_PROGRAMS += %D%/run %C%_SIM_EXTRA_HW_DEVICES = lm32cpu lm32timer lm32uart -AM_MAKEFLAGS += %C%_SIM_EXTRA_HW_DEVICES="$(%C%_SIM_EXTRA_HW_DEVICES)" ## List all generated headers to help Automake dependency tracking. BUILT_SOURCES += %D%/eng.h diff --git a/sim/m32r/local.mk b/sim/m32r/local.mk index 31178a3b034e..78c8a87a42eb 100644 --- a/sim/m32r/local.mk +++ b/sim/m32r/local.mk @@ -82,7 +82,6 @@ noinst_LIBRARIES += %D%/libsim.a noinst_PROGRAMS += %D%/run %C%_SIM_EXTRA_HW_DEVICES = m32r_cache m32r_uart -AM_MAKEFLAGS += %C%_SIM_EXTRA_HW_DEVICES="$(%C%_SIM_EXTRA_HW_DEVICES)" ## List all generated headers to help Automake dependency tracking. BUILT_SOURCES += \ diff --git a/sim/m68hc11/local.mk b/sim/m68hc11/local.mk index da4c25913d8f..8f881d5b854d 100644 --- a/sim/m68hc11/local.mk +++ b/sim/m68hc11/local.mk @@ -57,7 +57,6 @@ noinst_LIBRARIES += %D%/libsim.a noinst_PROGRAMS += %D%/run %C%_SIM_EXTRA_HW_DEVICES = m68hc11 m68hc11sio m68hc11eepr m68hc11tim m68hc11spi nvram -AM_MAKEFLAGS += %C%_SIM_EXTRA_HW_DEVICES="$(%C%_SIM_EXTRA_HW_DEVICES)" %C%_BUILD_OUTPUTS = \ %D%/gencode$(EXEEXT) \ diff --git a/sim/mips/local.mk b/sim/mips/local.mk index 136eebaacafa..e54a0ef6102e 100644 --- a/sim/mips/local.mk +++ b/sim/mips/local.mk @@ -86,7 +86,6 @@ noinst_LIBRARIES += %D%/libsim.a noinst_PROGRAMS += %D%/run %C%_SIM_EXTRA_HW_DEVICES = tx3904cpu tx3904irc tx3904tmr tx3904sio -AM_MAKEFLAGS += %C%_SIM_EXTRA_HW_DEVICES="$(%C%_SIM_EXTRA_HW_DEVICES)" ## List all generated headers to help Automake dependency tracking. BUILT_SOURCES += %D%/itable.h diff --git a/sim/mn10300/local.mk b/sim/mn10300/local.mk index 61c7f9188eaf..0c5d1bf59be4 100644 --- a/sim/mn10300/local.mk +++ b/sim/mn10300/local.mk @@ -53,7 +53,6 @@ noinst_LIBRARIES += %D%/libsim.a noinst_PROGRAMS += %D%/run %C%_SIM_EXTRA_HW_DEVICES = mn103cpu mn103int mn103tim mn103ser mn103iop -AM_MAKEFLAGS += %C%_SIM_EXTRA_HW_DEVICES="$(%C%_SIM_EXTRA_HW_DEVICES)" ## List all generated headers to help Automake dependency tracking. BUILT_SOURCES += \ -- 2.39.0