internal/rosa/stage0: replace amd64 tarball

This toolchain is built with the new patchset.

Signed-off-by: Ophestra <cat@gensokyo.uk>

internal/rosa/hakurei.go

@@ -63,9 +63,9 @@ func init() {
 			return t.newHakurei("", `
 mkdir -p /work/system/libexec/hakurei/
 
-echo '# Building hakurei.'
-go generate -v ./...
-go build -trimpath -v -tags=rosa -o /work/system/libexec/hakurei -ldflags="-s -w
+echo "Building hakurei for $(go env GOOS)/$(go env GOARCH)."
+go generate ./...
+go build -trimpath -tags=rosa -o /work/system/libexec/hakurei -ldflags="-s -w
 	-buildid=
 	-linkmode external
 	-extldflags=-static
@@ -76,7 +76,7 @@ go build -trimpath -v -tags=rosa -o /work/system/libexec/hakurei -ldflags="-s -w
 " ./...
 echo
 
-echo '# Testing hakurei.'
+echo '##### Testing hakurei.'
 go test -ldflags='-buildid= -linkmode external -extldflags=-static' ./...
 echo
 

internal/rosa/hakurei_release.go

@@ -4,13 +4,13 @@ package rosa
 
 import "hakurei.app/internal/pkg"
 
-const hakureiVersion = "0.4.0"
+const hakureiVersion = "0.4.1"
 
 // hakureiSource is the source code of a hakurei release.
 var hakureiSource = newTar(
 	"https://git.gensokyo.uk/rosa/hakurei/archive/"+
 		"v"+hakureiVersion+".tar.gz",
-	"wfQ9DqCW0Fw9o91wj-I55waoqzB-UqzzuC0_2h-P-1M78SgZ1WHSPCDJMth6EyC2",
+	"8bHvZcjUQOXUPbKL-qq99pHFTPnn-h7j1fkJudbGs8waLm3OmkI6eHfQev5bug2y",
 	pkg.TarGzip,
 )
 

internal/rosa/llvm.go

@@ -39,16 +39,23 @@ func (t Toolchain) newEarlyCompilerRT() (pkg.Artifact, string) {
 		Append: []string{"compiler-rt"},
 
 		Cache: []KV{
+			{"ENABLE_LINKER_BUILD_ID", "ON"},
+
 			// libc++ not yet available
 			{"CMAKE_CXX_COMPILER_TARGET", ""},
 
 			{"LLVM_HOST_TRIPLE", `"${ROSA_TRIPLE}"`},
 			{"LLVM_DEFAULT_TARGET_TRIPLE", `"${ROSA_TRIPLE}"`},
+			{"LLVM_ENABLE_RTTI", "ON"},
+			{"LLVM_BUILD_LLVM_DYLIB", "ON"},
+			{"LLVM_LINK_LLVM_DYLIB", "ON"},
 			{"LLVM_ENABLE_PER_TARGET_RUNTIME_DIR", "ON"},
 
 			{"COMPILER_RT_BUILD_BUILTINS", "ON"},
-			{"COMPILER_RT_DEFAULT_TARGET_ONLY", "OFF"},
+			{"COMPILER_RT_DEFAULT_TARGET_ONLY", "ON"},
+			{"COMPILER_RT_USE_BUILTINS_LIBRARY", "ON"},
 			{"COMPILER_RT_SANITIZERS_TO_BUILD", "asan"},
+			{"COMPILER_RT_BUILD_GWP_ASAN", "OFF"},
 
 			// does not work without libunwind
 			{"COMPILER_RT_BUILD_CTX_PROFILE", "OFF"},
@@ -99,19 +106,29 @@ func (t Toolchain) newEarlyRuntimes() (pkg.Artifact, string) {
 		Append: []string{"runtimes"},
 
 		Cache: []KV{
+			{"ENABLE_LINKER_BUILD_ID", "ON"},
+
 			// libc++ not yet available
 			{"CMAKE_CXX_COMPILER_WORKS", "ON"},
 
 			{"LLVM_HOST_TRIPLE", `"${ROSA_TRIPLE}"`},
 			{"LLVM_DEFAULT_TARGET_TRIPLE", `"${ROSA_TRIPLE}"`},
+			{"LLVM_ENABLE_RTTI", "ON"},
+			{"LLVM_BUILD_LLVM_DYLIB", "ON"},
+			{"LLVM_LINK_LLVM_DYLIB", "ON"},
 			{"LLVM_ENABLE_RUNTIMES", "'libunwind;libcxx;libcxxabi'"},
 
+			{"LIBUNWIND_ENABLE_ASSERTIONS", "OFF"},
 			{"LIBUNWIND_USE_COMPILER_RT", "ON"},
 			{"LIBCXX_HAS_MUSL_LIBC", "ON"},
 			{"LIBCXX_USE_COMPILER_RT", "ON"},
+			{"LIBCXX_CXX_ABI", "libcxxabi"},
+			{"LIBCXX_ENABLE_STATIC_ABI_LIBRARY", "OFF"},
+			{"LIBCXX_HARDENING_MODE", "fast"},
 			{"LIBCXX_HAS_ATOMIC_LIB", "OFF"},
 			{"LIBCXXABI_USE_COMPILER_RT", "ON"},
 			{"LIBCXXABI_USE_LLVM_UNWINDER", "ON"},
+			{"LIBCXXABI_ENABLE_STATIC_UNWINDER", "OFF"},
 			{"LIBCXXABI_HAS_CXA_THREAD_ATEXIT_IMPL", "OFF"},
 
 			{"LLVM_ENABLE_ZLIB", "FORCE_ON"},
@@ -144,11 +161,11 @@ func init() {
 func (t Toolchain) newLLVM() (pkg.Artifact, string) {
 	var early PArtifact = muslHeaders
 	if t.isStage0() {
-		// The LLVM build system is buggy around LLVM_LINK_LLVM_DYLIB and leaks
-		// the system installation when invoking the newly built toolchain. This
-		// is worked around in stage0 by providing standalone builds of
-		// runtimes. Later stages rely on 3-stage determinism and allows the
-		// system installation from its previous stage to leak through.
+		// The LLVM build system uses the system installation when building with
+		// LLVM_LINK_LLVM_DYLIB, since it builds runtimes after the fact, using
+		// the just-built toolchain. This is unacceptable in stage0 due to the
+		// potential version difference. Later stages bootstrap off of runtimes
+		// of its previous stage via 3-stage determinism.
 		early = earlyRuntimes
 	}
 
@@ -174,6 +191,7 @@ func (t Toolchain) newLLVM() (pkg.Artifact, string) {
 		{"LLVM_ENABLE_ZLIB", "FORCE_ON"},
 		{"LLVM_ENABLE_ZSTD", "FORCE_ON"},
 		{"LLVM_ENABLE_PER_TARGET_RUNTIME_DIR", "ON"},
+		{"LLVM_INCLUDE_BENCHMARKS", "OFF"},
 		{"CLANG_DEFAULT_RTLIB", "compiler-rt"},
 		{"CLANG_DEFAULT_UNWINDLIB", "libunwind"},
 		{"CLANG_DEFAULT_CXX_STDLIB", "libc++"},

internal/rosa/llvm_patches.go

@@ -90,8 +90,23 @@ index 8ac8d4eb9181..e46b04a898ca 100644
      addSystemInclude(DriverArgs, CC1Args, ResourceDirInclude);
 `},
 
-	{"path-system-libraries", `diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index d525b417b4ea..fdc411f2239c 100644
+	{"path-system-libraries", `diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
+index cb6a9b242421..b8d31690d1af 100644
+--- a/clang/lib/Driver/ToolChains/Gnu.cpp
++++ b/clang/lib/Driver/ToolChains/Gnu.cpp
+@@ -2314,6 +2314,10 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
+     Prefixes.push_back("/opt/rh/devtoolset-2/root/usr");
+   }
+ 
++  if (TargetTriple.getVendor() == llvm::Triple::Rosa) {
++    Prefixes.push_back(concat(SysRoot, "/system"));
++  }
++
+   // Fall back to /usr which is used by most non-Solaris systems.
+   Prefixes.push_back(concat(SysRoot, "/usr"));
+ }
+diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
+index d525b417b4ea..2b93f401733e 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
 @@ -302,6 +302,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
