package/ibm-sw-tpm2: fix build with gcc 10
authorFabrice Fontaine <fontaine.fabrice@gmail.com>
Mon, 31 Aug 2020 20:15:39 +0000 (22:15 +0200)
committerPeter Korsgaard <peter@korsgaard.com>
Tue, 1 Sep 2020 07:19:44 +0000 (09:19 +0200)
Fixes:
 - http://autobuild.buildroot.org/results/8533d202fb29bf2a1677de37fc71f1a0fbd54722

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/ibm-sw-tpm2/0002-Remove-unused-global-variable-to-fix-compilation-with-GCC-10.patch [new file with mode: 0644]

diff --git a/package/ibm-sw-tpm2/0002-Remove-unused-global-variable-to-fix-compilation-with-GCC-10.patch b/package/ibm-sw-tpm2/0002-Remove-unused-global-variable-to-fix-compilation-with-GCC-10.patch
new file mode 100644 (file)
index 0000000..ff82a18
--- /dev/null
@@ -0,0 +1,30 @@
+From 9bd2926c0f359f143141c32c2b261ca100d804c8 Mon Sep 17 00:00:00 2001
+From: Jonas Witschel <diabonas@archlinux.org>
+Date: Wed, 13 May 2020 10:56:03 +0200
+Subject: [PATCH] Remove unused global variable to fix compilation with GCC 10
+
+GCC defaults to -fno-common, resulting in a compilation error:
+
+CryptSym.h:84: multiple definition of `tpmCryptKeySchedule'
+
+Since the global variable is not used anywhere, it can be removed.
+[Retrieved from:
+https://github.com/kgoldman/ibmswtpm2/pull/3/commits/9bd2926c0f359f143141c32c2b261ca100d804c8]
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ src/CryptSym.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CryptSym.h b/src/CryptSym.h
+index 7b58e41..9a33b13 100644
+--- a/src/CryptSym.h
++++ b/src/CryptSym.h
+@@ -81,7 +81,7 @@ union tpmCryptKeySchedule_t {
+ #else
+     uint32_t            alignment;
+ #endif
+-} tpmCryptKeySchedule;
++};
+ /* Each block cipher within a library is expected to conform to the same calling conventions with
+    three parameters (keySchedule, in, and out) in the same order. That means that all algorithms
+    would use the same order of the same parameters. The code is written assuming the (keySchedule,