Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From 57ecf7205feedd23f901e1bb9d193787e559e433 Mon Sep 17 00:00:00 2001 |
| 2 | From: Andre McCurdy <armccurdy@gmail.com> |
| 3 | Date: Tue, 23 Jan 2018 15:13:26 -0800 |
| 4 | Subject: [PATCH] disable calls to getcontext() with musl |
| 5 | |
| 6 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> |
| 7 | --- |
| 8 | src/client/linux/handler/exception_handler.cc | 17 +++++++++++++++++ |
| 9 | 1 file changed, 17 insertions(+) |
| 10 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 11 | Index: git/src/client/linux/handler/exception_handler.cc |
| 12 | =================================================================== |
| 13 | --- git.orig/src/client/linux/handler/exception_handler.cc |
| 14 | +++ git/src/client/linux/handler/exception_handler.cc |
| 15 | @@ -495,7 +495,19 @@ bool ExceptionHandler::SimulateSignalDel |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 16 | siginfo.si_code = SI_USER; |
| 17 | siginfo.si_pid = getpid(); |
| 18 | ucontext_t context; |
| 19 | +#if defined(__GLIBC__) |
| 20 | getcontext(&context); |
| 21 | +#else |
| 22 | + // Extreme hack: Allow musl builds to compile - but don't expect them to work. |
| 23 | + // Although musl provides a definition for getcontext() in ucontext.h (which |
| 24 | + // enough to build libbreakpad_client) musl does not provide a corresponding |
| 25 | + // getcontext() function, so builds will fail when attempting to link anything |
| 26 | + // with libbreakpad_client. Disabling calls to getcontext() is a temporary |
| 27 | + // hack. The real fix is probably to enable Breakpad's own implementation of |
| 28 | + // getcontext() when building for musl (it's currently only enabled when |
| 29 | + // building for Android). |
| 30 | + memset (&context, 0, sizeof(context)); |
| 31 | +#endif |
| 32 | return HandleSignal(sig, &siginfo, &context); |
| 33 | } |
| 34 | |
| 35 | @@ -680,9 +692,14 @@ bool ExceptionHandler::WriteMinidump() { |
| 36 | sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0); |
| 37 | |
| 38 | CrashContext context; |
| 39 | +#if defined(__GLIBC__) |
| 40 | int getcontext_result = getcontext(&context.context); |
| 41 | if (getcontext_result) |
| 42 | return false; |
| 43 | +#else |
| 44 | + // Extreme hack - see comments above. |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 45 | + memset (&context.context, 0, sizeof(context.context)); |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 46 | +#endif |
| 47 | |
| 48 | #if defined(__i386__) |
| 49 | // In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved |