From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 8D3aBv3VzGBgYgAAgWs5BA (envelope-from ) for ; Fri, 18 Jun 2021 19:21:01 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 8AaTAv3VzGBfAwAAbx9fmQ (envelope-from ) for ; Fri, 18 Jun 2021 17:21:01 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9CF79136D2 for ; Fri, 18 Jun 2021 19:21:00 +0200 (CEST) Received: from localhost ([::1]:50012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIAq-0008Bq-Fg for larch@yhetil.org; Fri, 18 Jun 2021 13:20:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37692) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA0-0007ar-7A for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46544) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luI9z-00047B-WF for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luI9z-0004rg-Ru for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 02/37] utils: Define a target-x86-32? and target-x86-64? predicate. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162403675618314 (code B ref 49025); Fri, 18 Jun 2021 17:20:03 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:16 +0000 Received: from localhost ([127.0.0.1]:57994 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9D-0004lC-Jn for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:15 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34838) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI96-0004j5-7Z for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:09 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hK6b2; Fri, 18 Jun 2021 19:19:06 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:15:56 +0200 Message-Id: <20210618171631.20534-2-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036746; bh=lf5YV93HuGoFIHD1h6x01QuYB2H0sCsCvf+MhMqf3Ic=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=n9k7sEeAp6hkSj1w0Lsr3bVGtuDnfO1pijnnZNRf/T4QHS+FcvQ+zuCJzjAjDuFJk 0WHzhAWKTVp8G+oeHcNGLHIdfcA4XyIl+ATXuzl/gyjigsgqDxyAuy2XMVSN4c3Hys UjM3H2DQJU6y55zGB04CW8NyppM7TtQ4AefQSAd001e0IwSysuhVW1kqSuM5HE65gy Mf5WbFh5WdzlSXTEpUg9+cdepIV7TI4wa/v8BBXmnNAdI4jOgzf2+tdKxgyL/vvy3I PtX8MiwwQQWySvygzhxR8/dtIaa7wYZ3/ngn4yGvcukx19MyVsjq6tlHWXvpPTEaJQ SvVR1sHdQ2nfA== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1624036860; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=lf5YV93HuGoFIHD1h6x01QuYB2H0sCsCvf+MhMqf3Ic=; b=ao4gAH+WCO4sWCms0BLQIRLqzi5Y7HycHJK4ldMhOMG/L7nXPzaL1CIRcRnKlZf+qRekvl HwQ/ToqjigzhCem7CiS4qevqcGAVXKn8C4OhLsELJus+qkwtFGZW/gT0DHoPeApNYAOB/B /9WvwbYMY/z0tdODOD59lOGyUJcgq1wdpQcW8FeGGOPaGdCAYN37QZtP66dEEtuP0hlPdS /xR4EtgU1JecnzQHT+nmHljvybq7QIx4QBOZfLm3ljAMdDfdEwUK0eo5l7nK7Sy4B4guaP 09eadttrilyWlgfcqAmQ1v7XWoanx01i5TeY48oSx6Y+q/K2sYz17zAmfLNsUA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624036860; a=rsa-sha256; cv=none; b=MMBaQ5jk0BpCR9OAQZWh+MnG9iKO0FBKHxqxDcle5y5mJLb6D4i1lwxSFuAacUrpaS6P4V E/r2utD6o2CP+w+y7JrcCTP8GmLqUJKhDL29jeVomV5pmNRl4/cbXMq0aeHc6yAtXQr+oz eww1SJ4ZoKJDVRS+uDLTu9t6EZJcmOjr6lwR07pC0RspAx6bfPC4J1uWAOBQ3kTBXiB/TW 6hFK5KMPQkWobm7Q5clfu4bkfyD7p5w7wACGaFO7j8nA+P6yy8FsUrjIDfxuAohDSv77/W Q6Y5dMF8InX2MoDU8pW+R9V+/kRRlTi6gBqeemQwWR/cgXcXtzwea8TLdvHElw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=n9k7sEeA; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 5.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=n9k7sEeA; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 9CF79136D2 X-Spam-Score: 5.17 X-Migadu-Scanner: scn1.migadu.com X-TUID: OMAjDtNkmYOO * guix/utils.scm (target-x86-32?, target-x86-64?): New predicates. * tests/utils.scm ("target-x86-32?", "target-x86-64?"): New tests. --- guix/utils.scm | 20 ++++++++++++++++++++ tests/utils.scm | 23 +++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/guix/utils.scm b/guix/utils.scm index 4ff2602e23..2256ea2ca6 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -84,6 +84,8 @@ package-name->name+version target-linux? target-mingw? + target-x86-32? + target-x86-64? target-arm32? target-aarch64? target-arm? @@ -553,6 +555,24 @@ a character other than '@'." (and target (string-suffix? "-mingw32" target))) +(define* (target-x86-32? #:optional (target (or (%current-target-system) + (%current-system)))) + "Is the architecture of TARGET a variant of Intel's 32-bit architecture +(IA32)?" + ;; Intel also has a 16-bit architecture in the iN86 series, i286 + ;; (see, e.g. https://en.wikipedia.org/wiki/Intel/808286) so this + ;; procedure is not named target-x86?. + (or (string-prefix? "i386-" target) + (string-prefix? "i486-" target) + (string-prefix? "i586-" target) + (string-prefix? "i686-" target))) + +(define* (target-x86-64? #:optional (target (or (%current-target-system) + (%current-system)))) + "Is the architecture of TARGET a variant of Intel/AMD's 64-bit +architecture (x86_64)?" + (string-prefix? "x86_64-" target)) + (define* (target-arm32? #:optional (target (or (%current-target-system) (%current-system)))) (string-prefix? "arm" target)) diff --git a/tests/utils.scm b/tests/utils.scm index 80a0e669a4..92439b5587 100644 --- a/tests/utils.scm +++ b/tests/utils.scm @@ -306,6 +306,29 @@ skip these tests." '("i686-linux-gnu" "i686-pc-gnu" "i686-w64-mingw32"))) +(test-equal "target-x86-32?" + '(#f #f #f #t #t #t #t #f) + ;; These are (according to Wikipedia) two RISC architectures + ;; by Intel and presumably not compatible with the x86-32 series. + (map target-x86-32? + '("i860-gnu" "i960-gnu" + ;; This is a 16-bit architecture + "i286-gnu" + ;; These are part of the x86-32 series. + "i386-gnu" "i486-gnu" "i586-gnu" "i686-gnu" + ;; Maybe this one will exist some day, but not yet. + "i786-gnu"))) + +(test-equal "target-x86-64?" + '(#t #f #f #f) + (map target-x86-64? + `("x86_64-linux-gnu" "i386-linux-gnu" + ;; Just because it includes "64" doesn't make it 64-bit. + "aarch64-linux-gnu" + ;; Note that (expt 2 109) in decimal notation starts with 64. + ;; However, it isn't 32-bit. + ,(format #f "x86_~a-linux-gnu" (expt 2 109))))) + (test-end) (false-if-exception (delete-file temp-file)) -- 2.32.0