about summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2023-01-19 16:40:01 +0000
committerAlyssa Ross <hi@alyssa.is>2023-01-19 17:43:50 +0000
commit6d165a94740e6c1bd1e7a701cf0c2bc66d007fc5 (patch)
tree4736bf76dea1e8a840a422e274b8bcb0883a31a6 /lib
parent541a2a5e9170a6f633e24513359cfe92d8ba50af (diff)
lib.platforms.s390x: init
Diffstat (limited to 'lib')
-rw-r--r--lib/systems/doubles.nix1
-rw-r--r--lib/systems/inspect.nix1
-rw-r--r--lib/tests/systems.nix1
3 files changed, 3 insertions, 0 deletions
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index 91b0a55fedd39..383dd30bfdb2f 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 7233565a01365..a5fed5acf2c53 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 5808154ba8053..88e2e4206d56a 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" ];