diff --git a/arch/aarch64/bits/signal.h b/arch/aarch64/bits/signal.h index 760a9f323bcbfce9d73824571659295d30db683e..b71261f56816b79708d7f875601d9e620a92ceb6 100644 --- a/arch/aarch64/bits/signal.h +++ b/arch/aarch64/bits/signal.h @@ -149,7 +149,5 @@ typedef struct __ucontext { #define SIGPWR 30 #define SIGSYS 31 #define SIGUNUSED SIGSYS -#define SIGHOOK 36 -#define SIGUNHOOK 37 #define _NSIG 65 diff --git a/arch/arm/bits/signal.h b/arch/arm/bits/signal.h index 213e5fc23b9d825205c62abc323b83fac9c879ef..4906b4825c289e661710f32eeb3c98b417638fd5 100644 --- a/arch/arm/bits/signal.h +++ b/arch/arm/bits/signal.h @@ -82,7 +82,6 @@ typedef struct __ucontext { #define SIGPWR 30 #define SIGSYS 31 #define SIGUNUSED SIGSYS -#define SIGHOOK 36 -#define SIGUNHOOK 37 + #define _NSIG 65 diff --git a/porting/linux/user/include/signal.h b/porting/linux/user/include/signal.h index 40b227a5a585706e881a77248d81e9b4e40d10db..fc306f991e916e2235f47d55f97fbe86ad6ad06a 100644 --- a/porting/linux/user/include/signal.h +++ b/porting/linux/user/include/signal.h @@ -41,6 +41,7 @@ extern "C" { #define SI_USER 0 #define SI_KERNEL 128 + typedef struct sigaltstack stack_t; #endif @@ -196,9 +197,11 @@ int __libc_current_sigrtmax(void); #define SIGRTMAX (__libc_current_sigrtmax()) #define MUSL_SIGNAL_NATIVE_REMOTE (SIGRTMIN + 0) -#define MUSL_SIGNAL_NATIVE_LOCAL (SIGRTMIN + 1) -#define MUSL_SIGNAL_JSHEAP (SIGRTMIN + 2) -#define MUSL_SIGNAL_JSHEAP_PRIV (SIGRTMIN + 3) +#define MUSL_SIGNAL_HOOK (SIGRTMIN + 1) +#define MUSL_SIGNAL_UNHOOK (SIGRTMIN + 2) +#define MUSL_SIGNAL_NATIVE_LOCAL (SIGRTMIN + 3) +#define MUSL_SIGNAL_JSHEAP (SIGRTMIN + 4) +#define MUSL_SIGNAL_JSHEAP_PRIV (SIGRTMIN + 5) int kill(pid_t, int); int tgkill(int __tgid, int __tid, int __signal); diff --git a/porting/linux/user/src/hook/musl_preinit.c b/porting/linux/user/src/hook/musl_preinit.c index ac20cc74c89188f9c4d62a892ad4f21256a302ca..ba7286e2b12b73f51f5576cc9f21ea288d503035 100644 --- a/porting/linux/user/src/hook/musl_preinit.c +++ b/porting/linux/user/src/hook/musl_preinit.c @@ -357,14 +357,14 @@ static void __install_malloc_hook_signal_handler() struct sigaction actionInstallHook = {}; actionInstallHook.sa_handler = __install_malloc_hook; sigemptyset(&actionInstallHook.sa_mask); - sigaddset(&actionInstallHook.sa_mask, SIGUNHOOK); - sigaction(SIGHOOK, &actionInstallHook, NULL); + sigaddset(&actionInstallHook.sa_mask, MUSL_SIGNAL_UNHOOK); + sigaction(MUSL_SIGNAL_HOOK, &actionInstallHook, NULL); struct sigaction actionDef = {}; actionDef.sa_handler = __uninstal_malloc_hook; sigemptyset(&actionDef.sa_mask); - sigaddset(&actionDef.sa_mask, SIGHOOK); - sigaction(SIGUNHOOK, &actionDef, NULL); + sigaddset(&actionDef.sa_mask, MUSL_SIGNAL_HOOK); + sigaction(MUSL_SIGNAL_UNHOOK, &actionDef, NULL); } static void __initialize_malloc()