Skip to content

Commit 03e0781

Browse files
enh-googleAndroid Git Automerger
authored andcommitted
am f067a93: am 1f1e737: Merge "MIPS hasn\'t supported SA_RESTORER since 2.5 kernels."
* commit 'f067a933f5222939711328a127fcf007cf9032c7': MIPS hasn't supported SA_RESTORER since 2.5 kernels.
2 parents 607b0da + f067a93 commit 03e0781

File tree

1 file changed

+1
-2
lines changed
  • ndk/sources/android/libportable/arch-mips

1 file changed

+1
-2
lines changed

ndk/sources/android/libportable/arch-mips/signal.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,7 +1027,7 @@ static int sigaction_flags_pton(int portable_flags)
10271027
ALOGV("%s: SA_THIRTYTWO_PORTABLE isn't SUPPORTED.", __func__);
10281028
}
10291029
if (portable_flags & SA_RESTORER_PORTABLE) {
1030-
mips_flags |= SA_RESTORER;
1030+
ALOGV("%s: SA_RESTORER isn't SUPPORTED.", __func__);
10311031
}
10321032
if (portable_flags & SA_ONSTACK_PORTABLE) {
10331033
mips_flags |= SA_ONSTACK;
@@ -1059,7 +1059,6 @@ int sigaction_flags_ntop(int mips_flags)
10591059
#ifdef SA_THIRTYTWO
10601060
if (mips_flags & SA_THIRTYTWO) portable_flags |= SA_THIRTYTWO_PORTABLE;
10611061
#endif
1062-
if (mips_flags & SA_RESTORER) portable_flags |= SA_RESTORER_PORTABLE;
10631062
if (mips_flags & SA_ONSTACK) portable_flags |= SA_ONSTACK_PORTABLE;
10641063
if (mips_flags & SA_RESTART) portable_flags |= SA_RESTART_PORTABLE;
10651064
if (mips_flags & SA_NODEFER) portable_flags |= SA_NODEFER_PORTABLE;

0 commit comments

Comments
 (0)