Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Musl
提交
d5fed24d
T
Third Party Musl
项目概览
OpenHarmony
/
Third Party Musl
9 个月 前同步成功
通知
37
Star
125
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Musl
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
d5fed24d
编写于
7月 16, 2021
作者:
O
openharmony_ci
提交者:
Gitee
7月 16, 2021
浏览文件
操作
浏览文件
下载
差异文件
!58 解决编译参数顺序错误引起的问题
Merge pull request !58 from zhuoli72/master
上级
0f5c5ad1
f553aa4a
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
102 addition
and
72 deletion
+102
-72
musl_template.gni
musl_template.gni
+102
-72
未找到文件。
musl_template.gni
浏览文件 @
d5fed24d
...
@@ -6,7 +6,7 @@ template("musl_libs") {
...
@@ -6,7 +6,7 @@ template("musl_libs") {
no_default_deps = true
no_default_deps = true
forward_variables_from(invoker, ["target_abi"])
forward_variables_from(invoker, ["target_abi"])
template
_prefix = "${target_name}"
abi
_prefix = "${target_name}"
porting_deps = [
porting_deps = [
"//third_party/musl:create_porting_src",
"//third_party/musl:create_porting_src",
...
@@ -23,23 +23,29 @@ template("musl_libs") {
...
@@ -23,23 +23,29 @@ template("musl_libs") {
shared_lib_out_dir = "${target_abi}"
shared_lib_out_dir = "${target_abi}"
}
}
group("${template_prefix}_libs") {
musl_subarch = ""
if (target_abi == "a7_hard_neon-vfpv4") {
musl_subarch = "hf"
}
group("${abi_prefix}_libs") {
deps = [
deps = [
":${
template
_prefix}_libc_musl_shared",
":${
abi
_prefix}_libc_musl_shared",
":${
template
_prefix}_libc_musl_static",
":${
abi
_prefix}_libc_musl_static",
":${
template
_prefix}_libcrypt",
":${
abi
_prefix}_libcrypt",
":${
template
_prefix}_libdl",
":${
abi
_prefix}_libdl",
":${
template
_prefix}_libm",
":${
abi
_prefix}_libm",
":${
template
_prefix}_libpthread",
":${
abi
_prefix}_libpthread",
":${
template
_prefix}_libresolv",
":${
abi
_prefix}_libresolv",
":${
template
_prefix}_librt",
":${
abi
_prefix}_librt",
":${
template
_prefix}_libutil",
":${
abi
_prefix}_libutil",
":${
template
_prefix}_libxnet",
":${
abi
_prefix}_libxnet",
":${
template
_prefix}_musl_crt_install_action",
":${
abi
_prefix}_musl_crt_install_action",
":${
template
_prefix}_create_linker",
":${
abi
_prefix}_create_linker",
]
]
}
}
# part of default_compiler_configs from build/config/BUILDCONFIG.gn
musl_inherited_configs = [
musl_inherited_configs = [
"//build/config/compiler:afdo",
"//build/config/compiler:afdo",
"//build/config/compiler:afdo_optimize_size",
"//build/config/compiler:afdo_optimize_size",
...
@@ -55,10 +61,10 @@ template("musl_libs") {
...
@@ -55,10 +61,10 @@ template("musl_libs") {
"//build/config/compiler:no_exceptions",
"//build/config/compiler:no_exceptions",
"//build/config/compiler:no_rtti",
"//build/config/compiler:no_rtti",
"//build/config/compiler:runtime_library",
"//build/config/compiler:runtime_library",
"//build/config/
sanitizers:default_sanitizer_flags
",
"//build/config/
compiler:thin_archive
",
]
]
config("${
template
_prefix}_musl_abi_config") {
config("${
abi
_prefix}_musl_abi_config") {
if (target_abi == "soft") {
if (target_abi == "soft") {
cflags = [ "-mfloat-abi=soft" ]
cflags = [ "-mfloat-abi=soft" ]
} else if (target_abi == "a7_soft") {
} else if (target_abi == "a7_soft") {
...
@@ -81,8 +87,8 @@ template("musl_libs") {
...
@@ -81,8 +87,8 @@ template("musl_libs") {
}
}
}
}
config("${
template
_prefix}_musl_config") {
config("${
abi
_prefix}_musl_config") {
configs = [ ":${
template
_prefix}_musl_abi_config" ]
configs = [ ":${
abi
_prefix}_musl_abi_config" ]
include_dirs = [
include_dirs = [
"${target_out_dir}/${musl_ported_dir}/arch/${musl_arch}",
"${target_out_dir}/${musl_ported_dir}/arch/${musl_arch}",
...
@@ -98,7 +104,6 @@ template("musl_libs") {
...
@@ -98,7 +104,6 @@ template("musl_libs") {
"-march=armv7-a",
"-march=armv7-a",
"-O2",
"-O2",
"-Wall",
"-Wall",
"-fstack-protector-strong",
"-D_FORTIFY_SOURCE=2",
"-D_FORTIFY_SOURCE=2",
"-Wl,-z,relro,-z,now,-z,noexecstack",
"-Wl,-z,relro,-z,now,-z,noexecstack",
]
]
...
@@ -127,8 +132,6 @@ template("musl_libs") {
...
@@ -127,8 +132,6 @@ template("musl_libs") {
"-Wa,--noexecstack",
"-Wa,--noexecstack",
]
]
# cflags_nossp = [ "-fno-stack-protector" ]
cflags_all = cflags_basic +
cflags_all = cflags_basic +
cflags_c99fse +
cflags_c99fse +
cflags_auto
cflags_auto
...
@@ -141,7 +144,8 @@ template("musl_libs") {
...
@@ -141,7 +144,8 @@ template("musl_libs") {
dynamic_list = rebase_path("${target_out_dir}/${musl_ported_dir}/dynamic.list")
dynamic_list = rebase_path("${target_out_dir}/${musl_ported_dir}/dynamic.list")
ldflags = [
ldflags = cflags_all
ldflags += [
"--target=${musl_target_triple}",
"--target=${musl_target_triple}",
"-fuse-ld=lld",
"-fuse-ld=lld",
"-Wl,--sort-section,alignment",
"-Wl,--sort-section,alignment",
...
@@ -155,8 +159,7 @@ template("musl_libs") {
...
@@ -155,8 +159,7 @@ template("musl_libs") {
asmflags = cflags
asmflags = cflags
}
}
source_set("${template_prefix}_musl_crt") {
source_set("${abi_prefix}_musl_crt") {
cflags = []
sources = [
sources = [
"${target_out_dir}/${musl_ported_dir}/crt/${musl_arch}/crti.s",
"${target_out_dir}/${musl_ported_dir}/crt/${musl_arch}/crti.s",
"${target_out_dir}/${musl_ported_dir}/crt/${musl_arch}/crtn.s",
"${target_out_dir}/${musl_ported_dir}/crt/${musl_arch}/crtn.s",
...
@@ -165,23 +168,21 @@ template("musl_libs") {
...
@@ -165,23 +168,21 @@ template("musl_libs") {
"${target_out_dir}/${musl_ported_dir}/crt/rcrt1.c",
"${target_out_dir}/${musl_ported_dir}/crt/rcrt1.c",
]
]
cflags += [
"-fPIC",
"-fno-stack-protector",
]
defines = [ "CRT" ]
defines = [ "CRT" ]
configs -= musl_inherited_configs
configs -= musl_inherited_configs
configs += [ ":${template_prefix}_musl_config" ]
configs += [ ":${abi_prefix}_musl_config" ]
cflags = [
"-fPIC",
"-fno-stack-protector",
]
deps = porting_deps
deps = porting_deps
asmflags = cflags
asmflags = cflags
}
}
source_set("${template_prefix}_musl_src") {
source_set("${abi_prefix}_musl_src") {
cflags = []
sources_orig = []
sources_orig = []
sources = []
sources = []
set_sources_assignment_filter([])
set_sources_assignment_filter([])
...
@@ -205,21 +206,20 @@ template("musl_libs") {
...
@@ -205,21 +206,20 @@ template("musl_libs") {
sources += [ "${target_out_dir}/${musl_ported_dir}/${s}" ]
sources += [ "${target_out_dir}/${musl_ported_dir}/${s}" ]
}
}
cflags
+
= [
cflags = [
"-O3",
"-O3",
"-fPIC",
"-fPIC",
"-fstack-protector-strong",
]
]
configs -= musl_inherited_configs
configs -= musl_inherited_configs
configs += [ ":${
template
_prefix}_musl_config" ]
configs += [ ":${
abi
_prefix}_musl_config" ]
deps = porting_deps
deps = porting_deps
}
}
source_set("${template_prefix}_musl_src_nossp") {
source_set("${abi_prefix}_musl_src_nossp") {
cflags = []
sources = []
sources = []
sources_orig = [
sources_orig = [
"src/string/mempcpy.c",
"src/string/mempcpy.c",
"src/string/memset.c",
"src/string/memset.c",
...
@@ -233,21 +233,18 @@ template("musl_libs") {
...
@@ -233,21 +233,18 @@ template("musl_libs") {
sources += [ "${target_out_dir}/${musl_ported_dir}/${s}" ]
sources += [ "${target_out_dir}/${musl_ported_dir}/${s}" ]
}
}
cflags += [
configs -= musl_inherited_configs
configs += [ ":${abi_prefix}_musl_config" ]
cflags = [
"-O3",
"-O3",
"-fPIC",
"-fPIC",
"-fno-stack-protector",
"-fno-stack-protector",
]
]
configs -= musl_inherited_configs
configs += [ ":${template_prefix}_musl_config" ]
deps = porting_deps
deps = porting_deps
}
}
source_set("${template_prefix}_musl_ldso") {
source_set("${abi_prefix}_musl_ldso") {
cflags = []
cflags = [ "-fPIC" ]
sources = []
sources = []
sources_orig = musl_src_ldso
sources_orig = musl_src_ldso
...
@@ -256,56 +253,87 @@ template("musl_libs") {
...
@@ -256,56 +253,87 @@ template("musl_libs") {
}
}
configs -= musl_inherited_configs
configs -= musl_inherited_configs
configs += [ ":${template_prefix}_musl_config" ]
configs += [ ":${abi_prefix}_musl_config" ]
cflags = [
"-fPIC",
"-fno-stack-protector",
]
deps = porting_deps
deps = porting_deps
}
}
static_library("${
template
_prefix}_libc_musl_static") {
static_library("${
abi
_prefix}_libc_musl_static") {
output_name = "libc"
output_name = "libc"
complete_static_lib = true
complete_static_lib = true
configs -= musl_inherited_configs
output_dir = "${target_out_dir}/${static_lib_out_dir}"
output_dir = "${target_out_dir}/${static_lib_out_dir}"
deps = [
deps = [
":${
template
_prefix}_musl_src",
":${
abi
_prefix}_musl_src",
":${
template
_prefix}_musl_src_nossp",
":${
abi
_prefix}_musl_src_nossp",
]
]
}
}
static_library("${template_prefix}_libm") {
static_library("${abi_prefix}_libm") {
complete_static_lib = true
configs -= musl_inherited_configs
output_name = "libm"
output_dir = "${target_out_dir}/${static_lib_out_dir}"
output_dir = "${target_out_dir}/${static_lib_out_dir}"
}
}
static_library("${template_prefix}_librt") {
static_library("${abi_prefix}_librt") {
complete_static_lib = true
configs -= musl_inherited_configs
output_name = "librt"
output_dir = "${target_out_dir}/${static_lib_out_dir}"
output_dir = "${target_out_dir}/${static_lib_out_dir}"
}
}
static_library("${template_prefix}_libpthread") {
static_library("${abi_prefix}_libpthread") {
complete_static_lib = true
configs -= musl_inherited_configs
output_name = "libpthread"
output_dir = "${target_out_dir}/${static_lib_out_dir}"
output_dir = "${target_out_dir}/${static_lib_out_dir}"
}
}
static_library("${template_prefix}_libcrypt") {
static_library("${abi_prefix}_libcrypt") {
complete_static_lib = true
configs -= musl_inherited_configs
output_name = "libcrypt"
output_dir = "${target_out_dir}/${static_lib_out_dir}"
output_dir = "${target_out_dir}/${static_lib_out_dir}"
}
}
static_library("${template_prefix}_libutil") {
static_library("${abi_prefix}_libutil") {
complete_static_lib = true
configs -= musl_inherited_configs
output_name = "libutil"
output_dir = "${target_out_dir}/${static_lib_out_dir}"
output_dir = "${target_out_dir}/${static_lib_out_dir}"
}
}
static_library("${template_prefix}_libresolv") {
static_library("${abi_prefix}_libresolv") {
complete_static_lib = true
configs -= musl_inherited_configs
output_name = "libresolv"
output_dir = "${target_out_dir}/${static_lib_out_dir}"
output_dir = "${target_out_dir}/${static_lib_out_dir}"
}
}
static_library("${template_prefix}_libxnet") {
static_library("${abi_prefix}_libxnet") {
complete_static_lib = true
configs -= musl_inherited_configs
output_name = "libxnet"
output_dir = "${target_out_dir}/${static_lib_out_dir}"
output_dir = "${target_out_dir}/${static_lib_out_dir}"
}
}
static_library("${template_prefix}_libdl") {
static_library("${abi_prefix}_libdl") {
complete_static_lib = true
configs -= musl_inherited_configs
output_name = "libdl"
output_dir = "${target_out_dir}/${static_lib_out_dir}"
output_dir = "${target_out_dir}/${static_lib_out_dir}"
}
}
ohos_shared_library("${template_prefix}_libc_musl_shared") {
shared_library("${abi_prefix}_libc_musl_shared") {
output_name = "libc/${shared_lib_out_dir}/libc"
output_dir = "${root_out_dir}/common/common/libc/${shared_lib_out_dir}"
output_name = "libc"
output_extension = "so"
output_extension = "so"
libclang_rt_path = rebase_path("${runtime_lib_path}/${musl_target_triple}/${shared_lib_out_dir}")
libclang_rt_path = rebase_path("${runtime_lib_path}/${musl_target_triple}/${shared_lib_out_dir}")
...
@@ -320,24 +348,26 @@ template("musl_libs") {
...
@@ -320,24 +348,26 @@ template("musl_libs") {
remove_configs = musl_inherited_configs
remove_configs = musl_inherited_configs
remove_configs += [ "//build/config:default_libs" ]
remove_configs += [ "//build/config:default_libs" ]
configs = [ ":${template_prefix}_musl_config" ]
configs -= musl_inherited_configs
configs -= [ "//build/config:default_libs" ]
configs += [ ":${abi_prefix}_musl_config" ]
deps = [
deps = [
":${
template
_prefix}_musl_ldso",
":${
abi
_prefix}_musl_ldso",
":${
template
_prefix}_musl_src",
":${
abi
_prefix}_musl_src",
":${
template
_prefix}_musl_src_nossp",
":${
abi
_prefix}_musl_src_nossp",
]
]
}
}
action_foreach("${
template
_prefix}_musl_crt_install_action") {
action_foreach("${
abi
_prefix}_musl_crt_install_action") {
redir = "${root_out_dir}/obj"
redir = "${root_out_dir}/obj"
script = "${target_out_dir}/${musl_ported_dir}/scripts/install.py"
script = "${target_out_dir}/${musl_ported_dir}/scripts/install.py"
sources = [
sources = [
"${redir}/${target_out_dir}/${musl_ported_dir}/crt/${musl_arch}/${
template
_prefix}_musl_crt/crti.o",
"${redir}/${target_out_dir}/${musl_ported_dir}/crt/${musl_arch}/${
abi
_prefix}_musl_crt/crti.o",
"${redir}/${target_out_dir}/${musl_ported_dir}/crt/${musl_arch}/${
template
_prefix}_musl_crt/crtn.o",
"${redir}/${target_out_dir}/${musl_ported_dir}/crt/${musl_arch}/${
abi
_prefix}_musl_crt/crtn.o",
"${redir}/${target_out_dir}/${musl_ported_dir}/crt/${
template
_prefix}_musl_crt/Scrt1.o",
"${redir}/${target_out_dir}/${musl_ported_dir}/crt/${
abi
_prefix}_musl_crt/Scrt1.o",
"${redir}/${target_out_dir}/${musl_ported_dir}/crt/${
template
_prefix}_musl_crt/crt1.o",
"${redir}/${target_out_dir}/${musl_ported_dir}/crt/${
abi
_prefix}_musl_crt/crt1.o",
"${redir}/${target_out_dir}/${musl_ported_dir}/crt/${
template
_prefix}_musl_crt/rcrt1.o",
"${redir}/${target_out_dir}/${musl_ported_dir}/crt/${
abi
_prefix}_musl_crt/rcrt1.o",
]
]
outputs = [ "${target_out_dir}/${static_lib_out_dir}/{{source_file_part}}" ]
outputs = [ "${target_out_dir}/${static_lib_out_dir}/{{source_file_part}}" ]
...
@@ -348,15 +378,15 @@ template("musl_libs") {
...
@@ -348,15 +378,15 @@ template("musl_libs") {
]
]
args += [ "--output" ] + rebase_path(outputs, root_build_dir)
args += [ "--output" ] + rebase_path(outputs, root_build_dir)
deps = [ ":${
template
_prefix}_musl_crt" ]
deps = [ ":${
abi
_prefix}_musl_crt" ]
}
}
action("${
template
_prefix}_create_linker") {
action("${
abi
_prefix}_create_linker") {
script = "${target_out_dir}/${musl_ported_dir}/tools/install.sh"
script = "${target_out_dir}/${musl_ported_dir}/tools/install.sh"
sources = [ "${root_out_dir}/common/common/libc/${shared_lib_out_dir}/libc.so" ]
sources = [ "${root_out_dir}/common/common/libc/${shared_lib_out_dir}/libc.so" ]
outputs = [ "${root_out_dir}/common/common/libc/${shared_lib_out_dir}/ld-musl-${musl_arch}.so.1" ]
outputs = [ "${root_out_dir}/common/common/libc/${shared_lib_out_dir}/ld-musl-${musl_arch}
${musl_subarch}
.so.1" ]
args = [
args = [
"-D",
"-D",
...
@@ -365,7 +395,7 @@ template("musl_libs") {
...
@@ -365,7 +395,7 @@ template("musl_libs") {
args += rebase_path(sources)
args += rebase_path(sources)
args += rebase_path(outputs)
args += rebase_path(outputs)
deps = [ ":${
template
_prefix}_libc_musl_shared" ]
deps = [ ":${
abi
_prefix}_libc_musl_shared" ]
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录