From ccda70afb67ca55e297e68f8e96a10a903dcbee4 Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Thu, 27 Jun 2019 17:27:03 -0700 Subject: [PATCH] Fix ARM build break (#7564) --- src/Native/libunwind/include/__libunwind_config.h | 4 ++-- src/Native/libunwind/src/Registers.hpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Native/libunwind/include/__libunwind_config.h b/src/Native/libunwind/include/__libunwind_config.h index b8438cc2267..871ca33e760 100644 --- a/src/Native/libunwind/include/__libunwind_config.h +++ b/src/Native/libunwind/include/__libunwind_config.h @@ -72,8 +72,8 @@ # define _LIBUNWIND_CONTEXT_SIZE 61 # define _LIBUNWIND_CURSOR_SIZE 68 # else -# define _LIBUNWIND_CONTEXT_SIZE 42 -# define _LIBUNWIND_CURSOR_SIZE 49 +# define _LIBUNWIND_CONTEXT_SIZE 50 +# define _LIBUNWIND_CURSOR_SIZE 57 # endif # define _LIBUNWIND_HIGHEST_DWARF_REGISTER _LIBUNWIND_HIGHEST_DWARF_REGISTER_ARM # elif defined(__or1k__) diff --git a/src/Native/libunwind/src/Registers.hpp b/src/Native/libunwind/src/Registers.hpp index 3b3c8c74ee0..9f82d5c6766 100644 --- a/src/Native/libunwind/src/Registers.hpp +++ b/src/Native/libunwind/src/Registers.hpp @@ -2219,6 +2219,7 @@ class _LIBUNWIND_HIDDEN Registers_arm { bool validRegister(int num) const; uint32_t getRegister(int num) const; void setRegister(int num, uint32_t value, uint32_t location); + uint32_t getRegisterLocation(int num) const; bool validFloatRegister(int num) const; unw_fpreg_t getFloatRegister(int num); void setFloatRegister(int num, unw_fpreg_t value);