diff options
| author | John Ericson <git@JohnEricson.me> | 2020-03-19 10:38:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-19 10:38:22 -0400 |
| commit | 19a0b38cbe352f964acafb139e2a37dd082c9e3d (patch) | |
| tree | ee190aa7eae904f4dd763662113c325961c760f0 /lib | |
| parent | d96bd3394b734487d1c3bfbac0e8f17465e03afe (diff) | |
| parent | 7c0d3f6f70c7a55e8c988e9d6882820b9d26171d (diff) | |
| download | nixlib-19a0b38cbe352f964acafb139e2a37dd082c9e3d.tar nixlib-19a0b38cbe352f964acafb139e2a37dd082c9e3d.tar.gz nixlib-19a0b38cbe352f964acafb139e2a37dd082c9e3d.tar.bz2 nixlib-19a0b38cbe352f964acafb139e2a37dd082c9e3d.tar.lz nixlib-19a0b38cbe352f964acafb139e2a37dd082c9e3d.tar.xz nixlib-19a0b38cbe352f964acafb139e2a37dd082c9e3d.tar.zst nixlib-19a0b38cbe352f964acafb139e2a37dd082c9e3d.zip | |
Merge pull request #82882 from obsidiansystems/armv6-embedded
Misc fixes for armv6 bare metal cross
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/systems/doubles.nix | 8 | ||||
| -rw-r--r-- | lib/tests/systems.nix | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 96e602d0e167..619b0427918d 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -26,7 +26,13 @@ let "riscv32-linux" "riscv64-linux" - "aarch64-none" "avr-none" "arm-none" "i686-none" "x86_64-none" "powerpc-none" "msp430-none" "riscv64-none" "riscv32-none" "vc4-none" + "arm-none" "armv6l-none" "aarch64-none" + "avr-none" + "i686-none" "x86_64-none" + "powerpc-none" + "msp430-none" + "riscv64-none" "riscv32-none" + "vc4-none" "js-ghcjs" ]; diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index 6f52912994df..dd2b9575fc2c 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -14,7 +14,7 @@ let in with lib.systems.doubles; lib.runTests { testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded ++ js); - testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "arm-none" "armv7a-darwin" ]; + testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-none" "armv7a-linux" "armv7l-linux" "arm-none" "armv7a-darwin" ]; testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ]; testmips = mseteq mips [ "mipsel-linux" ]; testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ]; |