summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--var/spack/repos/builtin/packages/diffutils/package.py1
-rw-r--r--var/spack/repos/builtin/packages/diffutils/ppc.patch11
2 files changed, 12 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/diffutils/package.py b/var/spack/repos/builtin/packages/diffutils/package.py
index 8a0e5a21b5..e2edd9f1e1 100644
--- a/var/spack/repos/builtin/packages/diffutils/package.py
+++ b/var/spack/repos/builtin/packages/diffutils/package.py
@@ -31,6 +31,7 @@ class Diffutils(AutotoolsPackage, GNUMirrorPackage):
sha256="146b7021bb0a304a3d1c0638956c4e735c2076d292d238f2806efadc972d99e5",
when="@3.8 %nvhpc",
)
+ patch("ppc.patch")
conflicts("%nvhpc", when="@:3.6,3.8:")
diff --git a/var/spack/repos/builtin/packages/diffutils/ppc.patch b/var/spack/repos/builtin/packages/diffutils/ppc.patch
new file mode 100644
index 0000000000..6f02915d8f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/diffutils/ppc.patch
@@ -0,0 +1,11 @@
+diff -ur a/lib/sigsegv.c b/lib/sigsegv.c
+--- a/lib/sigsegv.c 2022-01-08 21:35:58.620000000 +0000
++++ b/lib/sigsegv.c 2022-01-08 21:36:11.380000000 +0000
+@@ -222,7 +222,7 @@
+ # if 0
+ # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1]
+ # else
+-# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1]
++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gregs[1]
+ # endif
+ # endif