From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id C7B55385B522; Sun, 25 Dec 2022 02:40:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C7B55385B522 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1671936054; bh=kOLv7ZiRuGroxwvmubpCEI17TIqbPYpzYNx4eFleREU=; h=From:To:Subject:Date:From; b=QoOIK4s2ItJT2B/QhT8x4iC9cUafOISVVoCG56mIyQg4SuamVU8WVcCaUVTrePIq/ IwzH1mRlYZruuMjljwva/SU7iq2gxHnsJOVBI4pEY36CLT7cn/b2jfAhw2qnODu9at OJ6YNLnFhDl9oQ3vrp1BT2k6TVP2sDRDyyUtRVyI= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: gdb-cvs@sourceware.org Subject: [binutils-gdb] sim: mips: add igen recursive dep X-Act-Checkin: binutils-gdb X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: d093438bdcf22b2d4e1738d2d55300745f88dd8d X-Git-Newrev: a449d2c2943feabdda499868d09c8588a4395a38 Message-Id: <20221225024054.C7B55385B522@sourceware.org> Date: Sun, 25 Dec 2022 02:40:54 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Da449d2c2943f= eabdda499868d09c8588a4395a38 commit a449d2c2943feabdda499868d09c8588a4395a38 Author: Mike Frysinger Date: Sat Dec 24 21:25:50 2022 -0500 sim: mips: add igen recursive dep =20 Make sure the igen tool exists before trying to compile the mips subdir. This happens to work when mips has a subconfigure, but hits a race condition when that is removed. Diff: --- sim/Makefile.in | 49 +++++++++++++++++++++++++------------------------ sim/mips/local.mk | 3 +++ 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index 0ba4bc8c8fd..1953d11deae 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -198,28 +198,29 @@ TESTS =3D testsuite/common/bits32m0$(EXEEXT) \ @SIM_ENABLE_ARCH_mcore_TRUE@am__append_58 =3D mcore/run @SIM_ENABLE_ARCH_microblaze_TRUE@am__append_59 =3D microblaze/run @SIM_ENABLE_ARCH_mips_TRUE@am__append_60 =3D mips/run -@SIM_ENABLE_ARCH_mips_TRUE@am__append_61 =3D mips_SIM_EXTRA_HW_DEVICES=3D"= $(mips_SIM_EXTRA_HW_DEVICES)" -@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_62 =3D mn10300/run -@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_63 =3D mn10300_SIM_EXTRA_HW_DEVIC= ES=3D"$(mn10300_SIM_EXTRA_HW_DEVICES)" -@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_64 =3D $(mn10300_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_mips_TRUE@am__append_61 =3D $(IGEN) +@SIM_ENABLE_ARCH_mips_TRUE@am__append_62 =3D mips_SIM_EXTRA_HW_DEVICES=3D"= $(mips_SIM_EXTRA_HW_DEVICES)" +@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_63 =3D mn10300/run +@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_64 =3D mn10300_SIM_EXTRA_HW_DEVIC= ES=3D"$(mn10300_SIM_EXTRA_HW_DEVICES)" @SIM_ENABLE_ARCH_mn10300_TRUE@am__append_65 =3D $(mn10300_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_moxie_TRUE@am__append_66 =3D moxie/run -@SIM_ENABLE_ARCH_msp430_TRUE@am__append_67 =3D msp430/run -@SIM_ENABLE_ARCH_or1k_TRUE@am__append_68 =3D or1k/run -@SIM_ENABLE_ARCH_or1k_TRUE@am__append_69 =3D $(or1k_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_66 =3D $(mn10300_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_moxie_TRUE@am__append_67 =3D moxie/run +@SIM_ENABLE_ARCH_msp430_TRUE@am__append_68 =3D msp430/run +@SIM_ENABLE_ARCH_or1k_TRUE@am__append_69 =3D or1k/run @SIM_ENABLE_ARCH_or1k_TRUE@am__append_70 =3D $(or1k_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_ppc_TRUE@am__append_71 =3D ppc/run ppc/psim -@SIM_ENABLE_ARCH_pru_TRUE@am__append_72 =3D pru/run -@SIM_ENABLE_ARCH_riscv_TRUE@am__append_73 =3D riscv/run -@SIM_ENABLE_ARCH_rl78_TRUE@am__append_74 =3D rl78/run -@SIM_ENABLE_ARCH_rx_TRUE@am__append_75 =3D rx/run -@SIM_ENABLE_ARCH_sh_TRUE@am__append_76 =3D sh/run -@SIM_ENABLE_ARCH_sh_TRUE@am__append_77 =3D $(sh_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_sh_TRUE@am__append_78 =3D sh/gencode -@SIM_ENABLE_ARCH_sh_TRUE@am__append_79 =3D $(sh_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_v850_TRUE@am__append_80 =3D v850/run -@SIM_ENABLE_ARCH_v850_TRUE@am__append_81 =3D $(v850_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_or1k_TRUE@am__append_71 =3D $(or1k_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_ppc_TRUE@am__append_72 =3D ppc/run ppc/psim +@SIM_ENABLE_ARCH_pru_TRUE@am__append_73 =3D pru/run +@SIM_ENABLE_ARCH_riscv_TRUE@am__append_74 =3D riscv/run +@SIM_ENABLE_ARCH_rl78_TRUE@am__append_75 =3D rl78/run +@SIM_ENABLE_ARCH_rx_TRUE@am__append_76 =3D rx/run +@SIM_ENABLE_ARCH_sh_TRUE@am__append_77 =3D sh/run +@SIM_ENABLE_ARCH_sh_TRUE@am__append_78 =3D $(sh_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_sh_TRUE@am__append_79 =3D sh/gencode +@SIM_ENABLE_ARCH_sh_TRUE@am__append_80 =3D $(sh_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_v850_TRUE@am__append_81 =3D v850/run @SIM_ENABLE_ARCH_v850_TRUE@am__append_82 =3D $(v850_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_v850_TRUE@am__append_83 =3D $(v850_BUILD_OUTPUTS) subdir =3D . ACLOCAL_M4 =3D $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps =3D $(top_srcdir)/../config/acx.m4 \ @@ -1189,7 +1190,7 @@ SUBDIRS =3D @subdirs@ $(SIM_SUBDIRS) AM_MAKEFLAGS =3D SIM_NEW_COMMON_OBJS_=3D"$(SIM_NEW_COMMON_OBJS)" \ $(am__append_3) $(am__append_12) $(am__append_21) \ $(am__append_42) $(am__append_50) $(am__append_54) \ - $(am__append_61) $(am__append_63) + $(am__append_62) $(am__append_64) pkginclude_HEADERS =3D $(am__append_1) noinst_LIBRARIES =3D $(SIM_COMMON_LIB) $(am__append_5) CLEANFILES =3D common/version.c common/version.c-stamp \ @@ -1203,8 +1204,8 @@ MOSTLYCLEANFILES =3D core $(common_HW_CONFIG_H_TARGET= S) $(patsubst \ $(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_65) $(am__append_70) $(am__append_79) \ - $(am__append_82) + $(am__append_66) $(am__append_71) $(am__append_80) \ + $(am__append_83) AM_CFLAGS =3D $(WERROR_CFLAGS) $(WARN_CFLAGS) AM_CPPFLAGS =3D $(INCGNU) -I$(srcroot)/include -I../bfd -I.. \ $(SIM_HW_CFLAGS) $(SIM_INLINE) -I$(srcdir)/common \ @@ -1218,8 +1219,8 @@ SIM_ALL_RECURSIVE_DEPS =3D 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_64) $(am__append_69) $(am__append_77) \ - $(am__append_81) + $(am__append_61) $(am__append_65) $(am__append_70) \ + $(am__append_78) $(am__append_82) SIM_INSTALL_DATA_LOCAL_DEPS =3D=20 SIM_INSTALL_EXEC_LOCAL_DEPS =3D $(am__append_30) SIM_UNINSTALL_LOCAL_DEPS =3D $(am__append_31) diff --git a/sim/mips/local.mk b/sim/mips/local.mk index 159fd2947d4..a708f64f84b 100644 --- a/sim/mips/local.mk +++ b/sim/mips/local.mk @@ -24,5 +24,8 @@ =20 noinst_PROGRAMS +=3D %D%/run =20 +## TODO: Delete this once mips igen rules move here from Makefile.in. +SIM_ALL_RECURSIVE_DEPS +=3D $(IGEN) + %C%_SIM_EXTRA_HW_DEVICES =3D tx3904cpu tx3904irc tx3904tmr tx3904sio AM_MAKEFLAGS +=3D %C%_SIM_EXTRA_HW_DEVICES=3D"$(%C%_SIM_EXTRA_HW_DEVICES)"