MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

compiler-rt-sanitizers: Fix build on mips

Browse Source 
uintptr_t size is not consistent between compiler-rt and clang
for mips

(From OE-Core rev: 7f2b80c8eaaf226d3c9faed93e9c93879de50b54)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj 2025-05-23 00:32:07 -07:00 committed by Richard Purdie
parent bd46ed87bc
commit 2ee99d2ddc
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
meta/recipes-devtools/clang/clang/0038-compiler-rt-Hardcode-uptr-sptr-typedefs-on-Mips-Linu.patch Normal file
View File

@ -0,0 +1,35 @@
From 9f88f2e4efa56e53c78f9b67775c71afa711a69c Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 22 May 2025 21:50:45 -0700
Subject: [PATCH] [compiler-rt] Hardcode uptr/sptr typedefs on Mips/Linux
Sanitizer build on Mips/Linux faills to build due to assertion errors
mismatched definitions. This is due to inconsistent definitions of
`uptr` of either `unsigned long` or `unsigned int` in compiler-rt. This
is caused by clang defining
__UINTPTR_TYPE__ long unsigned int where as gcc defines it as
unsigned int
As a workaround, this hardcodes `uptr`/`sptr` in compiler-rt to
`unsigned int`/`int` on Linux Mips, matching gcc.
Upstream-Status: Submitted [https://github.com/llvm/llvm-project/pull/141201]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h b/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h
index fff60c96f632..511ee8fe49cc 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h
@@ -139,7 +139,7 @@
namespace __sanitizer {
#if defined(__UINTPTR_TYPE__)
-# if defined(__arm__) && defined(__linux__)
+# if (defined(__arm__) || _ABIO32 == 1) && defined(__linux__)
// Linux Arm headers redefine __UINTPTR_TYPE__ and disagree with clang/gcc.
typedef unsigned int uptr;
typedef int sptr;

1
meta/recipes-devtools/clang/common.inc
View File

@ -58,6 +58,7 @@ SRC_URI = "\
file://0035-llvm-config-remove-LLVM_LDFLAGS-from-ldflags-output.patch \
file://0036-openmp-Do-not-emit-date-and-time-into-generate-files.patch \
file://0038-compiler-rt-Exclude-sync_fetch_and_-for-any-pre-ARMv.patch \
file://0038-compiler-rt-Hardcode-uptr-sptr-typedefs-on-Mips-Linu.patch \
"
# Fallback to no-PIE if not set
GCCPIE ??= ""