From 3ae6a0a01e286c3fbaa9f6cef896147569ee799a Mon Sep 17 00:00:00 2001
From: dhy308 <tony.gan@huawei.com>
Date: Mon, 16 Aug 2021 20:09:24 +0800
Subject: [PATCH] =?UTF-8?q?libs=E7=BC=96=E8=AF=91=E4=B8=8D=E5=8A=A0ASAN?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: dhy308 <tony.gan@huawei.com>
---
 musl_config.gni   | 5 +++--
 musl_template.gni | 9 +++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/musl_config.gni b/musl_config.gni
index 0f1bc0da..ef8c9b3f 100644
--- a/musl_config.gni
+++ b/musl_config.gni
@@ -27,9 +27,10 @@ declare_args() {
 }
 
 declare_args() {
-  runtime_lib_path = "//prebuilts/clang/ohos/linux-x86_64/llvm/lib/clang/10.0.1/lib"
+  runtime_lib_path =
+      "//prebuilts/clang/ohos/linux-x86_64/llvm/lib/clang/10.0.1/lib"
   user_custom_libc = true
-  musl_ported_dir = "intermidiates/${musl_target_os}/musl_src_ported" 
+  musl_ported_dir = "intermidiates/${musl_target_os}/musl_src_ported"
   musl_inc_out_dir = "usr/include/${musl_target_triple}"
   uapi_dir = "//kernel/linux/patches/linux-4.19/prebuilts/usr/include"
 
diff --git a/musl_template.gni b/musl_template.gni
index 28045e78..0b5b3597 100644
--- a/musl_template.gni
+++ b/musl_template.gni
@@ -89,6 +89,7 @@ template("musl_libs") {
     "//build/config/compiler:no_rtti",
     "//build/config/compiler:runtime_library",
     "//build/config/compiler:thin_archive",
+    "//build/config/sanitizers:default_sanitizer_flags",
   ]
 
   config("${abi_prefix}_musl_abi_config") {
@@ -136,9 +137,9 @@ template("musl_libs") {
     ]
 
     if (musl_arch == "arm") {
-      cflags_basic += [ "-march=armv7-a", ]
+      cflags_basic += [ "-march=armv7-a" ]
     } else if (musl_arch == "aarch64") {
-      cflags_basic += [ "-march=armv8", ]
+      cflags_basic += [ "-march=armv8" ]
     }
 
     cflags_auto = [
@@ -399,11 +400,11 @@ template("musl_libs") {
     configs += [ ":${abi_prefix}_musl_config" ]
 
     deps = [
+      ":${abi_prefix}_libdl",
+      ":${abi_prefix}_libpthread",
       ":${abi_prefix}_musl_ldso",
       ":${abi_prefix}_musl_src",
       ":${abi_prefix}_musl_src_nossp",
-      ":${abi_prefix}_libdl",
-      ":${abi_prefix}_libpthread",
     ]
   }
 
-- 
GitLab