| From 9384735383a0b8688e3f05ed23a53f18863eae20 Mon Sep 17 00:00:00 2001 |
| From: Sinan Kaya <sinan.kaya@microsoft.com> |
| Date: Tue, 11 Feb 2020 11:36:00 -0500 |
| Subject: [PATCH] Add forgotten ABSL_HAVE_VDSO_SUPPORT conditional |
| |
| Signed-off-by: Sinan Kaya <sinan.kaya@microsoft.com> |
| --- |
| absl/debugging/internal/stacktrace_x86-inl.inc | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| diff --git a/absl/debugging/internal/stacktrace_x86-inl.inc b/absl/debugging/internal/stacktrace_x86-inl.inc |
| index ff0fd31..28607c3 100644 |
| --- a/absl/debugging/internal/stacktrace_x86-inl.inc |
| +++ b/absl/debugging/internal/stacktrace_x86-inl.inc |
| @@ -171,6 +171,7 @@ static void **NextStackFrame(void **old_fp, const void *uc) { |
| static const unsigned char *kernel_rt_sigreturn_address = nullptr; |
| static const unsigned char *kernel_vsyscall_address = nullptr; |
| if (num_push_instructions == -1) { |
| +#ifdef ABSL_HAVE_VDSO_SUPPORT |
| absl::debugging_internal::VDSOSupport vdso; |
| if (vdso.IsPresent()) { |
| absl::debugging_internal::VDSOSupport::SymbolInfo |
| @@ -199,6 +200,9 @@ static void **NextStackFrame(void **old_fp, const void *uc) { |
| } else { |
| num_push_instructions = 0; |
| } |
| +#else |
| + num_push_instructions = 0; |
| +#endif |
| } |
| if (num_push_instructions != 0 && kernel_rt_sigreturn_address != nullptr && |
| old_fp[1] == kernel_rt_sigreturn_address) { |
| -- |
| 2.20.1.windows.1 |
| |