From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id D34983858D39 for ; Wed, 3 Nov 2021 23:47:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D34983858D39 Received: by smtp.gentoo.org (Postfix, from userid 559) id C6776342DBB; Wed, 3 Nov 2021 23:47:11 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 1/2] sim: ppc: switch to common builds for callback objects Date: Wed, 3 Nov 2021 19:47:06 -0400 Message-Id: <20211103234707.5692-1-vapier@gentoo.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, 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.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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-List-Received-Date: Wed, 03 Nov 2021 23:47:17 -0000 We don't need to build this anymore ourselves since the common build includes it and produces the same object code. We also need to pull in the split constant modules after the refactoring and pulling them out of nltvals.def & targ-map.o. This doesn't matter for the sim directly, but does for gdb and other users of libsim. We also delete some conditional source tree logic since we already require this be the "new" combined tree with a ../common/ dir. This has been the case for decades at this point. --- sim/ppc/Makefile.in | 11 ++++++----- sim/ppc/configure | 18 ------------------ sim/ppc/configure.ac | 14 -------------- 3 files changed, 6 insertions(+), 37 deletions(-) diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index 8f4cd997d303..2f8fe9b20b0e 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -430,7 +430,7 @@ BUILT_SRC_WO_CONFIG = \ pk.h \ hw.h hw.c \ filter_host.c \ - @sim_targ_vals@ + targ-vals.h targ-map.c targ-vals.def BUILT_SRC = \ $(BUILT_SRC_WO_CONFIG) \ @@ -469,6 +469,10 @@ MAIN_SRC = \ sim_calls.c COMMON_OBJS_NAMES = \ + callback.o \ + target-newlib-errno.o \ + target-newlib-open.o \ + target-newlib-signal.o \ version.o COMMON_OBJS = $(COMMON_OBJS_NAMES:%=../common/common_libcommon_a-%) @@ -511,7 +515,7 @@ LIB_OBJ = \ options.o -GDB_OBJ = gdb-sim.o sim_calls.o @sim_callback@ +GDB_OBJ = gdb-sim.o sim_calls.o targ-map.o HW_SRC = @sim_hw_src@ HW_OBJ = @sim_hw_obj@ @@ -616,9 +620,6 @@ stamp-map: Makefile gentmap $(srcroot)/move-if-change $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-map.c targ-map.c $(SILENCE) touch $@ -callback.o: $(srcdir)/../common/callback.c $(TARG_VALS_H) $(CONFIG_H) - $(ECHO_CC) $(CC) -c $(STD_CFLAGS) -DHAVE_CONFIG_H $(srcdir)/../common/callback.c - targ-map.o: targ-map.c $(ANSIDECL_H) $(GDB_CALLBACK_H) $(TARG_VALS_H) sim-fpu.o: $(srcdir)/../common/sim-fpu.c $(CONFIG_H) diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac index b837c5b8609e..8d5d78ce1dcd 100644 --- a/sim/ppc/configure.ac +++ b/sim/ppc/configure.ac @@ -545,18 +545,6 @@ else sim_devzero="" fi -dnl Figure out if we are in the new Cygnus tree with a common directory or not -AC_MSG_CHECKING(for common simulator directory) -if test -f "${srcdir}/../common/callback.c"; then - AC_MSG_RESULT(yes) - sim_callback="callback.o targ-map.o" - sim_targ_vals="targ-vals.h targ-map.c targ-vals.def" -else - AC_MSG_RESULT(no) - sim_callback="" - sim_targ_vals="" -fi - AC_MSG_CHECKING(for common simulator directory fpu implementation) if test -f "${srcdir}/../common/sim-fpu.c"; then AC_MSG_RESULT(yes) @@ -624,8 +612,6 @@ AC_SUBST(sim_default_model) AC_SUBST(sim_model_issue) AC_SUBST(sim_termio) AC_SUBST(sim_devzero) -AC_SUBST(sim_callback) -AC_SUBST(sim_targ_vals) AC_SUBST(sim_fpu_cflags) AC_SUBST(sim_fpu) -- 2.33.0