PKGBUILDs/community/texstudio/texstudio-debughelper-arm-fix.patch

37 lines
1.4 KiB
Diff
Raw Normal View History

2019-12-27 16:50:32 +00:00
From b0cf44fde92b66fbaefceb643b6124bc5bf0b087 Mon Sep 17 00:00:00 2001
2016-01-06 04:52:11 +00:00
From: hannes <hannes@fedoraproject.org>
2019-12-27 16:50:32 +00:00
Date: Sun, 11 Feb 2018 07:39:00 +0100
Subject: [PATCH 2/2] armfix
2016-01-06 04:52:11 +00:00
---
2019-12-27 16:50:32 +00:00
src/debughelper.cpp | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
2016-01-06 04:52:11 +00:00
2019-12-27 16:50:32 +00:00
diff --git a/src/debug/debughelper.cpp b/src/debug/debughelper.cpp
index 2918b43..74b94bc 100644
--- a/src/debug/debughelper.cpp
+++ b/src/debug/debughelper.cpp
@@ -517,16 +517,12 @@ QString print_backtrace(const QString &message)
2016-01-06 04:52:11 +00:00
#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
#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?
--
2019-12-27 16:50:32 +00:00
2.17.1
2016-01-06 04:52:11 +00:00