Attachment 236973 Details for Bug 266729 – security/john: fix build on armv7

[patch] security/john: fix build on armv7

0001-security-john-fix-build-on-armv7.patch (text/plain), 2.18 KB, created by Robert Clausecker on 2022-09-30 16:32:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Clausecker

Created: 2022-09-30 16:32:25 UTC

Size: 2.18 KB

patch

obsolete

>From 0f99b96eecff859eaa7bfd3cfd06ddf61a6c726a Mon Sep 17 00:00:00 2001
>From: Robert Clausecker <fuz@fuz.su>
>Date: Fri, 30 Sep 2022 18:30:45 +0200
>Subject: [PATCH] security/john: fix build on armv7
>
>Apply upstream patch c9825e688d, fixing use of AArch32 NEON
>intrinsics for clang.
>
>See also:	https://github.com/openwall/john/commit/c9825e688d1fb9fdd8942ceb0a6b4457b0f9f9b4
>---
> security/john/files/patch-git-c9825e688d | 19 +++++++++++++++++++
> 1 file changed, 19 insertions(+)
> create mode 100644 security/john/files/patch-git-c9825e688d
>
>diff --git a/security/john/files/patch-git-c9825e688d b/security/john/files/patch-git-c9825e688d
>new file mode 100644
>index 000000000000..ee35be286604
>--- /dev/null
>+++ b/security/john/files/patch-git-c9825e688d
>@@ -0,0 +1,19 @@
>+diff --git a/src/pseudo_intrinsics.h b/src/pseudo_intrinsics.h
>+index 5fabbdbb81..450e2477b5 100644
>+--- a/src/pseudo_intrinsics.h
>++++ b/src/pseudo_intrinsics.h
>+@@ -66,10 +66,10 @@ typedef union {
>+ #define VLOADU_EMULATED         1
>+ #define vor(x, y)               (vtype)vorrq_u32((x).v32, (y).v32)
>+ #define vorn(x, y)              (vtype)vornq_u32((x).v32, (y).v32)
>+-#define vroti_epi32(x, i)       (i > 0 ? (vtype)vsliq_n_u32(vshrq_n_u32((x).v32, 32 - (i)), (x).v32, i) : \
>+-                                         (vtype)vsriq_n_u32(vshlq_n_u32((x).v32, 32 + (i)), (x).v32, -(i)))
>+-#define vroti_epi64(x, i)       (i > 0 ? (vtype)vsliq_n_u64(vshrq_n_u64((x).v64, 64 - (i)), (x).v64, i) : \
>+-                                         (vtype)vsriq_n_u64(vshlq_n_u64((x).v64, 64 + (i)), (x).v64, -(i)))
>++#define vroti_epi32(x, i)       (i > 0 ? (vtype)vsliq_n_u32(vshrq_n_u32((x).v32, 32 - ((i) & 31)), (x).v32, (i) & 31) : \
>++                                 (vtype)vsriq_n_u32(vshlq_n_u32((x).v32, (32 + (i)) & 31), (x).v32, (-(i)) & 31))
>++#define vroti_epi64(x, i)       (i > 0 ? (vtype)vsliq_n_u64(vshrq_n_u64((x).v64, 64 - ((i) & 63)), (x).v64, (i) & 63) : \
>++                                 (vtype)vsriq_n_u64(vshlq_n_u64((x).v64, (64 + (i)) & 63), (x).v64, (-(i)) & 63))
>+ #define vroti16_epi32           vroti_epi32
>+ #define vset1_epi32(i)          (vtype)vdupq_n_u32(i)
>+ #define vset1_epi64(i)          (vtype)vdupq_n_u64(i)
>-- 
>2.37.1
>

Flags:

fuz: maintainer-approval? (danfe)

Actions: View | Diff

Attachments on bug 266729: 236973