From c6c7769d9dd166c45bd9d422e91ca537752c0382 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 8 Mar 2021 01:41:35 -0500 Subject: [PATCH] sim: introduce {COMPILE,LINK}_FOR_BUILD These use the same pattern as seen in the opcodes/ dir and in automake in general (ish). This helps simplify the boilerplate for building and linking build-time code, and fixes some inconsistency in flag usage. For rules that were compiling+linking in a single step, split them into separate steps so we can apply the correct set of options. This matches automake behavior too. --- sim/common/ChangeLog | 6 +++++ sim/common/Make-common.in | 10 ++++++-- sim/cr16/ChangeLog | 5 ++++ sim/cr16/Makefile.in | 6 ++--- sim/d10v/ChangeLog | 5 ++++ sim/d10v/Makefile.in | 6 ++--- sim/igen/ChangeLog | 7 ++++++ sim/igen/Makefile.in | 21 +++++++++------- sim/m32c/ChangeLog | 5 ++++ sim/m32c/Makefile.in | 6 ++--- sim/m68hc11/ChangeLog | 5 ++++ sim/m68hc11/Makefile.in | 7 ++++-- sim/ppc/ChangeLog | 7 ++++++ sim/ppc/Makefile.in | 51 +++++++++++++++++++++------------------ sim/sh/ChangeLog | 5 ++++ sim/sh/Makefile.in | 8 +++--- 16 files changed, 111 insertions(+), 49 deletions(-) diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 6b6df9282b0..8d48933c835 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,9 @@ +2021-03-13 Mike Frysinger + + * Make-common.in (COMPILE_FOR_BUILD, LINK_FOR_BUILD): Define. + (gentmap.o): New rule. + (gentmap): Call LINK_FOR_BUILD. + 2021-03-07 Mike Frysinger * Make-common.in (check): Delete body. diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index cf92e94993c..8b35deb5167 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -248,6 +248,9 @@ EXTRA_LIBS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL) $(LIBIBERTY_LIB) \ LIB_OBJS = callback.o syscall.o targ-map.o version.o $(SIM_OBJS) +COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) +LINK_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ + RUNTESTFLAGS = callback_h = $(srcroot)/include/gdb/callback.h @@ -269,8 +272,11 @@ run$(EXEEXT): $(SIM_RUN_OBJS) libsim.a $(LIBDEPS) # devo/libremote because this directory would contain more than just # a library). -gentmap: Makefile $(srccom)/gentmap.c $(srccom)/nltvals.def - $(CC_FOR_BUILD) $(srccom)/gentmap.c -o gentmap $(BUILD_CFLAGS) $(NL_TARGET) +gentmap.o: Makefile $(srccom)/gentmap.c $(srccom)/nltvals.def + $(COMPILE_FOR_BUILD) -o $@ -c $(srccom)/gentmap.c $(NL_TARGET) + +gentmap: gentmap.o + $(LINK_FOR_BUILD) $< targ-vals.h targ-map.c: stamp-tvals stamp-tvals: gentmap diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog index 7742e7f173b..500a625a553 100644 --- a/sim/cr16/ChangeLog +++ b/sim/cr16/ChangeLog @@ -1,3 +1,8 @@ +2021-03-13 Mike Frysinger + + * Makefile.in (gencode.o, cr16-opc.o): Call COMPILE_FOR_BUILD. + (gencode): Call LINK_FOR_BUILD. + 2021-03-08 Mike Frysinger * Makefile.in (gencode): Delete $(BUILD_LIB). diff --git a/sim/cr16/Makefile.in b/sim/cr16/Makefile.in index 8a5deb9e5d3..7be0537985b 100644 --- a/sim/cr16/Makefile.in +++ b/sim/cr16/Makefile.in @@ -42,13 +42,13 @@ table.c: gencode simops.h ./gencode >$@ gencode.o: gencode.c $(INCLUDE) - $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(WARN_CFLAGS) -c $(srcdir)/gencode.c + $(COMPILE_FOR_BUILD) $(WARN_CFLAGS) -c $(srcdir)/gencode.c cr16-opc.o: $(srcdir)/../../opcodes/cr16-opc.c - $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(WARN_CFLAGS) -c $(srcdir)/../../opcodes/cr16-opc.c + $(COMPILE_FOR_BUILD) $(WARN_CFLAGS) -c $(srcdir)/../../opcodes/cr16-opc.c gencode: gencode.o cr16-opc.o - $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o gencode gencode.o cr16-opc.o + $(LINK_FOR_BUILD) gencode.o cr16-opc.o clean-extra: rm -f table.c simops.h gencode diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog index cddd70c3801..c1deba13659 100644 --- a/sim/d10v/ChangeLog +++ b/sim/d10v/ChangeLog @@ -1,3 +1,8 @@ +2021-03-13 Mike Frysinger + + * Makefile.in (gencode.o, d10v-opc.o): Call COMPILE_FOR_BUILD. + (gencode): Call LINK_FOR_BUILD. + 2021-03-08 Mike Frysinger * Makefile.in (gencode): Delete $(BUILD_LIB). diff --git a/sim/d10v/Makefile.in b/sim/d10v/Makefile.in index cb5159b259b..c2907fc5879 100644 --- a/sim/d10v/Makefile.in +++ b/sim/d10v/Makefile.in @@ -43,13 +43,13 @@ table.c: gencode simops.h ./gencode >$@ gencode.o: gencode.c $(INCLUDE) - $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(WARN_CFLAGS) -c $(srcdir)/gencode.c + $(COMPILE_FOR_BUILD) $(WARN_CFLAGS) -c $(srcdir)/gencode.c d10v-opc.o: $(srcdir)/../../opcodes/d10v-opc.c - $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(WARN_CFLAGS) -c $(srcdir)/../../opcodes/d10v-opc.c + $(COMPILE_FOR_BUILD) $(WARN_CFLAGS) -c $(srcdir)/../../opcodes/d10v-opc.c gencode: gencode.o d10v-opc.o - $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o gencode gencode.o d10v-opc.o + $(LINK_FOR_BUILD) gencode.o d10v-opc.o clean-extra: rm -f table.c simops.h gencode diff --git a/sim/igen/ChangeLog b/sim/igen/ChangeLog index 2d647c4fce4..5ee1c7a66b7 100644 --- a/sim/igen/ChangeLog +++ b/sim/igen/ChangeLog @@ -1,3 +1,10 @@ +2021-03-13 Mike Frysinger + + * Makefile.in (COMPILE_FOR_BUILD, LINK_FOR_BUILD): Define. + (.c.o, igen.o): Call COMPILE_FOR_BUILD. + (igen, tmp-table, tmp-filter, tmp-ld-decode, tmp-ld-cache, tmp-ld-insn, + tmp-gen): Call LINK_FOR_BUILD. + 2021-03-08 Mike Frysinger * Makefile.in (tmp-table, tmp-filter, tmp-ld-decode, tmp-ld-cache, diff --git a/sim/igen/Makefile.in b/sim/igen/Makefile.in index 5976c4c008c..60626adafc3 100644 --- a/sim/igen/Makefile.in +++ b/sim/igen/Makefile.in @@ -82,11 +82,14 @@ BUILD_CFLAGS = \ $(INCLUDES) BUILD_LDFLAGS = +COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) +LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(BUILD_LDFLAGS) -o $@ + all: igen #all: tmp-filter tmp-table tmp-ld-insn tmp-ld-cache tmp-ld-decode tmp-gen .c.o: - $(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $< + $(COMPILE_FOR_BUILD) -c $< IGEN_OBJS=\ table.o \ @@ -106,28 +109,28 @@ IGEN_OBJS=\ gen.o igen: igen.o $(IGEN_OBJS) - $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o igen igen.o $(IGEN_OBJS) + $(LINK_FOR_BUILD) igen.o $(IGEN_OBJS) igen.o: igen.c misc.h filter_host.h lf.h table.h ld-decode.h ld-cache.h ld-insn.h filter.h gen-model.h gen-itable.h gen-icache.h gen-idecode.h gen-engine.h gen-semantics.h gen-support.h gen.h igen.h - $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/igen.c + $(COMPILE_FOR_BUILD) -c $(srcdir)/igen.c tmp-table: table.c table.h misc.o lf.o filter_host.o - $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o tmp-table -DMAIN $(srcdir)/table.c misc.o lf.o filter_host.o + $(LINK_FOR_BUILD) -DMAIN $(srcdir)/table.c misc.o lf.o filter_host.o tmp-filter: filter.c filter.h lf.o misc.o filter_host.o - $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o tmp-filter -DMAIN $(srcdir)/filter.c lf.o misc.o filter_host.o + $(LINK_FOR_BUILD) -DMAIN $(srcdir)/filter.c lf.o misc.o filter_host.o tmp-ld-decode: ld-decode.h ld-decode.c filter.o misc.o lf.o table.o filter_host.o gen.h igen.h - $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o tmp-ld-decode -DMAIN $(srcdir)/ld-decode.c filter.o misc.o lf.o table.o filter_host.o + $(LINK_FOR_BUILD) -DMAIN $(srcdir)/ld-decode.c filter.o misc.o lf.o table.o filter_host.o tmp-ld-cache: ld-cache.c ld-cache.h ld-insn.o misc.o lf.o table.o filter_host.o gen.h igen.h - $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o tmp-ld-cache -DMAIN $(srcdir)/ld-cache.c ld-insn.o filter.o misc.o lf.o table.o filter_host.o + $(LINK_FOR_BUILD) -DMAIN $(srcdir)/ld-cache.c ld-insn.o filter.o misc.o lf.o table.o filter_host.o tmp-ld-insn: ld-insn.c ld-insn.h misc.o lf.o table.o filter_host.o filter.o gen.h igen.h - $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o tmp-ld-insn -DMAIN $(srcdir)/ld-insn.c misc.o lf.o table.o filter_host.o filter.o + $(LINK_FOR_BUILD) -DMAIN $(srcdir)/ld-insn.c misc.o lf.o table.o filter_host.o filter.o tmp-gen: gen.c gen.h ld-insn.o ld-decode.o misc.o lf.o table.o filter_host.o filter.o gen.h igen.h - $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o tmp-gen -DMAIN $(srcdir)/gen.c misc.o ld-insn.o ld-decode.o lf.o table.o filter_host.o filter.o + $(LINK_FOR_BUILD) -DMAIN $(srcdir)/gen.c misc.o ld-insn.o ld-decode.o lf.o table.o filter_host.o filter.o filter_host.o: filter_host.c filter_host.h table.o: table.c misc.h filter_host.h lf.h table.h diff --git a/sim/m32c/ChangeLog b/sim/m32c/ChangeLog index d9997c7bded..85fd5c2f2b9 100644 --- a/sim/m32c/ChangeLog +++ b/sim/m32c/ChangeLog @@ -1,3 +1,8 @@ +2021-03-13 Mike Frysinger + + * Makefile.in (opc2c.o, safe-fgets.o): Call COMPILE_FOR_BUILD. + (opc2c): Call LINK_FOR_BUILD. + 2021-03-08 Mike Frysinger * Makefile.in (opc2c): Delete $(BUILD_LIBS). diff --git a/sim/m32c/Makefile.in b/sim/m32c/Makefile.in index 91f52a7a42b..6bc5c5b743d 100644 --- a/sim/m32c/Makefile.in +++ b/sim/m32c/Makefile.in @@ -53,13 +53,13 @@ m32c.c : m32c.opc opc2c ./opc2c -l m32c.out $(srcdir)/m32c.opc > m32c.c opc2c : opc2c.o safe-fgets.o - $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) $^ -o $@ + $(LINK_FOR_BUILD) $^ encodings: grep '/\* [01]' $(srcdir)/r8c.opc | sort opc2c.o : opc2c.c safe-fgets.h - $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/opc2c.c + $(COMPILE_FOR_BUILD) -c $(srcdir)/opc2c.c safe-fgets.o : safe-fgets.c safe-fgets.h - $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/safe-fgets.c + $(COMPILE_FOR_BUILD) -c $(srcdir)/safe-fgets.c diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog index b25e29af542..3fddeff1722 100644 --- a/sim/m68hc11/ChangeLog +++ b/sim/m68hc11/ChangeLog @@ -1,3 +1,8 @@ +2021-03-13 Mike Frysinger + + * Makefile.in (gencode.o): New rule. + (gencode): Call LINK_FOR_BUILD. + 2021-02-28 Mike Frysinger * configure: Regenerate. diff --git a/sim/m68hc11/Makefile.in b/sim/m68hc11/Makefile.in index 66493b6c062..9e2248fc638 100644 --- a/sim/m68hc11/Makefile.in +++ b/sim/m68hc11/Makefile.in @@ -48,8 +48,11 @@ m68hc11int.c: gencode m68hc12int.c: gencode ./gencode -m6812 > $@ -gencode: gencode.c - $(CC_FOR_BUILD) $(BUILD_CFLAGS) -o gencode $(srcdir)/gencode.c +gencode.o: gencode.c + $(COMPILE_FOR_BUILD) -c $< -o $@ + +gencode: gencode.o + $(LINK_FOR_BUILD) $^ interp.o: interp.c $(INCLUDE) diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog index 4dd82e17bcc..61bb3d95a23 100644 --- a/sim/ppc/ChangeLog +++ b/sim/ppc/ChangeLog @@ -1,3 +1,10 @@ +2021-03-13 Mike Frysinger + + * Makefile.in (COMPILE_FOR_BUILD, LINK_FOR_BUILD): Define. + Change $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) to + $(LINK_FOR_BUILD). Change $(CC_FOR_BUILD) $(BUILD_CFLAGS) to + $(COMPILE_FOR_BUILD). + 2021-03-08 Mike Frysinger * Makefile.in (gentmap, dgen, igen, tmp-filter, tmp-ld-decode, diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index 3ff8cedebb8..8c586350b9d 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -110,6 +110,9 @@ BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(INCLUDES) $(WARNING_CFLAGS) BUILD_LDFLAGS = LIBS = @LIBS@ +COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) +LINK_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ + CONFIG_FILE = @sim_config@ IGEN_OPCODE_RULES = @sim_opcode@ IGEN_DECODE_MECHANISM = @sim_decode_mechanism@ @@ -618,8 +621,8 @@ mon.o: mon.c $(BASICS_H) $(CPU_H) $(MON_H) # GDB after 4.16 expects the default_callback structure to be setup. # As a kludge, build the common stuff here for now. gentmap: $(srcdir)/../common/gentmap.c Makefile targ-vals.def - $(CC_FOR_BUILD) $(BUILD_CFLAGS) -I. -I../common -I$(srcdir)/../common \ - -o gentmap $(srcdir)/../common/gentmap.c + $(LINK_FOR_BUILD) -I. -I../common -I$(srcdir)/../common \ + $(srcdir)/../common/gentmap.c targ-vals.def: $(srcdir)/../common/nltvals.def rm -f targ-vals.def tmp-def @@ -709,69 +712,69 @@ itable.h itable.c icache.h icache.c idecode.h idecode.c semantics.h semantics.c spreg.h spreg.c: tmp-dgen dgen: dgen.o table.o lf.o misc.o filter_host.o - $(CC_FOR_BUILD) $(BUILD_CFLAGS) -o dgen dgen.o table.o lf.o misc.o filter_host.o + $(LINK_FOR_BUILD) dgen.o table.o lf.o misc.o filter_host.o igen: igen.o table.o lf.o misc.o filter_host.o ld-decode.o ld-cache.o filter.o ld-insn.o gen-model.o gen-itable.o gen-icache.o gen-semantics.o gen-idecode.o gen-support.o - $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o igen igen.o table.o lf.o misc.o filter_host.o ld-decode.o ld-cache.o filter.o ld-insn.o gen-model.o gen-itable.o gen-icache.o gen-semantics.o gen-idecode.o gen-support.o + $(LINK_FOR_BUILD) igen.o table.o lf.o misc.o filter_host.o ld-decode.o ld-cache.o filter.o ld-insn.o gen-model.o gen-itable.o gen-icache.o gen-semantics.o gen-idecode.o gen-support.o filter_host.c: filter_filename.c cat $(srcdir)/filter_filename.c > filter_host.c filter_host.o: filter_host.c $(CONFIG_H) $(PPC_CONFIG_H) $(FILTER_FILENAME_H) - $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c filter_host.c + $(COMPILE_FOR_BUILD) -c filter_host.c table.o: table.c $(CONFIG_H) $(MISC_H) $(LF_H) $(TABLE_H) - $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/table.c + $(COMPILE_FOR_BUILD) -c $(srcdir)/table.c lf.o: lf.c $(CONFIG_H) $(MISC_H) $(LF_H) - $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/lf.c + $(COMPILE_FOR_BUILD) -c $(srcdir)/lf.c filter.o: filter.c $(CONFIG_H) $(MISC_H) $(FILTER_H) - $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/filter.c + $(COMPILE_FOR_BUILD) -c $(srcdir)/filter.c tmp-filter: filter.c $(MISC_H) misc.o - $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o tmp-filter -DMAIN $(srcdir)/filter.c misc.o + $(LINK_FOR_BUILD) -DMAIN $(srcdir)/filter.c misc.o ld-decode.o: ld-decode.c $(MISC_H) $(LF_H) $(TABLE_H) $(LD_DECODE_H) - $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/ld-decode.c + $(COMPILE_FOR_BUILD) -c $(srcdir)/ld-decode.c tmp-ld-decode: ld-decode.c misc.o lf.o table.o filter_host.o - $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o tmp-ld-decode -DMAIN $(srcdir)/ld-decode.c misc.o lf.o table.o filter_host.o + $(LINK_FOR_BUILD) -DMAIN $(srcdir)/ld-decode.c misc.o lf.o table.o filter_host.o ld-cache.o: ld-cache.c $(MISC_H) $(LF_H) $(TABLE_H) $(LD_CACHE_H) - $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/ld-cache.c + $(COMPILE_FOR_BUILD) -c $(srcdir)/ld-cache.c tmp-ld-cache: ld-cache.c misc.o lf.o table.o filter_host.o - $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o tmp-ld-cache -DMAIN $(srcdir)/ld-cache.c misc.o lf.o table.o filter_host.o + $(LINK_FOR_BUILD) -DMAIN $(srcdir)/ld-cache.c misc.o lf.o table.o filter_host.o ld-insn.o: ld-insn.c $(MISC_H) $(LF_H) $(TABLE_H) $(FILTER_H) $(LD_DECODE_H) $(LD_CACHE_H) $(LD_INSN_H) $(IGEN_H) - $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/ld-insn.c + $(COMPILE_FOR_BUILD) -c $(srcdir)/ld-insn.c tmp-ld-insn: ld-insn.c ld-cache.o misc.o lf.o table.o ld-decode.o filter_host.o filter.o - $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o tmp-ld-insn -DMAIN $(srcdir)/ld-insn.c ld-cache.o misc.o lf.o table.o ld-decode.o filter_host.o filter.o + $(LINK_FOR_BUILD) -DMAIN $(srcdir)/ld-insn.c ld-cache.o misc.o lf.o table.o ld-decode.o filter_host.o filter.o gen-model.o: gen-model.c $(MISC_H) $(LF_H) $(TABLE_H) $(FILTER_H) $(LD_CACHE_H) $(LD_DECODE_H) $(LD_INSN_H) $(GEN_MODEL_H) - $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/gen-model.c + $(COMPILE_FOR_BUILD) -c $(srcdir)/gen-model.c gen-itable.o: gen-itable.c $(MISC_H) $(LF_H) $(TABLE_H) $(FILTER_H) $(LD_CACHE_H) $(LD_DECODE_H) $(LD_INSN_H) $(IGEN_H) $(GEN_ITABLE_H) - $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/gen-itable.c + $(COMPILE_FOR_BUILD) -c $(srcdir)/gen-itable.c gen-icache.o: gen-icache.c $(MISC_H) $(LF_H) $(TABLE_H) $(FILTER_H) $(LD_DECODE_H) $(LD_CACHE_H) $(LD_INSN_H) $(IGEN_H) $(GEN_SEMANTICS_H) $(GEN_IDECODE_H) $(GEN_ICACHE_H) - $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/gen-icache.c + $(COMPILE_FOR_BUILD) -c $(srcdir)/gen-icache.c gen-semantics.o: gen-semantics.c $(MISC_H) $(LF_H) $(TABLE_H) $(FILTER_H) $(LD_DECODE_H) $(LD_CACHE_H) $(LD_INSN_H) $(IGEN_H) $(GEN_SEMANTICS_H) $(GEN_ICACHE_H) $(GEN_IDECODE_H) - $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/gen-semantics.c + $(COMPILE_FOR_BUILD) -c $(srcdir)/gen-semantics.c gen-idecode.o: gen-idecode.c $(MISC_H) $(LF_H) $(TABLE_H) $(FILTER_H) $(LD_DECODE_H) $(LD_CACHE_H) $(LD_INSN_H) $(IGEN_H) $(GEN_IDECODE_H) $(GEN_ICACHE_H) $(GEN_SEMANTICS_H) - $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/gen-idecode.c + $(COMPILE_FOR_BUILD) -c $(srcdir)/gen-idecode.c gen-support.o: gen-support.c $(MISC_H) $(LF_H) $(TABLE_H) $(FILTER_H) $(LD_DECODE_H) $(LD_CACHE_H) $(LD_INSN_H) $(IGEN_H) $(GEN_SEMANTICS_H) $(GEN_SUPPORT_H) - $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/gen-support.c + $(COMPILE_FOR_BUILD) -c $(srcdir)/gen-support.c dgen.o: dgen.c $(CONFIG_H) $(MISC_H) $(LF_H) $(TABLE_H) - $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/dgen.c + $(COMPILE_FOR_BUILD) -c $(srcdir)/dgen.c igen.o: igen.c $(MISC_H) $(LF_H) $(TABLE_H) $(CONFIG_H) $(FILTER_H) $(LD_CACHE_H) $(LD_DECODE_H) $(LD_INSN_H) $(IGEN_H) $(GEN_MODEL_H) $(GEN_ICACHE_H) $(GEN_ITABLE_H) $(GEN_IDECODE_H) $(GEN_SEMANTICS_H) $(GEN_SUPPORT_H) - $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/igen.c + $(COMPILE_FOR_BUILD) -c $(srcdir)/igen.c misc.o: misc.c $(CONFIG_H) $(MISC_H) - $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/misc.c + $(COMPILE_FOR_BUILD) -c $(srcdir)/misc.c diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog index cb88b0db9e6..989e373a34b 100644 --- a/sim/sh/ChangeLog +++ b/sim/sh/ChangeLog @@ -1,3 +1,8 @@ +2021-03-13 Mike Frysinger + + * Makefile.in (gencode.o): New rule. + (gencode): Call LINK_FOR_BUILD. + 2021-02-28 Mike Frysinger * configure: Regenerate. diff --git a/sim/sh/Makefile.in b/sim/sh/Makefile.in index d116a30d669..54f1e0ab94b 100644 --- a/sim/sh/Makefile.in +++ b/sim/sh/Makefile.in @@ -39,9 +39,11 @@ table.c: gencode ppi.c: gencode ./gencode -p >ppi.c -gencode: gencode.c - $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) $(WARN_CFLAGS) \ - -o gencode $(srcdir)/gencode.c +gencode.o: gencode.c + $(COMPILE_FOR_BUILD) -c $< -o $@ + +gencode: gencode.o + $(LINK_FOR_BUILD) $^ sh-clean: rm -f gencode code.c table.c -- 2.39.2