internal/rosa/package: migrate llvm patches
All checks were successful
Test / Create distribution (push) Successful in 1m8s
Test / Sandbox (push) Successful in 4m46s
Test / ShareFS (push) Successful in 7m58s
Test / Sandbox (race detector) (push) Successful in 3m28s
Test / Hakurei (push) Successful in 5m1s
Test / Hakurei (race detector) (push) Successful in 6m50s
Test / Flake checks (push) Successful in 1m27s
All checks were successful
Test / Create distribution (push) Successful in 1m8s
Test / Sandbox (push) Successful in 4m46s
Test / ShareFS (push) Successful in 7m58s
Test / Sandbox (race detector) (push) Successful in 3m28s
Test / Hakurei (push) Successful in 5m1s
Test / Hakurei (race detector) (push) Successful in 6m50s
Test / Flake checks (push) Successful in 1m27s
LLVM itself is unlikely to ever be migrated due to complexity of the bootstrap, so migrate patches instead. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -1,9 +1,11 @@
|
|||||||
package rosa
|
package rosa
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"io/fs"
|
||||||
"regexp"
|
"regexp"
|
||||||
"slices"
|
"slices"
|
||||||
"strings"
|
"strings"
|
||||||
|
"unsafe"
|
||||||
|
|
||||||
"hakurei.app/internal/pkg"
|
"hakurei.app/internal/pkg"
|
||||||
)
|
)
|
||||||
@@ -48,6 +50,24 @@ func litArgs(verbose bool, skipChecks ...string) string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
|
var llvmPatches []KV
|
||||||
|
for _, name := range [...]string{
|
||||||
|
"increase-stack-size-unconditional",
|
||||||
|
"add-rosa-vendor",
|
||||||
|
"xfail-broken-tests",
|
||||||
|
"path-system-include",
|
||||||
|
"path-system-libraries",
|
||||||
|
} {
|
||||||
|
p, err := fs.ReadFile(nativeB, "package/llvm/"+name+".patch")
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
llvmPatches = append(llvmPatches, KV{
|
||||||
|
name,
|
||||||
|
unsafe.String(unsafe.SliceData(p), len(p)),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
native.MustRegister("early-compiler-rt", func(t Toolchain) (*Metadata, pkg.Artifact) {
|
native.MustRegister("early-compiler-rt", func(t Toolchain) (*Metadata, pkg.Artifact) {
|
||||||
meta := Metadata{
|
meta := Metadata{
|
||||||
Name: "early-compiler-rt",
|
Name: "early-compiler-rt",
|
||||||
|
|||||||
32
internal/rosa/package/llvm/add-rosa-vendor.patch
Normal file
32
internal/rosa/package/llvm/add-rosa-vendor.patch
Normal file
@@ -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)
|
||||||
@@ -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
|
||||||
25
internal/rosa/package/llvm/path-system-include.patch
Normal file
25
internal/rosa/package/llvm/path-system-include.patch
Normal file
@@ -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);
|
||||||
@@ -1,96 +1,4 @@
|
|||||||
package rosa
|
diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
|
||||||
|
|
||||||
// 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/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
|
|
||||||
index cb6a9b242421..b8d31690d1af 100644
|
index cb6a9b242421..b8d31690d1af 100644
|
||||||
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
|
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
|
||||||
+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
|
+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
|
||||||
@@ -178,5 +86,3 @@ index d525b417b4ea..2b93f401733e 100644
|
|||||||
std::string ArchName;
|
std::string ArchName;
|
||||||
bool IsArm = false;
|
bool IsArm = false;
|
||||||
|
|
||||||
`},
|
|
||||||
}
|
|
||||||
10
internal/rosa/package/llvm/xfail-broken-tests.patch
Normal file
10
internal/rosa/package/llvm/xfail-broken-tests.patch
Normal file
@@ -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>
|
||||||
|
|
||||||
Reference in New Issue
Block a user