freebsd: Add support for aarch64 (NixOS#358053)

RobWalt · Nov 27, 2024 · 07f8638 · 07f8638
2 parents e668162 + 2b02a18
commit 07f8638
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
@@ -13,7 +13,7 @@ let
     "x86_64-darwin" "i686-darwin" "aarch64-darwin" "armv7a-darwin"
 
     # FreeBSD
-    "i686-freebsd" "x86_64-freebsd"
+    "i686-freebsd" "x86_64-freebsd" "aarch64-freebsd"
 
     # Genode
     "aarch64-genode" "i686-genode" "x86_64-genode"

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
@@ -335,6 +335,11 @@ rec {
 
   # BSDs
 
+  aarch64-freebsd = {
+    config = "aarch64-unknown-freebsd";
+    useLLVM = true;
+  };
+
   x86_64-freebsd = {
     config = "x86_64-unknown-freebsd";
     useLLVM = true;

diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix
@@ -52,7 +52,7 @@ lib.runTests (
 
   testcygwin = mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ];
   testdarwin = mseteq darwin [ "x86_64-darwin" "i686-darwin" "aarch64-darwin" "armv7a-darwin" ];
-  testfreebsd = mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ];
+  testfreebsd = mseteq freebsd [ "aarch64-freebsd" "i686-freebsd" "x86_64-freebsd" ];
   testgenode = mseteq genode [ "aarch64-genode" "i686-genode" "x86_64-genode" ];
   testredox = mseteq redox [ "x86_64-redox" ];
   testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);

diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix
@@ -1,4 +1,5 @@
 {
+  stdenv,
   lib,
   mkDerivation,
   buildPackages,
@@ -14,6 +15,8 @@ mkDerivation {
     "contrib/libc-vis"
     "etc/mtree/BSD.include.dist"
     "sys"
+    # Used for aarch64-freebsd
+    "lib/msun/arm"
   ];
 
   extraNativeBuildInputs = [

diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix
@@ -106,6 +106,9 @@ mkDerivation {
       "include/paths.h"
 
       "lib/libdl"
+
+      # Used for aarch64-freebsd
+      "contrib/arm-optimized-routines"
     ];
 
   postPatch = ''