diff options
| -rw-r--r-- | lib/systems/doubles.nix | 2 | ||||
| -rw-r--r-- | lib/systems/inspect.nix | 2 | ||||
| -rw-r--r-- | lib/tests/systems.nix | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 27cdaf6a7233b..3cdebbc07c1fa 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -74,6 +74,8 @@ in { mips = filterDoubles predicates.isMips; mmix = filterDoubles predicates.isMmix; riscv = filterDoubles predicates.isRiscV; + riscv32 = filterDoubles predicates.isRiscV32; + riscv64 = filterDoubles predicates.isRiscV64; vc4 = filterDoubles predicates.isVc4; or1k = filterDoubles predicates.isOr1k; m68k = filterDoubles predicates.isM68k; diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 0ebaeba7bd897..27c25deafec38 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -24,6 +24,8 @@ rec { isMips64n64 = { cpu = { family = "mips"; bits = 64; }; abi = { abi = "64"; }; }; isMmix = { cpu = { family = "mmix"; }; }; isRiscV = { cpu = { family = "riscv"; }; }; + isRiscV32 = { cpu = { family = "riscv"; bits = 32; }; }; + isRiscV64 = { cpu = { family = "riscv"; bits = 64; }; }; isSparc = { cpu = { family = "sparc"; }; }; isWasm = { cpu = { family = "wasm"; }; }; isMsp430 = { cpu = { family = "msp430"; }; }; diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index 205ca9c11d332..46e7bd992f1e6 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -20,6 +20,8 @@ with lib.systems.doubles; lib.runTests { testmips = mseteq mips [ "mips64el-linux" "mipsel-linux" "mipsel-netbsd" ]; testmmix = mseteq mmix [ "mmix-mmixware" ]; 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" ]; testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "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" ]; |