wip lib/systems: add solo5

NixOS · Jan 1, 2022 · c0aab7a · c0aab7a
1 parent 24b6926
commit c0aab7a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 1 deletion.
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
@@ -38,6 +38,7 @@ rec {
         else if final.isAndroid             then "bionic"
         else if final.isLinux /* default */ then "glibc"
         else if final.isAvr                 then "avrlibc"
+        else if final.isSolo5               then "none" # XXX
         else if final.isNone                then "newlib"
         else if final.isNetBSD              then "nblibc"
         # TODO(@Ericson2314) think more about other operating systems
@@ -89,7 +90,7 @@ rec {
          # uname -r
          release = null;
       };
-      isStatic = final.isWasm || final.isRedox;
+      isStatic = final.isWasm || final.isRedox || final.isSolo5;
 
       # Just a guess, based on `system`
       inherit

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
@@ -210,6 +210,22 @@ rec {
     libc = "relibc";
   };
 
+  #
+  # Solo5
+  #
+
+  aarch64-solo5 = {
+    config = "aarch64-solo5-none";
+    linker = "lld";
+    useLLVM = true;
+  };
+
+  x86_64-linux-solo5 = {
+    config = "aarch64-solo5-none";
+    linker = "lld";
+    useLLVM = true;
+  };
+
   #
   # Darwin
   #

diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
@@ -53,6 +53,7 @@ rec {
     isRedox        = { kernel = kernels.redox; };
     isGhcjs        = { kernel = kernels.ghcjs; };
     isGenode       = { kernel = kernels.genode; };
+    isSolo5        = { vendor = vendors.solo5; };
     isNone         = { kernel = kernels.none; };
 
     isAndroid      = [ { abi = abis.android; } { abi = abis.androideabi; } ];

diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
@@ -236,6 +236,7 @@ rec {
     # Actually matters, unlocking some MinGW-w64-specific options in GCC. See
     # bottom of https://sourceforge.net/p/mingw-w64/wiki2/Unicode%20apps/
     w64 = {};
+    solo5 = {};
 
     none = {};
     unknown = {};
@@ -427,6 +428,8 @@ rec {
         then { cpu = elemAt l 0; vendor = "unknown"; kernel = elemAt l 2; }
       else if hasPrefix "genode" (elemAt l 2)
         then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; }
+      else if elemAt l 1 == "solo5"
+        then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; }
       else throw "Target specification with 3 components is ambiguous";
     "4" =    { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; abi = elemAt l 3; };
   }.${toString (length l)}

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -16702,6 +16702,7 @@ with pkgs;
     else if name == "wasilibc" then targetPackages.wasilibc or wasilibc
     else if name == "relibc" then targetPackages.relibc or relibc
     else if stdenv.targetPlatform.isGhcjs then null
+    else if stdenv.targetPlatform.isSolo5 then null
     else throw "Unknown libc ${name}";
 
   libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc;