From 7505f6f8f359bcc6d898bcfdd539b8b013a55245 Mon Sep 17 00:00:00 2001
From: wangl351 <wangl351@outlook.com>
Date: Fri, 1 Mar 2024 01:48:25 +0000
Subject: [PATCH 1/3] =?UTF-8?q?update=20third=5Fparty/musl/ndk=5Fscript/co?=
 =?UTF-8?q?py=5Fmusl=5Fsysroot.sh.=20=E7=94=B1=E4=BA=8E=E4=B9=8B=E5=89=8D?=
 =?UTF-8?q?=E6=9B=BE=E7=BB=8F=E7=BC=96=E8=AF=91=E8=BF=87=E4=B8=80=E9=81=8D?=
 =?UTF-8?q?=EF=BC=8Casm=E6=96=87=E4=BB=B6=E5=A4=B9=E4=B8=AD=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E6=96=87=E4=BB=B6=EF=BC=8Crm=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E4=BC=9A=E5=A4=B1=E8=B4=A5=E3=80=82=20=E6=89=80=E4=BB=A5?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=85=88=E5=88=A0=E9=99=A4=E4=B9=8B=E5=89=8D?=
 =?UTF-8?q?=E7=BC=96=E8=AF=91=E4=BA=A7=E7=94=9F=E7=9A=84asm=EF=BC=8C?=
 =?UTF-8?q?=E6=89=8D=E8=83=BD=E9=A1=BA=E5=88=A9=E7=9A=84=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E7=BC=96=E8=AF=91=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangl351 <wangl351@outlook.com>
---
 third_party/musl/ndk_script/copy_musl_sysroot.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/third_party/musl/ndk_script/copy_musl_sysroot.sh b/third_party/musl/ndk_script/copy_musl_sysroot.sh
index d8c700b3b63..c911add0972 100755
--- a/third_party/musl/ndk_script/copy_musl_sysroot.sh
+++ b/third_party/musl/ndk_script/copy_musl_sysroot.sh
@@ -33,8 +33,10 @@ mkdir -p  ${OUT_DIR}/x86_64-linux-ohos
 mkdir -p  ${OUT_DIR}/i686-linux-ohos
 
 cp -rp ${SOURCE_DIR}/* ${OUT_DIR}
-mv  ${OUT_DIR}/asm  ${OUT_DIR}/${TARGET_ARCH}-linux-ohos/
+rm -rf ${OUT_DIR}/${TARGET_ARCH}-linux-ohos/asm
+mv ${OUT_DIR}/asm  ${OUT_DIR}/${TARGET_ARCH}-linux-ohos/
 
 cp -rp ${OUT_DIR}/asm-x86/asm ${OUT_DIR}/x86_64-linux-ohos
+rm -rf ${OUT_DIR}/i686-linux-ohos/asm
 mv ${OUT_DIR}/asm-x86/asm ${OUT_DIR}/i686-linux-ohos
 rm -fr ${OUT_DIR}/asm-x86
-- 
Gitee


From 58007c1e7b3529b5c679204bca7fe0bb15acd830 Mon Sep 17 00:00:00 2001
From: wangl351 <wangl351@outlook.com>
Date: Fri, 1 Mar 2024 01:54:36 +0000
Subject: [PATCH 2/3] Revert "update
 third_party/musl/ndk_script/copy_musl_sysroot.sh."

This reverts commit 7505f6f8f359bcc6d898bcfdd539b8b013a55245.
---
 third_party/musl/ndk_script/copy_musl_sysroot.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/third_party/musl/ndk_script/copy_musl_sysroot.sh b/third_party/musl/ndk_script/copy_musl_sysroot.sh
index c911add0972..d8c700b3b63 100755
--- a/third_party/musl/ndk_script/copy_musl_sysroot.sh
+++ b/third_party/musl/ndk_script/copy_musl_sysroot.sh
@@ -33,10 +33,8 @@ mkdir -p  ${OUT_DIR}/x86_64-linux-ohos
 mkdir -p  ${OUT_DIR}/i686-linux-ohos
 
 cp -rp ${SOURCE_DIR}/* ${OUT_DIR}
-rm -rf ${OUT_DIR}/${TARGET_ARCH}-linux-ohos/asm
-mv ${OUT_DIR}/asm  ${OUT_DIR}/${TARGET_ARCH}-linux-ohos/
+mv  ${OUT_DIR}/asm  ${OUT_DIR}/${TARGET_ARCH}-linux-ohos/
 
 cp -rp ${OUT_DIR}/asm-x86/asm ${OUT_DIR}/x86_64-linux-ohos
-rm -rf ${OUT_DIR}/i686-linux-ohos/asm
 mv ${OUT_DIR}/asm-x86/asm ${OUT_DIR}/i686-linux-ohos
 rm -fr ${OUT_DIR}/asm-x86
-- 
Gitee


From 467a66dd458d1099f7b01184c9dac5037f9a6e96 Mon Sep 17 00:00:00 2001
From: wangl351 <wangl351@outlook.com>
Date: Fri, 1 Mar 2024 01:59:49 +0000
Subject: [PATCH 3/3] =?UTF-8?q?Fix=EF=BC=9A=E9=87=8D=E5=A4=8D=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98=20?=
 =?UTF-8?q?=E5=89=8D=E4=B8=80=E6=AC=A1=E7=BC=96=E8=AF=91=E4=BA=A7=E7=94=9F?=
 =?UTF-8?q?=E7=9A=84asm=EF=BC=8C=E4=BC=9A=E5=AF=BC=E8=87=B4mv=E5=91=BD?=
 =?UTF-8?q?=E4=BB=A4=E5=A4=B1=E8=B4=A5=EF=BC=8C=E6=8F=90=E7=A4=BA=E7=9B=AE?=
 =?UTF-8?q?=E6=A0=87=E5=B7=B2=E7=BB=8F=E5=AD=98=E5=9C=A8=E3=80=82=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B9=8B=E5=89=8D=E7=BC=96=E8=AF=91=E4=BA=A7?=
 =?UTF-8?q?=E7=94=9F=E7=9A=84asm=EF=BC=8C=E5=8F=AF=E4=BB=A5=E4=BD=BF?=
 =?UTF-8?q?=E5=BE=97=E5=86=8D=E6=AC=A1=E7=BC=96=E8=AF=91=E9=A1=BA=E5=88=A9?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangl351 <wangl351@outlook.com>
---
 third_party/musl/ndk_script/copy_musl_sysroot.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/third_party/musl/ndk_script/copy_musl_sysroot.sh b/third_party/musl/ndk_script/copy_musl_sysroot.sh
index d8c700b3b63..c911add0972 100755
--- a/third_party/musl/ndk_script/copy_musl_sysroot.sh
+++ b/third_party/musl/ndk_script/copy_musl_sysroot.sh
@@ -33,8 +33,10 @@ mkdir -p  ${OUT_DIR}/x86_64-linux-ohos
 mkdir -p  ${OUT_DIR}/i686-linux-ohos
 
 cp -rp ${SOURCE_DIR}/* ${OUT_DIR}
-mv  ${OUT_DIR}/asm  ${OUT_DIR}/${TARGET_ARCH}-linux-ohos/
+rm -rf ${OUT_DIR}/${TARGET_ARCH}-linux-ohos/asm
+mv ${OUT_DIR}/asm  ${OUT_DIR}/${TARGET_ARCH}-linux-ohos/
 
 cp -rp ${OUT_DIR}/asm-x86/asm ${OUT_DIR}/x86_64-linux-ohos
+rm -rf ${OUT_DIR}/i686-linux-ohos/asm
 mv ${OUT_DIR}/asm-x86/asm ${OUT_DIR}/i686-linux-ohos
 rm -fr ${OUT_DIR}/asm-x86
-- 
Gitee