d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eal: fix pedantic build of mlx4 debug mode

Browse Source 
Since the commit below includes rte_cpuflags.h in rte_spinlock.h,
compilation of the mlx4 driver fails when CONFIG_RTE_LIBRTE_MLX4_DEBUG=y.

This mode adds -pedantic to the compiler's command line for mlx4, which
complains about the static definition of an empty cpu_feature_table[] in
common rte_cpuflags.h, then about its redefinition as a larger array in
arch-specific rte_cpuflags.h.

While DPDK does not officially support -pedantic internally, external
applications may enable it and include rte_spinlock.h from the public API.

Instead of removing -pedantic from mlx4, this commit fixes rte_cpuflags.h.

Fixes: ba7468997e ("spinlock: add HTM lock elision for x86")

Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
Acked-by: David Marchand <david.marchand@6wind.com>
This commit is contained in:
Adrien Mazarguil 2015-06-29 11:34:52 +02:00 committed by Thomas Monjalon
parent 3379b158b2
commit c0362128c5
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/librte_eal/common/include/generic/rte_cpuflags.h
View File

@ -74,8 +74,12 @@ struct feature_entry {
/**
* An array that holds feature entries
*
* Defined in arch-specific rte_cpuflags.h.
*/
#ifdef __DOXYGEN__
static const struct feature_entry cpu_feature_table[];
#endif
/**
* Execute CPUID instruction and get contents of a specific register