[PR PATCH] pinebookpro-kernel: fix build w/ gcc10

[pullmoll <pullmoll@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 513 bytes --]

There is a new pull request by pullmoll against master on the void-packages repository

https://github.com/pullmoll/void-packages pbk-kernel
https://github.com/void-linux/void-packages/pull/24699

pinebookpro-kernel: fix build w/ gcc10
With gcc10 the patched piece of code does not compile when the XORs (^)
are done inside the initializer, so I added local variables for the
four initializers besides kiv.

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/24699.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pbk-kernel-24699.patch --]
[-- Type: text/x-diff, Size: 1965 bytes --]

From d1497929eb138229e5c4f881a3ace486ea5c43c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 5 Sep 2020 19:21:54 +0200
Subject: [PATCH] pinebookpro-kernel: fix build w/ gcc10

With gcc10 the patched piece of code does not compile when the XORs (^)
are done inside the initializer, so I added local variables for the
four initializers besides kiv.

[ci skip]
---
 .../patches/crypto_aegis_init_neon.patch      | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 srcpkgs/pinebookpro-kernel/patches/crypto_aegis_init_neon.patch

diff --git a/srcpkgs/pinebookpro-kernel/patches/crypto_aegis_init_neon.patch b/srcpkgs/pinebookpro-kernel/patches/crypto_aegis_init_neon.patch
new file mode 100644
index 00000000000..e5fd5a83886
--- /dev/null
+++ b/srcpkgs/pinebookpro-kernel/patches/crypto_aegis_init_neon.patch
@@ -0,0 +1,33 @@
+--- a/crypto/aegis128-neon-inner.c	2020-09-05 19:09:33.377243984 +0200
++++ b/crypto/aegis128-neon-inner.c	2020-09-05 19:11:29.457249973 +0200
+@@ -131,23 +131,21 @@
+ 
+ void crypto_aegis128_init_neon(void *state, const void *key, const void *iv)
+ {
+-	static const uint8_t const0[] = {
++	static uint8_t const const0[] = {
+ 		0x00, 0x01, 0x01, 0x02, 0x03, 0x05, 0x08, 0x0d,
+ 		0x15, 0x22, 0x37, 0x59, 0x90, 0xe9, 0x79, 0x62,
+ 	};
+-	static const uint8_t const1[] = {
++	static uint8_t const const1[] = {
+ 		0xdb, 0x3d, 0x18, 0x55, 0x6d, 0xc2, 0x2f, 0xf1,
+ 		0x20, 0x11, 0x31, 0x42, 0x73, 0xb5, 0x28, 0xdd,
+ 	};
+ 	uint8x16_t k = vld1q_u8(key);
+ 	uint8x16_t kiv = k ^ vld1q_u8(iv);
+-	struct aegis128_state st = {{
+-		kiv,
+-		vld1q_u8(const1),
+-		vld1q_u8(const0),
+-		k ^ vld1q_u8(const0),
+-		k ^ vld1q_u8(const1),
+-	}};
++	uint8x16_t c0 = vld1q_u8(const0);
++	uint8x16_t c1 = vld1q_u8(const1);
++	uint8x16_t kc0 = k ^ c0;
++	uint8x16_t kc1 = k ^ c1;
++	struct aegis128_state st = { kiv, c1, c0, kc0, kc1 };
+ 	int i;
+ 
+ 	preload_sbox();