From edda128da79dc50e6932355e6fd73516a03dd186 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 25 Dec 2022 03:23:06 -0500 Subject: [PATCH] sim: mips: move distclean settings to common build This was missed when mips/configure was merged into the top-level. --- sim/Makefile.in | 49 ++++++++++++++++++++++---------------------- sim/mips/Makefile.in | 4 ---- sim/mips/local.mk | 3 +++ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index 08e0f7cc24e..889dd34b627 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -200,27 +200,28 @@ TESTS = testsuite/common/bits32m0$(EXEEXT) \ @SIM_ENABLE_ARCH_mips_TRUE@am__append_60 = mips/run @SIM_ENABLE_ARCH_mips_TRUE@am__append_61 = $(IGEN) @SIM_ENABLE_ARCH_mips_TRUE@am__append_62 = mips_SIM_EXTRA_HW_DEVICES="$(mips_SIM_EXTRA_HW_DEVICES)" -@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_63 = mn10300/run -@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_64 = mn10300_SIM_EXTRA_HW_DEVICES="$(mn10300_SIM_EXTRA_HW_DEVICES)" -@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_65 = $(mn10300_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_mips_TRUE@am__append_63 = mips/multi-include.h mips/multi-run.c +@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_64 = mn10300/run +@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_65 = mn10300_SIM_EXTRA_HW_DEVICES="$(mn10300_SIM_EXTRA_HW_DEVICES)" @SIM_ENABLE_ARCH_mn10300_TRUE@am__append_66 = $(mn10300_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_moxie_TRUE@am__append_67 = moxie/run -@SIM_ENABLE_ARCH_msp430_TRUE@am__append_68 = msp430/run -@SIM_ENABLE_ARCH_or1k_TRUE@am__append_69 = or1k/run -@SIM_ENABLE_ARCH_or1k_TRUE@am__append_70 = $(or1k_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_67 = $(mn10300_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_moxie_TRUE@am__append_68 = moxie/run +@SIM_ENABLE_ARCH_msp430_TRUE@am__append_69 = msp430/run +@SIM_ENABLE_ARCH_or1k_TRUE@am__append_70 = or1k/run @SIM_ENABLE_ARCH_or1k_TRUE@am__append_71 = $(or1k_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_ppc_TRUE@am__append_72 = ppc/run ppc/psim -@SIM_ENABLE_ARCH_pru_TRUE@am__append_73 = pru/run -@SIM_ENABLE_ARCH_riscv_TRUE@am__append_74 = riscv/run -@SIM_ENABLE_ARCH_rl78_TRUE@am__append_75 = rl78/run -@SIM_ENABLE_ARCH_rx_TRUE@am__append_76 = rx/run -@SIM_ENABLE_ARCH_sh_TRUE@am__append_77 = sh/run -@SIM_ENABLE_ARCH_sh_TRUE@am__append_78 = $(sh_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_sh_TRUE@am__append_79 = sh/gencode -@SIM_ENABLE_ARCH_sh_TRUE@am__append_80 = $(sh_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_v850_TRUE@am__append_81 = v850/run -@SIM_ENABLE_ARCH_v850_TRUE@am__append_82 = $(v850_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_or1k_TRUE@am__append_72 = $(or1k_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_ppc_TRUE@am__append_73 = ppc/run ppc/psim +@SIM_ENABLE_ARCH_pru_TRUE@am__append_74 = pru/run +@SIM_ENABLE_ARCH_riscv_TRUE@am__append_75 = riscv/run +@SIM_ENABLE_ARCH_rl78_TRUE@am__append_76 = rl78/run +@SIM_ENABLE_ARCH_rx_TRUE@am__append_77 = rx/run +@SIM_ENABLE_ARCH_sh_TRUE@am__append_78 = sh/run +@SIM_ENABLE_ARCH_sh_TRUE@am__append_79 = $(sh_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_sh_TRUE@am__append_80 = sh/gencode +@SIM_ENABLE_ARCH_sh_TRUE@am__append_81 = $(sh_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_v850_TRUE@am__append_82 = v850/run @SIM_ENABLE_ARCH_v850_TRUE@am__append_83 = $(v850_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_v850_TRUE@am__append_84 = $(v850_BUILD_OUTPUTS) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ @@ -1201,22 +1202,22 @@ SUBDIRS = @subdirs@ $(SIM_SUBDIRS) AM_MAKEFLAGS = SIM_NEW_COMMON_OBJS_="$(SIM_NEW_COMMON_OBJS)" \ $(am__append_3) $(am__append_12) $(am__append_21) \ $(am__append_42) $(am__append_50) $(am__append_54) \ - $(am__append_62) $(am__append_64) + $(am__append_62) $(am__append_65) pkginclude_HEADERS = $(am__append_1) noinst_LIBRARIES = $(SIM_COMMON_LIB) $(am__append_5) CLEANFILES = common/version.c common/version.c-stamp \ testsuite/common/bits-gen testsuite/common/bits32m0.c \ testsuite/common/bits32m31.c testsuite/common/bits64m0.c \ testsuite/common/bits64m63.c -DISTCLEANFILES = +DISTCLEANFILES = $(am__append_63) MOSTLYCLEANFILES = core $(common_HW_CONFIG_H_TARGETS) $(patsubst \ %,%/stamp-hw,$(SIM_ENABLED_ARCHES)) $(am__append_7) \ site-sim-config.exp testrun.log testrun.sum $(am__append_15) \ $(am__append_19) $(am__append_24) $(am__append_28) \ $(am__append_35) $(am__append_40) $(am__append_44) \ $(am__append_48) $(am__append_52) $(am__append_57) \ - $(am__append_66) $(am__append_71) $(am__append_80) \ - $(am__append_83) + $(am__append_67) $(am__append_72) $(am__append_81) \ + $(am__append_84) AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS) AM_CPPFLAGS = $(INCGNU) -I$(srcroot)/include -I../bfd -I.. \ $(SIM_HW_CFLAGS) $(SIM_INLINE) -I$(srcdir)/common \ @@ -1230,8 +1231,8 @@ SIM_ALL_RECURSIVE_DEPS = common/libcommon.a \ $(am__append_17) $(am__append_23) $(am__append_26) \ $(am__append_34) $(am__append_39) $(am__append_43) \ $(am__append_46) $(am__append_51) $(am__append_55) \ - $(am__append_61) $(am__append_65) $(am__append_70) \ - $(am__append_78) $(am__append_82) + $(am__append_61) $(am__append_66) $(am__append_71) \ + $(am__append_79) $(am__append_83) SIM_INSTALL_DATA_LOCAL_DEPS = SIM_INSTALL_EXEC_LOCAL_DEPS = $(am__append_30) SIM_UNINSTALL_LOCAL_DEPS = $(am__append_31) diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in index 8493f8780dc..fbf13519e8d 100644 --- a/sim/mips/Makefile.in +++ b/sim/mips/Makefile.in @@ -83,7 +83,6 @@ SIM_BITSIZE = -DWITH_TARGET_WORD_BITSIZE=@SIM_MIPS_BITSIZE@ -DWITH_TARGET_WORD_M SIM_FLOAT = -DWITH_FLOATING_POINT=HARD_FLOATING_POINT -DWITH_TARGET_FLOATING_POINT_BITSIZE=@SIM_MIPS_FPU_BITSIZE@ SIM_EXTRA_CLEAN = clean-extra -SIM_EXTRA_DISTCLEAN = distclean-extra all: $(SIM_$(SIM_MIPS_GEN)_ALL) @@ -505,6 +504,3 @@ clean-extra: rm -f $(BUILT_SRC_FROM_MULTI) rm -f tmp-* rm -f micromips16*.o micromips32*.o m16*.o m32*.o itable*.o - -distclean-extra: - rm -f multi-include.h multi-run.c diff --git a/sim/mips/local.mk b/sim/mips/local.mk index a708f64f84b..21a6f5cb56b 100644 --- a/sim/mips/local.mk +++ b/sim/mips/local.mk @@ -29,3 +29,6 @@ SIM_ALL_RECURSIVE_DEPS += $(IGEN) %C%_SIM_EXTRA_HW_DEVICES = tx3904cpu tx3904irc tx3904tmr tx3904sio AM_MAKEFLAGS += %C%_SIM_EXTRA_HW_DEVICES="$(%C%_SIM_EXTRA_HW_DEVICES)" + +## These are created by mips/acinclude.m4 during configure time. +DISTCLEANFILES += %D%/multi-include.h %D%/multi-run.c -- 2.30.2