提交 ddaf4f41 编写于 作者: L liyueric

Revert "把SignalHandler移到musl"

This reverts commit 9aeff21e.
Signed-off-by: Nliyueric <liyu1@huawei.com>
上级 9f4d06ae
...@@ -20,7 +20,6 @@ template("musl_libs") { ...@@ -20,7 +20,6 @@ template("musl_libs") {
musl_subarch = "hf" musl_subarch = "hf"
} }
dfx_deps = [ "//base/hiviewdfx/faultloggerd/interfaces/innerkits/signal_handler:dfxsignalhandler" ]
porting_deps = [ porting_deps = [
"//third_party/musl:create_alltypes_h", "//third_party/musl:create_alltypes_h",
"//third_party/musl:create_porting_src", "//third_party/musl:create_porting_src",
...@@ -165,7 +164,6 @@ template("musl_libs") { ...@@ -165,7 +164,6 @@ template("musl_libs") {
} }
cflags_auto += [ "-DRESERVE_SIGNAL_STACK" ] cflags_auto += [ "-DRESERVE_SIGNAL_STACK" ]
cflags_auto += [ "-DDFX_SIGNAL_LIBC" ]
cflags_c99fse = [ cflags_c99fse = [
"-std=c99", "-std=c99",
...@@ -448,7 +446,6 @@ template("musl_libs") { ...@@ -448,7 +446,6 @@ template("musl_libs") {
} }
deps = porting_deps deps = porting_deps
deps += dfx_deps
} }
source_set("${abi_prefix}_musl_hook") { source_set("${abi_prefix}_musl_hook") {
......
...@@ -194,12 +194,6 @@ extern hidden void (*const __init_array_end)(void), (*const __fini_array_end)(vo ...@@ -194,12 +194,6 @@ extern hidden void (*const __init_array_end)(void), (*const __fini_array_end)(vo
weak_alias(__init_array_start, __init_array_end); weak_alias(__init_array_start, __init_array_end);
weak_alias(__fini_array_start, __fini_array_end); weak_alias(__fini_array_start, __fini_array_end);
#ifdef DFX_SIGNAL_LIBC
static void __InstallSignalHandler()
{
}
weak_alias(__InstallSignalHandler, DFX_InstallSignalHandler);
#endif
#ifdef HANDLE_RANDOMIZATION #ifdef HANDLE_RANDOMIZATION
static int do_dlclose(struct dso *p); static int do_dlclose(struct dso *p);
...@@ -2348,9 +2342,6 @@ void __dls3(size_t *sp, size_t *auxv) ...@@ -2348,9 +2342,6 @@ void __dls3(size_t *sp, size_t *auxv)
if (replace_argv0) argv[0] = replace_argv0; if (replace_argv0) argv[0] = replace_argv0;
#ifdef DFX_SIGNAL_LIBC
DFX_InstallSignalHandler();
#endif
errno = 0; errno = 0;
CRTJMP((void *)aux[AT_ENTRY], argv-1); CRTJMP((void *)aux[AT_ENTRY], argv-1);
......
...@@ -37,7 +37,7 @@ void stack_naming(struct pthread *new){ ...@@ -37,7 +37,7 @@ void stack_naming(struct pthread *new){
}; };
#ifdef RESERVE_SIGNAL_STACK #ifdef RESERVE_SIGNAL_STACK
#if defined (__LP64__) #if defined (__LF64__)
#define RESERVE_SIGNAL_STACK_SIZE (32 * 1024) #define RESERVE_SIGNAL_STACK_SIZE (32 * 1024)
#else #else
#define RESERVE_SIGNAL_STACK_SIZE (20 * 1024) #define RESERVE_SIGNAL_STACK_SIZE (20 * 1024)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册