From 429a55b86557883a18e9c6405918825eb6eafd28 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 26 Nov 2021 20:41:44 -0500 Subject: [PATCH] sim: testsuite: fix bits-gen EXEEXT handling Add missing $(EXEEXT) to dependencies on bits-gen. These are actually build-only tools, but automake doesn't allow for build & host tools, so the rules are re-using EXEEXT. --- sim/Makefile.in | 8 ++++---- sim/testsuite/common/local.mk | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index 671d63c30b8..1dae0a482fb 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -2693,7 +2693,7 @@ testsuite/common/bits-gen$(EXEEXT): $(testsuite_common_bits_gen_OBJECTS) $(tests testsuite/common/bits32m0$(EXEEXT): $(testsuite_common_bits32m0_OBJECTS) $(testsuite_common_bits32m0_DEPENDENCIES) testsuite/common/$(am__dirstamp) $(AM_V_CCLD)$(LINK_FOR_BUILD) $(testsuite_common_bits32m0_OBJECTS) $(testsuite_common_bits32m0_LDADD) -testsuite/common/bits32m0.c: testsuite/common/bits-gen testsuite/common/bits-tst.c +testsuite/common/bits32m0.c: testsuite/common/bits-gen$(EXEEXT) testsuite/common/bits-tst.c $(AM_V_GEN)$< 32 0 big > $@.tmp $(AM_V_at)cat $(srcdir)/testsuite/common/bits-tst.c >> $@.tmp $(AM_V_at)mv $@.tmp $@ @@ -2701,7 +2701,7 @@ testsuite/common/bits32m0.c: testsuite/common/bits-gen testsuite/common/bits-tst testsuite/common/bits32m31$(EXEEXT): $(testsuite_common_bits32m31_OBJECTS) $(testsuite_common_bits32m31_DEPENDENCIES) testsuite/common/$(am__dirstamp) $(AM_V_CCLD)$(LINK_FOR_BUILD) $(testsuite_common_bits32m31_OBJECTS) $(testsuite_common_bits32m31_LDADD) -testsuite/common/bits32m31.c: testsuite/common/bits-gen testsuite/common/bits-tst.c +testsuite/common/bits32m31.c: testsuite/common/bits-gen$(EXEEXT) testsuite/common/bits-tst.c $(AM_V_GEN)$< 32 31 little > $@.tmp $(AM_V_at)cat $(srcdir)/testsuite/common/bits-tst.c >> $@.tmp $(AM_V_at)mv $@.tmp $@ @@ -2709,7 +2709,7 @@ testsuite/common/bits32m31.c: testsuite/common/bits-gen testsuite/common/bits-ts testsuite/common/bits64m0$(EXEEXT): $(testsuite_common_bits64m0_OBJECTS) $(testsuite_common_bits64m0_DEPENDENCIES) testsuite/common/$(am__dirstamp) $(AM_V_CCLD)$(LINK_FOR_BUILD) $(testsuite_common_bits64m0_OBJECTS) $(testsuite_common_bits64m0_LDADD) -testsuite/common/bits64m0.c: testsuite/common/bits-gen testsuite/common/bits-tst.c +testsuite/common/bits64m0.c: testsuite/common/bits-gen$(EXEEXT) testsuite/common/bits-tst.c $(AM_V_GEN)$< 64 0 big > $@.tmp $(AM_V_at)cat $(srcdir)/testsuite/common/bits-tst.c >> $@.tmp $(AM_V_at)mv $@.tmp $@ @@ -2717,7 +2717,7 @@ testsuite/common/bits64m0.c: testsuite/common/bits-gen testsuite/common/bits-tst testsuite/common/bits64m63$(EXEEXT): $(testsuite_common_bits64m63_OBJECTS) $(testsuite_common_bits64m63_DEPENDENCIES) testsuite/common/$(am__dirstamp) $(AM_V_CCLD)$(LINK_FOR_BUILD) $(testsuite_common_bits64m63_OBJECTS) $(testsuite_common_bits64m63_LDADD) -testsuite/common/bits64m63.c: testsuite/common/bits-gen testsuite/common/bits-tst.c +testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/common/bits-tst.c $(AM_V_GEN)$< 64 63 little > $@.tmp $(AM_V_at)cat $(srcdir)/testsuite/common/bits-tst.c >> $@.tmp $(AM_V_at)mv $@.tmp $@ diff --git a/sim/testsuite/common/local.mk b/sim/testsuite/common/local.mk index 69f2d70eb5f..e48f369d941 100644 --- a/sim/testsuite/common/local.mk +++ b/sim/testsuite/common/local.mk @@ -48,7 +48,7 @@ check_PROGRAMS += $(TESTS) %D%/bits32m0$(EXEEXT): $(%C%_bits32m0_OBJECTS) $(%C%_bits32m0_DEPENDENCIES) %D%/$(am__dirstamp) $(AM_V_CCLD)$(LINK_FOR_BUILD) $(%C%_bits32m0_OBJECTS) $(%C%_bits32m0_LDADD) -%D%/bits32m0.c: %D%/bits-gen %D%/bits-tst.c +%D%/bits32m0.c: %D%/bits-gen$(EXEEXT) %D%/bits-tst.c $(AM_V_GEN)$< 32 0 big > $@.tmp $(AM_V_at)cat $(srcdir)/%D%/bits-tst.c >> $@.tmp $(AM_V_at)mv $@.tmp $@ @@ -56,7 +56,7 @@ check_PROGRAMS += $(TESTS) %D%/bits32m31$(EXEEXT): $(%C%_bits32m31_OBJECTS) $(%C%_bits32m31_DEPENDENCIES) %D%/$(am__dirstamp) $(AM_V_CCLD)$(LINK_FOR_BUILD) $(%C%_bits32m31_OBJECTS) $(%C%_bits32m31_LDADD) -%D%/bits32m31.c: %D%/bits-gen %D%/bits-tst.c +%D%/bits32m31.c: %D%/bits-gen$(EXEEXT) %D%/bits-tst.c $(AM_V_GEN)$< 32 31 little > $@.tmp $(AM_V_at)cat $(srcdir)/%D%/bits-tst.c >> $@.tmp $(AM_V_at)mv $@.tmp $@ @@ -64,7 +64,7 @@ check_PROGRAMS += $(TESTS) %D%/bits64m0$(EXEEXT): $(%C%_bits64m0_OBJECTS) $(%C%_bits64m0_DEPENDENCIES) %D%/$(am__dirstamp) $(AM_V_CCLD)$(LINK_FOR_BUILD) $(%C%_bits64m0_OBJECTS) $(%C%_bits64m0_LDADD) -%D%/bits64m0.c: %D%/bits-gen %D%/bits-tst.c +%D%/bits64m0.c: %D%/bits-gen$(EXEEXT) %D%/bits-tst.c $(AM_V_GEN)$< 64 0 big > $@.tmp $(AM_V_at)cat $(srcdir)/%D%/bits-tst.c >> $@.tmp $(AM_V_at)mv $@.tmp $@ @@ -72,7 +72,7 @@ check_PROGRAMS += $(TESTS) %D%/bits64m63$(EXEEXT): $(%C%_bits64m63_OBJECTS) $(%C%_bits64m63_DEPENDENCIES) %D%/$(am__dirstamp) $(AM_V_CCLD)$(LINK_FOR_BUILD) $(%C%_bits64m63_OBJECTS) $(%C%_bits64m63_LDADD) -%D%/bits64m63.c: %D%/bits-gen %D%/bits-tst.c +%D%/bits64m63.c: %D%/bits-gen$(EXEEXT) %D%/bits-tst.c $(AM_V_GEN)$< 64 63 little > $@.tmp $(AM_V_at)cat $(srcdir)/%D%/bits-tst.c >> $@.tmp $(AM_V_at)mv $@.tmp $@ -- 2.30.2