diff mbox series

net/bnx2x: fix the meson compile issue

Message ID 1572347364-23487-1-git-send-email-gavin.hu@arm.com (mailing list archive)
State Superseded, archived
Delegated to: Ferruh Yigit
Headers
Series net/bnx2x: fix the meson compile issue |

Checks

Context Check Description
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-compilation success Compile Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/travis-robot warning Travis build: failed
ci/Intel-compilation fail Compilation issues
ci/checkpatch success coding style OK

Commit Message

Gavin Hu Oct. 29, 2019, 11:09 a.m. UTC 
  The definition is conflicting with that of the compiler, as show the
following error: ../drivers/net/bnx2x/bnx2x_osal.h:27:17: error:
conflicting types for ‘uint64_t’ #define __le64  uint64_t ^~~~ In file
included from /usr/include/stdint.h:37, from
/usr/lib/gcc/aarch64-linux-gnu/8/include/stdint.h:9, from
../lib/librte_eal/common/include/arch/arm/rte_byteorder.h:16, from
../drivers/net/bnx2x/bnx2x.h:17, from ../drivers/net/bnx2x/bnx2x_rxtx.c:8:
/usr/include/aarch64-linux-gnu/bits/stdint-uintn.h:27:20: note: previous
declaration of ‘uint64_t’ was here
typedef __uint64_t uint64_t;

The fix is to remove the duplicate definition.

Fixes: 38dff79ba736 ("net/bnx2x: update HSI")
Cc: stable@dpdk.org

Signed-off-by: Gavin Hu <gavin.hu@arm.com>
---
 drivers/net/bnx2x/bnx2x_osal.h | 4 ----
 1 file changed, 4 deletions(-)

Comments

Ferruh Yigit Oct. 30, 2019, 11:23 a.m. UTC | #1 
On 10/29/2019 11:09 AM, Gavin Hu wrote:
> The definition is conflicting with that of the compiler, as show the
> following error: ../drivers/net/bnx2x/bnx2x_osal.h:27:17: error:
> conflicting types for ‘uint64_t’ #define __le64  uint64_t ^~~~ In file
> included from /usr/include/stdint.h:37, from
> /usr/lib/gcc/aarch64-linux-gnu/8/include/stdint.h:9, from
> ../lib/librte_eal/common/include/arch/arm/rte_byteorder.h:16, from
> ../drivers/net/bnx2x/bnx2x.h:17, from ../drivers/net/bnx2x/bnx2x_rxtx.c:8:
> /usr/include/aarch64-linux-gnu/bits/stdint-uintn.h:27:20: note: previous
> declaration of ‘uint64_t’ was here
> typedef __uint64_t uint64_t;
> 
> The fix is to remove the duplicate definition.
> 
> Fixes: 38dff79ba736 ("net/bnx2x: update HSI")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Gavin Hu <gavin.hu@arm.com>

Hi Rasesh, Shahed,

The driver is causing the build error for the arm, I remember same issue was
valid for x86 and fixed later but seems not fixed for arm.

Can you please check for the build error, if we can't find a solution, may have
to merge this patch.

Thanks,
ferruh


> ---
>  drivers/net/bnx2x/bnx2x_osal.h | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/drivers/net/bnx2x/bnx2x_osal.h b/drivers/net/bnx2x/bnx2x_osal.h
> index 7cd2932..aad4e0b 100644
> --- a/drivers/net/bnx2x/bnx2x_osal.h
> +++ b/drivers/net/bnx2x/bnx2x_osal.h
> @@ -22,8 +22,4 @@
>  #undef __LITTLE_ENDIAN
>  #endif
>  
> -#define __le16		uint16_t
> -#define __le32		uint32_t
> -#define __le64		uint64_t
> -
>  #endif /* BNX2X_OSAL_H */
>
Rasesh Mody Oct. 30, 2019, 6:35 p.m. UTC | #2 
>From: Ferruh Yigit <ferruh.yigit@intel.com>
>Sent: Wednesday, October 30, 2019 4:23 AM
>
>On 10/29/2019 11:09 AM, Gavin Hu wrote:
>> The definition is conflicting with that of the compiler, as show the
>> following error: ../drivers/net/bnx2x/bnx2x_osal.h:27:17: error:
>> conflicting types for ‘uint64_t’ #define __le64  uint64_t ^~~~ In file
>> included from /usr/include/stdint.h:37, from
>> /usr/lib/gcc/aarch64-linux-gnu/8/include/stdint.h:9, from
>> ../lib/librte_eal/common/include/arch/arm/rte_byteorder.h:16, from
>> ../drivers/net/bnx2x/bnx2x.h:17, from ../drivers/net/bnx2x/bnx2x_rxtx.c:8:
>> /usr/include/aarch64-linux-gnu/bits/stdint-uintn.h:27:20: note:
>> previous declaration of ‘uint64_t’ was here typedef __uint64_t
>> uint64_t;
>>
>> The fix is to remove the duplicate definition.
>>
>> Fixes: 38dff79ba736 ("net/bnx2x: update HSI")
>> Cc: stable@dpdk.org
>>
>> Signed-off-by: Gavin Hu <gavin.hu@arm.com>
>
>Hi Rasesh, Shahed,
>
>The driver is causing the build error for the arm, I remember same issue was
>valid for x86 and fixed later but seems not fixed for arm.
>
>Can you please check for the build error, if we can't find a solution, may have
>to merge this patch.
>

Hi Ferruh,

We have a solution to fix the bnx2x build error, it's part of the bug 355. I plan to send it out once tested on failing setup.

Thanks!
-Rasesh

>Thanks,
>ferruh
>
>
>> ---
>>  drivers/net/bnx2x/bnx2x_osal.h | 4 ----
>>  1 file changed, 4 deletions(-)
>>
>> diff --git a/drivers/net/bnx2x/bnx2x_osal.h
>> b/drivers/net/bnx2x/bnx2x_osal.h index 7cd2932..aad4e0b 100644
>> --- a/drivers/net/bnx2x/bnx2x_osal.h
>> +++ b/drivers/net/bnx2x/bnx2x_osal.h
>> @@ -22,8 +22,4 @@
>>  #undef __LITTLE_ENDIAN
>>  #endif
>>
>> -#define __le16		uint16_t
>> -#define __le32		uint32_t
>> -#define __le64		uint64_t
>> -
>>  #endif /* BNX2X_OSAL_H */
>>
diff mbox series

Patch

diff --git a/drivers/net/bnx2x/bnx2x_osal.h b/drivers/net/bnx2x/bnx2x_osal.h
index 7cd2932..aad4e0b 100644
--- a/drivers/net/bnx2x/bnx2x_osal.h
+++ b/drivers/net/bnx2x/bnx2x_osal.h
@@ -22,8 +22,4 @@ 
 #undef __LITTLE_ENDIAN
 #endif
 
-#define __le16		uint16_t
-#define __le32		uint32_t
-#define __le64		uint64_t
-
 #endif /* BNX2X_OSAL_H */