NVDIMM Device and Persistent Memory development
 help / color / mirror / Atom feed
* [ndctl PATCH] util/size.h: Fix build error for GCC < 10
@ 2022-02-26 11:39 Vaibhav Jain
  2022-03-02 10:57 ` Joao Martins
  0 siblings, 1 reply; 2+ messages in thread
From: Vaibhav Jain @ 2022-02-26 11:39 UTC (permalink / raw)
  To: nvdimm
  Cc: Vaibhav Jain, Dan Williams, Vishal Verma, Aneesh Kumar K . V,
	Ira Weiny, Shivaprasad G Bhat, Tarun Sahu

Building with GCC 8.4.1 results in following build error for 'util/size.c':

../util/size.h:57:16: error: missing binary operator before token "("
   __has_builtin(__builtin_mul_overflow) && \

This is caused due to missing '__has_builtin' preprocessor operator in GCC
versions < 10.0.0. The patch updates the check for CLANG's availability of
__builtin_{mul,add}_overflow to prevent preprocessor from evaluating the
expression "___has_builtin(__builtin_mul_overflow) &&
__has_builtin(__builtin_add_overflow)".

Fixes:10653a171bc0("util/size.h: fix build for older compilers")
Reported-by: Tarun Sahu <tsahu@linux.ibm.com>
Signed-off-by: Vaibhav Jain <vaibhav@linux.ibm.com>
---
 util/size.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/util/size.h b/util/size.h
index 1cb06690261b..02baa77fe649 100644
--- a/util/size.h
+++ b/util/size.h
@@ -53,11 +53,12 @@ static inline bool is_power_of_2(unsigned long long v)
 #define COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW 1
 #endif
 
-#if __clang__ && \
-    __has_builtin(__builtin_mul_overflow) && \
+#if __clang__
+#if __has_builtin(__builtin_mul_overflow) && \
     __has_builtin(__builtin_add_overflow)
 #define COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW 1
 #endif
+#endif
 
 #if COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW
 
-- 
2.35.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [ndctl PATCH] util/size.h: Fix build error for GCC < 10
  2022-02-26 11:39 [ndctl PATCH] util/size.h: Fix build error for GCC < 10 Vaibhav Jain
@ 2022-03-02 10:57 ` Joao Martins
  0 siblings, 0 replies; 2+ messages in thread
From: Joao Martins @ 2022-03-02 10:57 UTC (permalink / raw)
  To: Vaibhav Jain, nvdimm, Vishal Verma
  Cc: Dan Williams, Aneesh Kumar K . V, Ira Weiny, Shivaprasad G Bhat,
	Tarun Sahu

On 2/26/22 11:39, Vaibhav Jain wrote:
> Building with GCC 8.4.1 results in following build error for 'util/size.c':
> 
> ../util/size.h:57:16: error: missing binary operator before token "("
>    __has_builtin(__builtin_mul_overflow) && \
> 
> This is caused due to missing '__has_builtin' preprocessor operator in GCC
> versions < 10.0.0. The patch updates the check for CLANG's availability of
> __builtin_{mul,add}_overflow to prevent preprocessor from evaluating the
> expression "___has_builtin(__builtin_mul_overflow) &&
> __has_builtin(__builtin_add_overflow)".
> 
> Fixes:10653a171bc0("util/size.h: fix build for older compilers")
> Reported-by: Tarun Sahu <tsahu@linux.ibm.com>
> Signed-off-by: Vaibhav Jain <vaibhav@linux.ibm.com>

Reviewed-by: Joao Martins <joao.m.martins@oracle.com>

> ---
>  util/size.h | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/util/size.h b/util/size.h
> index 1cb06690261b..02baa77fe649 100644
> --- a/util/size.h
> +++ b/util/size.h
> @@ -53,11 +53,12 @@ static inline bool is_power_of_2(unsigned long long v)
>  #define COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW 1
>  #endif
>  
> -#if __clang__ && \
> -    __has_builtin(__builtin_mul_overflow) && \
> +#if __clang__
> +#if __has_builtin(__builtin_mul_overflow) && \
>      __has_builtin(__builtin_add_overflow)
>  #define COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW 1
>  #endif
> +#endif
>  
>  #if COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW
>  

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-03-02 10:57 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-26 11:39 [ndctl PATCH] util/size.h: Fix build error for GCC < 10 Vaibhav Jain
2022-03-02 10:57 ` Joao Martins

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox