From b082953404ca41c0f8af8292031bc763df6cb7ae Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 18 Apr 2021 18:10:59 +0200
Subject: [PATCH] nettle: always use auxval on ppc, and fix on ppc64 big endian

---
 .../nettle/patches/musl-ppc-use-auxval.patch  | 21 ++++++++++++++++++
 srcpkgs/nettle/patches/ppc64-elfv2.patch      | 22 +++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 srcpkgs/nettle/patches/musl-ppc-use-auxval.patch
 create mode 100644 srcpkgs/nettle/patches/ppc64-elfv2.patch

diff --git a/srcpkgs/nettle/patches/musl-ppc-use-auxval.patch b/srcpkgs/nettle/patches/musl-ppc-use-auxval.patch
new file mode 100644
index 00000000000..315aebfdcb7
--- /dev/null
+++ b/srcpkgs/nettle/patches/musl-ppc-use-auxval.patch
@@ -0,0 +1,21 @@
+This ensures that efficient capability checks are used on musl.
+
+--- fat-ppc.c
++++ fat-ppc.c
+@@ -42,12 +42,10 @@
+ 
+ #if defined(_AIX)
+ # include <sys/systemcfg.h>
+-#elif defined(__linux__) && defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  define USE_GETAUXVAL 1
+-#  include <asm/cputable.h>
+-#  include <sys/auxv.h>
+-# endif
++#elif defined(__linux__)
++# define USE_GETAUXVAL 1
++# include <asm/cputable.h>
++# include <sys/auxv.h>
+ #elif defined(__FreeBSD__)
+ # include <machine/cpu.h>
+ # ifdef PPC_FEATURE2_HAS_VEC_CRYPTO
diff --git a/srcpkgs/nettle/patches/ppc64-elfv2.patch b/srcpkgs/nettle/patches/ppc64-elfv2.patch
new file mode 100644
index 00000000000..c7d463b6a86
--- /dev/null
+++ b/srcpkgs/nettle/patches/ppc64-elfv2.patch
@@ -0,0 +1,22 @@
+Ensure that ELFv2 ABI is used on all ppc64, including big endian.
+
+--- powerpc64/machine.m4
++++ powerpc64/machine.m4
+@@ -1,7 +1,7 @@
+ define(`PROLOGUE',
+ `.globl C_NAME($1)
+ DECLARE_FUNC(C_NAME($1))
+-ifelse(WORDS_BIGENDIAN,no,
++ifelse(`no',`no',
+ `ifdef(`FUNC_ALIGN',`.align FUNC_ALIGN')
+ C_NAME($1):
+ addis 2,12,(.TOC.-C_NAME($1))@ha
+@@ -17,7 +17,7 @@ ifdef(`FUNC_ALIGN',`.align FUNC_ALIGN')
+ undefine(`FUNC_ALIGN')')
+ 
+ define(`EPILOGUE',
+-`ifelse(WORDS_BIGENDIAN,no,
++`ifelse(`no',`no',
+ `.size C_NAME($1), . - C_NAME($1)',
+ `.size .C_NAME($1), . - .C_NAME($1)
+ .size C_NAME($1), . - .C_NAME($1)')')