internal/rosa/llvm: use latest version on arm64

This also removes arch-specific patches because they were not useful.

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

5 files changed, 2 insertions, 24 deletions

diff --git a/internal/rosa/llvm.go b/internal/rosa/llvm.go
index 7424a2fd..ebffcdc8 100644
--- a/internal/rosa/llvm.go
+++ b/internal/rosa/llvm.go
@@ -333,7 +333,7 @@ ln -s clang++ /work/system/bin/c++
 ninja check-all
 `,
 
-		patches: slices.Concat([]KV{
+		patches: []KV{
 			{"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
@@ -505,7 +505,7 @@ index 64324a3f8b01..15ce70b68217 100644
                                     "/System/Library/Frameworks"};
  
 `},
-		}, clangPatches),
+		},
 	})
 
 	return
diff --git a/internal/rosa/llvm_amd64.go b/internal/rosa/llvm_amd64.go
deleted file mode 100644
index dc28c367..00000000
--- a/internal/rosa/llvm_amd64.go
+++ /dev/null
@@ -1,4 +0,0 @@
-package rosa
-
-// clangPatches are patches applied to the LLVM source tree for building clang.
-var clangPatches []KV
diff --git a/internal/rosa/llvm_arm64.go b/internal/rosa/llvm_arm64.go
deleted file mode 100644
index 4ce6646b..00000000
--- a/internal/rosa/llvm_arm64.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package rosa
-
-// clangPatches are patches applied to the LLVM source tree for building clang.
-var clangPatches []KV
-
-// one version behind, latest fails 5 tests with 2 flaky on arm64
-const (
-	llvmVersionMajor = "21"
-	llvmVersion      = llvmVersionMajor + ".1.8"
-
-	llvmChecksum = "8SUpqDkcgwOPsqHVtmf9kXfFeVmjVxl4LMn-qSE1AI_Xoeju-9HaoPNGtidyxyka"
-)
diff --git a/internal/rosa/llvm_latest.go b/internal/rosa/llvm_latest.go
index 29455eb6..71ad7daf 100644
--- a/internal/rosa/llvm_latest.go
+++ b/internal/rosa/llvm_latest.go
@@ -1,5 +1,3 @@
-//go:build !arm64
-
 package rosa
 
 // latest version of LLVM, conditional to temporarily avoid broken new releases
diff --git a/internal/rosa/llvm_riscv64.go b/internal/rosa/llvm_riscv64.go
deleted file mode 100644
index dc28c367..00000000
--- a/internal/rosa/llvm_riscv64.go
+++ /dev/null
@@ -1,4 +0,0 @@
-package rosa
-
-// clangPatches are patches applied to the LLVM source tree for building clang.
-var clangPatches []KV