From acb24b4cc4432687e063ae2b5a08f449934e5fbf Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 22 Feb 2020 12:37:46 -0500 Subject: lib/systems: Assume newlib when no kernel and no libc is provided newlib is the default for most tools when no kernel is provided. Other exist, but this seems like a safe default. (cherry picked from commit 8009c2071179ee3490f244b91a49202728efe403) --- lib/systems/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 36afdae38668..4ca932d17921 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -36,9 +36,8 @@ rec { else if final.isUClibc then "uclibc" else if final.isAndroid then "bionic" else if final.isLinux /* default */ then "glibc" - else if final.isMsp430 then "newlib" - else if final.isVc4 then "newlib" else if final.isAvr then "avrlibc" + else if final.isNone then "newlib" else if final.isNetBSD then "nblibc" # TODO(@Ericson2314) think more about other operating systems else "native/impure"; -- cgit v1.2.3 From 00afca09295db93bf8bffe3f6f2d92a74eb97b38 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 12 Mar 2020 09:56:17 -0400 Subject: lib: Add armv6l-none to doubles list --- lib/systems/doubles.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lib') 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" ]; -- cgit v1.2.3 From 7c0d3f6f70c7a55e8c988e9d6882820b9d26171d Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 18 Mar 2020 17:43:11 -0400 Subject: lib: Fix systems test for new `armv6l-none` --- lib/tests/systems.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') 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" ]; -- cgit v1.2.3