generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am a14df4a9: Merge "[MIPS] SA_RESTORER support is not needed for MIPS"

Browse Source 
* commit 'a14df4a98ad1c4018f63fea358dd30c7e6b51858':
  [MIPS] SA_RESTORER support is not needed for MIPS
This commit is contained in:
Elliott Hughes
2014-01-31 13:00:40 +00:00
committed by Android Git Automerger
parent 64b519e2d4 a14df4a98a
commit 8902d9a944
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libc/bionic/sigaction.cpp
View File

@@ -42,12 +42,14 @@ int sigaction(int signal, const struct sigaction* bionic_new_action, struct siga
kernel_new_action.sa_flags = bionic_new_action->sa_flags; kernel_new_action.sa_flags = bionic_new_action->sa_flags;
kernel_new_action.sa_handler = bionic_new_action->sa_handler; kernel_new_action.sa_handler = bionic_new_action->sa_handler;
kernel_new_action.sa_mask = bionic_new_action->sa_mask; kernel_new_action.sa_mask = bionic_new_action->sa_mask;
#ifdef SA_RESTORER
kernel_new_action.sa_restorer = bionic_new_action->sa_restorer; kernel_new_action.sa_restorer = bionic_new_action->sa_restorer;
if (!(kernel_new_action.sa_flags & SA_RESTORER)) { if (!(kernel_new_action.sa_flags & SA_RESTORER)) {
kernel_new_action.sa_flags |= SA_RESTORER; kernel_new_action.sa_flags |= SA_RESTORER;
kernel_new_action.sa_restorer = &__rt_sigreturn; kernel_new_action.sa_restorer = &__rt_sigreturn;
} }
#endif
} }
__kernel_sigaction kernel_old_action; __kernel_sigaction kernel_old_action;
@@ -60,11 +62,13 @@ int sigaction(int signal, const struct sigaction* bionic_new_action, struct siga
bionic_old_action->sa_flags = kernel_old_action.sa_flags; bionic_old_action->sa_flags = kernel_old_action.sa_flags;
bionic_old_action->sa_handler = kernel_old_action.sa_handler; bionic_old_action->sa_handler = kernel_old_action.sa_handler;
bionic_old_action->sa_mask = kernel_old_action.sa_mask; bionic_old_action->sa_mask = kernel_old_action.sa_mask;
#ifdef SA_RESTORER
bionic_old_action->sa_restorer = kernel_old_action.sa_restorer; bionic_old_action->sa_restorer = kernel_old_action.sa_restorer;
if (bionic_old_action->sa_restorer == &__rt_sigreturn) { if (bionic_old_action->sa_restorer == &__rt_sigreturn) {
bionic_old_action->sa_flags &= ~SA_RESTORER; bionic_old_action->sa_flags &= ~SA_RESTORER;
} }
#endif
} }
return result; return result;