From: Pallavi Kadam <pallavi.kadam@intel.com>
To: dev@dpdk.org, thomas@monjalon.net
Cc: ranjit.menon@intel.com, dmitry.kozliuk@gmail.com,
bruce.richardson@intel.com, ferruh.yigit@intel.com,
beilei.xing@intel.com, jia.guo@intel.com,
Narcisa.Vasile@microsoft.com, talshn@nvidia.com,
pallavi.kadam@intel.com
Subject: [dpdk-dev] [PATCH v3 1/2] eal: add rte_random.c file on windows
Date: Mon, 21 Dec 2020 16:45:10 -0800 [thread overview]
Message-ID: <20201222004511.12948-2-pallavi.kadam@intel.com> (raw)
In-Reply-To: <20201222004511.12948-1-pallavi.kadam@intel.com>
This file is required to compile and build i40e PMD on Windows.
Add rte_rand variable to export file.
Redefine _m_prefetchw for Clang toolchain due to following error
with respect to conflicting types:
FAILED: lib/76b5a35@@rte_eal@sta/librte_eal_common_rte_random.c.obj
clang @lib/76b5a35@@rte_eal@sta/librte_eal_common_rte_random.c.obj.rsp
In file included from ../lib/librte_eal/common/rte_random.c:13:
In file included from ..\lib/librte_eal/include\rte_eal.h:20:
In file included from ..\lib/librte_eal/include\rte_per_lcore.h:25:
In file included from ..\lib/librte_eal/windows/include\pthread.h:21:
In file included from ..\lib/librte_eal/windows/include\rte_windows.h:27:
In file included from C:\Program Files (x86)\Windows Kits\10\include\
10.0.18362.0\um\windows.h:171:
In file included from C:\Program Files (x86)\Windows Kits\10\include\
10.0.18362.0\shared\windef.h:24:
In file included from C:\Program Files (x86)\Windows Kits\10\include\
10.0.18362.0\shared\minwindef.h:182:
C:\Program Files (x86)\Windows Kits\10\include\10.0.18362.0\um\
winnt.h:3324:1: error: conflicting types for '_m_prefetchw'
_m_prefetchw (
^
C:\Program Files\LLVM\lib\clang\10.0.0\include\prfchwintrin.h:50:1:
note: previous definition is here
_m_prefetchw(void *__P)
^
1 error generated.
Signed-off-by: Pallavi Kadam <pallavi.kadam@intel.com>
Reviewed-by: Ranjit Menon <ranjit.menon@intel.com>
---
lib/librte_eal/common/meson.build | 1 +
lib/librte_eal/rte_eal_exports.def | 1 +
lib/librte_eal/windows/include/rte_windows.h | 6 ++++++
3 files changed, 8 insertions(+)
diff --git a/lib/librte_eal/common/meson.build b/lib/librte_eal/common/meson.build
index 39abf7a0a..98e8fffd4 100644
--- a/lib/librte_eal/common/meson.build
+++ b/lib/librte_eal/common/meson.build
@@ -33,6 +33,7 @@ if is_windows
'malloc_heap.c',
'rte_malloc.c',
'eal_common_timer.c',
+ 'rte_random.c',
'rte_service.c',
)
subdir_done()
diff --git a/lib/librte_eal/rte_eal_exports.def b/lib/librte_eal/rte_eal_exports.def
index 6a6be1cfa..a2ad4d633 100644
--- a/lib/librte_eal/rte_eal_exports.def
+++ b/lib/librte_eal/rte_eal_exports.def
@@ -114,6 +114,7 @@ EXPORTS
rte_memzone_reserve_bounded
rte_memzone_walk
rte_openlog_stream
+ rte_rand
rte_realloc
rte_rtm_supported
rte_service_attr_get
diff --git a/lib/librte_eal/windows/include/rte_windows.h b/lib/librte_eal/windows/include/rte_windows.h
index b82af34f6..0063b5d78 100644
--- a/lib/librte_eal/windows/include/rte_windows.h
+++ b/lib/librte_eal/windows/include/rte_windows.h
@@ -18,6 +18,12 @@
#define WIN32_LEAN_AND_MEAN
#endif
+/* Override Windows SDK definition of _m_prefetchw to avoid conflicting types */
+#ifdef RTE_TOOLCHAIN_CLANG
+#undef _m_prefetchw
+#define _m_prefetchw __m_prefetchw
+#endif
+
/* Must come first. */
#include <windows.h>
--
2.18.0.windows.1
next prev parent reply other threads:[~2020-12-22 0:53 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-05 1:10 [dpdk-dev] [PATCH 0/3] Support i40e PMD on Windows Pallavi Kadam
2020-12-05 1:10 ` [dpdk-dev] [PATCH 1/3] eal/windows: add some interrupt functions stub Pallavi Kadam
2020-12-05 1:10 ` [dpdk-dev] [PATCH 2/3] net/i40e: add changes to support i40e PMD on windows Pallavi Kadam
2020-12-05 13:52 ` Dmitry Kozlyuk
2020-12-09 0:09 ` Kadam, Pallavi
2020-12-06 15:49 ` Thomas Monjalon
2020-12-07 9:14 ` Bruce Richardson
2020-12-09 0:14 ` Kadam, Pallavi
2020-12-09 0:21 ` Kadam, Pallavi
2020-12-09 8:59 ` Thomas Monjalon
2020-12-17 23:17 ` Kadam, Pallavi
2020-12-05 1:10 ` [dpdk-dev] [PATCH 3/3] config/build: ignore enum forward reference warning Pallavi Kadam
2020-12-05 13:51 ` Dmitry Kozlyuk
2020-12-10 0:53 ` Narcisa Ana Maria Vasile
2020-12-17 23:15 ` Kadam, Pallavi
2020-12-17 22:59 ` [dpdk-dev] [PATCH v2 0/2] Support i40e PMD on Windows Pallavi Kadam
2020-12-17 22:59 ` [dpdk-dev] [PATCH v2 1/2] eal: add rte_random.c file on windows Pallavi Kadam
2020-12-18 11:29 ` Thomas Monjalon
2020-12-18 18:49 ` Kadam, Pallavi
2020-12-17 22:59 ` [dpdk-dev] [PATCH v2 2/2] build: i40e PMD on Windows Pallavi Kadam
2020-12-18 11:27 ` Thomas Monjalon
2020-12-18 18:42 ` Kadam, Pallavi
2020-12-22 0:45 ` [dpdk-dev] [PATCH v3 0/2] Support " Pallavi Kadam
2020-12-22 0:45 ` Pallavi Kadam [this message]
2020-12-22 0:45 ` [dpdk-dev] [PATCH v3 2/2] build: " Pallavi Kadam
2021-01-08 22:58 ` Jie Zhou
2021-01-13 22:52 ` Thomas Monjalon
2021-01-13 22:55 ` Ranjit Menon
2021-01-13 23:10 ` Thomas Monjalon
2021-01-14 1:51 ` Tal Shnaiderman
2021-01-14 22:55 ` [dpdk-dev] [PATCH v3 0/2] Support " Thomas Monjalon
2021-01-14 23:06 ` Ranjit Menon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201222004511.12948-2-pallavi.kadam@intel.com \
--to=pallavi.kadam@intel.com \
--cc=Narcisa.Vasile@microsoft.com \
--cc=beilei.xing@intel.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=dmitry.kozliuk@gmail.com \
--cc=ferruh.yigit@intel.com \
--cc=jia.guo@intel.com \
--cc=ranjit.menon@intel.com \
--cc=talshn@nvidia.com \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).