From patchwork Tue Jan 2 05:36:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 83107 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 6ADF5385828E for ; Tue, 2 Jan 2024 06:38:42 +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 EF5BE3858C2F for ; Tue, 2 Jan 2024 06:36:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EF5BE3858C2F 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 EF5BE3858C2F 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=1704177409; cv=none; b=XclT4dpGond17ezdvuMaNp7/ScihOGgj1JlcRz1izimOmcSdFHgsgidLuhpmY7s5Pps6Rhr6Pf51dNoM/4GHt2vpeHAGRl6Xe3jf2pDXxA14KqyVBys6l/nfvAKm+AX0GutDm+VgqTJsHVSry2sThmt9UlKW5FEq/3GPzDGB8XE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704177409; c=relaxed/simple; bh=6LgLWyRIvFMLI/dZvs2RW23lzgwBxJ61axlmXHCmerI=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=llsOC5eJHljyGd9jcdAfNcxMLd7gu052iIWvX2trCAlRJ+icKd02xx+EcGfbiEv4Ul0mUNFo75sgj/t7apb57fpRlqTJ4mjndZayt7+PmLIqNyj+bee18sL0EsF6CpNbBy1VPCk6jVPRC844f95Gvzw7mv4sbAwvV5LEqerCsTY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id 84497340813; Tue, 2 Jan 2024 06:36:46 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH/submitted 03/10] sim: ppc: move termio defines to config.h Date: Tue, 2 Jan 2024 00:36:31 -0500 Message-ID: <20240102053639.28290-3-vapier@gentoo.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240102053639.28290-1-vapier@gentoo.org> References: <20240102053639.28290-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 Move the defines from explicit -D options to config.h defines to simplify the build and make it easier to move to the top-level configure. --- sim/ppc/Makefile.in | 2 -- sim/ppc/config.in | 12 ++++++++++++ sim/ppc/configure | 19 ++++++++++++------- sim/ppc/configure.ac | 10 ++++------ 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index 26a1e7cfd28e..8eaad7424c44 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -68,7 +68,6 @@ TIMEBASE_CFLAGS = @sim_timebase@ FLOAT_CFLAGS = @sim_float@ MONITOR_CFLAGS = @sim_monitor@ MODEL_CFLAGS = @sim_model@ @sim_default_model@ @sim_model_issue@ -TERMIO_CFLAGS = @sim_termio@ SWITCH_CFLAGS = @sim_switch@ CONFIG_CFLAGS = \ $(SMP_CFLAGS) \ @@ -78,7 +77,6 @@ CONFIG_CFLAGS = \ $(FLOAT_CFLAGS) \ $(MONITOR_CFLAGS) \ $(MODEL_CFLAGS) \ - $(TERMIO_CFLAGS) \ $(SWITCH_CFLAGS) SIM_FPU_CFLAGS = -DHAVE_COMMON_FPU -I../common -I${srcdir}/../common diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac index 13db9fc4791e..e8354791a711 100644 --- a/sim/ppc/configure.ac +++ b/sim/ppc/configure.ac @@ -289,7 +289,6 @@ AC_CONFIG_HEADER(config.h:config.in) dnl Figure out what type of termio/termios support there is -sim_termio="" AC_MSG_CHECKING(for struct termios) AC_CACHE_VAL(ac_cv_termios_struct, [AC_TRY_COMPILE([#include @@ -303,7 +302,7 @@ AC_CACHE_VAL(ac_cv_termios_struct, ac_cv_termios_struct=yes, ac_cv_termios_struct=no)]) AC_MSG_RESULT($ac_cv_termios_struct) if test $ac_cv_termios_struct = yes; then - sim_termio="$sim_termio -DHAVE_TERMIOS_STRUCTURE" + AC_DEFINE([HAVE_TERMIOS_STRUCTURE], 1, [Define if struct termios exists.]) fi if test "$ac_cv_termios_struct" = "yes"; then @@ -316,7 +315,7 @@ if test "$ac_cv_termios_struct" = "yes"; then AC_MSG_RESULT($ac_cv_termios_cline) if test $ac_cv_termios_cline = yes; then - sim_termio="$sim_termio -DHAVE_TERMIOS_CLINE" + AC_DEFINE([HAVE_TERMIOS_CLINE], 1, [Define if struct termios has c_line.]) fi else ac_cv_termios_cline=no @@ -336,7 +335,7 @@ if test "$ac_cv_termios_struct" != "yes"; then ac_cv_termio_struct=yes, ac_cv_termio_struct=no)]) AC_MSG_RESULT($ac_cv_termio_struct) if test $ac_cv_termio_struct = yes; then - sim_termio="$sim_termio -DHAVE_TERMIO_STRUCTURE" + AC_DEFINE([HAVE_TERMIO_STRUCTURE], 1, [Define if struct termio exists.]) fi else ac_cv_termio_struct=no @@ -352,7 +351,7 @@ if test "$ac_cv_termio_struct" = "yes"; then AC_MSG_RESULT($ac_cv_termio_cline) if test $ac_cv_termio_cline = yes; then - sim_termio="$sim_termio -DHAVE_TERMIO_CLINE" + AC_DEFINE([HAVE_TERMIO_CLINE], 1, [Define if struct termio has c_line.]) fi else ac_cv_termio_cline=no @@ -378,7 +377,6 @@ AC_SUBST(sim_monitor) AC_SUBST(sim_model) AC_SUBST(sim_default_model) AC_SUBST(sim_model_issue) -AC_SUBST(sim_termio) AC_OUTPUT(Makefile, [case x$CONFIG_HEADERS in xconfig.h:config.in) echo > stamp-h ;; esac])