From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id GFYeN8NUUGClCgAA0tVLHw (envelope-from ) for ; Tue, 16 Mar 2021 06:48:35 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id SB3WMsNUUGABHgAAB5/wlQ (envelope-from ) for ; Tue, 16 Mar 2021 06:48:35 +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 9104F1354E for ; Tue, 16 Mar 2021 07:48:35 +0100 (CET) Received: from localhost ([::1]:55748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM3VK-0003bL-N2 for larch@yhetil.org; Tue, 16 Mar 2021 02:48:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49576) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM3Ut-0003Dl-BH for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54629) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM3Ut-0005bL-1m for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lM3Ut-0001gQ-0l for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47182] [PATCH 15/18] syscalls: Fix RNDADDTOENTCNT on powerpc64le-linux. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Mar 2021 06:48:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47182@debbugs.gnu.org Cc: Chris Marusich Received: via spool by 47182-submit@debbugs.gnu.org id=B47182.16158772476314 (code B ref 47182); Tue, 16 Mar 2021 06:48:06 +0000 Received: (at 47182) by debbugs.gnu.org; 16 Mar 2021 06:47:27 +0000 Received: from localhost ([127.0.0.1]:37924 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3UE-0001dg-Kk for submit@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:26 -0400 Received: from mail-pl1-f176.google.com ([209.85.214.176]:33382) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3Ty-0001b6-Ir for 47182@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:11 -0400 Received: by mail-pl1-f176.google.com with SMTP id c16so16503824ply.0 for <47182@debbugs.gnu.org>; Mon, 15 Mar 2021 23:47:10 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=of8ir6BkT+HxSxgSQsY3L87NvlxvWlvIZjpyYfe0QfA=; b=ghQrtAPYSHWYj2f/ZP6u69RyG7CeOhOCo1SJY/CFmntprviHtsFClZs5IXVx7ZxQBx +OxacmUz64tkurnbVBwoXr+O9V2udTC7uV1F7nbQDbAQkxCDJ9v8C44+NCwmnTY47Zr4 oi49ggIXrCifTVRMeAq67kXJehTbLAwta12fy8udgFO7+Ap5jqERH7pSFHJwUDBVLd+a Bnkxo3VXIBYFqX41fmub+VHWVsTrZncfYuE8biPHnR1C9ZOTHTf1LN+u1329OlS1X9wC VyALGeKeqaKkTe2v5iyxQkstb1U0q0AZFVw5JHlHxO7q9E4+2SjYmLpnmX70u3lZNBkQ tq2Q== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=of8ir6BkT+HxSxgSQsY3L87NvlxvWlvIZjpyYfe0QfA=; b=UihwIktkVMhfuBjf/Bm1ff7VPCOXIjozsw8D6n17ciFLSAHeHRoarUnciISaeXRGki jsGtsM7RZEy7kf2N7HJqWSH5Vz4OVRRD2WGmPwEGco9WE9gNVtUgjT34W6uZqlcyU+Rk nC7zA+BFfryYteMgOaeXMQDKmgegxRne0ZgpozwKrTKaO3/B/evwBIyyzscUFo/cDJwG IWKbCcjJ/fZE1GZKvt6YRoainKgfN4LWBJUSw2a5l7bkGxkOgJyRFqkdYZ4hKj042ZeC lAxZg3j9pv7NOwZAqlAjdYhdyQsdpGxbAQP9OHjavgeeTHZYkhpKkaAE6b7lJYNrNuO3 wVRQ== X-Gm-Message-State: AOAM533O9QveDCspSBQbvQmWSv2xGDcYRi9bM6mASW+BO89wBJJ8UhH6 0eCNwKW+711xdpgeRdk/QOoHsdbUgTyeQA== X-Google-Smtp-Source: ABdhPJyqVZ4PGD82eLUGBPOUIJFFISqTiMVaKMIrTDmgrkxArzYg1tVCDnBj8QIIryCUsdkloYcz4Q== X-Received: by 2002:a17:902:9306:b029:e6:ac65:468e with SMTP id bc6-20020a1709029306b02900e6ac65468emr10534154plb.16.1615877224495; Mon, 15 Mar 2021 23:47:04 -0700 (PDT) Received: from garuda-lan.lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id r186sm15541160pfr.124.2021.03.15.23.47.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 23:47:04 -0700 (PDT) From: Chris Marusich Date: Mon, 15 Mar 2021 23:45:08 -0700 Message-Id: <20210316064511.2891553-15-cmmarusich@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210316064511.2891553-1-cmmarusich@gmail.com> References: <20210316062805.2890883-1-cmmarusich@gmail.com> <20210316064511.2891553-1-cmmarusich@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: , 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=1615877315; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=of8ir6BkT+HxSxgSQsY3L87NvlxvWlvIZjpyYfe0QfA=; b=hZc0VLKoLIOn7kex4L9w/pmLdwB0nKJK4qulX9c8Z87bf1aU0zy5UgCQXBoKnbb94RY8qN tLBDuO4NRVZmZ9il3AkPlnA2Yhx/G2Oqxkfdsfre+zAR0MEgHTH1/KzLIEW9OFu+0P8zHS eE0leoVbjg7b+bY+pdM8SXXTYdsw62hrJZDlvXfiqPaEw1Oh+DhRR9hxXGZY9J7RadCnP3 VP3bWjwsXZcs79YPEzZUw07caMROYHto30o9G5U2ts8gR3XfOkRvamf3Y9Bnkl6BqFYsmQ s1IWqFPkym1dQwhT5/YkQNx0H5BC79MsixYtkHG6ji5slhXO0sQPRyr84AbdeQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615877315; a=rsa-sha256; cv=none; b=Q4c0IS8UioPaq7qS1TvsJZMMDdXGh6LAhoF4x7QzFSgI/N1G7RlDyleGJ2WmkQQuaGIW63 mavnN4LPe8lnFfj7eX5qF1ewmjqRKMru4UZxwiCWHYzijAZ6ZKyzOKP7mRnU9pEZG6J/B3 Y/Ov9W0IXRRe5M4901BQSo+5X8PUgTzX97pdivc5i3ipMkhcUkKxsPXWrdNSoNewS3rVQc zFfYrYgWN+gaNyDon3ehvj09dCxLzoD90okPkzrJTrx1DZYiJg3wVMrV51XKFef4KH7reg gqBZGyrpa94kNl5F5U93HuMf5gcN6amfWKyjrdjQhv7mDcpzlnPfurQab9yLSg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=ghQrtAPY; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (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: -0.30 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=ghQrtAPY; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (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: 9104F1354E X-Spam-Score: -0.30 X-Migadu-Scanner: scn0.migadu.com X-TUID: QijYDy9limYm This fixes the failing test add-to-entropy-count in tests/syscalls.scm on powerpc64le-linux. * guix/build/syscalls.scm (RNDADDTOENTCNT): When %host-type starts with "powerpc64le", set this to #x80045201. Otherwise, set it to #x40045201 as before. --- guix/build/syscalls.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index a2c1d80fb1a..8886fc0fb94 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2019 Guillaume Le Vaillant ;;; Copyright © 2020 Julien Lepiller ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2021 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -942,7 +943,11 @@ backend device." ;;; ;; From . -(define RNDADDTOENTCNT #x40045201) +(define RNDADDTOENTCNT + ;; Avoid using %current-system here to avoid depending on host-side code. + (if (string-prefix? "powerpc64le" %host-type) + #x80045201 + #x40045201)) (define (add-to-entropy-count port-or-fd n) "Add N to the kernel's entropy count (the value that can be read from -- 2.26.2