@@ -102,18 +117,7 @@ index d525b417b4ea..fdc411f2239c 100644
  
    if (IsCSKY && !SelectedMultilibs.empty())
      SysRoot = SysRoot + SelectedMultilibs.back().osSuffix();
-@@ -337,12 +338,23 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
-   const std::string OSLibDir = std::string(getOSLibDir(Triple, Args));
-   const std::string MultiarchTriple = getMultiarchTriple(D, Triple, SysRoot);
- 
-+  if (IsRosa) {
-+    ExtraOpts.push_back("-rpath");
-+    ExtraOpts.push_back("/system/lib");
-+    ExtraOpts.push_back("-rpath");
-+    ExtraOpts.push_back(concat("/system/lib", Triple.str()));
-+  }
-+
-   // mips32: Debian multilib, we use /libo32, while in other case, /lib is
+@@ -341,8 +342,12 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
    // used. We need add both libo32 and /lib.
    if (Arch == llvm::Triple::mips || Arch == llvm::Triple::mipsel) {
      Generic_GCC::AddMultilibPaths(D, SysRoot, "libo32", MultiarchTriple, Paths);
@@ -128,7 +132,7 @@ index d525b417b4ea..fdc411f2239c 100644
    }
    Generic_GCC::AddMultilibPaths(D, SysRoot, OSLibDir, MultiarchTriple, Paths);
  
