contrib: pthreads: Use the right CONTEXT field on arm64
authorMartin Storsjö <martin@martin.st>
Sun, 18 Mar 2018 11:54:29 +0000 (13:54 +0200)
committerMartin Storsjö <martin@martin.st>
Mon, 19 Mar 2018 12:23:51 +0000 (14:23 +0200)
contrib/src/pthreads/arm64.patch [new file with mode: 0644]
contrib/src/pthreads/rules.mak

diff --git a/contrib/src/pthreads/arm64.patch b/contrib/src/pthreads/arm64.patch
new file mode 100644 (file)
index 0000000..ef2cad1
--- /dev/null
@@ -0,0 +1,14 @@
+diff -urN pthreads-orig/context.h pthreads/context.h
+--- pthreads-orig/context.h    2011-03-04 01:37:20.000000000 +0200
++++ pthreads/context.h 2018-03-18 13:50:07.362676429 +0200
+@@ -67,6 +67,10 @@
+ #define PTW32_PROGCTR(Context)  ((Context).Pc)
+ #endif
++#if defined(_ARM64_) || defined(__aarch64__)
++#define PTW32_PROGCTR(Context)  ((Context).Pc)
++#endif
++
+ #if !defined(PTW32_PROGCTR)
+ #error Module contains CPU-specific code; modify and recompile.
+ #endif
index 9bc9014..6e39bfc 100644 (file)
@@ -22,6 +22,7 @@ endif
        $(APPLY) $(SRC)/pthreads/implib.patch
        $(APPLY) $(SRC)/pthreads/remove-inline.patch
        $(APPLY) $(SRC)/pthreads/x86-inline-asm.patch
+       $(APPLY) $(SRC)/pthreads/arm64.patch
        $(MOVE)
 
 ifdef HAVE_CROSS_COMPILE