From patchwork Tue May 23 23:57:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 685243 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1988852wrt; Tue, 23 May 2023 17:02:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ67XSRmyG9D8xdANCkBm4bsQGXNcKawaJ/QrcTaWuG7rweGZ3+OP5lp5jCSGPxV/z3nbrj+ X-Received: by 2002:a37:6805:0:b0:75b:23a1:8e5b with SMTP id d5-20020a376805000000b0075b23a18e5bmr5216615qkc.44.1684886556322; Tue, 23 May 2023 17:02:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684886556; cv=none; d=google.com; s=arc-20160816; b=XnbqJqc0eMZ41YQ0EzNHpyZ4Jg0sQwgh9nlXNmExaqFD4gocJXDIAJ/wFoZJR0iRkj p7E3hH8i0Gxeystsw8n5Je+lyYGl8UytVUHBLCh2I7fvP4mE4Y9Wepdq/Z2eYNCJmV6L ILo4kpodNGJjLQHj7DLYJnaxPUP2sHpqDvqxpdag3iftgpDsmNg1vn2bRHbJAkG4Qxzl LketOO0CjDFof004ieafOfRQa0uJshGV5LlBGnT0ndcOfHpMbO/jfQ3hVKj3eODNPumJ 1M/HNXn+hfMdlUf6tVQwKtvBpTZQwlfWReWCD2VrCelj1DZPSeVGYSeHugtRvgzVJa20 xZ1A== 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:cc:to :from:dkim-signature; bh=y+VrjHOrusR8Ccf+/cO3Nyi/RyoonOjF8bnygB9K0pI=; b=xYOYDaqPTFE8dHWKy3Y4HF3Ym7ncNKP/Hy2/Xce6/CHXrjSy2wZzeNiiAQhr7pSuUD 19R5jRu2s3+W6ngqWHmfigZQgDXH7HMiDg7tDt0sMPgn9mDGeFUw8Sc6RZw75d01EeuX 8nbf7914R6o2A1zP/Q4p05wVr1jzgFgybf9cPET76h1tTlj3bOOOqfcj2C8Dt9ys9fBr GR1naqQkQXvpFzwnVCCtaRCqvA/tzK9ObIFP1VqGDjnHueYjnSXHT+wCGbqPhbet2ho/ 2Bhf6+spvp5yJ6eI3pqel6mJAcMxgs5WgEvVqKycnf1sVCWts3QBmd14GBdT063DABEO W/Uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=czmXDrrh; 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 s7-20020a05620a030700b0075b13a89c28si3826172qkm.664.2023.05.23.17.02.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 May 2023 17:02:36 -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=czmXDrrh; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1btl-0004Ik-A8; Tue, 23 May 2023 19:58:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1btf-0004Gi-AD for qemu-devel@nongnu.org; Tue, 23 May 2023 19:58:31 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1btS-0001oD-7G for qemu-devel@nongnu.org; Tue, 23 May 2023 19:58:31 -0400 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-64d3578c25bso162306b3a.3 for ; Tue, 23 May 2023 16:58:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684886296; x=1687478296; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=y+VrjHOrusR8Ccf+/cO3Nyi/RyoonOjF8bnygB9K0pI=; b=czmXDrrh7tx4ODpM2K55eUXihYngN0Yvrr7nO96dMcUYopRf6gxylD0zaN5xpi1OnV vbscGG7lX41pGF/ZDnpKaj5eBPhS2cvrOfelTJTHTNvz8m4z8lcYF4hRisDv/6w8U8Y2 6x1q+9VgRtEd8JcGlY9vhsdOsVcS6yvhFC+CbjjRv2lJQaPvAiropuyNrluoahzO+xfj lSDnNTJH8/PcRJa/EvLJCbOTSr0RQs7P0yjYCDO1sIJ5fCHpQ/sGeqleXDEk8QT36zWB glFWSrds4yIt6Et202k+qLk1fmOZpu+3zJuE2jBgGlagaCpNNLmLGPuVJmLiUaUpAn4z oWrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684886296; x=1687478296; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y+VrjHOrusR8Ccf+/cO3Nyi/RyoonOjF8bnygB9K0pI=; b=QXO/GuCVKOXX1oXDp6WuvqPGh08Bk9Pk3+zukS7PN7lgW1M97ycopnhLnXcoxxbd9T Mv+U0vkuTTnjI/fpWxGRV+vE6w5JozEdDJOBO6t1Z1qh2e0HSYBO1J7nx2SJPXOLOIal f6jUuQY6+1wJ3BFesx+HnYqFZJUJdKtzXm2CNsB1Tt4tBcm68L6OA7sBET/H9HmO6E0M SOldlOrADSbN5Ht5gIMxArpR9A8MGdCdUANooyZx6YO0bRDuSvx1iNcAnS0dPb2eloXw F38Vn44TcCK1rV6hOC8hnK05xp/VR82eLSUI0CNIpWBC3gB2vIPSqgcHFZbOpKYA2gNa ForQ== X-Gm-Message-State: AC+VfDzttWitd6iIRLwJlXeCEW6JubaqOUjYxJ+hM204YkEHDaJJEJpM B/YhNVz5hf0Wa2jz94YnhXGLkHBDTQvDBxm+tI4= X-Received: by 2002:a05:6a00:1303:b0:64c:c5c0:6e01 with SMTP id j3-20020a056a00130300b0064cc5c06e01mr815871pfu.31.1684886296215; Tue, 23 May 2023 16:58:16 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:c13a:d73:4f88:3654]) by smtp.gmail.com with ESMTPSA id p18-20020aa78612000000b0063b7c42a070sm6285041pfn.68.2023.05.23.16.58.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 16:58:15 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?A?= =?utf-8?q?lex_Benn=C3=A9e?= Subject: [PULL 12/28] meson: Fix detect atomic128 support with optimization Date: Tue, 23 May 2023 16:57:48 -0700 Message-Id: <20230523235804.747803-13-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230523235804.747803-1-richard.henderson@linaro.org> References: <20230523235804.747803-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::431; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x431.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+patch=linaro.org@nongnu.org Silly typo: sizeof(16) != 16. Fixes: e61f1efeb730 ("meson: Detect atomic128 support with optimization") Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index c516b911d9..ef181ff2df 100644 --- a/meson.build +++ b/meson.build @@ -2557,7 +2557,7 @@ if has_int128 # __alignof(unsigned __int128) for the host. atomic_test_128 = ''' int main(int ac, char **av) { - unsigned __int128 *p = __builtin_assume_aligned(av[ac - 1], sizeof(16)); + unsigned __int128 *p = __builtin_assume_aligned(av[ac - 1], 16); p[1] = __atomic_load_n(&p[0], __ATOMIC_RELAXED); __atomic_store_n(&p[2], p[3], __ATOMIC_RELAXED); __atomic_compare_exchange_n(&p[4], &p[5], p[6], 0, __ATOMIC_RELAXED, __ATOMIC_RELAXED);