From patchwork Sun Sep 12 15:58:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 509500 Delivered-To: patch@linaro.org Received: by 2002:a02:8629:0:0:0:0:0 with SMTP id e38csp3098831jai; Sun, 12 Sep 2021 09:06:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxeOkoRPakCqf1WKMg4LxGLiXYBByMJ0J8RWBt20XmqXNf55CsbYCfglQuFJNeO/vfOTxZ/ X-Received: by 2002:adf:f183:: with SMTP id h3mr2905262wro.32.1631462770535; Sun, 12 Sep 2021 09:06:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631462770; cv=none; d=google.com; s=arc-20160816; b=NMnHhtyzJENWVH/s8QJcoICSMx0XGfCZckBRelM9EZe3vSnn1x9mNhTQPLc3CXyfJn zushJiSlIQNGhloNDfI/TKxvoHvUS6ZT8bkZWjov/no9/VNUwa7dtHNxg1EcSOfipINN q44oDxIN9q8ElkP8IlFu7a9fvrA+zuN22mvbQFlgV6Y9qhOFOn9LB295Ukd6xUtazY/t PR90udyQgKby0UMBK57YJwUrRy4xdFYChkYsSEGz9TvEZcUWVAop5AKnMiPGyAI9t+ei ZqGqCI+IEYz/CqN8ab4yicXVR4ay9bbJ0+2tOFUBzk4Zj+gfZWts8aK02t6vEkdQmhqT Scww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=m7emFn9ZXxGGMcBZFosB1EnmF9R96t2zGLMZbzq44mc=; b=dp7TtXo003lJaXXSNUxOXq2gRn6LRBq333gp+HqkHfNPhpnrWHYoDpc4ZRg83QWrd9 VOTmU3Vvi9xnrDPRDt+kXnjiFwjYUFq5R6Ddd5iYxRHnzCpVLb2xsyhJvT8peFSrx6Ox y9mrRvSBgUfnDAhcL+7UEMRia683lqY7m8QfVMeV3dLmc4sEPY2T/Cbt3Q+S2EPCsZ9e PHmXA9m1gYd7UD4vkYv6UaeYvzfaTL9OyAk6v1rT0FWXwrD2nC6IvTHcGfMlvpBPgynB vr/pS87x+kcbDC/A3hkmmDrZPNeyg/S0a20agIvny9/NZG/WOWVOPkysbXCvEI5rmqxa FAoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=X1HK1FUm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i2si4796459wrm.110.2021.09.12.09.06.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 12 Sep 2021 09:06:10 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=X1HK1FUm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:55330 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPRzd-0004ms-IC for patch@linaro.org; Sun, 12 Sep 2021 12:06:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPRs4-0002QN-OU for qemu-devel@nongnu.org; Sun, 12 Sep 2021 11:58:21 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]:37719) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPRs1-0003xF-CI for qemu-devel@nongnu.org; Sun, 12 Sep 2021 11:58:19 -0400 Received: by mail-pl1-x630.google.com with SMTP id f21so2021864plb.4 for ; Sun, 12 Sep 2021 08:58:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m7emFn9ZXxGGMcBZFosB1EnmF9R96t2zGLMZbzq44mc=; b=X1HK1FUm3HBpdWLlIShTQXfxDBn3QbTNqlzrS2uIb2MVZ+Vq/9RTQYFdj9FZQNuW1H PfenExM/qaeu4FWMFX2+c2yfYBeH3t1Vp+zCXFJA5DY/ZicbtpVS//vvUPDuV3c+fxLS 7KQg+W+JAV5oTG4qoGrIhP/R05GTJ84iPRtBnyHtXht/rbP241blCqTjdOpjjDfTiVRK K0tL3rchaTRfAVkPeq6xAces2OKPG55W09SXvoMbMOBDcp17VeE7x97gpmGv+T48Hf0x /GSKLz2J+mBWMoWveB24N85WYIz1bzznN9rpQOfsDtsmt5kbJKvmoQLLffjqtpt5GMhT r36A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m7emFn9ZXxGGMcBZFosB1EnmF9R96t2zGLMZbzq44mc=; b=YlN+9i2cuYuguezfVc9ZM4cTX/aqVAi+fMMybfEtC48HLvtNXQRxsWFKtLePW8FSlF JbVaUtWa0jveMrDsEnY+1eGw/T1DCPX+1vp3GtcBwqbMSBn2fAbQFrPMSvpn9X1aAvVr 1LKLi9R/FEygkpzPo9RXgloBd6Jn1zsEbd9Evtt1EdiXb9lM/xO0esI1BGZxg5NueO3J XRTLTZnEwKzN7REBQAgrxOWMDjW4lWl52CC1FGyoTHwDnodYo/SmTc/gaCjBK3sTevs8 oKBtrYwPOB1wH2BhQE3JFbh+0ZDVCIPDeks4p4riRofuxLaqBv8uyF0d1BsO7nnOAOe7 o7hA== X-Gm-Message-State: AOAM530RWN7SuOqJQzqSKOn7kzS/Pm9Db596HlB99PrEyPG9i4ezTzjm /6EgkQRn78lxyGGyyZSNjvBL6EPw7HCVAw== X-Received: by 2002:a17:90b:814:: with SMTP id bk20mr8255580pjb.108.1631462295989; Sun, 12 Sep 2021 08:58:15 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id v13sm4439415pfm.16.2021.09.12.08.58.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 08:58:15 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 7/9] tcg/ppc: Replace TCG_TARGET_CALL_DARWIN with _CALL_DARWIN Date: Sun, 12 Sep 2021 08:58:07 -0700 Message-Id: <20210912155809.196236-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210912155809.196236-1-richard.henderson@linaro.org> References: <20210912155809.196236-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x630.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" If __APPLE__, ensure that _CALL_DARWIN is set, then remove our local TCG_TARGET_CALL_DARWIN. Signed-off-by: Richard Henderson --- tcg/ppc/tcg-target.c.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.25.1 diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc index e0f4665213..2202ce017e 100644 --- a/tcg/ppc/tcg-target.c.inc +++ b/tcg/ppc/tcg-target.c.inc @@ -25,8 +25,8 @@ #include "elf.h" #include "../tcg-pool.c.inc" -#if defined _CALL_DARWIN || defined __APPLE__ -#define TCG_TARGET_CALL_DARWIN +#if !defined _CALL_DARWIN && defined __APPLE__ +#define _CALL_DARWIN 1 #endif #ifdef _CALL_SYSV # define TCG_TARGET_CALL_ALIGN_ARGS 1 @@ -169,7 +169,7 @@ static const int tcg_target_call_oarg_regs[] = { }; static const int tcg_target_callee_save_regs[] = { -#ifdef TCG_TARGET_CALL_DARWIN +#ifdef _CALL_DARWIN TCG_REG_R11, #endif TCG_REG_R14, @@ -2372,7 +2372,7 @@ static void tcg_out_nop_fill(tcg_insn_unit *p, int count) # define LINK_AREA_SIZE (6 * SZR) # define LR_OFFSET (1 * SZR) # define TCG_TARGET_CALL_STACK_OFFSET (LINK_AREA_SIZE + 8 * SZR) -#elif defined(TCG_TARGET_CALL_DARWIN) +#elif defined(_CALL_DARWIN) # define LINK_AREA_SIZE (6 * SZR) # define LR_OFFSET (2 * SZR) #elif TCG_TARGET_REG_BITS == 64