!186 Clang triple renaming

Merge pull request !186 from maweiye/new-triple

libc-test/test_template.gni

@@ -11,9 +11,8 @@ if (current_cpu == "arm") {
 }
 
 musl_include_dir =
-    "${root_out_dir}/obj/${musl_dir}/usr/include/${musl_arch}-linux-ohosmusl"
-musl_lib_dir =
-    "${root_out_dir}/obj/${musl_dir}/usr/lib/${musl_arch}-linux-ohosmusl"
+    "${root_out_dir}/obj/${musl_dir}/usr/include/${musl_arch}-linux-ohos"
+musl_lib_dir = "${root_out_dir}/obj/${musl_dir}/usr/lib/${musl_arch}-linux-ohos"
 
 test_lib_dir = "musl/libc-test-lib"
 
@@ -80,7 +79,7 @@ template("test_unittest") {
 
     if (target_dir == "functional") {
       cflags_c += [
-        # include/${musl_arch}-linux-ohosmusl/endian.h:26:25: error: '&' within '|' [-Werror,-Wbitwise-op-parentheses]
+        # include/${musl_arch}-linux-ohos/endian.h:26:25: error: '&' within '|' [-Werror,-Wbitwise-op-parentheses]
         "-Wno-error=bitwise-op-parentheses",
 
         #functional/sscanf.c:73:9: error: magnitude of floating-point constant too large for type 'double'; maximum is 1.7976931348623157E+308 [-Werror,-Wliteral-range]

musl_config.gni

@@ -19,10 +19,10 @@ declare_args() {
   if ((defined(target_os) && target_os == "ohos") ||
       (defined(ohos_kernel_type) && ohos_kernel_type == "linux")) {
     musl_target_os = "linux"
-    musl_target_triple = "${musl_arch}-linux-ohosmusl"
+    musl_target_triple = "${musl_arch}-linux-ohos"
   } else if (defined(ohos_kernel_type) && ohos_kernel_type == "liteos_a") {
     musl_target_os = "liteos_a"
-    musl_target_triple = "arm-liteos"
+    musl_target_triple = "arm-liteos-ohos"
   }
 }