diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-05-01 03:09:49 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-05-01 03:36:58 +0900 |
| commit | fc66f0bb47dd4634f81aa67bf8fc092945643520 (patch) | |
| tree | ca4664af315dc0929f7f4034aba29de769197d5a /internal/rosa/llvm_patches.go | |
| parent | 2cd6b35beeb655ae2a69d17d223063ee5a3e00bb (diff) | |
internal/rosa/llvm: use llvm build system
This removes the multistep bootstrap hack. Stage0 exceptions are also eliminated for a later change to bring the stage0 distribution down to just a bare toolchain, toybox and shell. This change also enables dynamic linking and ThinLTO.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal/rosa/llvm_patches.go')
| -rw-r--r-- | internal/rosa/llvm_patches.go | 191 |
1 files changed, 191 insertions, 0 deletions
diff --git a/internal/rosa/llvm_patches.go b/internal/rosa/llvm_patches.go new file mode 100644 index 00000000..f1060b9f --- /dev/null +++ b/internal/rosa/llvm_patches.go @@ -0,0 +1,191 @@ +package rosa + +// llvmPatches are centralised patches against latest LLVM monorepo. +var llvmPatches = []KV{ + {"increase-stack-size-unconditional", `diff --git a/llvm/lib/Support/Threading.cpp b/llvm/lib/Support/Threading.cpp +index 9da357a7ebb9..b2931510c1ae 100644 +--- a/llvm/lib/Support/Threading.cpp ++++ b/llvm/lib/Support/Threading.cpp +@@ -80,7 +80,7 @@ unsigned llvm::ThreadPoolStrategy::compute_thread_count() const { + // keyword. + #include "llvm/Support/thread.h" + +-#if defined(__APPLE__) ++#if defined(__APPLE__) || 1 + // Darwin's default stack size for threads except the main one is only 512KB, + // which is not enough for some/many normal LLVM compilations. This implements + // the same interface as std::thread but requests the same stack size as the +`}, + + {"add-rosa-vendor", `diff --git a/llvm/include/llvm/TargetParser/Triple.h b/llvm/include/llvm/TargetParser/Triple.h +index 9c83abeeb3b1..5acfe5836a23 100644 +--- a/llvm/include/llvm/TargetParser/Triple.h ++++ b/llvm/include/llvm/TargetParser/Triple.h +@@ -190,6 +190,7 @@ public: + + Apple, + PC, ++ Rosa, + SCEI, + Freescale, + IBM, +diff --git a/llvm/lib/TargetParser/Triple.cpp b/llvm/lib/TargetParser/Triple.cpp +index a4f9dd42c0fe..cb5a12387034 100644 +--- a/llvm/lib/TargetParser/Triple.cpp ++++ b/llvm/lib/TargetParser/Triple.cpp +@@ -279,6 +279,7 @@ StringRef Triple::getVendorTypeName(VendorType Kind) { + case NVIDIA: return "nvidia"; + case OpenEmbedded: return "oe"; + case PC: return "pc"; ++ case Rosa: return "rosa"; + case SCEI: return "scei"; + case SUSE: return "suse"; + case Meta: +@@ -689,6 +690,7 @@ static Triple::VendorType parseVendor(StringRef VendorName) { + return StringSwitch<Triple::VendorType>(VendorName) + .Case("apple", Triple::Apple) + .Case("pc", Triple::PC) ++ .Case("rosa", Triple::Rosa) + .Case("scei", Triple::SCEI) + .Case("sie", Triple::SCEI) + .Case("fsl", Triple::Freescale) +`}, + + {"xfail-broken-tests", `diff --git a/clang/test/Modules/timestamps.c b/clang/test/Modules/timestamps.c +index 50fdce630255..4b4465a75617 100644 +--- a/clang/test/Modules/timestamps.c ++++ b/clang/test/Modules/timestamps.c +@@ -1,3 +1,5 @@ ++// XFAIL: target={{.*-rosa-linux-musl}} ++ + /// Verify timestamps that gets embedded in the module + #include <c-header.h> + +`}, + + {"path-system-include", `diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp +index 8ac8d4eb9181..e46b04a898ca 100644 +--- a/clang/lib/Driver/ToolChains/Linux.cpp ++++ b/clang/lib/Driver/ToolChains/Linux.cpp +@@ -671,6 +671,12 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs, + addExternCSystemInclude( + DriverArgs, CC1Args, + concat(SysRoot, "/usr/include", MultiarchIncludeDir)); ++ if (!MultiarchIncludeDir.empty() && ++ D.getVFS().exists(concat(SysRoot, "/system/include", MultiarchIncludeDir))) ++ addExternCSystemInclude( ++ DriverArgs, CC1Args, ++ concat(SysRoot, "/system/include", MultiarchIncludeDir)); ++ + + if (getTriple().getOS() == llvm::Triple::RTEMS) + return; +@@ -681,6 +687,7 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs, + addExternCSystemInclude(DriverArgs, CC1Args, concat(SysRoot, "/include")); + + addExternCSystemInclude(DriverArgs, CC1Args, concat(SysRoot, "/usr/include")); ++ addExternCSystemInclude(DriverArgs, CC1Args, concat(SysRoot, "/system/include")); + + if (!DriverArgs.hasArg(options::OPT_nobuiltininc) && getTriple().isMusl()) + 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 +--- 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) + const bool IsHexagon = Arch == llvm::Triple::hexagon; + const bool IsRISCV = Triple.isRISCV(); + const bool IsCSKY = Triple.isCSKY(); ++ const bool IsRosa = Triple.getVendor() == llvm::Triple::Rosa; + + 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 + // 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); +- addPathIfExists(D, concat(SysRoot, "/libo32"), Paths); +- addPathIfExists(D, concat(SysRoot, "/usr/libo32"), Paths); ++ if (!IsRosa) { ++ addPathIfExists(D, concat(SysRoot, "/libo32"), Paths); ++ addPathIfExists(D, concat(SysRoot, "/usr/libo32"), Paths); ++ } else { ++ addPathIfExists(D, concat(SysRoot, "/system/libo32"), Paths); ++ } + } + Generic_GCC::AddMultilibPaths(D, SysRoot, OSLibDir, MultiarchTriple, Paths); + +@@ -360,18 +372,30 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + Paths); + } + +- addPathIfExists(D, concat(SysRoot, "/usr/lib", MultiarchTriple), Paths); +- addPathIfExists(D, concat(SysRoot, "/usr", OSLibDir), Paths); ++ if (!IsRosa) { ++ addPathIfExists(D, concat(SysRoot, "/usr/lib", MultiarchTriple), Paths); ++ addPathIfExists(D, concat(SysRoot, "/usr", OSLibDir), Paths); ++ } else { ++ addPathIfExists(D, concat(SysRoot, "/system/lib", MultiarchTriple), Paths); ++ addPathIfExists(D, concat(SysRoot, "/system", OSLibDir), Paths); ++ } + if (IsRISCV) { + StringRef ABIName = tools::riscv::getRISCVABI(Args, Triple); + addPathIfExists(D, concat(SysRoot, "/", OSLibDir, ABIName), Paths); +- addPathIfExists(D, concat(SysRoot, "/usr", OSLibDir, ABIName), Paths); ++ if (!IsRosa) ++ addPathIfExists(D, concat(SysRoot, "/usr", OSLibDir, ABIName), Paths); ++ else ++ addPathIfExists(D, concat(SysRoot, "/system", OSLibDir, ABIName), Paths); + } + + Generic_GCC::AddMultiarchPaths(D, SysRoot, OSLibDir, Paths); + +- addPathIfExists(D, concat(SysRoot, "/lib"), Paths); +- addPathIfExists(D, concat(SysRoot, "/usr/lib"), Paths); ++ if (!IsRosa) { ++ addPathIfExists(D, concat(SysRoot, "/lib"), Paths); ++ addPathIfExists(D, concat(SysRoot, "/usr/lib"), Paths); ++ } else { ++ addPathIfExists(D, concat(SysRoot, "/system/lib"), Paths); ++ } + } + + ToolChain::RuntimeLibType Linux::GetDefaultRuntimeLibType() const { +@@ -572,6 +596,9 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const { + return Triple.isArch64Bit() ? "/system/bin/linker64" : "/system/bin/linker"; + } + if (Triple.isMusl()) { ++ if (Triple.getVendor() == llvm::Triple::Rosa) ++ return "/system/bin/linker"; ++ + 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"}; + +`}, +} |
