[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
15/18: syscalls: Fix RNDADDTOENTCNT on powerpc64le-linux.
From: |
guix-commits |
Subject: |
15/18: syscalls: Fix RNDADDTOENTCNT on powerpc64le-linux. |
Date: |
Fri, 12 Mar 2021 03:16:58 -0500 (EST) |
marusich pushed a commit to branch wip-ppc64le-for-master
in repository guix.
commit ed28a8d9afd648adab3bbef017588580f3a17e1e
Author: Chris Marusich <cmmarusich@gmail.com>
AuthorDate: Sun Feb 21 16:05:58 2021 -0800
syscalls: Fix RNDADDTOENTCNT on powerpc64le-linux.
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 74d7a33..f39730f 100644
--- a/guix/build/syscalls.scm
+++ b/guix/build/syscalls.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -876,7 +877,11 @@ backend device."
;;;
;; From <uapi/linux/random.h>.
-(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
- 08/18: gnu: bdb-4.8: Fix configure on powerpc64le-linux., (continued)
- 08/18: gnu: bdb-4.8: Fix configure on powerpc64le-linux., guix-commits, 2021/03/12
- 09/18: gnu: guile-avahi: Fix compilation on powerpc64le-linux., guix-commits, 2021/03/12
- 02/18: utils: Add target-powerpc? procedure., guix-commits, 2021/03/12
- 03/18: gnu: gcc-4.7: On powerpc64le, fix /lib64 references., guix-commits, 2021/03/12
- 04/18: gnu: glibc: Fix ldd path on powerpc*., guix-commits, 2021/03/12
- 05/18: gnu: gcc-boot0: Enable 128-bit long double for POWER9., guix-commits, 2021/03/12
- 07/18: gnu: binutils-final: Support more Power architectures., guix-commits, 2021/03/12
- 10/18: gnu: texlive-bin: Fix compilation on powerpc64le*., guix-commits, 2021/03/12
- 12/18: gnu: libelf: Fix compilation for powerpc64le-linux., guix-commits, 2021/03/12
- 11/18: gnu: texlive-latex-base: Fix compilation on powerpc64le*., guix-commits, 2021/03/12
- 15/18: syscalls: Fix RNDADDTOENTCNT on powerpc64le-linux.,
guix-commits <=
- 13/18: Add powerpc64le-linux as a supported Guix architecture., guix-commits, 2021/03/12
- 16/18: ci: %cross-targets: Add powerpc64le-linux-gnu., guix-commits, 2021/03/12
- 14/18: syscalls: Fix clone on powerpc64le-linux., guix-commits, 2021/03/12
- 17/18: utils: Fix target-64bit? on powerpc64le-linux., guix-commits, 2021/03/12
- 18/18: squash glibc: Fix ldd path on powerpc*., guix-commits, 2021/03/12