am 5bb6cf6e: am 03e0781e: am f067a933: am 1f1e7379: Merge "MIPS hasn\'t supported SA_RESTORER since 2.5 kernels."

* commit '5bb6cf6e07bd4d806bcdf073ccad73d87d7e7f00':
  MIPS hasn't supported SA_RESTORER since 2.5 kernels.
This commit is contained in:
Elliott Hughes
2014-01-09 21:36:28 +00:00
committed by Android Git Automerger

View File

@@ -1027,7 +1027,7 @@ static int sigaction_flags_pton(int portable_flags)
ALOGV("%s: SA_THIRTYTWO_PORTABLE isn't SUPPORTED.", __func__); ALOGV("%s: SA_THIRTYTWO_PORTABLE isn't SUPPORTED.", __func__);
} }
if (portable_flags & SA_RESTORER_PORTABLE) { if (portable_flags & SA_RESTORER_PORTABLE) {
mips_flags |= SA_RESTORER; ALOGV("%s: SA_RESTORER isn't SUPPORTED.", __func__);
} }
if (portable_flags & SA_ONSTACK_PORTABLE) { if (portable_flags & SA_ONSTACK_PORTABLE) {
mips_flags |= SA_ONSTACK; mips_flags |= SA_ONSTACK;
@@ -1059,7 +1059,6 @@ int sigaction_flags_ntop(int mips_flags)
#ifdef SA_THIRTYTWO #ifdef SA_THIRTYTWO
if (mips_flags & SA_THIRTYTWO) portable_flags |= SA_THIRTYTWO_PORTABLE; if (mips_flags & SA_THIRTYTWO) portable_flags |= SA_THIRTYTWO_PORTABLE;
#endif #endif
if (mips_flags & SA_RESTORER) portable_flags |= SA_RESTORER_PORTABLE;
if (mips_flags & SA_ONSTACK) portable_flags |= SA_ONSTACK_PORTABLE; if (mips_flags & SA_ONSTACK) portable_flags |= SA_ONSTACK_PORTABLE;
if (mips_flags & SA_RESTART) portable_flags |= SA_RESTART_PORTABLE; if (mips_flags & SA_RESTART) portable_flags |= SA_RESTART_PORTABLE;
if (mips_flags & SA_NODEFER) portable_flags |= SA_NODEFER_PORTABLE; if (mips_flags & SA_NODEFER) portable_flags |= SA_NODEFER_PORTABLE;