texstudio/texstudio-debughelper-arm-fix.patch

From b0cf44fde92b66fbaefceb643b6124bc5bf0b087 Mon Sep 17 00:00:00 2001
From: hannes <hannes@fedoraproject.org>
Date: Sun, 11 Feb 2018 07:39:00 +0100
Subject: [PATCH 2/2] armfix

---
 src/debughelper.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/debughelper.cpp b/src/debughelper.cpp
index 2918b43..74b94bc 100644
--- a/src/debughelper.cpp
+++ b/src/debughelper.cpp
@@ -522,11 +522,7 @@ QString print_backtrace(const QString &message)
 #define STACK_FROM_UCONTEXT(context) (context)->uc_mcontext.arm_sp
 #define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.arm_fp
 #define RETURNTO_FROM_UCONTEXT(context) (context)->uc_mcontext.arm_lr
-*/
-#define PC_FROM_UCONTEXT(context) (context)->uc_mcontext.__gregs[_REG_R15]
-#define STACK_FROM_UCONTEXT(context) (context)->uc_mcontext.__gregs[_REG_R13]
-#define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.__gregs[_REG_R11]
-#define RETURNTO_FROM_UCONTEXT(context) (context)->uc_mcontext.__gregs[_REG_R14]
+
 #elif defined(CPU_IS_IA64)
 #define PC_FROM_UCONTEXT(context) (context)->_u._mc.sc_ip
 #define STACK_FROM_UCONTEXT(context) (context)->_u._mc.sc_gr[12] //is that register 12?
--- a/src/debughelper.cpp
+++ b/src/debughelper.cpp
@@ -517,7 +517,7 @@ QString print_backtrace(const QString &message)
 #define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.gp_regs[31] //not always used
 #define RETURNTO_FROM_UCONTEXT(context) (context)->uc_mcontext.gp_regs[34]
 #elif defined(CPU_IS_ARM)
-/*
+
 #define PC_FROM_UCONTEXT(context) (context)->uc_mcontext.arm_pc
 #define STACK_FROM_UCONTEXT(context) (context)->uc_mcontext.arm_sp
 #define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.arm_fp
@@ -1111,6 +1111,7 @@ void SimulatedCPU::set_from_real()
 #else
 #error Unknown processor architecture
 #endif
+#undef geteip
 geteip:
 	this->pc = (char *) && geteip;
 }
-- 
2.14.3