!331 将sighook和sigunhook 两个定义移到 porting/linux/user/include/signal.h文件中

Merge pull request !331 from shuxinyiA/master

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

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

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);

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()