From 12371a51e647a00b90fe250837f056642125c095 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 20 Feb 2022 20:32:52 -0800 Subject: lib/systems: add mips64el definitions MIPS has a large space of {architecture,abi,endianness}; this commit adds all of them to lib/systems/platforms.nix so we can be done with it. Currently lib/systems/inspect.nix has a single "isMips" predicate, which is a bit ambiguous now that we will have both mips32 and mips64 support, with the latter having two ABIs. Let's add four new predicates (isMips32, isMips64, isMips64n32, and isMips64n64) and treat the now-ambiguous isMips as deprecated in favor of the more-specific predicates. These predicates are used mainly for enabling/disabling target-specific workarounds, and it is extremely rare that a platform-specific workaround is needed, and both mips32 and mips64 need exactly the same workaround. The separate predicates (isMips64n32 and isMips64n64) for ABI distinctions are, unfortunately, useful. Boost's user-scheduled threading (used by nix) does does not currently supports mips64n32, which is a very desirable ABI on routers since they rarely have more than 2**32 bytes of DRAM. --- lib/systems/default.nix | 3 ++- lib/systems/doubles.nix | 8 ++++++-- lib/systems/examples.nix | 4 ++++ lib/systems/inspect.nix | 6 +++++- lib/systems/parse.nix | 7 +++++++ lib/systems/platforms.nix | 49 +++++++++++++++++++++++++++++++++++++++++++++++ lib/tests/systems.nix | 4 ++-- 7 files changed, 75 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 529eeb6514b..7ddd5b8a581 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -105,7 +105,8 @@ rec { else if final.isAarch64 then "arm64" else if final.isx86_32 then "i386" else if final.isx86_64 then "x86_64" - else if final.isMips then "mips" + else if final.isMips32 then "mips" + else if final.isMips64 then "mips" # linux kernel does not distinguish mips32/mips64 else if final.isPower then "powerpc" else if final.isRiscV then "riscv" else if final.isS390 then "s390" diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 00e57339a31..27cdaf6a723 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -26,7 +26,7 @@ let # Linux "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" - "armv7l-linux" "i686-linux" "m68k-linux" "mipsel-linux" + "armv7l-linux" "i686-linux" "m68k-linux" "mipsel-linux" "mips64el-linux" "powerpc64-linux" "powerpc64le-linux" "riscv32-linux" "riscv64-linux" "s390-linux" "s390x-linux" "x86_64-linux" @@ -87,7 +87,11 @@ in { darwin = filterDoubles predicates.isDarwin; freebsd = filterDoubles predicates.isFreeBSD; # Should be better, but MinGW is unclear. - gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; }); + gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) + ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) + ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; }) + ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnuabin32; }) + ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnuabi64; }); illumos = filterDoubles predicates.isSunOS; linux = filterDoubles predicates.isLinux; netbsd = filterDoubles predicates.isNetBSD; diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 9c0c91617e8..9cac909093d 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -93,6 +93,10 @@ rec { config = "mipsel-unknown-linux-gnu"; } // platforms.fuloong2f_n32; + mips64el-linux-gnuabin32 = platforms.mips64el-linux-gnuabin32; + mips64el-linux-gnuabi64 = platforms.mips64el-linux-gnuabi64 // { rustc.config = "mips64el-unknown-linux-gnuabi64"; }; + mips64el-qemu-linux-gnuabi64 = platforms.mips64el-qemu-linux-gnuabi64; + muslpi = raspberryPi // { config = "armv6l-unknown-linux-musleabihf"; }; diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 718954e0839..89cac575c67 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -17,6 +17,10 @@ rec { isAarch32 = { cpu = { family = "arm"; bits = 32; }; }; isAarch64 = { cpu = { family = "arm"; bits = 64; }; }; isMips = { cpu = { family = "mips"; }; }; + isMips32 = { cpu = { family = "mips"; bits = 32; }; }; + isMips64 = { cpu = { family = "mips"; bits = 64; }; }; + isMips64n32 = { cpu = { family = "mips"; bits = 64; }; abi = { abi = "n32"; }; }; + isMips64n64 = { cpu = { family = "mips"; bits = 64; }; abi = { abi = "64"; }; }; isMmix = { cpu = { family = "mmix"; }; }; isRiscV = { cpu = { family = "riscv"; }; }; isSparc = { cpu = { family = "sparc"; }; }; @@ -57,7 +61,7 @@ rec { isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ]; isGnu = with abis; map (a: { abi = a; }) [ gnuabi64 gnu gnueabi gnueabihf ]; - isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ]; + isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf muslabin32 muslabi64 ]; isUClibc = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ]; isEfi = map (family: { cpu.family = family; }) diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index f0e87c30e47..3ceddbb599b 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -359,6 +359,13 @@ rec { ]; }; gnuabi64 = { abi = "64"; }; + muslabi64 = { abi = "64"; }; + + # NOTE: abi=n32 requires a 64-bit MIPS chip! That is not a typo. + # It is basically the 64-bit abi with 32-bit pointers. Details: + # https://www.linux-mips.org/pub/linux/mips/doc/ABI/MIPS-N32-ABI-Handbook.pdf + gnuabin32 = { abi = "n32"; }; + muslabin32 = { abi = "n32"; }; musleabi = { float = "soft"; }; musleabihf = { float = "hard"; }; diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index b2a8dbedef4..9bfbb87c08c 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -482,6 +482,55 @@ rec { }; }; + # MIPS ABI table transcribed from here: https://wiki.debian.org/Multiarch/Tuples + + # can execute on 32bit chip + mips-linux-gnu = { config = "mips-linux-gnu"; gcc = { arch = "mips32r2"; abi = "o32"; float = "hard"; }; }; + mipsel-linux-gnu = { config = "mipsel-linux-gnu"; gcc = { arch = "mips32r2"; abi = "o32"; float = "hard"; }; }; + mipsisa32r6-linux-gnu = { config = "mipsisa32r6-linux-gnu"; gcc = { arch = "mips32r6"; abi = "o32"; float = "hard"; }; }; + mipsisa32r6el-linux-gnu = { config = "mipsisa32r6el-linux-gnu"; gcc = { arch = "mips32r6"; abi = "o32"; float = "hard"; }; }; + + # require 64bit chip (for more registers, 64-bit floating point, 64-bit "long long") but use 32bit pointers + mips64-linux-gnuabin32 = { config = "mips64-linux-gnuabin32"; gcc = { arch = "mips64r2"; abi = "n32"; float = "hard"; }; }; + mips64el-linux-gnuabin32 = { config = "mips64el-linux-gnuabin32"; gcc = { arch = "mips64r2"; abi = "n32"; float = "hard"; }; }; + mipsisa64r6-linux-gnuabin32 = { config = "mipsisa64r6-linux-gnuabin32"; gcc = { arch = "mips64r6"; abi = "n32"; float = "hard"; }; }; + mipsisa64r6el-linux-gnuabin32 = { config = "mipsisa64r6el-linux-gnuabin32"; gcc = { arch = "mips64r6"; abi = "n32"; float = "hard"; }; }; + + # 64bit pointers + mips64-linux-gnuabi64 = { config = "mips64-linux-gnuabi64"; gcc = { arch = "mips64r2"; abi = "64"; float = "hard"; }; }; + mips64el-linux-gnuabi64 = { config = "mips64el-linux-gnuabi64"; gcc = { arch = "mips64r2"; abi = "64"; float = "hard"; }; }; + mipsisa64r6-linux-gnuabi64 = { config = "mipsisa64r6-linux-gnuabi64"; gcc = { arch = "mips64r6"; abi = "64"; float = "hard"; }; }; + mipsisa64r6el-linux-gnuabi64 = { config = "mipsisa64r6el-linux-gnuabi64"; gcc = { arch = "mips64r6"; abi = "64"; float = "hard"; }; }; + + # based on: + # https://www.mail-archive.com/qemu-discuss@nongnu.org/msg05179.html + # https://gmplib.org/~tege/qemu.html#mips64-debian + mips64el-qemu-linux-gnuabi64 = mips64el-linux-gnuabi64 // { + linux-kernel = { + name = "mips64el"; + baseConfig = "64r2el_defconfig"; + target = "vmlinuz"; + autoModules = false; + DTB = true; + # for qemu 9p passthrough filesystem + extraConfig = '' + MIPS_MALTA y + PAGE_SIZE_4KB y + CPU_LITTLE_ENDIAN y + CPU_MIPS64_R2 y + 64BIT y + CPU_MIPS64_R2 y + + NET_9P y + NET_9P_VIRTIO y + 9P_FS y + 9P_FS_POSIX_ACL y + PCI y + VIRTIO_PCI y + ''; + }; + }; + ## ## Other ## diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index 2646e792682..c88adbf4651 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -17,7 +17,7 @@ with lib.systems.doubles; lib.runTests { testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-netbsd" "armv6l-none" "armv7a-linux" "armv7a-netbsd" "armv7l-linux" "armv7l-netbsd" "arm-none" "armv7a-darwin" ]; testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-genode" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ]; - testmips = mseteq mips [ "mipsel-linux" "mipsel-netbsd" ]; + testmips = mseteq mips [ "mips64el-linux" "mipsel-linux" "mipsel-netbsd" ]; testmmix = mseteq mmix [ "mmix-mmixware" ]; 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" ]; @@ -28,7 +28,7 @@ with lib.systems.doubles; lib.runTests { testredox = mseteq redox [ "x86_64-redox" ]; testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */); testillumos = mseteq illumos [ "x86_64-solaris" ]; - testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" "s390x-linux" ]; + testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mips64el-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" "s390x-linux" ]; testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "m68k-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ]; testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]; testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ]; -- cgit 1.4.1 From e748e1fd18617319e9f46eaca7e68c0621c5f356 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 8 Mar 2022 20:38:21 -0800 Subject: https://github.com/NixOS/nixpkgs/pull/161158#pullrequestreview-903824553 --- lib/systems/platforms.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'lib') diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index 9bfbb87c08c..2970b2dde61 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -485,22 +485,22 @@ rec { # MIPS ABI table transcribed from here: https://wiki.debian.org/Multiarch/Tuples # can execute on 32bit chip - mips-linux-gnu = { config = "mips-linux-gnu"; gcc = { arch = "mips32r2"; abi = "o32"; float = "hard"; }; }; - mipsel-linux-gnu = { config = "mipsel-linux-gnu"; gcc = { arch = "mips32r2"; abi = "o32"; float = "hard"; }; }; - mipsisa32r6-linux-gnu = { config = "mipsisa32r6-linux-gnu"; gcc = { arch = "mips32r6"; abi = "o32"; float = "hard"; }; }; - mipsisa32r6el-linux-gnu = { config = "mipsisa32r6el-linux-gnu"; gcc = { arch = "mips32r6"; abi = "o32"; float = "hard"; }; }; + mips-linux-gnu = { gcc = { arch = "mips32r2"; abi = "o32"; float = "hard"; }; }; + mipsel-linux-gnu = { gcc = { arch = "mips32r2"; abi = "o32"; float = "hard"; }; }; + mipsisa32r6-linux-gnu = { gcc = { arch = "mips32r6"; abi = "o32"; float = "hard"; }; }; + mipsisa32r6el-linux-gnu = { gcc = { arch = "mips32r6"; abi = "o32"; float = "hard"; }; }; # require 64bit chip (for more registers, 64-bit floating point, 64-bit "long long") but use 32bit pointers - mips64-linux-gnuabin32 = { config = "mips64-linux-gnuabin32"; gcc = { arch = "mips64r2"; abi = "n32"; float = "hard"; }; }; - mips64el-linux-gnuabin32 = { config = "mips64el-linux-gnuabin32"; gcc = { arch = "mips64r2"; abi = "n32"; float = "hard"; }; }; - mipsisa64r6-linux-gnuabin32 = { config = "mipsisa64r6-linux-gnuabin32"; gcc = { arch = "mips64r6"; abi = "n32"; float = "hard"; }; }; - mipsisa64r6el-linux-gnuabin32 = { config = "mipsisa64r6el-linux-gnuabin32"; gcc = { arch = "mips64r6"; abi = "n32"; float = "hard"; }; }; + mips64-linux-gnuabin32 = { gcc = { arch = "mips64r2"; abi = "n32"; float = "hard"; }; }; + mips64el-linux-gnuabin32 = { gcc = { arch = "mips64r2"; abi = "n32"; float = "hard"; }; }; + mipsisa64r6-linux-gnuabin32 = { gcc = { arch = "mips64r6"; abi = "n32"; float = "hard"; }; }; + mipsisa64r6el-linux-gnuabin32 = { gcc = { arch = "mips64r6"; abi = "n32"; float = "hard"; }; }; # 64bit pointers - mips64-linux-gnuabi64 = { config = "mips64-linux-gnuabi64"; gcc = { arch = "mips64r2"; abi = "64"; float = "hard"; }; }; - mips64el-linux-gnuabi64 = { config = "mips64el-linux-gnuabi64"; gcc = { arch = "mips64r2"; abi = "64"; float = "hard"; }; }; - mipsisa64r6-linux-gnuabi64 = { config = "mipsisa64r6-linux-gnuabi64"; gcc = { arch = "mips64r6"; abi = "64"; float = "hard"; }; }; - mipsisa64r6el-linux-gnuabi64 = { config = "mipsisa64r6el-linux-gnuabi64"; gcc = { arch = "mips64r6"; abi = "64"; float = "hard"; }; }; + mips64-linux-gnuabi64 = { gcc = { arch = "mips64r2"; abi = "64"; float = "hard"; }; }; + mips64el-linux-gnuabi64 = { gcc = { arch = "mips64r2"; abi = "64"; float = "hard"; }; }; + mipsisa64r6-linux-gnuabi64 = { gcc = { arch = "mips64r6"; abi = "64"; float = "hard"; }; }; + mipsisa64r6el-linux-gnuabi64 = { gcc = { arch = "mips64r6"; abi = "64"; float = "hard"; }; }; # based on: # https://www.mail-archive.com/qemu-discuss@nongnu.org/msg05179.html -- cgit 1.4.1 From 998fd408e0675e71c7abe600b4dc6a5c29845634 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 8 Mar 2022 20:39:08 -0800 Subject: remove float = "hard" from mips entries --- lib/systems/platforms.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'lib') diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index 2970b2dde61..fb515f67eee 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -485,22 +485,22 @@ rec { # MIPS ABI table transcribed from here: https://wiki.debian.org/Multiarch/Tuples # can execute on 32bit chip - mips-linux-gnu = { gcc = { arch = "mips32r2"; abi = "o32"; float = "hard"; }; }; - mipsel-linux-gnu = { gcc = { arch = "mips32r2"; abi = "o32"; float = "hard"; }; }; - mipsisa32r6-linux-gnu = { gcc = { arch = "mips32r6"; abi = "o32"; float = "hard"; }; }; - mipsisa32r6el-linux-gnu = { gcc = { arch = "mips32r6"; abi = "o32"; float = "hard"; }; }; + mips-linux-gnu = { gcc = { arch = "mips32r2"; abi = "o32"; }; }; + mipsel-linux-gnu = { gcc = { arch = "mips32r2"; abi = "o32"; }; }; + mipsisa32r6-linux-gnu = { gcc = { arch = "mips32r6"; abi = "o32"; }; }; + mipsisa32r6el-linux-gnu = { gcc = { arch = "mips32r6"; abi = "o32"; }; }; # require 64bit chip (for more registers, 64-bit floating point, 64-bit "long long") but use 32bit pointers - mips64-linux-gnuabin32 = { gcc = { arch = "mips64r2"; abi = "n32"; float = "hard"; }; }; - mips64el-linux-gnuabin32 = { gcc = { arch = "mips64r2"; abi = "n32"; float = "hard"; }; }; - mipsisa64r6-linux-gnuabin32 = { gcc = { arch = "mips64r6"; abi = "n32"; float = "hard"; }; }; - mipsisa64r6el-linux-gnuabin32 = { gcc = { arch = "mips64r6"; abi = "n32"; float = "hard"; }; }; + mips64-linux-gnuabin32 = { gcc = { arch = "mips64r2"; abi = "n32"; }; }; + mips64el-linux-gnuabin32 = { gcc = { arch = "mips64r2"; abi = "n32"; }; }; + mipsisa64r6-linux-gnuabin32 = { gcc = { arch = "mips64r6"; abi = "n32"; }; }; + mipsisa64r6el-linux-gnuabin32 = { gcc = { arch = "mips64r6"; abi = "n32"; }; }; # 64bit pointers - mips64-linux-gnuabi64 = { gcc = { arch = "mips64r2"; abi = "64"; float = "hard"; }; }; - mips64el-linux-gnuabi64 = { gcc = { arch = "mips64r2"; abi = "64"; float = "hard"; }; }; - mipsisa64r6-linux-gnuabi64 = { gcc = { arch = "mips64r6"; abi = "64"; float = "hard"; }; }; - mipsisa64r6el-linux-gnuabi64 = { gcc = { arch = "mips64r6"; abi = "64"; float = "hard"; }; }; + mips64-linux-gnuabi64 = { gcc = { arch = "mips64r2"; abi = "64"; }; }; + mips64el-linux-gnuabi64 = { gcc = { arch = "mips64r2"; abi = "64"; }; }; + mipsisa64r6-linux-gnuabi64 = { gcc = { arch = "mips64r6"; abi = "64"; }; }; + mipsisa64r6el-linux-gnuabi64 = { gcc = { arch = "mips64r6"; abi = "64"; }; }; # based on: # https://www.mail-archive.com/qemu-discuss@nongnu.org/msg05179.html -- cgit 1.4.1 From ed4fa55fc3d152b924d6c23bb97856f64729a11c Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 8 Mar 2022 21:05:58 -0800 Subject: comment: explain why gnuabi64 has a rustc.config but gnuabin32 does not. --- lib/systems/examples.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 9cac909093d..1ee704a1811 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -93,7 +93,7 @@ rec { config = "mipsel-unknown-linux-gnu"; } // platforms.fuloong2f_n32; - mips64el-linux-gnuabin32 = platforms.mips64el-linux-gnuabin32; + mips64el-linux-gnuabin32 = platforms.mips64el-linux-gnuabin32; # the rust project does not publish a bootstrap tarball for gnuabin32 mips64el-linux-gnuabi64 = platforms.mips64el-linux-gnuabi64 // { rustc.config = "mips64el-unknown-linux-gnuabi64"; }; mips64el-qemu-linux-gnuabi64 = platforms.mips64el-qemu-linux-gnuabi64; -- cgit 1.4.1 From 6de935a0126efde78feefbbe3bddfaa6be2bda6a Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 8 Mar 2022 18:27:49 -0800 Subject: This commit adds only comments to platforms.nix. --- lib/systems/platforms.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'lib') diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index fb515f67eee..e7d61b24b05 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -1,3 +1,10 @@ +# Note: lib/systems/default.nix takes care of producing valid, +# fully-formed "platform" values (e.g. hostPlatform, buildPlatform, +# targetPlatform, etc) containing at least the minimal set of attrs +# required (see types.parsedPlatform in lib/systems/parse.nix). This +# file takes an already-valid platform and further elaborates it with +# optional fields such as linux-kernel, gcc, etc. + { lib }: rec { pc = { @@ -548,6 +555,9 @@ rec { }; }; + # This function takes a minimally-valid "platform" and returns an + # attrset containing zero or more additional attrs which should be + # included in the platform in order to further elaborate it. select = platform: # x86 /**/ if platform.isx86 then pc -- cgit 1.4.1 From ff69b8c2bf81f848979f18a47f18941979c5eaf2 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Thu, 10 Mar 2022 20:27:46 -0800 Subject: Ericson2314's suggestion here: https://github.com/NixOS/nixpkgs/pull/161158#discussion_r822295406 --- lib/systems/examples.nix | 22 +++++++++++++++++++--- lib/systems/platforms.nix | 26 +++++++------------------- 2 files changed, 26 insertions(+), 22 deletions(-) (limited to 'lib') diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 1ee704a1811..997a7a8c273 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -93,9 +93,25 @@ rec { config = "mipsel-unknown-linux-gnu"; } // platforms.fuloong2f_n32; - mips64el-linux-gnuabin32 = platforms.mips64el-linux-gnuabin32; # the rust project does not publish a bootstrap tarball for gnuabin32 - mips64el-linux-gnuabi64 = platforms.mips64el-linux-gnuabi64 // { rustc.config = "mips64el-unknown-linux-gnuabi64"; }; - mips64el-qemu-linux-gnuabi64 = platforms.mips64el-qemu-linux-gnuabi64; + # MIPS ABI table transcribed from here: https://wiki.debian.org/Multiarch/Tuples + + # can execute on 32bit chip + mips-linux-gnu = { config = "mips-linux-gnu"; } // platforms.gcc_mips32r2_o32; + mipsel-linux-gnu = { config = "mipsel-linux-gnu"; } // platforms.gcc_mips32r2_o32; + mipsisa32r6-linux-gnu = { config = "mipsisa32r6-linux-gnu"; } // platforms.gcc_mips32r6_o32; + mipsisa32r6el-linux-gnu = { config = "mipsisa32r6el-linux-gnu"; } // platforms.gcc_mips32r6_o32; + + # require 64bit chip (for more registers, 64-bit floating point, 64-bit "long long") but use 32bit pointers + mips64-linux-gnuabin32 = { config = "mips64-linux-gnuabin32"; } // platforms.gcc_mips64r2_n32; + mips64el-linux-gnuabin32 = { config = "mips64el-linux-gnuabin32"; } // platforms.gcc_mips64r2_n32; + mipsisa64r6-linux-gnuabin32 = { config = "mipsisa64r6-linux-gnuabin32"; } // platforms.gcc_mips64r6_n32; + mipsisa64r6el-linux-gnuabin32 = { config = "mipsisa64r6el-linux-gnuabin32"; } // platforms.gcc_mips64r6_n32; + + # 64bit pointers + mips64-linux-gnuabi64 = { config = "mips64-linux-gnuabi64"; } // platforms.gcc_mips64r2_64; + mips64el-linux-gnuabi64 = { config = "mips64el-linux-gnuabi64"; } // platforms.gcc_mips64r2_64; + mipsisa64r6-linux-gnuabi64 = { config = "mipsisa64r6-linux-gnuabi64"; } // platforms.gcc_mips64r6_64; + mipsisa64r6el-linux-gnuabi64 = { config = "mipsisa64r6el-linux-gnuabi64"; } // platforms.gcc_mips64r6_64; muslpi = raspberryPi // { config = "armv6l-unknown-linux-musleabihf"; diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index e7d61b24b05..04d55416242 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -489,30 +489,18 @@ rec { }; }; - # MIPS ABI table transcribed from here: https://wiki.debian.org/Multiarch/Tuples - # can execute on 32bit chip - mips-linux-gnu = { gcc = { arch = "mips32r2"; abi = "o32"; }; }; - mipsel-linux-gnu = { gcc = { arch = "mips32r2"; abi = "o32"; }; }; - mipsisa32r6-linux-gnu = { gcc = { arch = "mips32r6"; abi = "o32"; }; }; - mipsisa32r6el-linux-gnu = { gcc = { arch = "mips32r6"; abi = "o32"; }; }; - - # require 64bit chip (for more registers, 64-bit floating point, 64-bit "long long") but use 32bit pointers - mips64-linux-gnuabin32 = { gcc = { arch = "mips64r2"; abi = "n32"; }; }; - mips64el-linux-gnuabin32 = { gcc = { arch = "mips64r2"; abi = "n32"; }; }; - mipsisa64r6-linux-gnuabin32 = { gcc = { arch = "mips64r6"; abi = "n32"; }; }; - mipsisa64r6el-linux-gnuabin32 = { gcc = { arch = "mips64r6"; abi = "n32"; }; }; - - # 64bit pointers - mips64-linux-gnuabi64 = { gcc = { arch = "mips64r2"; abi = "64"; }; }; - mips64el-linux-gnuabi64 = { gcc = { arch = "mips64r2"; abi = "64"; }; }; - mipsisa64r6-linux-gnuabi64 = { gcc = { arch = "mips64r6"; abi = "64"; }; }; - mipsisa64r6el-linux-gnuabi64 = { gcc = { arch = "mips64r6"; abi = "64"; }; }; + gcc_mips32r2_o32 = { gcc = { arch = "mips32r2"; abi = "o32"; }; }; + gcc_mips32r6_o32 = { gcc = { arch = "mips32r6"; abi = "o32"; }; }; + gcc_mips64r2_n32 = { gcc = { arch = "mips64r2"; abi = "n32"; }; }; + gcc_mips64r6_n32 = { gcc = { arch = "mips64r6"; abi = "n32"; }; }; + gcc_mips64r2_64 = { gcc = { arch = "mips64r2"; abi = "64"; }; }; + gcc_mips64r6_64 = { gcc = { arch = "mips64r6"; abi = "64"; }; }; # based on: # https://www.mail-archive.com/qemu-discuss@nongnu.org/msg05179.html # https://gmplib.org/~tege/qemu.html#mips64-debian - mips64el-qemu-linux-gnuabi64 = mips64el-linux-gnuabi64 // { + mips64el-qemu-linux-gnuabi64 = (import ./examples).mips64el-linux-gnuabi64 // { linux-kernel = { name = "mips64el"; baseConfig = "64r2el_defconfig"; -- cgit 1.4.1