diff mbox series

[1/1] package/ibm-sw-tpm2: fix patch to address musl builds

Message ID 20200430194421.5530-1-vfazio@xes-inc.com
State New
Headers show
Series [1/1] package/ibm-sw-tpm2: fix patch to address musl builds | expand

Commit Message

Vincent Fazio April 30, 2020, 7:44 p.m. UTC
From: Vincent Fazio <vfazio@gmail.com>

Previously, __WORDSIZE was being used to define RADIX_BITS.

__WORDSIZE is not defined consistently via limits.h across all libc
variants, so use LONG_BIT instead.

Fixes:

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

Signed-off-by: Vincent Fazio <vfazio@gmail.com>
Signed-off-by: Vincent Fazio <vfazio@xes-inc.com>
---
 ...TS.patch => 0001-Use-LONG_BIT-to-define-RADIX_BITS.patch} | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename package/ibm-sw-tpm2/{0001-Use-__WORDSIZE-to-define-RADIX_BITS.patch => 0001-Use-LONG_BIT-to-define-RADIX_BITS.patch} (91%)

Comments

Vincent Fazio May 1, 2020, 5:18 p.m. UTC | #1
Note, if we don't like this option i've also seen other packages do 
something akin to:

#if ULONG_MAX == 0xffffffff
#define RADIX_BITS 32
#elif ULONG_MAX == 0xffffffffffffffff
#define RADIX_BITS 64
#else
#error "Unsupported radix size"
#endif


Vincent Fazio
Embedded Software Engineer - Linux
Extreme Engineering Solutions, Inc
http://www.xes-inc.com

On 4/30/20 2:44 PM, Vincent Fazio wrote:
> From: Vincent Fazio <vfazio@gmail.com>
>
> Previously, __WORDSIZE was being used to define RADIX_BITS.
>
> __WORDSIZE is not defined consistently via limits.h across all libc
> variants, so use LONG_BIT instead.
>
> Fixes:
>
>    http://autobuild.buildroot.net/results/b5cb347a98dc64f77982633c0fc48d14030aa5b6/
>
> Signed-off-by: Vincent Fazio <vfazio@gmail.com>
> Signed-off-by: Vincent Fazio <vfazio@xes-inc.com>
> ---
>   ...TS.patch => 0001-Use-LONG_BIT-to-define-RADIX_BITS.patch} | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
>   rename package/ibm-sw-tpm2/{0001-Use-__WORDSIZE-to-define-RADIX_BITS.patch => 0001-Use-LONG_BIT-to-define-RADIX_BITS.patch} (91%)
>
> diff --git a/package/ibm-sw-tpm2/0001-Use-__WORDSIZE-to-define-RADIX_BITS.patch b/package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch
> similarity index 91%
> rename from package/ibm-sw-tpm2/0001-Use-__WORDSIZE-to-define-RADIX_BITS.patch
> rename to package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch
> index a19160f68c..3a7e02ba7a 100644
> --- a/package/ibm-sw-tpm2/0001-Use-__WORDSIZE-to-define-RADIX_BITS.patch
> +++ b/package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch
> @@ -1,12 +1,13 @@
>   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
> +Subject: [PATCH] Use LONG_BIT to define RADIX_BITS
>   
>   This allows to avoid having to support each CPU architecture
>   individually.
>   
>   Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> +Signed-off-by: Vincent Fazio <vfazio@gmail.com>
>   ---
>    src/LibSupport.h | 17 +++--------------
>    1 file changed, 3 insertions(+), 14 deletions(-)
> @@ -35,7 +36,7 @@ index b2e6a51..f064d20 100644
>   -#endif // RADIX_BITS
>   +#include <limits.h>
>   +
> -+#define RADIX_BITS __WORDSIZE
> ++#define RADIX_BITS LONG_BIT
>    
>    // These macros use the selected libraries to the proper include files.
>    #define LIB_QUOTE(_STRING_) #_STRING_
diff mbox series

Patch

diff --git a/package/ibm-sw-tpm2/0001-Use-__WORDSIZE-to-define-RADIX_BITS.patch b/package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch
similarity index 91%
rename from package/ibm-sw-tpm2/0001-Use-__WORDSIZE-to-define-RADIX_BITS.patch
rename to package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch
index a19160f68c..3a7e02ba7a 100644
--- a/package/ibm-sw-tpm2/0001-Use-__WORDSIZE-to-define-RADIX_BITS.patch
+++ b/package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch
@@ -1,12 +1,13 @@ 
 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
+Subject: [PATCH] Use LONG_BIT to define RADIX_BITS
 
 This allows to avoid having to support each CPU architecture
 individually.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+Signed-off-by: Vincent Fazio <vfazio@gmail.com>
 ---
  src/LibSupport.h | 17 +++--------------
  1 file changed, 3 insertions(+), 14 deletions(-)
@@ -35,7 +36,7 @@  index b2e6a51..f064d20 100644
 -#endif // RADIX_BITS
 +#include <limits.h>
 +
-+#define RADIX_BITS __WORDSIZE
++#define RADIX_BITS LONG_BIT
  
  // These macros use the selected libraries to the proper include files.
  #define LIB_QUOTE(_STRING_) #_STRING_