From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 669793858C52; Tue, 10 Jan 2023 06:26:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 669793858C52 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673331983; bh=pBm2hqK5+q/vRQxcUBUH7AAIdya5jvoeEyNNinr0hyc=; h=From:To:Subject:Date:From; b=t8jD6zWWzGpZIukjRGjTLQyfJ0jKYstq7oc5Yw3r1L6PVy4BZUsKMqAVTa35v7nFK MmwACqPOTa5nnSa2y2itiXgOpnn8LOK+R67uABJXiHBqJDfIwMMzLOie6vmMiEWTI/ KOcailzctnFNXUbv941yxccA1ZzTytM/CTBlLQ3E= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: gdb-cvs@sourceware.org Subject: [binutils-gdb] sim: erc32: move arch-specific file compilation to top-level X-Act-Checkin: binutils-gdb X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: 2206990476c6064c55e3fdd061b88e4c28dabfdf X-Git-Newrev: 304195bcf89dc48c7a61b45beb1c2484908ae91c Message-Id: <20230110062623.669793858C52@sourceware.org> Date: Tue, 10 Jan 2023 06:26:23 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D304195bcf89d= c48c7a61b45beb1c2484908ae91c commit 304195bcf89dc48c7a61b45beb1c2484908ae91c Author: Mike Frysinger Date: Sun Jan 1 13:41:16 2023 -0500 sim: erc32: move arch-specific file compilation to top-level =20 The arch-specific flags are only used by the arch-specific modules, not the common/ files, so we can delete them too. Diff: --- sim/Makefile.in | 6 +++--- sim/erc32/Makefile.in | 10 ---------- sim/erc32/local.mk | 11 ++++++++--- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index db85f5efda9..f7a693b9d42 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -2236,6 +2236,9 @@ testsuite_common_CPPFLAGS =3D \ =20 @SIM_ENABLE_ARCH_d10v_TRUE@d10v_gencode_SOURCES =3D d10v/gencode.c @SIM_ENABLE_ARCH_d10v_TRUE@d10v_gencode_LDADD =3D d10v/d10v-opc.o +@SIM_ENABLE_ARCH_erc32_TRUE@READLINE_SRC =3D $(srcroot)/readline/readline +@SIM_ENABLE_ARCH_erc32_TRUE@AM_CPPFLAGS_erc32 =3D $(READLINE_CFLAGS) \ +@SIM_ENABLE_ARCH_erc32_TRUE@ -DFAST_UART @SIM_ENABLE_ARCH_erc32_TRUE@erc32_libsim_a_SOURCES =3D=20 @SIM_ENABLE_ARCH_erc32_TRUE@erc32_libsim_a_LIBADD =3D \ @SIM_ENABLE_ARCH_erc32_TRUE@ $(common_libcommon_a_OBJECTS) \ @@ -4863,9 +4866,6 @@ testsuite/common/bits64m63.c: testsuite/common/bits-g= en$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_d10v_TRUE@ $(AM_V_GEN)$< >$@ @SIM_ENABLE_ARCH_erc32_TRUE@$(erc32_libsim_a_OBJECTS) $(erc32_libsim_a_LIB= ADD): erc32/hw-config.h =20 -@SIM_ENABLE_ARCH_erc32_TRUE@erc32/%.o: erc32/%.c -@SIM_ENABLE_ARCH_erc32_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(= @F) - @SIM_ENABLE_ARCH_erc32_TRUE@erc32/%.o: common/%.c @SIM_ENABLE_ARCH_erc32_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(= @F) =20 diff --git a/sim/erc32/Makefile.in b/sim/erc32/Makefile.in index 58afbe1f747..adff308c23b 100644 --- a/sim/erc32/Makefile.in +++ b/sim/erc32/Makefile.in @@ -17,14 +17,4 @@ # along with this program. If not, see . =20 ## COMMON_PRE_CONFIG_FRAG - -READLINE_SRC =3D $(srcroot)/readline/readline - -SIM_EXTRA_CFLAGS =3D $(READLINE_CFLAGS) - -# UARTS run at about 115200 baud (simulator time). Add -DFAST_UART to -# CFLAGS if faster (infinite) UART speed is desired. Might affect the -# behaviour of UART interrupt routines ... -SIM_EXTRA_CFLAGS +=3D -DFAST_UART - ## COMMON_POST_CONFIG_FRAG diff --git a/sim/erc32/local.mk b/sim/erc32/local.mk index 7c95128a166..12aced4bafa 100644 --- a/sim/erc32/local.mk +++ b/sim/erc32/local.mk @@ -17,6 +17,14 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . =20 +READLINE_SRC =3D $(srcroot)/readline/readline +AM_CPPFLAGS_%C% =3D $(READLINE_CFLAGS) + +## UARTS run at about 115200 baud (simulator time). Add -DFAST_UART to +## CFLAGS if faster (infinite) UART speed is desired. Might affect the +## behaviour of UART interrupt routines ... +AM_CPPFLAGS_%C% +=3D -DFAST_UART + %C%_libsim_a_SOURCES =3D %C%_libsim_a_LIBADD =3D \ $(common_libcommon_a_OBJECTS) \ @@ -31,9 +39,6 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-co= nfig.h =20 noinst_LIBRARIES +=3D %D%/libsim.a =20 -%D%/%.o: %D%/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) - %D%/%.o: common/%.c $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)