Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mips64: bootstrap-files #161927

Closed
wants to merge 5 commits into from
Closed

mips64: bootstrap-files #161927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
36b227d
mips64el support: first steps
Feb 21, 2022
f6714f1
lib/systems/platforms.nix: fix transcription typo in MIPS ABI table
Feb 23, 2022
a2c24b0
lib/systems/inspect.nix: libc-neutral wording of isMips64{n32,n64}
Feb 23, 2022
b8c418e
mips64el: add support for mips64el-linux-musl
Feb 23, 2022
45909d0
mips64el: bootstrap-files
Feb 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/systems/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions lib/systems/doubles.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -87,7 +87,7 @@ 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;
Expand Down
3 changes: 3 additions & 0 deletions lib/systems/examples.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ rec {
config = "mipsel-unknown-linux-gnu";
} // platforms.fuloong2f_n32;

mips64el-linux-gnuabin32 = platforms.mips64el-linux-gnuabin32;
mips64el-linux-gnuabi64 = platforms.mips64el-linux-gnuabi64;

muslpi = raspberryPi // {
config = "armv6l-unknown-linux-musleabihf";
};
Expand Down
5 changes: 5 additions & 0 deletions lib/systems/inspect.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ 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"; }; abi = { abi = "n32"; }; };
isMips64n64 =[{ cpu = { family = "mips"; }; abi = { abi = "64"; }; }
{ cpu = { family = "mips"; bits = 64; }; abi = { name = "musl"; }; } ];
isMmix = { cpu = { family = "mmix"; }; };
isRiscV = { cpu = { family = "riscv"; }; };
isSparc = { cpu = { family = "sparc"; }; };
Expand Down
7 changes: 7 additions & 0 deletions lib/systems/parse.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"; };
Expand Down
20 changes: 20 additions & 0 deletions lib/systems/platforms.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,26 @@ 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"; }; };

##
## Other
##
Expand Down
4 changes: 2 additions & 2 deletions lib/tests/systems.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ];

Expand All @@ -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" ];
Expand Down
1 change: 1 addition & 0 deletions pkgs/stdenv/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ in
armv8m-linux = stagesLinux;
aarch64-linux = stagesLinux;
mipsel-linux = stagesLinux;
mips64el-linux = stagesLinux;
powerpc-linux = /* stagesLinux */ stagesNative;
powerpc64-linux = stagesLinux;
powerpc64le-linux = stagesLinux;
Expand Down
12 changes: 12 additions & 0 deletions pkgs/stdenv/linux/bootstrap-files/mips64el.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
busybox = import <nix/fetchurl.nix> {
url = "file:///nix/store/5xy00yds18lycmcm3qzwaxpybqkhbyx9-stdenv-bootstrap-tools-mips64el-linux-gnuabi64/on-server/busybox";
sha256 = "sha256-0K3Cz+uoG3J8Lfjz8i7NTFujnyKklp9d+NBnLPFAH0I=";
executable = true;
};

bootstrapTools = import <nix/fetchurl.nix> {
url = "file:///nix/store/5xy00yds18lycmcm3qzwaxpybqkhbyx9-stdenv-bootstrap-tools-mips64el-linux-gnuabi64/on-server/bootstrap-tools.tar.xz";
sha256 = "sha256-So+8RJ+omB9V2I46Z/sbHiFsOVTW4wIscYr3SXxVz8o=";
};
}
2 changes: 2 additions & 0 deletions pkgs/stdenv/linux/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@
armv6l-linux = import ./bootstrap-files/armv6l.nix;
armv7l-linux = import ./bootstrap-files/armv7l.nix;
aarch64-linux = import ./bootstrap-files/aarch64.nix;
mips64el-linux = import ./bootstrap-files/mips64el.nix;
mipsel-linux = import ./bootstrap-files/loongson2f.nix;
riscv64-linux = import ./bootstrap-files/riscv64.nix;
};
musl = {
aarch64-linux = import ./bootstrap-files/aarch64-musl.nix;
armv6l-linux = import ./bootstrap-files/armv6l-musl.nix;
x86_64-linux = import ./bootstrap-files/x86_64-musl.nix;
mips64el-linux = import ./bootstrap-files/mips64el.nix;
};
};

Expand Down
2 changes: 2 additions & 0 deletions pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ in lib.mapAttrs (n: make) (with lib.systems.examples; {
armv6l-musl = muslpi;
aarch64-musl = aarch64-multiplatform-musl;
riscv64 = riscv64;
mips64el-linux-gnuabin32 = lib.systems.platforms.mips64el-linux-gnuabin32;
mips64el-linux-gnuabi64 = lib.systems.platforms.mips64el-linux-gnuabi64;
powerpc64 = ppc64;
powerpc64-musl = ppc64-musl;
powerpc64le = powernv;
Expand Down
5 changes: 4 additions & 1 deletion pkgs/top-level/stage.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,10 @@ let
musleabi = lib.systems.parse.abis.musleabi;
musleabihf = lib.systems.parse.abis.musleabihf;
}.${stdenv.hostPlatform.parsed.abi.name}
or lib.systems.parse.abis.musl;
or (if stdenv.hostPlatform.isMips64n32 then lib.systems.parse.abis.muslabin32
# commented out because glibc does not yet understand *-muslabi64
#else if stdenv.hostPlatform.isMips64n64 then lib.systems.parse.abis.muslabi64
else lib.systems.parse.abis.musl);
};
} // lib.optionalAttrs (stdenv.hostPlatform.system == "powerpc64-linux") {
gcc.abi = "elfv2";
Expand Down