From d471b54bcba205734a627df3743e1fd70f7a5b5f Mon Sep 17 00:00:00 2001
From: w00657280 <wuyuechang3@huawei.com>
Date: Thu, 13 Mar 2025 15:19:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9LLVM19=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: w00657280 <wuyuechang3@huawei.com>
---
 compiler-rt/cmake/config-ix.cmake                     | 2 +-
 compiler-rt/lib/asan/asan_linux.cpp                   | 1 -
 compiler-rt/lib/sanitizer_common/sanitizer_mallinfo.h | 3 ---
 toolchain.sh                                          | 6 +++---
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake
index ab7e04d6374f..c5350ac0b9d4 100644
--- a/compiler-rt/cmake/config-ix.cmake
+++ b/compiler-rt/cmake/config-ix.cmake
@@ -822,7 +822,7 @@ else()
 endif()
 
 if (PROFILE_SUPPORTED_ARCH AND NOT LLVM_USE_SANITIZER AND
-    OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows|Android|Fuchsia|SunOS|NetBSD|AIX")
+    OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows|Android|Fuchsia|SunOS|NetBSD|AIX|OHOS")
   set(COMPILER_RT_HAS_PROFILE TRUE)
 else()
   set(COMPILER_RT_HAS_PROFILE FALSE)
diff --git a/compiler-rt/lib/asan/asan_linux.cpp b/compiler-rt/lib/asan/asan_linux.cpp
index 03372badea62..455b58862a85 100644
--- a/compiler-rt/lib/asan/asan_linux.cpp
+++ b/compiler-rt/lib/asan/asan_linux.cpp
@@ -217,7 +217,6 @@ void SignContextStack(void *context) {
   ucp->uc_stack.ss_flags = HashContextStack(*ucp);
 }
 
-#if !SANITIZER_ANDROID && !SANITIZER_OHOS
 void ReadContextStack(void *context, uptr *stack, uptr *ssize) {
   const ucontext_t *ucp = reinterpret_cast<const ucontext_t *>(context);
   if (HashContextStack(*ucp) == ucp->uc_stack.ss_flags) {
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_mallinfo.h b/compiler-rt/lib/sanitizer_common/sanitizer_mallinfo.h
index 1c07e68e55a7..fcb0037988fa 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_mallinfo.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_mallinfo.h
@@ -27,9 +27,6 @@ struct __sanitizer_struct_mallinfo {
 
 #elif SANITIZER_LINUX || SANITIZER_APPLE || SANITIZER_FUCHSIA
 
-struct __sanitizer_struct_mallinfo {
-  int v[10];
-};
 
 struct __sanitizer_struct_mallinfo2 {
   uptr v[10];
diff --git a/toolchain.sh b/toolchain.sh
index 1bdc1baffa44..43e4907478a3 100755
--- a/toolchain.sh
+++ b/toolchain.sh
@@ -25,7 +25,7 @@ do
 done
 
 
-ndk_dir=$(ls ${SOURCE_DIR}/lib/|more |grep ohos |grep -v mipsel |grep -v riscv |awk '{print $NF}')
+ndk_dir=$(ls ${SOURCE_DIR}/lib/|more |grep ohos |grep -v mipsel |grep -v riscv |grep -v arm|grep -v loongarch64|awk '{print $NF}')
 
 for i in $ndk_dir
 do
@@ -33,8 +33,8 @@ do
 	find ${OUT_DIR}/lib/$i -name 'libc++.so' -type f -exec bash -c 'echo "INPUT(-lc++_shared)" > $1'  _ {}  \;
 done
 
-cp -rfp ${SOURCE_DIR}/lib   ${OUT_DIR}
-cp -rfp ${SOURCE_DIR}/include  ${OUT_DIR}
+cp -rfp ${SOURCE_DIR}/lib/*   ${OUT_DIR}
+cp -rfp ${SOURCE_DIR}/include/*  ${OUT_DIR}
 
 function strip_dir() {
     for file in `ls $1`
-- 
Gitee