diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2023-01-01 13:41:16 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2023-01-10 01:15:28 -0500 |
| commit | 304195bcf89dc48c7a61b45beb1c2484908ae91c (patch) | |
| tree | 46a135bc520d05afceefc5370de87af8ed453cf6 | |
| parent | 2206990476c6064c55e3fdd061b88e4c28dabfdf (diff) | |
| download | gdb-304195bcf89dc48c7a61b45beb1c2484908ae91c.zip gdb-304195bcf89dc48c7a61b45beb1c2484908ae91c.tar.gz gdb-304195bcf89dc48c7a61b45beb1c2484908ae91c.tar.bz2 | |
sim: erc32: move arch-specific file compilation to top-level
The arch-specific flags are only used by the arch-specific modules,
not the common/ files, so we can delete them too.
| -rw-r--r-- | sim/Makefile.in | 6 | ||||
| -rw-r--r-- | sim/erc32/Makefile.in | 10 | ||||
| -rw-r--r-- | sim/erc32/local.mk | 11 |
3 files changed, 11 insertions, 16 deletions
diff --git a/sim/Makefile.in b/sim/Makefile.in index db85f5e..f7a693b 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -2236,6 +2236,9 @@ testsuite_common_CPPFLAGS = \ @SIM_ENABLE_ARCH_d10v_TRUE@d10v_gencode_SOURCES = d10v/gencode.c @SIM_ENABLE_ARCH_d10v_TRUE@d10v_gencode_LDADD = d10v/d10v-opc.o +@SIM_ENABLE_ARCH_erc32_TRUE@READLINE_SRC = $(srcroot)/readline/readline +@SIM_ENABLE_ARCH_erc32_TRUE@AM_CPPFLAGS_erc32 = $(READLINE_CFLAGS) \ +@SIM_ENABLE_ARCH_erc32_TRUE@ -DFAST_UART @SIM_ENABLE_ARCH_erc32_TRUE@erc32_libsim_a_SOURCES = @SIM_ENABLE_ARCH_erc32_TRUE@erc32_libsim_a_LIBADD = \ @SIM_ENABLE_ARCH_erc32_TRUE@ $(common_libcommon_a_OBJECTS) \ @@ -4863,9 +4866,6 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_d10v_TRUE@ $(AM_V_GEN)$< >$@ @SIM_ENABLE_ARCH_erc32_TRUE@$(erc32_libsim_a_OBJECTS) $(erc32_libsim_a_LIBADD): erc32/hw-config.h -@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) diff --git a/sim/erc32/Makefile.in b/sim/erc32/Makefile.in index 58afbe1..adff308 100644 --- a/sim/erc32/Makefile.in +++ b/sim/erc32/Makefile.in @@ -17,14 +17,4 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. ## COMMON_PRE_CONFIG_FRAG - -READLINE_SRC = $(srcroot)/readline/readline - -SIM_EXTRA_CFLAGS = $(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 += -DFAST_UART - ## COMMON_POST_CONFIG_FRAG diff --git a/sim/erc32/local.mk b/sim/erc32/local.mk index 7c95128..12aced4 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 <http://www.gnu.org/licenses/>. +READLINE_SRC = $(srcroot)/readline/readline +AM_CPPFLAGS_%C% = $(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% += -DFAST_UART + %C%_libsim_a_SOURCES = %C%_libsim_a_LIBADD = \ $(common_libcommon_a_OBJECTS) \ @@ -31,9 +39,6 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%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) |