summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-avoid-BSWAP-assembly-for-ARM-v6.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-avoid-BSWAP-assembly-for-ARM-v6.patch')
-rw-r--r--meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-avoid-BSWAP-assembly-for-ARM-v6.patch36
1 files changed, 0 insertions, 36 deletions
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-avoid-BSWAP-assembly-for-ARM-v6.patch b/meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-avoid-BSWAP-assembly-for-ARM-v6.patch
deleted file mode 100644
index a7dc35ae5..000000000
--- a/meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-avoid-BSWAP-assembly-for-ARM-v6.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1Upstream-Status: Pending
2
3diff -urN -x .git orig/thirdparty/libressl/avoid-BSWAP-assembly-for-ARM-v6.patch patched/thirdparty/libressl/avoid-BSWAP-assembly-for-ARM-v6.patch
4--- orig/thirdparty/libressl/avoid-BSWAP-assembly-for-ARM-v6.patch 1970-01-01 09:00:00.000000000 +0900
5+++ patched/thirdparty/libressl/avoid-BSWAP-assembly-for-ARM-v6.patch 2020-08-07 23:14:46.196764271 +0900
6@@ -0,0 +1,30 @@
7+This patch was imported from the libressl potable.
8+https://github.com/libressl-portable/portable/commit/a9332ccecfce63bf54924e70c11f420edd3ae312
9+
10+From a9332ccecfce63bf54924e70c11f420edd3ae312 Mon Sep 17 00:00:00 2001
11+From: Brent Cook <bcook@openbsd.org>
12+Date: Sun, 17 Jul 2016 18:12:23 -0500
13+Subject: [PATCH] avoid BSWAP assembly for ARM <= v6
14+
15+diff -urN orig/crypto/modes/modes_lcl.h patched/crypto/modes/modes_lcl.h
16+--- orig/crypto/modes/modes_lcl.h 2018-11-18 21:27:10.000000000 +0900
17++++ patched/crypto/modes/modes_lcl.h 2020-08-07 23:11:01.960764745 +0900
18+@@ -45,14 +45,16 @@
19+ asm ("bswapl %0" \
20+ : "+r"(ret)); ret; })
21+ # elif (defined(__arm__) || defined(__arm)) && !defined(__STRICT_ALIGNMENT)
22+-# define BSWAP8(x) ({ u32 lo=(u64)(x)>>32,hi=(x); \
23++# if (__ARM_ARCH >= 6)
24++# define BSWAP8(x) ({ u32 lo=(u64)(x)>>32,hi=(x); \
25+ asm ("rev %0,%0; rev %1,%1" \
26+ : "+r"(hi),"+r"(lo)); \
27+ (u64)hi<<32|lo; })
28+-# define BSWAP4(x) ({ u32 ret; \
29++# define BSWAP4(x) ({ u32 ret; \
30+ asm ("rev %0,%1" \
31+ : "=r"(ret) : "r"((u32)(x))); \
32+ ret; })
33++# endif
34+ # endif
35+ #endif
36+ #endif