* [dpdk-stable] [PATCH v10 05/10] pci: fix format warning on Windows
[not found] ` <20200629123741.20716-1-talshn@mellanox.com>
@ 2020-06-29 12:37 ` talshn
2020-06-29 12:37 ` [dpdk-stable] [PATCH v10 07/10] drivers: fix incorrect meson import folder for Windows talshn
1 sibling, 0 replies; 2+ messages in thread
From: talshn @ 2020-06-29 12:37 UTC (permalink / raw)
To: dev
Cc: thomas, pallavi.kadam, dmitry.kozliuk, david.marchand, grive,
ranjit.menon, navasile, harini.ramakrishnan, ocardona,
anatoly.burakov, fady, bruce.richardson, Tal Shnaiderman, stable
From: Tal Shnaiderman <talshn@mellanox.com>
the struct rte_pci_addr defines domain as uint32_t variable however
the PCI_PRI_FMT macro used for logging the struct sets the format
of domain to uint16_t.
The mismatch causes the following warning messages
in Windows clang build:
format specifies type 'unsigned short' but the argument
has type 'uint32_t' (aka 'unsigned int') [-Wformat]
Fixes: af75078fece3 ("first public release")
Cc: stable@dpdk.org
Signed-off-by: Tal Shnaiderman <talshn@mellanox.com>
---
lib/librte_pci/rte_pci.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/librte_pci/rte_pci.h b/lib/librte_pci/rte_pci.h
index 9337079178..104b2bb858 100644
--- a/lib/librte_pci/rte_pci.h
+++ b/lib/librte_pci/rte_pci.h
@@ -23,7 +23,7 @@ extern "C" {
#include <sys/types.h>
/** Formatting string for PCI device identifier: Ex: 0000:00:01.0 */
-#define PCI_PRI_FMT "%.4" PRIx16 ":%.2" PRIx8 ":%.2" PRIx8 ".%" PRIx8
+#define PCI_PRI_FMT "%.4" PRIx32 ":%.2" PRIx8 ":%.2" PRIx8 ".%" PRIx8
#define PCI_PRI_STR_SIZE sizeof("XXXXXXXX:XX:XX.X")
/** Short formatting string, without domain, for PCI device: Ex: 00:01.0 */
--
2.16.1.windows.4
^ permalink raw reply [flat|nested] 2+ messages in thread* [dpdk-stable] [PATCH v10 07/10] drivers: fix incorrect meson import folder for Windows
[not found] ` <20200629123741.20716-1-talshn@mellanox.com>
2020-06-29 12:37 ` [dpdk-stable] [PATCH v10 05/10] pci: fix format warning on Windows talshn
@ 2020-06-29 12:37 ` talshn
1 sibling, 0 replies; 2+ messages in thread
From: talshn @ 2020-06-29 12:37 UTC (permalink / raw)
To: dev
Cc: thomas, pallavi.kadam, dmitry.kozliuk, david.marchand, grive,
ranjit.menon, navasile, harini.ramakrishnan, ocardona,
anatoly.burakov, fady, bruce.richardson, Tal Shnaiderman, stable
From: Tal Shnaiderman <talshn@mellanox.com>
import library (/IMPLIB) in meson.build should use
the 'drivers' and not 'libs' folder.
The error is: fatal error LNK1149: output filename matches input filename.
The fix uses the correct folder.
Fixes: 5ed3766981 ("drivers: process shared link dependencies as for libs")
Cc: stable@dpdk.org
Signed-off-by: Tal Shnaiderman <talshn@mellanox.com>
---
drivers/meson.build | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/meson.build b/drivers/meson.build
index f4b6cbf3a6..dea0ba2cca 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -153,7 +153,7 @@ foreach class:dpdk_driver_classes
version_map = '@0@/@1@/@2@_version.map'.format(
meson.current_source_dir(),
drv_path, lib_name)
- implib = dir_name + '.dll.a'
+ implib = 'lib' + lib_name + '.dll.a'
def_file = custom_target(lib_name + '_def',
command: [map_to_def_cmd, '@INPUT@', '@OUTPUT@'],
@@ -161,8 +161,12 @@ foreach class:dpdk_driver_classes
output: '@0@_exports.def'.format(lib_name))
lk_deps = [version_map, def_file]
if is_windows
- lk_args = ['-Wl,/def:' + def_file.full_path(),
- '-Wl,/implib:lib\\' + implib]
+ if is_ms_linker
+ lk_args = ['-Wl,/def:' + def_file.full_path(),
+ '-Wl,/implib:drivers\\' + implib]
+ else
+ lk_args = []
+ endif
else
lk_args = ['-Wl,--version-script=' + version_map]
# on unix systems check the output of the
--
2.16.1.windows.4
^ permalink raw reply [flat|nested] 2+ messages in thread