From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 057531382C5 for ; Mon, 3 May 2021 12:56:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EC5FBE081B; Mon, 3 May 2021 12:56:21 +0000 (UTC) Received: from mail-qk1-x732.google.com (mail-qk1-x732.google.com [IPv6:2607:f8b0:4864:20::732]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B87F6E07D8 for ; Mon, 3 May 2021 12:56:21 +0000 (UTC) Received: by mail-qk1-x732.google.com with SMTP id 76so2997650qkn.13 for ; Mon, 03 May 2021 05:56:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version; bh=qhg3PYjPAVjqeHuw7Up4dkabLgKfYZSmTpVOLgrGahE=; b=JjIoe0UPIG/p1vMlVA35qjlaViWSZwim1sKPJGzOyf9tpMY7q3QP9jyerYdxKdNjkS 6AEicOqiObRl2+wvDtrsuzQypxbmAuUQBx6ppH+Yr1TnRwVBxtLgli4tFAvig749vapM RbYiOz7EdxUQBjIVExX8Pj0zVznKqRSchMqNMrCaAql+xXpVMXsn0NfKTUhwxUiswxjR Fv1LjIEH+oAXrQwsHkpYz7NNPndO80636wntBCc55O7kn7DhOn1pvSvqJWnNxAQ905+z 8o/aqkaNwPBmtXQ25SjLnRdSuZ9ey5cey0jFl4Kd6AvOTdOiUK4F85Jt5ST0tYDnKnOP oosA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version; bh=qhg3PYjPAVjqeHuw7Up4dkabLgKfYZSmTpVOLgrGahE=; b=Vym3QEggWDuLyoc9+Zlug9Ql6/H5Edif+jvFttSriejHYdycoFKiYj9gPban3cX82g 6IFeNewZP2ssfb83lnHPdGZuiVD2rBYuShn6hro0vU/0S3fTV7NRAgTRPOAon3BDj7Z1 6b8Lo8tZ11giBPPW0hwE9PgkJ4yf3fCUNEcS6QqUwBV12whRICT73pUiimFIfxdBN01r wBJDut68Yvd9EIl2n+AnaA4AdoWMIuHs8OkDHERAgtIjSXf9sRNLZBqIgPIY8aTwlF7p 6ReLQ9wUUppxeQHDNpvS0bwe7gfZCIkE/hsXIQsnNhWlaYCfVyjSb6X74wHOtYwa87Rk 7eCQ== X-Gm-Message-State: AOAM5307h//ckfto9Qhr2uCZrojMCUxSfSJqtqBPsAxm6V0YZTGd0Nn2 KqUdgIg06KBAZrV2KI2TN80= X-Google-Smtp-Source: ABdhPJwH94wuGk7BIzKCY7RKBtjCpy2ucNrlpvISVNOmiHCcZdHNZXzSjimm7VWWHPlIb95npq75Cw== X-Received: by 2002:a37:a6c6:: with SMTP id p189mr10861478qke.161.1620046581038; Mon, 03 May 2021 05:56:21 -0700 (PDT) Received: from callisto (c-73-175-137-55.hsd1.pa.comcast.net. [73.175.137.55]) by smtp.gmail.com with ESMTPSA id u9sm8557881qtf.76.2021.05.03.05.56.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 05:56:20 -0700 (PDT) From: fedora.dm0@gmail.com To: gentoo-dev@lists.gentoo.org Cc: floppym@gentoo.org Subject: [gentoo-dev] [PATCH] meson.eclass: include riscv bitness in cpu_family Date: Mon, 03 May 2021 08:56:19 -0400 Message-ID: <87tunkc6x8.fsf@gmail.com> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain X-Archives-Salt: 2a9473f4-ab8a-4ab0-a5c6-b1295ef49c8f X-Archives-Hash: 5d9014ab415ce234603e6b2f469fd45d This makes cpu_family identify RISC-V systems as either "riscv64" or "riscv32" to match the given tuple, or it will leave it as "riscv" when the tuple has an unknown cpu field. This fixes the expected values of cpu_family in meson projects: https://mesonbuild.com/Reference-tables.html#cpu-families Signed-off-by: David Michael --- eclass/meson.eclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eclass/meson.eclass b/eclass/meson.eclass index d0ce5adb355..e9c651fdeda 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -142,6 +142,11 @@ _meson_get_machine_info() { case ${cpu_family} in amd64) cpu_family=x86_64 ;; arm64) cpu_family=aarch64 ;; + riscv) + case ${tuple} in + riscv32*) cpu_family=riscv32 ;; + riscv64*) cpu_family=riscv64 ;; + esac ;; esac # This may require adjustment based on CFLAGS -- 2.26.3