From bcf7afb23f9ae3a8dbdbb4ffe78c1e6f8bdc4444 Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Sun, 27 Nov 2022 10:35:13 +0100 Subject: Adjust patches for lcl.h -> local.h rename --- patches/bn_lcl.h.patch | 11 ----------- patches/bn_local.h.patch | 11 +++++++++++ patches/modes_lcl.h.patch | 21 --------------------- patches/modes_local.h.patch | 21 +++++++++++++++++++++ 4 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 patches/bn_lcl.h.patch create mode 100644 patches/bn_local.h.patch delete mode 100644 patches/modes_lcl.h.patch create mode 100644 patches/modes_local.h.patch diff --git a/patches/bn_lcl.h.patch b/patches/bn_lcl.h.patch deleted file mode 100644 index 84835ed..0000000 --- a/patches/bn_lcl.h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./crypto/bn/bn_lcl.h.orig Fri Feb 18 16:30:39 2022 -+++ ./crypto/bn/bn_lcl.h Mon Feb 21 05:39:35 2022 -@@ -283,7 +283,7 @@ - : "r"(a), "r"(b)); \ - ret; }) - # endif /* compiler */ --# elif defined(__x86_64) || defined(__x86_64__) -+# elif (defined(__x86_64) || defined(__x86_64__)) && defined(_LP64) - # if defined(__GNUC__) && __GNUC__>=2 - # define BN_UMULT_HIGH(a,b) ({ \ - BN_ULONG ret,discard; \ diff --git a/patches/bn_local.h.patch b/patches/bn_local.h.patch new file mode 100644 index 0000000..2378ec7 --- /dev/null +++ b/patches/bn_local.h.patch @@ -0,0 +1,11 @@ +--- ./crypto/bn/bn_local.h.orig Fri Feb 18 16:30:39 2022 ++++ ./crypto/bn/bn_local.h Mon Feb 21 05:39:35 2022 +@@ -283,7 +283,7 @@ + : "r"(a), "r"(b)); \ + ret; }) + # endif /* compiler */ +-# elif defined(__x86_64) || defined(__x86_64__) ++# elif (defined(__x86_64) || defined(__x86_64__)) && defined(_LP64) + # if defined(__GNUC__) && __GNUC__>=2 + # define BN_UMULT_HIGH(a,b) ({ \ + BN_ULONG ret,discard; \ diff --git a/patches/modes_lcl.h.patch b/patches/modes_lcl.h.patch deleted file mode 100644 index 330d4d0..0000000 --- a/patches/modes_lcl.h.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- crypto/modes/modes_lcl.h.orig Tue Nov 14 10:25:15 2017 -+++ crypto/modes/modes_lcl.h Sat Jan 19 22:19:23 2019 -@@ -45,14 +45,16 @@ - asm ("bswapl %0" \ - : "+r"(ret)); ret; }) - # elif (defined(__arm__) || defined(__arm)) && !defined(__STRICT_ALIGNMENT) --# define BSWAP8(x) ({ u32 lo=(u64)(x)>>32,hi=(x); \ -+# if (__ARM_ARCH >= 6) -+# define BSWAP8(x) ({ u32 lo=(u64)(x)>>32,hi=(x); \ - asm ("rev %0,%0; rev %1,%1" \ - : "+r"(hi),"+r"(lo)); \ - (u64)hi<<32|lo; }) --# define BSWAP4(x) ({ u32 ret; \ -+# define BSWAP4(x) ({ u32 ret; \ - asm ("rev %0,%1" \ - : "=r"(ret) : "r"((u32)(x))); \ - ret; }) -+# endif - # endif - #endif - #endif diff --git a/patches/modes_local.h.patch b/patches/modes_local.h.patch new file mode 100644 index 0000000..8f55eed --- /dev/null +++ b/patches/modes_local.h.patch @@ -0,0 +1,21 @@ +--- crypto/modes/modes_local.h.orig Tue Nov 14 10:25:15 2017 ++++ crypto/modes/modes_local.h Sat Jan 19 22:19:23 2019 +@@ -45,14 +45,16 @@ + asm ("bswapl %0" \ + : "+r"(ret)); ret; }) + # elif (defined(__arm__) || defined(__arm)) && !defined(__STRICT_ALIGNMENT) +-# define BSWAP8(x) ({ u32 lo=(u64)(x)>>32,hi=(x); \ ++# if (__ARM_ARCH >= 6) ++# define BSWAP8(x) ({ u32 lo=(u64)(x)>>32,hi=(x); \ + asm ("rev %0,%0; rev %1,%1" \ + : "+r"(hi),"+r"(lo)); \ + (u64)hi<<32|lo; }) +-# define BSWAP4(x) ({ u32 ret; \ ++# define BSWAP4(x) ({ u32 ret; \ + asm ("rev %0,%1" \ + : "=r"(ret) : "r"((u32)(x))); \ + ret; }) ++# endif + # endif + #endif + #endif -- cgit v1.2.3-55-g6feb