diff options
| author | Elliott Hughes <enh@google.com> | 2013-10-16 22:27:54 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-10-17 11:36:55 -0700 |
| commit | c7e9b2331771e5e87c34a8ee3dc6cc41d35b02fe (patch) | |
| tree | c04816a58f739d9f76c12a0f5acf1676eed6c89c /linker/debugger.cpp | |
| parent | f89f1eaa6071111c2ef584e97efb23f1b5dbdd2d (diff) | |
| download | bionic-c7e9b2331771e5e87c34a8ee3dc6cc41d35b02fe.zip bionic-c7e9b2331771e5e87c34a8ee3dc6cc41d35b02fe.tar.gz bionic-c7e9b2331771e5e87c34a8ee3dc6cc41d35b02fe.tar.bz2 | |
Fix sigaction(3) for 64-bit.
Also clean up <signal.h> and revert the hacks that were necessary
for 64-bit in linker/debugger.cpp until now.
Change-Id: I3b0554ca8a49ee1c97cda086ce2c1954ebc11892
Diffstat (limited to 'linker/debugger.cpp')
| -rw-r--r-- | linker/debugger.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/linker/debugger.cpp b/linker/debugger.cpp index 6ddd358..c947522 100644 --- a/linker/debugger.cpp +++ b/linker/debugger.cpp @@ -176,12 +176,7 @@ static bool have_siginfo(int signum) { * Catches fatal signals so we can ask debuggerd to ptrace us before * we crash. */ -#if __LP64__ // TODO: implement 64-bit sigaction using rt_sigaction. -void debuggerd_signal_handler(int n) { - siginfo_t* info = NULL; -#else void debuggerd_signal_handler(int n, siginfo_t* info, void*) { -#endif /* * It's possible somebody cleared the SA_SIGINFO flag, which would mean * our "info" arg holds an undefined value. @@ -254,11 +249,7 @@ void debuggerd_init() { struct sigaction action; memset(&action, 0, sizeof(action)); sigemptyset(&action.sa_mask); -#if __LP64__ // TODO: implement 64-bit sigaction using rt_sigaction. - action.sa_handler = debuggerd_signal_handler; -#else action.sa_sigaction = debuggerd_signal_handler; -#endif action.sa_flags = SA_RESTART | SA_SIGINFO; // Use the alternate signal stack if available so we can catch stack overflows. |