diff options
| author | Theo Buehler <tb@openbsd.org> | 2023-07-08 14:20:25 -0600 |
|---|---|---|
| committer | Theo Buehler <tb@openbsd.org> | 2023-07-08 14:20:25 -0600 |
| commit | d36f70674fa41bd30cb383222cd91ea5e2267a3b (patch) | |
| tree | 91729c6357e6545978e6563f9505657878aea876 | |
| parent | 4aa2efb54da5d68c6df6fd1c3050f4666636fb4a (diff) | |
| download | portable-d36f70674fa41bd30cb383222cd91ea5e2267a3b.tar.gz portable-d36f70674fa41bd30cb383222cd91ea5e2267a3b.tar.bz2 portable-d36f70674fa41bd30cb383222cd91ea5e2267a3b.zip | |
Rebase modes_local.h patch over KNF rampage
| -rw-r--r-- | patches/modes_local.h.patch | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/patches/modes_local.h.patch b/patches/modes_local.h.patch index 8f55eed..1ff799b 100644 --- a/patches/modes_local.h.patch +++ b/patches/modes_local.h.patch | |||
| @@ -1,19 +1,16 @@ | |||
| 1 | --- crypto/modes/modes_local.h.orig Tue Nov 14 10:25:15 2017 | 1 | --- crypto/modes/modes_local.h.orig Sat Jul 8 14:03:53 2023 |
| 2 | +++ crypto/modes/modes_local.h Sat Jan 19 22:19:23 2019 | 2 | +++ crypto/modes/modes_local.h Sat Jul 8 14:10:56 2023 |
| 3 | @@ -45,14 +45,16 @@ | 3 | @@ -45,6 +45,7 @@ |
| 4 | asm ("bswapl %0" \ | 4 | asm ("bswapl %0" \ |
| 5 | : "+r"(ret)); ret; }) | 5 | : "+r"(ret)); ret; }) |
| 6 | # elif (defined(__arm__) || defined(__arm)) && !defined(__STRICT_ALIGNMENT) | 6 | # elif (defined(__arm__) || defined(__arm)) && !defined(__STRICT_ALIGNMENT) |
| 7 | -# define BSWAP8(x) ({ u32 lo=(u64)(x)>>32,hi=(x); \ | ||
| 8 | +# if (__ARM_ARCH >= 6) | 7 | +# if (__ARM_ARCH >= 6) |
| 9 | +# define BSWAP8(x) ({ u32 lo=(u64)(x)>>32,hi=(x); \ | 8 | # define BSWAP8(x) ({ u32 lo=(u64)(x)>>32,hi=(x); \ |
| 10 | asm ("rev %0,%0; rev %1,%1" \ | 9 | asm ("rev %0,%0; rev %1,%1" \ |
| 11 | : "+r"(hi),"+r"(lo)); \ | 10 | : "+r"(hi),"+r"(lo)); \ |
| 12 | (u64)hi<<32|lo; }) | 11 | @@ -53,6 +54,7 @@ |
| 13 | -# define BSWAP4(x) ({ u32 ret; \ | 12 | asm ("rev %0,%1" \ |
| 14 | +# define BSWAP4(x) ({ u32 ret; \ | 13 | : "=r"(ret) : "r"((u32)(x))); \ |
| 15 | asm ("rev %0,%1" \ | ||
| 16 | : "=r"(ret) : "r"((u32)(x))); \ | ||
| 17 | ret; }) | 14 | ret; }) |
| 18 | +# endif | 15 | +# endif |
| 19 | # endif | 16 | # endif |