diff options
| author | Derek Bruening <bruening@google.com> | 2016-06-13 16:16:49 +0000 |
|---|---|---|
| committer | Derek Bruening <bruening@google.com> | 2016-06-13 16:16:49 +0000 |
| commit | 97a35f8a8e9741e9157c0afdbb48a9db99d8a718 (patch) | |
| tree | b85b137b49b5a969201a29868e71cd124e6c4b47 /lib/sanitizer_common/sanitizer_linux.cc | |
| parent | d5a0419aecd169af9f26b6f7254ff2ef555e497f (diff) | |
Revert "[sanitizer][esan] Add internal_sigaction_syscall"
This reverts commit r272553.
The iOS build fails to link.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@272557 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/sanitizer_common/sanitizer_linux.cc')
| -rw-r--r-- | lib/sanitizer_common/sanitizer_linux.cc | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc index 90c3fe8d3..75e21a607 100644 --- a/lib/sanitizer_common/sanitizer_linux.cc +++ b/lib/sanitizer_common/sanitizer_linux.cc @@ -99,12 +99,6 @@ const int FUTEX_WAKE = 1; # define SANITIZER_LINUX_USES_64BIT_SYSCALLS 0 #endif -#if defined(__x86_64__) -extern "C" { -extern void internal_sigreturn(); -} -#endif - namespace __sanitizer { #if SANITIZER_LINUX && defined(__x86_64__) @@ -622,8 +616,7 @@ int internal_fork() { #if SANITIZER_LINUX #define SA_RESTORER 0x04000000 -// Doesn't set sa_restorer if the caller did not set it, so use with caution -//(see below). +// Doesn't set sa_restorer, use with caution (see below). int internal_sigaction_norestorer(int signum, const void *act, void *oldact) { __sanitizer_kernel_sigaction_t k_act, k_oldact; internal_memset(&k_act, 0, sizeof(__sanitizer_kernel_sigaction_t)); @@ -667,23 +660,6 @@ int internal_sigaction_norestorer(int signum, const void *act, void *oldact) { } return result; } - -// Invokes sigaction via a raw syscall with a restorer, but does not support -// all platforms yet. -// We disable for Go simply because we have not yet added to buildgo.sh. -#if defined(__x86_64__) && !SANITIZER_GO -int internal_sigaction_syscall(int signum, const void *act, void *oldact) { - __sanitizer_sigaction u_adjust; - internal_memcpy(&u_adjust, act, sizeof(u_adjust)); -#if !SANITIZER_ANDROID || !SANITIZER_MIPS32 - if (u_adjust.sa_restorer == nullptr) { - u_adjust.sa_restorer = internal_sigreturn; - } -#endif - return internal_sigaction_norestorer(signum, (const void *)&u_adjust, - oldact); -} -#endif // defined(__x86_64__) && !SANITIZER_GO #endif // SANITIZER_LINUX uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set, |