[PATCH] libdebugger/arm: Fix build for atsam.

Christian Mauderer christian.mauderer at embedded-brains.de
Tue Oct 15 15:09:19 UTC 2019


---
 cpukit/libdebugger/rtems-debugger-arm.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/cpukit/libdebugger/rtems-debugger-arm.c b/cpukit/libdebugger/rtems-debugger-arm.c
index 3d5dea0ab7..a6aaca31f2 100644
--- a/cpukit/libdebugger/rtems-debugger-arm.c
+++ b/cpukit/libdebugger/rtems-debugger-arm.c
@@ -1590,10 +1590,15 @@ target_exception(CPU_Exception_frame* frame)
  #define EXCEPTION_EXIT_THREAD(_frame)       EXCEPTION_EXIT_THREAD_V4(_frame)
  #define EXCEPTION_EXIT_EXC()                EXCEPTION_EXIT_EXC_V4()
 #elif defined(ARM_MULTILIB_ARCH_V7M)
- #define EXCEPTION_ENTRY_EXC()               (void) arm_switch_reg
+ #if !ARM_THUMB_ONLY && defined(__thumb__)
+  #define EXCEPTION_ENTRY_EXC()               (void) arm_switch_reg
+  #define EXCEPTION_EXIT_EXC()                (void) arm_switch_reg
+ #else
+  #define EXCEPTION_ENTRY_EXC()
+  #define EXCEPTION_EXIT_EXC()
+ #endif
  #define EXCEPTION_ENTRY_THREAD(_frame)      (_frame) = NULL
  #define EXCEPTION_EXIT_THREAD(_frame)       (_frame) = NULL
- #define EXCEPTION_EXIT_EXC()                (void) arm_switch_reg
 #else
  #error ARM architecture is not supported.
 #endif
-- 
2.16.4



More information about the devel mailing list