From 228a2279678f2b2b1730515d0edcfec4f616532f Mon Sep 17 00:00:00 2001 From: Andrew Hsieh Date: Thu, 14 Mar 2013 14:37:59 -0700 Subject: [PATCH] Fix X86 sigsetjmp and siglongjmp Both exist in header android-X/arch-/usr/include/setjmp.h already. Add to X86 to be consistent with header and other archs ARM/MIPS See https://code.google.com/p/android/issues/detail?id=19851 Change-Id: I635c6c0491f5bf2aaa9013f23cb4b1bf7cb57a40 --- ndk/platforms/android-9/arch-x86/lib/libc.a | Bin 3257844 -> 3259518 bytes .../arch-x86/symbols/libc.so.functions.txt | 2 ++ 2 files changed, 2 insertions(+) diff --git a/ndk/platforms/android-9/arch-x86/lib/libc.a b/ndk/platforms/android-9/arch-x86/lib/libc.a index 90220b052900e04719de79f4698830a096a75c2c..29b1726eda8d17e2eed33e86b4f00750b301bfa8 100644 GIT binary patch delta 18475 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 diff --git a/ndk/platforms/android-9/arch-x86/symbols/libc.so.functions.txt b/ndk/platforms/android-9/arch-x86/symbols/libc.so.functions.txt index 121dc51ea..60772cc79 100644 --- a/ndk/platforms/android-9/arch-x86/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-9/arch-x86/symbols/libc.so.functions.txt @@ -761,8 +761,10 @@ sigaction sigaltstack sigblock siginterrupt +siglongjmp sigpending sigprocmask +sigsetjmp sigsetmask sigsuspend sigwait