-@@ -360,18 +372,30 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
+@@ -360,18 +365,30 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
          Paths);
    }
  
@@ -164,7 +168,7 @@ index d525b417b4ea..fdc411f2239c 100644
  }
  
  ToolChain::RuntimeLibType Linux::GetDefaultRuntimeLibType() const {
-@@ -572,6 +596,9 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -572,6 +589,9 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
      return Triple.isArch64Bit() ? "/system/bin/linker64" : "/system/bin/linker";
    }
    if (Triple.isMusl()) {
@@ -174,18 +178,5 @@ index d525b417b4ea..fdc411f2239c 100644
      std::string ArchName;
      bool IsArm = false;
  
-diff --git a/clang/tools/clang-installapi/Options.cpp b/clang/tools/clang-installapi/Options.cpp
-index f484d6f33ad8..dca55e72d67e 100644
---- a/clang/tools/clang-installapi/Options.cpp
-+++ b/clang/tools/clang-installapi/Options.cpp
-@@ -514,7 +514,7 @@ bool Options::processFrontendOptions(InputArgList &Args) {
-     FEOpts.FwkPaths = std::move(FrameworkPaths);
- 
-   // Add default framework/library paths.
--  PathSeq DefaultLibraryPaths = {"/usr/lib", "/usr/local/lib"};
-+  PathSeq DefaultLibraryPaths = {"/usr/lib", "/system/lib", "/usr/local/lib"};
-   PathSeq DefaultFrameworkPaths = {"/Library/Frameworks",
-                                    "/System/Library/Frameworks"};
- 
 `},
 }

internal/rosa/musl.go

@@ -53,6 +53,23 @@ rmdir -v /work/lib
 		Chmod: true,
 
 		Env: env,
+
+		Patches: []KV{
+			{"ldso-rosa", `diff --git a/ldso/dynlink.c b/ldso/dynlink.c
+index 715948f4..c2fece68 100644
+--- a/ldso/dynlink.c
++++ b/ldso/dynlink.c
+@@ -1157,7 +1157,7 @@ static struct dso *load_library(const char *name, struct dso *needed_by)
+ 					sys_path = "";
+ 				}
+ 			}
+-			if (!sys_path) sys_path = "/lib:/usr/local/lib:/usr/lib";
++			if (!sys_path) sys_path = "/system/lib:/system/lib/" LDSO_ARCH "-rosa-linux-musl:/lib:/usr/local/lib:/usr/lib";
+ 			fd = path_open(name, sys_path, buf, sizeof buf);
+ 		}
+ 		pathname = buf;
+`},
+		},
 	}, &helper,
 		Coreutils,
 	), version

internal/rosa/stage0.go

@@ -43,11 +43,10 @@ var (
 func NewStage0() pkg.Artifact {
 	stage0Once.Do(func() {
 		stage0 = newTar(
-			"https://hakurei.app/seed/20260429/"+
+			"https://hakurei.app/seed/20260504/"+
 				"stage0-"+triplet()+".tar.bz2",
 			perArch[string]{
-				"amd64": "ldz-WkSx2wxUK4ndi-tlaaU8ykOowbpGRcBsciAcIDdnX6-QfzQg_se3lsZYuzuK",
-				"arm64": "_mo39S_sgzPYaIQ_Wi13O46KPQuWqCCiZdildpz6a8MTh2khIt68tNIulyUGBV2z",
+				"amd64": "IQjFDkiAVLo1XzflgMMiLP3gnVY2hhDMTzl-QqJDCQhcLQ3lLtRzjI5WCxGyW_lk",
 			}.unwrap(),
 			pkg.TarBzip2,
 		)