[GMT/f21] Fix arch patch for aarch64

[Orion Poplawski]

commit f45939f7da5016a8cd571a483646e5809aa6dc28
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Oct 6 10:40:17 2014 -0600

    Fix arch patch for aarch64

 GMT.spec       |    5 ++++-
 gmt-arch.patch |   18 +++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/GMT.spec b/GMT.spec
index 2536051..4a0e3ce 100644
--- a/GMT.spec
+++ b/GMT.spec
@@ -11,7 +11,7 @@
 
 Name:           GMT
 Version:        5.1.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Generic Mapping Tools
 
 License:        LGPLv3+
@@ -192,6 +192,9 @@ find $RPM_BUILD_ROOT -name \*.bat -delete
 
 
 %changelog
+* Mon Oct 6 2014 Orion Poplawski - 5.1.1-6
+- Fix arch patch for aarch64
+
 * Sat Oct 4 2014 Dan Horák <dan[at]danny.cz> - 5.1.1-5
 - Fix build on s390(x)
 
diff --git a/gmt-arch.patch b/gmt-arch.patch
index c86f9f9..264a0fe 100644
--- a/gmt-arch.patch
+++ b/gmt-arch.patch
@@ -1,8 +1,12 @@
 diff -up gmt-5.1.1/src/common_sighandler.c.arch gmt-5.1.1/src/common_sighandler.c
---- gmt-5.1.1/src/common_sighandler.c.arch	2014-01-31 18:39:56.000000000 -0500
-+++ gmt-5.1.1/src/common_sighandler.c	2014-10-04 09:28:45.177623134 -0400
-@@ -77,14 +77,20 @@ void backtrace_symbols_fd(void *const *b
+--- gmt-5.1.1/src/common_sighandler.c.arch	2014-01-31 16:39:56.000000000 -0700
++++ gmt-5.1.1/src/common_sighandler.c	2014-10-06 09:59:39.299525565 -0600
+@@ -75,16 +75,24 @@ void backtrace_symbols_fd(void *const *b
+ #elif defined(SIZEOF_GREG_T)
+ # ifdef __x86_64__
  #  define UC_IP(uc) ((void *) (uc)->uc_mcontext.gregs[REG_RIP])
++# elif defined(__aarch64__)
++#  define UC_IP(uc) ((void *) (uc)->uc_mcontext.pc)
  # elif defined( __arm__)
  #  define UC_IP(uc) ((void *) (uc)->uc_mcontext.arm_pc)
 +# elif defined(__s390__)
@@ -14,18 +18,18 @@ diff -up gmt-5.1.1/src/common_sighandler.c.arch gmt-5.1.1/src/common_sighandler.
  # ifdef __x86_64__
  #  define UC_IP(uc) ((void *) (uc)->uc_mcontext.rip)
 -# elif defined( __arm__)
-+# elif defined(__arm__)
- #  define UC_IP(uc) ((void *) (uc)->uc_mcontext.arm_pc)
 +# elif defined(__aarch64__)
 +#  define UC_IP(uc) ((void *) (uc)->uc_mcontext.pc)
++# elif defined(__arm__)
+ #  define UC_IP(uc) ((void *) (uc)->uc_mcontext.arm_pc)
 +# elif defined(__powerpc__) || defined(__powerpc64__)
 +#  define UC_IP(uc) ((void *) (uc)->uc_mcontext.regs->nip)
  # else
  #  define UC_IP(uc) ((void *) (uc)->uc_mcontext.eip)
  # endif
 diff -up gmt-5.1.1/src/gmt_config.h.in.arch gmt-5.1.1/src/gmt_config.h.in
---- gmt-5.1.1/src/gmt_config.h.in.arch	2014-02-17 16:27:37.000000000 -0500
-+++ gmt-5.1.1/src/gmt_config.h.in	2014-10-04 09:26:21.147623134 -0400
+--- gmt-5.1.1/src/gmt_config.h.in.arch	2014-02-17 14:27:37.000000000 -0700
++++ gmt-5.1.1/src/gmt_config.h.in	2014-10-06 09:57:41.682071649 -0600
 @@ -283,13 +283,6 @@
  #cmakedefine HAVE__BYTESWAP_ULONG /* for 32 bit */
  #cmakedefine HAVE__BYTESWAP_UINT64 /* for 64 bit */