diff mbox series

[RFC,07/10] net/nfp: remove weak symbols

Message ID 20250207083252.3131588-8-david.marchand@redhat.com (mailing list archive)
State Superseded
Delegated to: Thomas Monjalon
Headers
Series Remove weak symbols |

Commit Message

David Marchand Feb. 7, 2025, 8:32 a.m. UTC 
Rather than use weak symbols, link stubs code when needed.

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 drivers/net/nfp/meson.build              | 7 +++++--
 drivers/net/nfp/nfdk/nfp_nfdk_vec_stub.c | 2 +-
 drivers/net/nfp/nfp_rxtx_vec_stub.c      | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

Comments

Chaoyong He Feb. 7, 2025, 8:44 a.m. UTC | #1 
Seems ok for me.

Acked-by: Chaoyong He <chaoyong.he@corigine.com>

> -----Original Message-----
> From: David Marchand <david.marchand@redhat.com>
> Sent: Friday, February 7, 2025 4:33 PM
> To: dev@dpdk.org
> Cc: thomas@monjalon.net; bruce.richardson@intel.com;
> andremue@linux.microsoft.com; Chaoyong He <chaoyong.he@corigine.com>
> Subject: [RFC 07/10] net/nfp: remove weak symbols
> 
> Rather than use weak symbols, link stubs code when needed.
> 
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
>  drivers/net/nfp/meson.build              | 7 +++++--
>  drivers/net/nfp/nfdk/nfp_nfdk_vec_stub.c | 2 +-
>  drivers/net/nfp/nfp_rxtx_vec_stub.c      | 4 ++--
>  3 files changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build index
> 4052846dc2..39762bd45a 100644
> --- a/drivers/net/nfp/meson.build
> +++ b/drivers/net/nfp/meson.build
> @@ -17,7 +17,6 @@ sources = files(
>          'flower/nfp_flower_service.c',
>          'nfd3/nfp_nfd3_dp.c',
>          'nfdk/nfp_nfdk_dp.c',
> -        'nfdk/nfp_nfdk_vec_stub.c',
>          'nfpcore/nfp_cppcore.c',
>          'nfpcore/nfp_crc.c',
>          'nfpcore/nfp_elf.c',
> @@ -45,7 +44,6 @@ sources = files(
>          'nfp_net_flow.c',
>          'nfp_net_meta.c',
>          'nfp_rxtx.c',
> -        'nfp_rxtx_vec_stub.c',
>          'nfp_service.c',
>  )
> 
> @@ -67,6 +65,11 @@ if arch_subdir == 'x86'
>          )
> 
>          objs += nfp_avx2_lib.extract_all_objects(recursive: true)
> +else
> +        sources += files(
> +                'nfp_rxtx_vec_stub.c',
> +                'nfdk/nfp_nfdk_vec_stub.c',
> +        )
>  endif
> 
>  deps += ['hash', 'security', 'common_nfp'] diff --git
> a/drivers/net/nfp/nfdk/nfp_nfdk_vec_stub.c
> b/drivers/net/nfp/nfdk/nfp_nfdk_vec_stub.c
> index 146ec21d51..4f905bce6b 100644
> --- a/drivers/net/nfp/nfdk/nfp_nfdk_vec_stub.c
> +++ b/drivers/net/nfp/nfdk/nfp_nfdk_vec_stub.c
> @@ -5,7 +5,7 @@
> 
>  #include "nfp_nfdk_vec.h"
> 
> -uint16_t __rte_weak
> +uint16_t
>  nfp_net_nfdk_vec_avx2_xmit_pkts(__rte_unused void *tx_queue,
>  		__rte_unused struct rte_mbuf **tx_pkts,
>  		__rte_unused uint16_t nb_pkts)
> diff --git a/drivers/net/nfp/nfp_rxtx_vec_stub.c
> b/drivers/net/nfp/nfp_rxtx_vec_stub.c
> index c480f61ef0..201965afbe 100644
> --- a/drivers/net/nfp/nfp_rxtx_vec_stub.c
> +++ b/drivers/net/nfp/nfp_rxtx_vec_stub.c
> @@ -10,13 +10,13 @@
> 
>  #include "nfp_rxtx_vec.h"
> 
> -bool __rte_weak
> +bool
>  nfp_net_get_avx2_supported(void)
>  {
>  	return false;
>  }
> 
> -uint16_t __rte_weak
> +uint16_t
>  nfp_net_vec_avx2_recv_pkts(__rte_unused void *rx_queue,
>  		__rte_unused struct rte_mbuf **rx_pkts,
>  		__rte_unused uint16_t nb_pkts)
> --
> 2.48.1
diff mbox series

Patch

diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build
index 4052846dc2..39762bd45a 100644
--- a/drivers/net/nfp/meson.build
+++ b/drivers/net/nfp/meson.build
@@ -17,7 +17,6 @@  sources = files(
         'flower/nfp_flower_service.c',
         'nfd3/nfp_nfd3_dp.c',
         'nfdk/nfp_nfdk_dp.c',
-        'nfdk/nfp_nfdk_vec_stub.c',
         'nfpcore/nfp_cppcore.c',
         'nfpcore/nfp_crc.c',
         'nfpcore/nfp_elf.c',
@@ -45,7 +44,6 @@  sources = files(
         'nfp_net_flow.c',
         'nfp_net_meta.c',
         'nfp_rxtx.c',
-        'nfp_rxtx_vec_stub.c',
         'nfp_service.c',
 )
 
@@ -67,6 +65,11 @@  if arch_subdir == 'x86'
         )
 
         objs += nfp_avx2_lib.extract_all_objects(recursive: true)
+else
+        sources += files(
+                'nfp_rxtx_vec_stub.c',
+                'nfdk/nfp_nfdk_vec_stub.c',
+        )
 endif
 
 deps += ['hash', 'security', 'common_nfp']
diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_vec_stub.c b/drivers/net/nfp/nfdk/nfp_nfdk_vec_stub.c
index 146ec21d51..4f905bce6b 100644
--- a/drivers/net/nfp/nfdk/nfp_nfdk_vec_stub.c
+++ b/drivers/net/nfp/nfdk/nfp_nfdk_vec_stub.c
@@ -5,7 +5,7 @@ 
 
 #include "nfp_nfdk_vec.h"
 
-uint16_t __rte_weak
+uint16_t
 nfp_net_nfdk_vec_avx2_xmit_pkts(__rte_unused void *tx_queue,
 		__rte_unused struct rte_mbuf **tx_pkts,
 		__rte_unused uint16_t nb_pkts)
diff --git a/drivers/net/nfp/nfp_rxtx_vec_stub.c b/drivers/net/nfp/nfp_rxtx_vec_stub.c
index c480f61ef0..201965afbe 100644
--- a/drivers/net/nfp/nfp_rxtx_vec_stub.c
+++ b/drivers/net/nfp/nfp_rxtx_vec_stub.c
@@ -10,13 +10,13 @@ 
 
 #include "nfp_rxtx_vec.h"
 
-bool __rte_weak
+bool
 nfp_net_get_avx2_supported(void)
 {
 	return false;
 }
 
-uint16_t __rte_weak
+uint16_t
 nfp_net_vec_avx2_recv_pkts(__rte_unused void *rx_queue,
 		__rte_unused struct rte_mbuf **rx_pkts,
 		__rte_unused uint16_t nb_pkts)