From patchwork Sat Nov 5 03:42:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 59978 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 2909B3858429 for ; Sat, 5 Nov 2022 03:43:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2909B3858429 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667619823; bh=q1mBnDRolQAvw5IDJuqjESwroh4mFDHx8lU0HGHXEwY=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=g701h1Ek2EBEKILQb8UvfOuQFLjfL02p0/2S63BbTZgXKszp1ghy/HcgA/Xz8xKcv xqsjYbi4wTrlUDUmhURDdwdc6yWtW1jLDRpZ1LJcDioBO1f7ksyOirdqT5ifvQ1khC B6aDZG+l1noq28sSJAbQezZThqHTBjxBUdNs1awU= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 6D56F3858D35 for ; Sat, 5 Nov 2022 03:43:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6D56F3858D35 Received: by smtp.gentoo.org (Postfix, from userid 559) id 606A7340D1D; Sat, 5 Nov 2022 03:43:13 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH] sim: ppc: inline the sim-packages option Date: Sat, 5 Nov 2022 10:42:55 +0700 Message-Id: <20221105034255.30375-1-vapier@gentoo.org> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP 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.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Mike Frysinger via Gdb-patches From: Mike Frysinger Reply-To: Mike Frysinger Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This has only ever had a single option that's enabled by default. The objects it adds are pretty small and don't add overhead at runtime if it isn't used, so just enable it all the time to make the build code simpler. --- sim/ppc/Makefile.in | 18 ++++++++++-------- sim/ppc/configure | 31 ------------------------------- sim/ppc/configure.ac | 24 ------------------------ sim/ppc/pk.h | 2 ++ 4 files changed, 12 insertions(+), 63 deletions(-) create mode 100644 sim/ppc/pk.h diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index b1fda1fbff42..6575f962c9dd 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -516,8 +516,8 @@ GDB_OBJ = gdb-sim.o sim_calls.o HW_SRC = @sim_hw_src@ HW_OBJ = @sim_hw_obj@ -PACKAGE_SRC = @sim_pk_src@ -PACKAGE_OBJ = @sim_pk_obj@ +PACKAGE_SRC = pk_disklabel.c +PACKAGE_OBJ = $(PACKAGE_SRC:.c=.o) psim$(EXEEXT): $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) @@ -528,7 +528,7 @@ run$(EXEEXT): psim$(EXEEXT) $(SILENCE) rm -f $@ $(ECHO_GEN) ln $< $@ 2>/dev/null || $(LN_S) $< $@ 2>/dev/null || cp -p $< $@ -$(TARGETLIB): tmp-igen tmp-dgen tmp-hw tmp-pk tmp-defines $(LIB_OBJ) $(GDB_OBJ) +$(TARGETLIB): tmp-igen tmp-dgen tmp-hw tmp-defines $(LIB_OBJ) $(GDB_OBJ) $(ECHO_AR) $(AR) $(AR_FLAGS) $(TARGETLIB) $(LIB_OBJ) $(GDB_OBJ) $(ECHO_RANLIB) $(RANLIB) $(TARGETLIB) @@ -782,10 +782,12 @@ hw_vm.o: hw_vm.c $(DEVICE_TABLE_H) $(CPU_H) # real packages -pk.h: tmp-pk; @true -tmp-pk: Makefile $(PACKAGE_SRC) $(srcroot)/move-if-change +$(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) f=""; \ + $(SILENCE) echo "/* Generated file by Makefile.in; do not edit. */" > tmp-pk.h; \ + f=""; \ for i in $(PACKAGE_SRC) ; do \ case " $$f " in \ *" $$i "*) ;; \ @@ -796,8 +798,8 @@ tmp-pk: Makefile $(PACKAGE_SRC) $(srcroot)/move-if-change | 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 pk.h + >> 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) diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac index b5909b705719..f26912eacde0 100644 --- a/sim/ppc/configure.ac +++ b/sim/ppc/configure.ac @@ -337,28 +337,6 @@ if test x"$silent" != x"yes"; then fi])dnl -AC_ARG_ENABLE(sim-packages, -[ --enable-sim-packages=list Specify the packages to be included in the build.], -[packages=disklabel -case "${enableval}" in - yes) ;; - no) AC_MSG_ERROR("List of packages must be specified for --enable-sim-packages"); packages="";; - ,*) packages="${packages}${enableval}";; - *,) packages="${enableval}${packages}";; - *) packages="${enableval}"'';; -esac -sim_pk_src=`echo $packages | sed -e 's/,/.c pk_/g' -e 's/^/pk_/' -e 's/$/.c/'` -sim_pk_obj=`echo $sim_pk_src | sed -e 's/\.c/.o/g'` -if test x"$silent" != x"yes" && test x"$packages" != x""; then - echo "Setting packages to $sim_pk_src, $sim_pk_obj" -fi],[packages=disklabel -sim_pk_src=`echo $packages | sed -e 's/,/.c pk_/g' -e 's/^/pk_/' -e 's/$/.c/'` -sim_pk_obj=`echo $sim_pk_src | sed -e 's/\.c/.o/g'` -if test x"$silent" != x"yes"; then - echo "Setting packages to $sim_pk_src, $sim_pk_obj" -fi])dnl - - AC_ARG_ENABLE(sim-smp, [ --enable-sim-smp=n Specify number of processors to configure for.], [case "${enableval}" in @@ -590,8 +568,6 @@ AC_SUBST(sim_filter) AC_SUBST(sim_icache) AC_SUBST(sim_hw_src) AC_SUBST(sim_hw_obj) -AC_SUBST(sim_pk_src) -AC_SUBST(sim_pk_obj) AC_SUBST(sim_xor_endian) AC_SUBST(sim_smp) AC_SUBST(sim_igen_smp) diff --git a/sim/ppc/pk.h b/sim/ppc/pk.h new file mode 100644 index 000000000000..b4de99658459 --- /dev/null +++ b/sim/ppc/pk.h @@ -0,0 +1,2 @@ +/* Generated file; do not edit. */ +extern package_create_instance_callback pk_disklabel_create_instance;