When compiling with MSVC the error below shows up due to function
versioning:
../lib/net/rte_net_crc.c(418): error C2061: syntax error:
identifier '__attribute__'
MSVC allows alias function names to be exported, but the mechanism is
different than the one used by gcc. It was considered to enhance the logic
in the existing version.map files but that file is also passed to other
tools on Linux, making this challenging. A simpler approach is to have an
optional version.map file to be used only when Microsoft's linker is to be
used. This optional map file is only necessary for libraries that have
versioned code.
Signed-off-by: Andre Muezerie <andre...@linux.microsoft.com>
---
lib/net/rte_net_crc.c | 2 ++
lib/net/version_ms_linker.map | 23 +++++++++++++++++++++++
2 files changed, 25 insertions(+)
create mode 100644 lib/net/version_ms_linker.map
diff --git a/lib/net/rte_net_crc.c b/lib/net/rte_net_crc.c
index 2fb3eec231..5b41085a36 100644
--- a/lib/net/rte_net_crc.c
+++ b/lib/net/rte_net_crc.c
@@ -418,6 +418,7 @@ BIND_DEFAULT_SYMBOL(rte_net_crc_set_alg, _v26, 26);
MAP_STATIC_SYMBOL(struct rte_net_crc *rte_net_crc_set_alg(
enum rte_net_crc_alg alg, enum rte_net_crc_type type),
rte_net_crc_set_alg_v26);
+MAP_STATIC_BASE_SYMBOL(rte_net_crc_set_alg, rte_net_crc_set_alg_v26)
void rte_net_crc_free(struct rte_net_crc *crc)
{
@@ -449,6 +450,7 @@ BIND_DEFAULT_SYMBOL(rte_net_crc_calc, _v26, 26);
MAP_STATIC_SYMBOL(uint32_t rte_net_crc_calc(const struct rte_net_crc *ctx,
const void *data, const uint32_t data_len),
rte_net_crc_calc_v26);
+MAP_STATIC_BASE_SYMBOL(rte_net_crc_calc, rte_net_crc_calc_v26)
/* Call initialisation helpers for all crc algorithm handlers */
RTE_INIT(rte_net_crc_init)
diff --git a/lib/net/version_ms_linker.map b/lib/net/version_ms_linker.map
new file mode 100644
index 0000000000..9503c669d1
--- /dev/null
+++ b/lib/net/version_ms_linker.map
@@ -0,0 +1,23 @@
+DPDK_25 {
+ global:
+
+ rte_eth_random_addr;
+ rte_ether_format_addr;
+ rte_ether_unformat_addr;
+ rte_net_crc_calc=rte_net_crc_calc_v26;
+ rte_net_crc_free;
+ rte_net_crc_set_alg=rte_net_crc_set_alg_v26;
+ rte_net_get_ptype;
+ rte_net_make_rarp_packet;
+ rte_net_skip_ip6_ext;
+
+ local: *;
+};
+
+DPDK_26 {
+ global:
+
+ rte_net_crc_calc=rte_net_crc_calc_v26;
+ rte_net_crc_set_alg=rte_net_crc_set_alg_v26;
+
+} DPDK_25;
--
2.48.1.vfs.0.0
