NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/ibm-sw-tpm2: add patch to fix build issues on several architectures

Browse Source 
src/LibSupport.h has some logic to find the wordsize of the current
architecture, using an explicit list of CPU architectures. This makes
the build fail on a number of CPU architectures that are not
explicitly handled.

Let's instead use the __WORDSIZE definition of the C library, which is
guaranteed to be available for all CPU architectures.

Fixes:

  http://autobuild.buildroot.net/results/a235345477ea2ec3b0dd4ffed4d7667d46caec48/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Thomas Petazzoni 2020-04-27 07:46:49 +02:00 committed by Yann E. MORIN
parent cf3636af9b
commit 26e37cef16
1 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
package/ibm-sw-tpm2/0001-Use-__WORDSIZE-to-define-RADIX_BITS.patch Normal file
View File

@ -0,0 +1,44 @@
From 24a352fc99ebde22235b05b18615817ef7f4263c 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 __WORDSIZE to define RADIX_BITS
This allows to avoid having to support each CPU architecture
individually.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
src/LibSupport.h | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/src/LibSupport.h b/src/LibSupport.h
index b2e6a51..f064d20 100644
--- a/src/LibSupport.h
+++ b/src/LibSupport.h
@@ -64,20 +64,9 @@
#ifndef _LIB_SUPPORT_H_
#define _LIB_SUPPORT_H_
-#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__)
-# define RADIX_BITS 64
-# elif defined(__i386__) || defined(__i386) || defined(i386) \
- || defined(_WIN32) || defined(_M_IX86) \
- || defined(_M_ARM) || defined(__arm__) || defined(__thumb__)
-# define RADIX_BITS 32
-# else
-# error Unable to determine RADIX_BITS from compiler environment
-# endif
-#endif // RADIX_BITS
+#include <limits.h>
+
+#define RADIX_BITS __WORDSIZE
// These macros use the selected libraries to the proper include files.
#define LIB_QUOTE(_STRING_) #_STRING_
--
2.25.3