From 444dde06ed249ade3966cf9d72cd79a918d56734 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 11 Sep 2022 16:19:14 -0700 Subject: compiler-rt-sanitizers: Fix build on mips Signed-off-by: Khem Raj --- ...-compiler-rt-Fix-stat-struct-s-size-for-O.patch | 32 ++++++++++++++++++++++ recipes-devtools/clang/common.inc | 1 + 2 files changed, 33 insertions(+) create mode 100644 recipes-devtools/clang/clang/0035-Revert-MIPS-compiler-rt-Fix-stat-struct-s-size-for-O.patch diff --git a/recipes-devtools/clang/clang/0035-Revert-MIPS-compiler-rt-Fix-stat-struct-s-size-for-O.patch b/recipes-devtools/clang/clang/0035-Revert-MIPS-compiler-rt-Fix-stat-struct-s-size-for-O.patch new file mode 100644 index 0000000..f1926f3 --- /dev/null +++ b/recipes-devtools/clang/clang/0035-Revert-MIPS-compiler-rt-Fix-stat-struct-s-size-for-O.patch @@ -0,0 +1,32 @@ +From 2d3ac2fb6e291cd11ca482fa4843565c04d414f4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 11 Sep 2022 16:15:36 -0700 +Subject: [PATCH] Revert "[MIPS][compiler-rt] Fix stat struct's size for O32 + ABI" + +This reverts commit 2bfb0fcb51510f22723c8cdfefe2a796a0a5ab25. + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + .../lib/sanitizer_common/sanitizer_platform_limits_posix.h | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h +index bd5692ed511b..a6091307bdce 100644 +--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -98,10 +98,9 @@ const unsigned struct_kernel_stat64_sz = 104; + const unsigned struct_kernel_stat_sz = 144; + const unsigned struct_kernel_stat64_sz = 104; + #elif defined(__mips__) +-const unsigned struct_kernel_stat_sz = +- SANITIZER_ANDROID +- ? FIRST_32_SECOND_64(104, 128) +- : FIRST_32_SECOND_64((_MIPS_SIM == _ABIN32) ? 160 : 144, 216); ++const unsigned struct_kernel_stat_sz = SANITIZER_ANDROID ++ ? FIRST_32_SECOND_64(104, 128) ++ : FIRST_32_SECOND_64(160, 216); + const unsigned struct_kernel_stat64_sz = 104; + #elif defined(__s390__) && !defined(__s390x__) + const unsigned struct_kernel_stat_sz = 64; diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc index cb705ef..3a4d504 100644 --- a/recipes-devtools/clang/common.inc +++ b/recipes-devtools/clang/common.inc @@ -44,6 +44,7 @@ SRC_URI = "\ file://0032-clang-exclude-openembedded-distributions-from-settin.patch \ file://0033-compiler-rt-Enable-__int128-for-ppc32.patch \ file://0034-llvm-Do-not-use-cmake-infra-to-detect-libzstd.patch \ + file://0035-Revert-MIPS-compiler-rt-Fix-stat-struct-s-size-for-O.patch \ " # Fallback to no-PIE if not set GCCPIE ??= "" -- cgit v1.2.3-54-g00ecf