git: 80acbe76a9c7 - 2023Q3 - graphics/gmt: fix build on armv7
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 30 Jul 2023 23:02:07 UTC
The branch 2023Q3 has been updated by fuz:
URL: https://cgit.FreeBSD.org/ports/commit/?id=80acbe76a9c788a618dab42c2051e7a4bb08ba00
commit 80acbe76a9c788a618dab42c2051e7a4bb08ba00
Author: Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-07-28 20:07:02 +0000
Commit: Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-07-30 23:01:41 +0000
graphics/gmt: fix build on armv7
Fix wrong code for armv7 mcontext_t PC retrieval.
Approved by: portmgr (build fix blanket)
MFH: 2023Q3
(cherry picked from commit a5783589a611edd6c2e15a71bdd740a0206058e6)
---
graphics/gmt/files/patch-src_gmt__common__sighandler.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/graphics/gmt/files/patch-src_gmt__common__sighandler.c b/graphics/gmt/files/patch-src_gmt__common__sighandler.c
new file mode 100644
index 000000000000..f4368e5d2fa8
--- /dev/null
+++ b/graphics/gmt/files/patch-src_gmt__common__sighandler.c
@@ -0,0 +1,11 @@
+--- src/gmt_common_sighandler.c.orig 2023-07-28 19:57:48 UTC
++++ src/gmt_common_sighandler.c
+@@ -84,7 +84,7 @@ void backtrace_symbols_fd(void *const *buffer, int siz
+ # ifdef __x86_64__
+ # define UC_IP(uc) ((void *) (uc)->uc_mcontext.mc_rip)
+ # elif defined( __arm__)
+-# define UC_IP(uc) ((void *) (uc)->uc_mcontext.arm_pc)
++# define UC_IP(uc) ((void *) (uc)->uc_mcontext.__gregs[_REG_PC])
+ # elif defined( __aarch64__)
+ # define UC_IP(uc) ((void *) (uc)->uc_mcontext.mc_gpregs.gp_elr)
+ # elif defined(__ppc__)