From patchwork Mon Jul 12 21:55:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 473149 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp3349323jao; Mon, 12 Jul 2021 15:04:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJylANMcJxoxtltTBvj2PzvoqAtfcO3kLx2/HLtvWPCP6yYY/zL216OZfx05Dgp/2jTSVprt X-Received: by 2002:a17:906:1b16:: with SMTP id o22mr1390460ejg.293.1626127485578; Mon, 12 Jul 2021 15:04:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626127485; cv=none; d=google.com; s=arc-20160816; b=wBzbBrbQXDB3qtG8aGE1OVMAM7UByy5zPYLZKES/ILxXASXZaGpn7i5cnPs/5KZ9op iMMkMM0StBDTnWfpMVkX4WUIHtPLs2JzEcyti47j3ajDjcKtzEjdbS6vFIhgW1dFBRya syNxO+7Te9NeKjuTQ1ZjDRi+9FODYxhNUGST8vZgs00TD4WAxF8EOFtAB8N78bnYAtcE ADRTE6/bjRWYTzfEKu9QW5dviH/ORG536E+JhLHQQRZo/U2OLrI1BnhEmoz8dMagBPqv IVCggOyXdruSb341yA5ozrjFzy7wIitLv6S6XLNbsBHqdxTfPtSuSB7utAT9dXx6UrGi 7YHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=gcw0NgCulR9Vj0+SMtfXGemJm540r7AlK/Q8dtwhye5pWfl/sNnWpEbWl7UsyQwDif geBvdMpbBjoizBbrW1ZRBm6vbwDBKxna1oaCOoQokYvaBMvDyuUfmHS5XI6XDsyHxhK/ /iwsD2lxX7pxYjuajhtwrqiPgfLCZFbj5Y5m8sA6NM7uU85wMOl7KN7v4Q9qXcUT7CkL ShP6CoM/rPzLOHlMTui4Fzi5asEAUzcjOysa4tGP1I8+FNvauHBdbQWkujH4tfr6/PDg WkGfZLmhJ7VABPaeIy1u9/kQEzodRwW+t9Eo+pefn+0q5nJvJZemlvP76iF64e72NsAO mGxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="rxNTD/co"; 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 j22si6353193edr.518.2021.07.12.15.04.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 15:04:45 -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="rxNTD/co"; 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]:48902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m342e-0005ig-K5 for patch@linaro.org; Mon, 12 Jul 2021 18:04:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50788) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m33tz-0000kv-7U for qemu-devel@nongnu.org; Mon, 12 Jul 2021 17:55:47 -0400 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]:38750) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m33tw-0006vA-OE for qemu-devel@nongnu.org; Mon, 12 Jul 2021 17:55:46 -0400 Received: by mail-pj1-x102e.google.com with SMTP id me13-20020a17090b17cdb0290173bac8b9c9so143788pjb.3 for ; Mon, 12 Jul 2021 14:55:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=m7emFn9ZXxGGMcBZFosB1EnmF9R96t2zGLMZbzq44mc=; b=rxNTD/co5NHhu5YAUrO/4/3Q6zmq5wj1krlkzCno+nne0/ipSHG0K/ycuc0vCcEg22 /yvZwjVZQo36lgaJiYiuy7opmBQMwI9a/2KK43qbqVsiehBLNdseNKpSoC3neWC6vErJ bFGB+sb2l30hqigiXYBHpnAya6yWoQwsejs2EFNb5Cj3npC32sE5n4+xu7MCx+ol4h1c boNSoY31FvdpeWY/YJXvNUhUuUDowrIE+EDsOUFrt/xJOalgaheaVBXWggRRK820oH1B eWa84HO8OC7vdMUtAq89eZzkc77iuu3l7Ake8hYt6VF5V2kt2FtEgiXslbfL4qgXAZ9d 8bOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m7emFn9ZXxGGMcBZFosB1EnmF9R96t2zGLMZbzq44mc=; b=g0e1QodO9uK6Ifrw5Rc+derBFLScwWg58xn537BhRjGRjsUs7JzVt/1VfUwFHk1HJ6 Gj6YHOLsNv7cmldpyZyW49m2ujDEzOVHEiEnPtJG145YWxswgG7ULNjpqkO5dGsCFKXl k0HOPsfie2EJ10DfIUuqVL7b+rrbj5DCuAVzaQjQ+cKjVHVl1dCCwVx6C04oQ6CsIXWp zo6/rqEpP1sHHfX9TZtAG/+2H8rN9DKJI6sLi/47ERWMBCn7uLm4HYIrTSHAsGIKkq6s mvbl/1EEspISz1kcWMITOvlomzISM2d4JX1/1+y0MR1fO4u1vcKoQGmhNy3kbBz44NWZ 7AOQ== X-Gm-Message-State: AOAM530XLwESUKNpqI4YXhFVBsSNYzIeCiF29CiU+mxFRDhQ454qj4ov eRSTQuSZlLJioKUGpjC/z9RNpcf/38xrPQ== X-Received: by 2002:a17:90a:1de3:: with SMTP id v90mr934918pjv.219.1626126943457; Mon, 12 Jul 2021 14:55:43 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id d2sm376932pjo.50.2021.07.12.14.55.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 14:55:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 10/11] tcg/ppc: Replace TCG_TARGET_CALL_DARWIN with _CALL_DARWIN Date: Mon, 12 Jul 2021 14:55:34 -0700 Message-Id: <20210712215535.1471256-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210712215535.1471256-1-richard.henderson@linaro.org> References: <20210712215535.1471256-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102e.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: , 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