From patchwork Fri Dec 31 19:53:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 529290 Delivered-To: patch@linaro.org Received: by 2002:ac0:b243:0:0:0:0:0 with SMTP id s3csp5698961imc; Fri, 31 Dec 2021 11:54:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJwA+qMPP8ELNhuAVcJkgE21ZJEcOYGXlxGg4jfSiScvrrFG3OWjOQpwLfWHDmspQQvB5kSC X-Received: by 2002:a25:cad1:: with SMTP id a200mr31137207ybg.183.1640980441807; Fri, 31 Dec 2021 11:54:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640980441; cv=none; d=google.com; s=arc-20160816; b=BnPuRny6E2IDp8kgUu8PeWg7JsGJ88kkHJaJZyrz9DvZhjcmzdFX6SiF5SXxI1AfEL GNdiqm3iC8YDzsVkKjKC6QRb/24fEtRKOzjRQIRR5sZxN26sUoq3VHifPyT0o+I7+PlE j0uOIRiBb6VM/f/Xi1PE1Df3/ACJpUBaTEsfD4+iccMsMIsFffEOuxJpexSjn2OtVAye 1wSty0a46uPlNSRcZY+WyFFRModtV6SGCMcdnpUbYbjzq9ncIYgz3dW9lJm2EFRx3KfD f7Q53NZiU8wmsnMMkzheW7+KHy7/nV+f/I4nZRt1W2WB7yai9dOrLSv7CR1AsSMaKeSL EmjA== 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:message-id:date:subject:to:from:dkim-signature; bh=d5gaGDZ+99ggf9ZXPhFh9Enr0XUZOvFdyJRvEuhLCgk=; b=xUvQgFwtBTnpgLLYE3isReNcMkqyVV0nD7L8Ydh90qCg3goOkCjk8wNe54fuF5iswV hIvD2FTEpsDYCGefH3WgCRS58eCPVj1GuZfwzW5rWCxl3jUfcxRMO9bd8oymNlxzWypp 5hvoOYSIRXDeR+61WpliPNWupaeTUnA41ZG3fOm9Fs1pIBGmTHHxQyIJp3hgW6u8OQaE co4TsF/dIuNruMW6kH6uGYHwI6aCnWO4jB8f0jrLaFEth077nZP75IQ6XUzuP39OXxJ4 fmBGnNxYQJUeWnTjkaPT71Kr4rwxOrx/mCLD3XsfH+F/YckfCejCHXrptZfMxTDqMXv/ mMbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="JIY/a8WQ"; 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=fail (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 n64si12750442yba.216.2021.12.31.11.54.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 31 Dec 2021 11:54:01 -0800 (PST) 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=fail header.i=@linaro.org header.s=google header.b="JIY/a8WQ"; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:60058 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n3NyT-00042P-5R for patch@linaro.org; Fri, 31 Dec 2021 14:54:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n3Nxa-00041v-96 for qemu-devel@nongnu.org; Fri, 31 Dec 2021 14:53:06 -0500 Received: from [2607:f8b0:4864:20::42f] (port=38493 helo=mail-pf1-x42f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n3NxY-0005sV-Hn for qemu-devel@nongnu.org; Fri, 31 Dec 2021 14:53:05 -0500 Received: by mail-pf1-x42f.google.com with SMTP id b22so24359574pfb.5 for ; Fri, 31 Dec 2021 11:53:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=d5gaGDZ+99ggf9ZXPhFh9Enr0XUZOvFdyJRvEuhLCgk=; b=JIY/a8WQGPPnb1jQxI061HO9EE8SrDrCiOBk6Ar5BeGsHr1e2FtUtEMzcUd77qyDsv jar23Ks93J0mYpSi9LnzFZ6ROhvXDQjT2YL/HqNlUae9AjsD3V1GvlEXLSLHTXPqRM8J Ri7BJ4Skz1LA5tdh6dJ2tLwMSqXP0hVbMlKb9BaKrG+cPY3wrDLxYBr2Yd5h7aW15YTJ 8Pp6QmTIN/i1Q1cl3ivGlCCt/NvOi9wijz8F3yYmgYTD56dQusvDVaIMgytHXIwN1FbY EAYqCStUpyWl8lLSAfELO7JnBuwPB/veIXhuoZh47q4didGIHdq8+xgBbo23dXZo1bLR 6INg== 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:mime-version :content-transfer-encoding; bh=d5gaGDZ+99ggf9ZXPhFh9Enr0XUZOvFdyJRvEuhLCgk=; b=RLCHJ/YuqTFNKHEfpHTl0uqQI7BT77gXtVkMaqhlQ3tjdUbMUOidNDVDBsZK7pYEyY wuS0spTd5Roo8LXIeK8gpAtnsu1x1bHOdfseaFwcWXh5xsUC1hu6uqQx2zKtq73G4UND g0SFCssaeS2RlTgaKJuq1eXAhqxpjsyM8xExJSQ8uDYqOAa8YsWDCR8Z9RF1pbLwrtoL qx3srALwULkU3MQtR8sDyOAohU5lVydS26RgH+c3GtpIUbOIUM3Hc85H5p+z3vQzDsDC kdaoP0wfQZoHonu08dVOp3zl2vl2P/bsSdfwyH5sUPMo0FjL93p2uqOj7DTlQ5ERd6Iz Uy/Q== X-Gm-Message-State: AOAM5302Lt60v0gNni+08CvhY+F4kBEhltOwZheRZOFfNd7OdyCB7QUb cqSeh4FJoDKB6Eb1GgFuZKHo1N3TKAbSew== X-Received: by 2002:a63:4564:: with SMTP id u36mr31757466pgk.27.1640980382688; Fri, 31 Dec 2021 11:53:02 -0800 (PST) Received: from stoup.hsd1.or.comcast.net ([2601:1c0:6101:be80:9312:6940:7d21:4efb]) by smtp.gmail.com with ESMTPSA id l6sm30741613pfu.63.2021.12.31.11.53.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Dec 2021 11:53:02 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH] meson: Unify mips and mips64 in host_arch Date: Fri, 31 Dec 2021 11:53:01 -0800 Message-Id: <20211231195301.228362-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::42f (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::42f; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42f.google.com X-Spam_score_int: 6 X-Spam_score: 0.6 X-Spam_bar: / X-Spam_report: (0.6 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: pbonzini@redhat.com, alex.bennee@linaro.org, f4bug@amsat.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Fixes the build on a mips64 host. Prior to the break, we identified the arch via the __mips__ define; afterward we use meson's host_machine.cpu_family(). Restore the previous combination. Fixes: 823eb013452e ("configure, meson: move ARCH to meson.build") Reported-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- meson.build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meson.build b/meson.build index 886f0a9343..53065e96ec 100644 --- a/meson.build +++ b/meson.build @@ -74,6 +74,8 @@ if cpu not in supported_cpus host_arch = 'unknown' elif cpu == 'x86' host_arch = 'i386' +elif cpu == 'mips64' + host_arch = 'mips' else host_arch = cpu endif