-From 5aeb25abf13de43b9e497f6509209911dd1386b8 Mon Sep 17 00:00:00 2001
+From 7ea7fe229ea6195938d9eadbe783cb1aa74380ba Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Date: Sun, 26 Apr 2020 15:33:39 +0200
Subject: [PATCH] Use LONG_BIT to define RADIX_BITS
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Vincent Fazio <vfazio@gmail.com>
---
- src/LibSupport.h | 17 +++--------------
+ src/LibSupport.h | 21 +++------------------
src/TcpServerPosix.c | 1 +
src/makefile | 2 ++
- 3 files changed, 6 insertions(+), 14 deletions(-)
+ 3 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/src/LibSupport.h b/src/LibSupport.h
-index b2e6a51..0b59d18 100644
+index 5055560..48b1e16 100644
--- a/src/LibSupport.h
+++ b/src/LibSupport.h
-@@ -64,20 +64,9 @@
+@@ -64,24 +64,9 @@
#ifndef _LIB_SUPPORT_H_
#define _LIB_SUPPORT_H_
+-/* kgold added power and s390 */
-#ifndef RADIX_BITS
-# if defined(__x86_64__) || defined(__x86_64) \
-- || defined(__amd64__) || defined(__amd64) || defined(_WIN64) || defined(_M_X64) \
-- || defined(_M_ARM64) || defined(__aarch64__) \
-- || defined(__powerpc64__) || defined(__ppc64__)
+- || defined(__amd64__) || defined(__amd64) \
+- || defined(_WIN64) || defined(_M_X64) \
+- || defined(_M_ARM64) || defined(__aarch64__) \
+- || defined(__powerpc64__) || defined(__PPC64__) || defined(__ppc64__) \
+- || defined(__s390x__)
-# define RADIX_BITS 64
-# elif defined(__i386__) || defined(__i386) || defined(i386) \
- || defined(_WIN32) || defined(_M_IX86) \
-- || defined(_M_ARM) || defined(__arm__) || defined(__thumb__)
+- || defined(_M_ARM) || defined(__arm__) || defined(__thumb__) \
+- || defined(__powerpc__) || defined(__PPC__)
-# define RADIX_BITS 32
-# else
-# error Unable to determine RADIX_BITS from compiler environment
// These macros use the selected libraries to the proper include files.
#define LIB_QUOTE(_STRING_) #_STRING_
diff --git a/src/TcpServerPosix.c b/src/TcpServerPosix.c
-index 20fcb29..bdac7aa 100644
+index cad0402..6293cdd 100644
--- a/src/TcpServerPosix.c
+++ b/src/TcpServerPosix.c
@@ -66,6 +66,7 @@
#include <stdio.h>
- /* FIXME need Posix TCP socket code */
+ #include <stdbool.h>
+#include <sys/select.h>
#include <unistd.h>
#include <sys/types.h>
# add this line for big endian platforms
--
-2.26.2
+2.17.1
+++ /dev/null
-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,
projects / buildroot.git / commitdiff