diff --git a/testing/llvm-next/0006-Add-musl-triples.patch b/testing/llvm-next/0006-Add-musl-triples.patch index e3755761581..a771256ab82 100644 --- a/testing/llvm-next/0006-Add-musl-triples.patch +++ b/testing/llvm-next/0006-Add-musl-triples.patch @@ -1,6 +1,6 @@ --- a/clang/lib/Driver/ToolChains/Gnu.cpp +++ b/clang/lib/Driver/ToolChains/Gnu.cpp -@@ -2329,7 +2329,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( +@@ -2335,7 +2342,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( // lists should shrink over time. Please don't add more elements to *Triples. static const char *const AArch64LibDirs[] = {"/lib64", "/lib"}; static const char *const AArch64Triples[] = { @@ -10,7 +10,7 @@ static const char *const AArch64beLibDirs[] = {"/lib"}; static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu"}; -@@ -2338,7 +2339,9 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( +@@ -2344,7 +2352,9 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf", "armv7hl-redhat-linux-gnueabi", "armv6hl-suse-linux-gnueabi", @@ -21,7 +21,7 @@ static const char *const ARMebLibDirs[] = {"/lib"}; static const char *const ARMebTriples[] = {"armeb-linux-gnueabi"}; static const char *const ARMebHFTriples[] = { -@@ -2357,7 +2360,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( +@@ -2363,7 +2373,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( "x86_64-pc-linux-gnu", "x86_64-redhat-linux6E", "x86_64-redhat-linux", "x86_64-suse-linux", "x86_64-manbo-linux-gnu", "x86_64-slackware-linux", @@ -31,22 +31,32 @@ static const char *const X32Triples[] = {"x86_64-linux-gnux32", "x86_64-pc-linux-gnux32"}; static const char *const X32LibDirs[] = {"/libx32", "/lib"}; -@@ -2366,11 +2370,13 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( +@@ -2372,17 +2383,22 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( "i586-linux-gnu", "i686-linux-gnu", "i686-pc-linux-gnu", "i386-redhat-linux6E", "i686-redhat-linux", "i386-redhat-linux", "i586-suse-linux", "i686-montavista-linux", + "i686-linux-musl", }; + static const char *const LoongArch32LibDirs[] = {"/lib32", "/lib"}; + static const char *const LoongArch32Triples[] = { + "loongarch32-linux-gnu", "loongarch32-unknown-linux-gnu", + "loongarch32-linux-gnuf32", "loongarch32-unknown-linux-gnuf32", +- "loongarch32-linux-gnusf", "loongarch32-unknown-linux-gnusf"}; ++ "loongarch32-linux-gnusf", "loongarch32-unknown-linux-gnusf", ++ "loongarch32-linux-musl", ++ }; + static const char *const LoongArch64LibDirs[] = {"/lib64", "/lib"}; static const char *const LoongArch64Triples[] = { - "loongarch64-linux-gnu", "loongarch64-unknown-linux-gnu"}; + "loongarch64-linux-gnu", "loongarch64-unknown-linux-gnu", -+ "loongarch64-linux-musl"}; ++ "loongarch64-linux-musl", ++ }; static const char *const M68kLibDirs[] = {"/lib"}; static const char *const M68kTriples[] = {"m68k-unknown-linux-gnu", -@@ -2427,7 +2433,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( +@@ -2439,7 +2455,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( "riscv32-unknown-elf"}; static const char *const RISCV64LibDirs[] = {"/lib64", "/lib"}; static const char *const RISCV64Triples[] = {"riscv64-unknown-linux-gnu", diff --git a/testing/llvm-next/APKBUILD b/testing/llvm-next/APKBUILD index e65c9bdd7b5..e128e1cf4d7 100644 --- a/testing/llvm-next/APKBUILD +++ b/testing/llvm-next/APKBUILD @@ -1,13 +1,22 @@ # Maintainer: Celeste maintainer="Celeste " pkgname=llvm-next -pkgver=22.0.0_pre20251226 -_gitrev=a08cc6e0d5e3fa653649a7826f1ffafc2b3ea2dd +pkgver=23.0.0_pre20260120 +_gitrev=53ae317ed28b71c991309d38a7171a3173f364d7 pkgrel=0 pkgdesc="Future LLVM Preview" url="https://llvm.org/" arch="aarch64 loongarch64 ppc64le riscv64 x86_64" license="Apache-2.0" + +case "$CARCH" in +riscv64) + # upgrade later, keep self-hosting + pkgver=22.0.0_pre20251226 + pkgrel=0 + ;; +esac + depends_dev=" $pkgname=$pkgver-r$pkgrel $pkgname-test-utils=$pkgver-r$pkgrel @@ -468,11 +477,6 @@ Bindings/OCaml/debuginfo.ml;\ ppc64le) LIT_XFAIL="${LIT_XFAIL}\ Bindings/OCaml/target.ml;\ -" - ;; - aarch64) - LIT_XFAIL="${LIT_XFAIL}\ -ExecutionEngine/OrcLazy/multiple-compile-threads-basic.ll;\ " ;; loongarch64) @@ -1291,13 +1295,13 @@ pyc() { } sha512sums=" -d9632a9f8d1d72c84c2f84a0b9d58cd3aa10d55c1225301c063a87c069a9a7fe7ccdb5f520fef18224ec62174f56c98abaab266f0e48acab62ebcea5d19aa0d7 llvm-project-a08cc6e0d5e3fa653649a7826f1ffafc2b3ea2dd.tar.gz +16919d7fde052708923500c323c7e5e5c901055c9862cfb7b228e13d7e99f482e8cc20a7f92d7080e8994055340ec91ca377427cc781356e7ac8bd0813d95faf llvm-project-53ae317ed28b71c991309d38a7171a3173f364d7.tar.gz a1c2aa981064add2b4ed8130bc38b4f4d8a7d6891d7b7439bced528cd5558bd13283dda60e9eb1552b601dad278e307a79198337ede28109ee988afee28ef6a1 0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch c51dcd90def5dfcc70e14d50143c53d215a2a13d34051c26a6cad50c8b95be1e97c21295c7b1b3b9671da6add350d1cd26c5e049fd537226e089ab5d16c83907 0002-Fix-memory-mf_exec-on-aarch64.patch 7384dacff265d9fd3a36433e3289455023c78fec442b3e847ead2c5fc0acbc3f3f81db742d1a298c6d752709a856a2efff8676cb7056983180af61a7aa3b08ec 0003-LLVM-install-prefix.patch 2a2b92cea1b18aa35835afaf71bab705022163fb409df27d33bf0b175edb7426d1ddbe46a730fe9821eafa047967d26bb5dc79e4e2e5b63e5b44798a733d2012 0004-LLVM-stack-size.patch a45f078c4ddd5e1bece2e2e6795d4760a88dd3bb0921786d2f0650979268554e87e9190b42be1efa7e76e8d14a5a6db453dc367711576397e00fe647c9261791 0005-Skip-roundeven-tests.patch -c682209c915a03b71c622ab9fcd349cfad3f56e6ecc673f37c0b9d7f1ecb4fb23e98908838f1c63befcf010eafc2b90705fc2c19234443b2820cec030bb06be9 0006-Add-musl-triples.patch +5a8267c77bc675097d383c733e3838ead95c7f32a8538242e6930a2c09fd0d4be6b929ff242a4507a4441d1a5e0a44bff5fa79e65b99ef5cf3a81ade47e6a14b 0006-Add-musl-triples.patch 40de689ac9bccbd1b7aa68c119f97e22b5dd1f76497c78a85ec51c0a6c56ef88696365eaaa80b94b2430795946d97abb5676c85b1bdfe33044e87fcb18b378f1 0007-Enable-stack-protector-by-default-for-Alpine-Linux.patch 72d10e61085496714fed362514baaf21cd9a51f81aad1760260534297973a367c53bb0e5c1a082bf61196ff01e688057e8a8daf060d90ef3cfde7c4f7fbbff64 0008-Switch-on-default-now-relro-without-reading-osrelease.patch bd077e775270869eee1c2a5715822aa4d1f82637ba71bf01bbe40d5a8731f05619ca56676e3cc3715228134b81288f70fd60c853ad81afde7dffdc0bdd6bce63 0009-Use-full-version-for-liblldb-symlink-target.patch