Rebase modes_local.h patch over KNF rampage

libressl · Jul 8, 2023 · d36f706 · d36f706
1 parent 4aa2efb
commit d36f706
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/patches/modes_local.h.patch b/patches/modes_local.h.patch
@@ -1,19 +1,16 @@
---- 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"		\
+--- crypto/modes/modes_local.h.orig	Sat Jul  8 14:03:53 2023
++++ crypto/modes/modes_local.h	Sat Jul  8 14:10:56 2023
+@@ -45,6 +45,7 @@
+ 			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)));	\
+ #  define BSWAP8(x) ({	u32 lo=(u64)(x)>>32,hi=(x);			\
+ 			asm ("rev %0,%0; rev %1,%1"			\
+ 			: "+r"(hi),"+r"(lo));				\
+@@ -53,6 +54,7 @@
+ 			asm ("rev %0,%1"				\
+ 			: "=r"(ret) : "r"((u32)(x)));			\
  			ret;				})
 +#  endif
  # endif