From e002dda5d3080ece5e206d743726b9d1e3623e3d Mon Sep 17 00:00:00 2001
From: xxlight <xiaoxiaoliang2@huawei.com>
Date: Thu, 25 Aug 2022 15:05:55 +0800
Subject: [PATCH] fix:support march

Signed-off-by: xxlight <xiaoxiaoliang2@huawei.com>
Change-Id: I5d30f273f71b2a7dc3f068975b6cf62f9f23a477
---
 BUILD.gn          |  1 -
 musl_template.gni | 28 ++++++----------------------
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index f45b65f8..66dae48c 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -52,7 +52,6 @@ if (is_lite_system && current_os == "ohos") {
   }
 
   musl_libs("soft_libs") {
-    target_abi = "soft"
   }
 
   group("musl_headers") {
diff --git a/musl_template.gni b/musl_template.gni
index f75116e8..97f136b9 100644
--- a/musl_template.gni
+++ b/musl_template.gni
@@ -4,20 +4,10 @@ import("musl_src.gni")
 template("musl_libs") {
   no_default_deps = true
 
-  forward_variables_from(invoker, [ "target_abi" ])
-
-  if (target_abi == "soft") {
-    _libs_path_prefix = "."
-    _libs_out_dir = "usr/lib/${musl_target_triple}"
-  } else {
-    _libs_path_prefix = "${target_abi}"
-    _libs_out_dir = "usr/lib/${musl_target_triple}/${target_abi}"
-  }
+  forward_variables_from(invoker, [ "*" ])
 
-  musl_subarch = ""
-  if (target_abi == "a7_hard_neon-vfpv4") {
-    musl_subarch = "hf"
-  }
+  _libs_path_prefix = "."
+  _libs_out_dir = "usr/lib/${musl_target_triple}"
 
   dfx_deps = [ "//base/hiviewdfx/faultloggerd/interfaces/innerkits/signal_handler:dfxsignalhandler" ]
   porting_deps = [
@@ -151,10 +141,7 @@ template("musl_libs") {
 
     cflags = cflags_all
 
-    defines = []
-    if ("${target_abi}" != "a7_hard_neon-vfpv4") {
-      defines += [ "BROKEN_VFP_ASM" ]
-    }
+    defines = [ "BROKEN_VFP_ASM" ]
     if (is_standard_system) {
       defines += [
         "OHOS_DNS_PROXY_BY_NETSYS=1",
@@ -276,10 +263,7 @@ template("musl_libs") {
       sources_orig -= [ "src/thread/${musl_arch}/__set_thread_area.s" ]
     }
 
-    defines = []
-    if ("${target_abi}" == "a7_hard_neon-vfpv4") {
-      defines += [ "__ARM_PCS_VFP" ]
-    }
+    defines = [ "__ARM_PCS_VFP" ]
     if (musl_secure_level > 0) {
       defines += [ "MALLOC_FREELIST_HARDENED" ]
     }
@@ -606,7 +590,7 @@ template("musl_libs") {
     } else {
       asan = ""
     }
-    _muls_linker_so = "${root_out_dir}/common/common/libc/${_libs_path_prefix}/ld-musl-${musl_arch}${musl_subarch}${asan}.so.1"
+    _muls_linker_so = "${root_out_dir}/common/common/libc/${_libs_path_prefix}/ld-musl-${musl_arch}${asan}.so.1"
     outputs = [ _muls_linker_so ]
   }
 }
-- 
GitLab