From 8c9b6e7689157423ae99f89f30791d70214ef87b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 8 Mar 2021 00:30:31 -0500 Subject: [PATCH] sim: delete unused BUILD_LIBS setting This hasn't been initialized anywhere for years. It used to be for passing in the path to libiberty, but that stopped happening long ago. Delete it to simplify the build logic. --- sim/cr16/ChangeLog | 4 ++++ sim/cr16/Makefile.in | 2 +- sim/d10v/ChangeLog | 4 ++++ sim/d10v/Makefile.in | 2 +- sim/igen/ChangeLog | 5 +++++ sim/igen/Makefile.in | 12 ++++++------ sim/m32c/ChangeLog | 4 ++++ sim/m32c/Makefile.in | 2 +- sim/ppc/ChangeLog | 5 +++++ sim/ppc/Makefile.in | 14 +++++++------- 10 files changed, 38 insertions(+), 16 deletions(-) diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog index c419fd1eac0..7742e7f173b 100644 --- a/sim/cr16/ChangeLog +++ b/sim/cr16/ChangeLog @@ -1,3 +1,7 @@ +2021-03-08 Mike Frysinger + + * Makefile.in (gencode): Delete $(BUILD_LIB). + 2021-02-28 Mike Frysinger * configure: Regenerate. diff --git a/sim/cr16/Makefile.in b/sim/cr16/Makefile.in index 7468bf366a4..8a5deb9e5d3 100644 --- a/sim/cr16/Makefile.in +++ b/sim/cr16/Makefile.in @@ -48,7 +48,7 @@ cr16-opc.o: $(srcdir)/../../opcodes/cr16-opc.c $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(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 $(BUILD_LIB) + $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o gencode 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 ecb6d607675..cddd70c3801 100644 --- a/sim/d10v/ChangeLog +++ b/sim/d10v/ChangeLog @@ -1,3 +1,7 @@ +2021-03-08 Mike Frysinger + + * Makefile.in (gencode): Delete $(BUILD_LIB). + 2021-02-28 Mike Frysinger * configure: Regenerate. diff --git a/sim/d10v/Makefile.in b/sim/d10v/Makefile.in index 8fe4c0f0899..cb5159b259b 100644 --- a/sim/d10v/Makefile.in +++ b/sim/d10v/Makefile.in @@ -49,7 +49,7 @@ d10v-opc.o: $(srcdir)/../../opcodes/d10v-opc.c $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(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 $(BUILD_LIB) + $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o gencode 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 0eeda65cb4e..2d647c4fce4 100644 --- a/sim/igen/ChangeLog +++ b/sim/igen/ChangeLog @@ -1,3 +1,8 @@ +2021-03-08 Mike Frysinger + + * Makefile.in (tmp-table, tmp-filter, tmp-ld-decode, tmp-ld-cache, + tmp-ld-insn, tmp-gen): Delete $(BUILD_LIBS). + 2021-03-07 Mike Frysinger * gen.c (main): Delete options arg to INIT_OPTIONS. diff --git a/sim/igen/Makefile.in b/sim/igen/Makefile.in index b513b128c36..5976c4c008c 100644 --- a/sim/igen/Makefile.in +++ b/sim/igen/Makefile.in @@ -112,22 +112,22 @@ igen.o: igen.c misc.h filter_host.h lf.h table.h ld-decode.h ld-cache.h ld-insn. $(CC_FOR_BUILD) $(BUILD_CFLAGS) -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 $(BUILD_LIBS) + $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o tmp-table -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 $(BUILD_LIBS) + $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o tmp-filter -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 $(BUILD_LIBS) + $(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 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 $(BUILD_LIBS) + $(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 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 $(BUILD_LIBS) + $(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 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 $(BUILD_LIBS) + $(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 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 0acd917680e..d9997c7bded 100644 --- a/sim/m32c/ChangeLog +++ b/sim/m32c/ChangeLog @@ -1,3 +1,7 @@ +2021-03-08 Mike Frysinger + + * Makefile.in (opc2c): Delete $(BUILD_LIBS). + 2021-02-28 Mike Frysinger * configure: Regenerate. diff --git a/sim/m32c/Makefile.in b/sim/m32c/Makefile.in index d623821ee09..91f52a7a42b 100644 --- a/sim/m32c/Makefile.in +++ b/sim/m32c/Makefile.in @@ -53,7 +53,7 @@ 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 $@ $(BUILD_LIBS) + $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) $^ -o $@ encodings: grep '/\* [01]' $(srcdir)/r8c.opc | sort diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog index b64f6ecf53c..4dd82e17bcc 100644 --- a/sim/ppc/ChangeLog +++ b/sim/ppc/ChangeLog @@ -1,3 +1,8 @@ +2021-03-08 Mike Frysinger + + * Makefile.in (gentmap, dgen, igen, tmp-filter, tmp-ld-decode, + tmp-ld-cache, tmp-ld-insn): Delete $(BUILD_LIBS). + 2021-03-07 Mike Frysinger * Makefile.in (check): Define. diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index f97f075d7d2..3ff8cedebb8 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -619,7 +619,7 @@ mon.o: mon.c $(BASICS_H) $(CPU_H) $(MON_H) # 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 $(BUILD_LIBS) + -o gentmap $(srcdir)/../common/gentmap.c targ-vals.def: $(srcdir)/../common/nltvals.def rm -f targ-vals.def tmp-def @@ -709,10 +709,10 @@ 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 $(BUILD_LIBS) + $(CC_FOR_BUILD) $(BUILD_CFLAGS) -o dgen 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 $(BUILD_LIBS) + $(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 filter_host.c: filter_filename.c cat $(srcdir)/filter_filename.c > filter_host.c @@ -729,22 +729,22 @@ lf.o: lf.c $(CONFIG_H) $(MISC_H) $(LF_H) filter.o: filter.c $(CONFIG_H) $(MISC_H) $(FILTER_H) $(CC_FOR_BUILD) $(BUILD_CFLAGS) -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 $(BUILD_LIBS) + $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o tmp-filter -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 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 $(BUILD_LIBS) + $(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 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 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 $(BUILD_LIBS) + $(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 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 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 $(BUILD_LIBS) + $(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 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 -- 2.30.2