diff options
Diffstat (limited to 'internal/rosa/package')
5 files changed, 168 insertions, 0 deletions
diff --git a/internal/rosa/package/llvm/add-rosa-vendor.patch b/internal/rosa/package/llvm/add-rosa-vendor.patch new file mode 100644 index 00000000..919403a3 --- /dev/null +++ b/internal/rosa/package/llvm/add-rosa-vendor.patch @@ -0,0 +1,32 @@ +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) diff --git a/internal/rosa/package/llvm/increase-stack-size-unconditional.patch b/internal/rosa/package/llvm/increase-stack-size-unconditional.patch new file mode 100644 index 00000000..20ffe579 --- /dev/null +++ b/internal/rosa/package/llvm/increase-stack-size-unconditional.patch @@ -0,0 +1,13 @@ +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 diff --git a/internal/rosa/package/llvm/path-system-include.patch b/internal/rosa/package/llvm/path-system-include.patch new file mode 100644 index 00000000..c442d641 --- /dev/null +++ b/internal/rosa/package/llvm/path-system-include.patch @@ -0,0 +1,25 @@ +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); diff --git a/internal/rosa/package/llvm/path-system-libraries.patch b/internal/rosa/package/llvm/path-system-libraries.patch new file mode 100644 index 00000000..fbe46def --- /dev/null +++ b/internal/rosa/package/llvm/path-system-libraries.patch @@ -0,0 +1,88 @@ +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) + 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(); +@@ -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); +- 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 +365,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 +589,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/internal/rosa/package/llvm/xfail-broken-tests.patch b/internal/rosa/package/llvm/xfail-broken-tests.patch new file mode 100644 index 00000000..0bc9af76 --- /dev/null +++ b/internal/rosa/package/llvm/xfail-broken-tests.patch @@ -0,0 +1,10 @@ +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> + |