From 6d165a94740e6c1bd1e7a701cf0c2bc66d007fc5 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 19 Jan 2023 16:40:01 +0000 Subject: [PATCH] lib.platforms.s390x: init --- lib/systems/doubles.nix | 1 + lib/systems/inspect.nix | 1 + lib/tests/systems.nix | 1 + 3 files changed, 3 insertions(+) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 91b0a55fedd3..383dd30bfdb2 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -85,6 +85,7 @@ in { or1k = filterDoubles predicates.isOr1k; m68k = filterDoubles predicates.isM68k; s390 = filterDoubles predicates.isS390; + s390x = filterDoubles predicates.isS390x; js = filterDoubles predicates.isJavaScript; bigEndian = filterDoubles predicates.isBigEndian; diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 7233565a0136..a5fed5acf2c5 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -47,6 +47,7 @@ rec { isOr1k = { cpu = { family = "or1k"; }; }; isM68k = { cpu = { family = "m68k"; }; }; isS390 = { cpu = { family = "s390"; }; }; + isS390x = { cpu = { family = "s390"; bits = 64; }; }; isJavaScript = { cpu = cpuTypes.js; }; is32bit = { cpu = { bits = 32; }; }; diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index 5808154ba805..88e2e4206d56 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -24,6 +24,7 @@ with lib.systems.doubles; lib.runTests { testriscv = mseteq riscv [ "riscv32-linux" "riscv64-linux" "riscv32-netbsd" "riscv64-netbsd" "riscv32-none" "riscv64-none" ]; testriscv32 = mseteq riscv32 [ "riscv32-linux" "riscv32-netbsd" "riscv32-none" ]; testriscv64 = mseteq riscv64 [ "riscv64-linux" "riscv64-netbsd" "riscv64-none" ]; + tests390x = mseteq s390x [ "s390x-linux" "s390x-none" ]; testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd13" "x86_64-genode" "x86_64-redox" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ]; testcygwin = mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ];