From patchwork Tue Jan 2 07:25:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 83123 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8CE9B3858C41 for ; Tue, 2 Jan 2024 08:26:31 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 9165D3858299 for ; Tue, 2 Jan 2024 08:25:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9165D3858299 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 9165D3858299 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:ea4a:1:5054:ff:fec7:86e4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704183922; cv=none; b=g/XYL1eawzNbJzHY3V5ZF2I5JhvJ8l+ZBh0tTpRaHgiV/G3Zjai7glr5Vd/Ax4YN0XQSOtSs0cqs/zTe4i3eeZrcGvBi2mPCSfbJ6vfgvKSOLTTeJq0c4nXmUq8B8rVxrfw9d/45xMmxMPzm2sXMxkukZqEjd9Rt1S4tuwcSSZY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704183922; c=relaxed/simple; bh=rM+PCL7mJXKWhpG3w1dJjEj0WqTnFrHOVnGO1I3TzJA=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=MOHT90NJrSqVnR6hVIJvDjlvPOiEzUUR5YbUnsVi96dX4Sm93r5vq3nFV9FC+ScaDoVZQ1TYK0qMLGLeYUpKk6RosAmk1gMtMvCY9iNTASpzhZmNf9OSkw9A2i+BPrFXN4fmqC/MKpjnVid2TxQkAKbzP4HzlHSOqxYJ7mFxKYk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id 244A4340943; Tue, 2 Jan 2024 08:25:17 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH/submitted 3/3] sim: ppc: hoist pk.h creation to top-level Date: Tue, 2 Jan 2024 02:25:08 -0500 Message-ID: <20240102072508.10504-3-vapier@gentoo.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240102072508.10504-1-vapier@gentoo.org> References: <20240102072508.10504-1-vapier@gentoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org --- sim/Makefile.in | 22 ++++++++++++++++++++-- sim/ppc/Makefile.in | 37 +++++-------------------------------- sim/ppc/local.mk | 24 ++++++++++++++++++++++++ sim/ppc/pk.h | 2 +- 4 files changed, 50 insertions(+), 35 deletions(-) diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index ed3185f399d4..68be55597497 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -361,12 +361,6 @@ INLINE = \ inline.h \ inline.c -BUILT_SRC_WO_CONFIG = \ - pk.h - -BUILT_SRC = \ - $(BUILT_SRC_WO_CONFIG) - LIB_INLINE_SRC = \ psim.c \ bits.c \ @@ -483,7 +477,7 @@ interrupts.o: interrupts.c $(CPU_H) $(IDECODE_H) $(OS_EMUL_H) # Given that inlines are turned on now, rebuild idecode whenever # anything changes. -idecode.o: idecode.c $(CPU_H) $(IDECODE_H) $(SEMANTICS_H) $(LIB_INLINE_SRC) $(BUILT_SRC) +idecode.o: idecode.c $(CPU_H) $(IDECODE_H) $(SEMANTICS_H) $(LIB_INLINE_SRC) # double.o: double.c dp-bit.c @@ -525,7 +519,7 @@ sim-fpu.o: $(srcdir)/../common/sim-fpu.c $(ECHO_CC) $(CC) -c $(STD_CFLAGS) -DHAVE_CONFIG_H $(srcdir)/../common/sim-fpu.c # Rebuild options whenever something changes so the date/time is up to date. -options.o: options.c $(CPU_H) $(OPTIONS_H) $(DEFINES_H) $(BASICS_H) $(IDECODE_H) $(INLINE) $(LIB_SRC) $(BUILT_SRC) ../config.status Makefile +options.o: options.c $(CPU_H) $(OPTIONS_H) $(DEFINES_H) $(BASICS_H) $(IDECODE_H) $(INLINE) $(LIB_SRC) ../config.status Makefile $(ECHO_CC) $(CC) -c $(STD_CFLAGS) '-DOPCODE_RULES="@sim_ppc_opcode@"' '-DIGEN_FLAGS="$(ppc_IGEN_FLAGS)"' $(srcdir)/options.c hw_cpu.o: hw_cpu.c $(DEVICE_TABLE_H) $(HW_CPU_H) $(INTERRUPTS_H) $(CPU_H) @@ -552,27 +546,6 @@ hw_vm.o: hw_vm.c $(DEVICE_TABLE_H) $(CPU_H) -# real packages -$(srcdir)/pk.h: $(MAINT) tmp-pk - @true -tmp-pk: $(srcdir)/Makefile.in $(PACKAGE_SRC) $(srcroot)/move-if-change - $(ECHO_GEN)# The first for loop is to remove duplicates. - $(SILENCE) echo "/* Generated file by Makefile.in; do not edit. */" > tmp-pk.h; \ - f=""; \ - for i in $(PACKAGE_SRC) ; do \ - case " $$f " in \ - *" $$i "*) ;; \ - *) f="$$f $$i" ;; \ - esac ; \ - done ; \ - for pk in $$f ; do echo $$pk ; done \ - | sed -e 's/^.*pk_\(.*\)\.c/\1/' \ - -e 's/^/extern package_create_instance_callback pk_/' \ - -e 's/$$/_create_instance;/' \ - >> tmp-pk.h - $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-pk.h $(srcdir)/pk.h - $(SILENCE) touch $@ - pk_disklabel.o: pk_disklabel.c $(DEVICE_TABLE_H) $(PK_H) # ignore this line, it stops make from getting confused @@ -580,11 +553,11 @@ pk_disklabel.o: pk_disklabel.c $(DEVICE_TABLE_H) $(PK_H) tags etags: TAGS -TAGS: $(BUILT_SRC) - etags $(srcdir)/*.h $(srcdir)/*.c $(BUILT_SRC) +TAGS: + etags $(srcdir)/*.h $(srcdir)/*.c clean mostlyclean: - rm -f tmp-* *.[oasi] core $(BUILT_SRC_WO_CONFIG) + rm -f tmp-* *.[oasi] core distclean realclean: clean rm -f TAGS Makefile diff --git a/sim/ppc/local.mk b/sim/ppc/local.mk index 7d4ea357c30d..155d83a9470a 100644 --- a/sim/ppc/local.mk +++ b/sim/ppc/local.mk @@ -220,5 +220,29 @@ BUILT_SOURCES += \ SIM_ALL_RECURSIVE_DEPS += %D%/stamp-hw %D%/hw.c %D%/hw.h: %D%/stamp-igen +## Real packages +## NB: The first for loop is to remove duplicates. +%C%_PACKAGE_SRC = %D%/pk_disklabel.c +$(srcdir)/%D%/pk.h: @MAINT@ %D%/stamp-pk ; @true +%D%/stamp-pk: $(srcdir)/%D%/Makefile.in $(%C%_PACKAGE_SRC) $(srcroot)/move-if-change + $(AM_V_GEN)echo "/* Generated file by local.mk; do not edit. */" > %D%/pk.hin; \ + f=""; \ + for i in $(%C%_PACKAGE_SRC) ; do \ + case " $$f " in \ + *" $$i "*) ;; \ + *) f="$$f $$i" ;; \ + esac ; \ + done ; \ + for pk in $$f ; do echo $$pk ; done \ + | sed -e 's/^.*pk_\(.*\)\.c/\1/' \ + -e 's/^/extern package_create_instance_callback pk_/' \ + -e 's/$$/_create_instance;/' \ + >> %D%/pk.hin + $(AM_V_at)$(SHELL) $(srcroot)/move-if-change %D%/pk.hin $(srcdir)/%D%/pk.h + $(AM_V_at)touch $@ + +%C%_BUILD_OUTPUTS += %D%/stamp-pk +SIM_ALL_RECURSIVE_DEPS += %D%/stamp-pk + %C%docdir = $(docdir)/%C% %C%doc_DATA = %D%/BUGS %D%/INSTALL %D%/README %D%/RUN diff --git a/sim/ppc/pk.h b/sim/ppc/pk.h index 92e49e9e8a45..2a6720473788 100644 --- a/sim/ppc/pk.h +++ b/sim/ppc/pk.h @@ -1,2 +1,2 @@ -/* Generated file by Makefile.in; do not edit. */ +/* Generated file by local.mk; do not edit. */ extern package_create_instance_callback pk_disklabel_create_instance;