提交 02859e86 编写于 作者: M maweiye

Add version-script

Signed-off-by: Nmaweiye <maweiye@huawei.com>
上级 d79bcef1
...@@ -50,6 +50,7 @@ ohos_executable("dlns_set_fun_test") { ...@@ -50,6 +50,7 @@ ohos_executable("dlns_set_fun_test") {
sources = [ "dlns_set_fun.c" ] sources = [ "dlns_set_fun.c" ]
configs = [ "//third_party/musl/libc-test/src/common:config_runtest" ] configs = [ "//third_party/musl/libc-test/src/common:config_runtest" ]
libs = [ "${musl_lib_dir}/libc.a" ]
} }
ohos_executable("dlns_inherit_test") { ohos_executable("dlns_inherit_test") {
...@@ -63,6 +64,7 @@ ohos_executable("dlns_inherit_test") { ...@@ -63,6 +64,7 @@ ohos_executable("dlns_inherit_test") {
sources = [ "dlns_inherit.c" ] sources = [ "dlns_inherit.c" ]
configs = [ "//third_party/musl/libc-test/src/common:config_runtest" ] configs = [ "//third_party/musl/libc-test/src/common:config_runtest" ]
libs = [ "${musl_lib_dir}/libc.a" ]
} }
ohos_executable("dlns_separated_test") { ohos_executable("dlns_separated_test") {
...@@ -76,6 +78,7 @@ ohos_executable("dlns_separated_test") { ...@@ -76,6 +78,7 @@ ohos_executable("dlns_separated_test") {
sources = [ "dlns_separated.c" ] sources = [ "dlns_separated.c" ]
configs = [ "//third_party/musl/libc-test/src/common:config_runtest" ] configs = [ "//third_party/musl/libc-test/src/common:config_runtest" ]
libs = [ "${musl_lib_dir}/libc.a" ]
} }
ohos_executable("dlns_special_scene_test") { ohos_executable("dlns_special_scene_test") {
......
...@@ -73,6 +73,7 @@ template("test_unittest") { ...@@ -73,6 +73,7 @@ template("test_unittest") {
ldflags = [ "-nostdlib" ] ldflags = [ "-nostdlib" ]
libs = [ "//${out_test_dir}/src/common/libtest.a" ] libs = [ "//${out_test_dir}/src/common/libtest.a" ]
libs += [ "${musl_lib_dir}/libc.a" ]
if (target_dir == "math") { if (target_dir == "math") {
include_dirs += [ include_dirs += [
......
此差异已折叠。
...@@ -483,6 +483,7 @@ template("musl_libs") { ...@@ -483,6 +483,7 @@ template("musl_libs") {
output_dir = "${target_out_dir}/${_libs_out_dir}" output_dir = "${target_out_dir}/${_libs_out_dir}"
deps = [ deps = [
":soft_musl_hook", ":soft_musl_hook",
":soft_musl_ldso",
":soft_musl_src", ":soft_musl_src",
":soft_musl_src_nossp", ":soft_musl_src_nossp",
] ]
...@@ -558,6 +559,9 @@ template("musl_libs") { ...@@ -558,6 +559,9 @@ template("musl_libs") {
musl_lib_path = rebase_path("${target_out_dir}/${_libs_out_dir}") musl_lib_path = rebase_path("${target_out_dir}/${_libs_out_dir}")
libc_map_path =
rebase_path("${target_out_dir}/${musl_ported_dir}/libc.map.txt")
ldflags = [ ldflags = [
"-nostdlib", "-nostdlib",
"-Wl,-e,_dlstart", "-Wl,-e,_dlstart",
...@@ -567,6 +571,7 @@ template("musl_libs") { ...@@ -567,6 +571,7 @@ template("musl_libs") {
"-L${musl_lib_path}", "-L${musl_lib_path}",
"-ldl", "-ldl",
"-lpthread", "-lpthread",
"-Wl,--version-script=${libc_map_path}",
] ]
configs -= musl_inherited_configs configs -= musl_inherited_configs
......
...@@ -478,6 +478,9 @@ static int check_vna_hash(Verdef *def, int16_t vsym, uint32_t vna_hash) ...@@ -478,6 +478,9 @@ static int check_vna_hash(Verdef *def, int16_t vsym, uint32_t vna_hash)
} }
break; break;
} }
if (matched) {
break;
}
if (verdef->vd_next == 0) { if (verdef->vd_next == 0) {
break; break;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册