Rebuild package

This commit is contained in:
2026-07-10 19:15:55 +03:00
parent 99e2b32805
commit 6b5a005cca
3 changed files with 63 additions and 1 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
name: llvm21
description: A collection of modular and reusable compiler and toolchain technologies
version: 21.1.8
revision: 2
revision: 3
url: https://llvm.org
license: Apache2-with-llvm-exception
maintainers:
+2
View File
@@ -7,6 +7,8 @@
prepare() {
cd "$BPM_SOURCE"/tools
patch -Np1 -i "$BPM_WORKDIR"/enable-fstack-protector-strong-by-default.patch
cd "$BPM_SOURCE"/projects/compiler-rt
patch -Np2 -i "$BPM_WORKDIR"/remove-linux-scc.h.patch
}
# The build function is executed in the source directory
+60
View File
@@ -0,0 +1,60 @@
From 12239e6eb6f38ee85bed432ecdb92c41481f88c9 Mon Sep 17 00:00:00 2001
From: cqwrteur <[email protected]>
Date: Sat, 25 Apr 2026 14:23:32 +0800
Subject: [PATCH] [compiler-rt][sanitizer] Remove linux/scc.h (#194116)
#194110
Linux Kernel has removed scc.h header completely from the source code
Therefore, we need to remove the usage in compiler-rt/sanitizer too.
https://github.com/torvalds/linux/commit/64edfa65062dc4509ba75978116b2f6d392346f5#diff-1ca78e598a5041ee51ae795d168435afad598b82a7a0ce80f215993589b96c7c
Without removing it, not only it breaks compiler-rt but also GCC build
since GCC always builds libsanitizer for linux targets.
After merging this we will need to cherry pick to GCC.
(cherry picked from commit 3dc4fd6dd41100f051a63642f449b16324389c96)
---
.../sanitizer_platform_limits_posix.cpp | 21 ++++++++-----------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
index ea8cc306268cb..0109df531e88c 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
@@ -151,16 +151,15 @@ typedef struct user_fpregs elf_fpregset_t;
#if defined(__mips64)
# include <sys/procfs.h>
#endif
-#include <sys/user.h>
-#include <linux/if_eql.h>
-#include <linux/if_plip.h>
-#include <linux/lp.h>
-#include <linux/mroute.h>
-#include <linux/mroute6.h>
-#include <linux/scc.h>
-#include <linux/serial.h>
-#include <sys/msg.h>
-#include <sys/ipc.h>
+# include <linux/if_eql.h>
+# include <linux/if_plip.h>
+# include <linux/lp.h>
+# include <linux/mroute.h>
+# include <linux/mroute6.h>
+# include <linux/serial.h>
+# include <sys/ipc.h>
+# include <sys/msg.h>
+# include <sys/user.h>
#endif // SANITIZER_ANDROID
#include <link.h>
@@ -532,8 +531,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
unsigned struct_kbsentry_sz = sizeof(struct kbsentry);
unsigned struct_mtconfiginfo_sz = sizeof(struct mtconfiginfo);
unsigned struct_nr_parms_struct_sz = sizeof(struct nr_parms_struct);
- unsigned struct_scc_modem_sz = sizeof(struct scc_modem);
- unsigned struct_scc_stat_sz = sizeof(struct scc_stat);
unsigned struct_serial_multiport_struct_sz
= sizeof(struct serial_multiport_struct);
unsigned struct_serial_struct_sz = sizeof(struct serial_struct);