build: fix invalid characters in toolchain definitions
Checks
Commit Message
When using "icx" (Intel(R) oneAPI DPC++/C++ Compiler) to build DPDK,
meson reports the toolchain as "intel-llvm"[1]. This value is used
directly to define the RTE_TOOLCHAIN macros, which means that we end up
with the invalid macro name "RTE_TOOLCHAIN_INTEL-LLVM", and getting the
compiler warning:
./rte_build_config.h:422:28: warning: ISO C99 requires whitespace after the macro name [-Wc99-extensions]
This can be fixed, and the macro generation made more robust generally,
by adding "underscorify()" on the string. This replaces the "-", and
any other invalid characters, with "_" [2].
[1] https://mesonbuild.com/Reference-tables.html#compiler-ids
[2] https://mesonbuild.com/Reference-manual_elementary_str.html#strunderscorify
Fixes: afd18fa21b5e ("build: set toolchain info during meson configure")
Cc: stable@dpdk.org
Reported-by: Keith Wiles <keith.wiles@intel.com>
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
config/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On Tue, Feb 07, 2023 at 03:22:00PM +0000, Bruce Richardson wrote:
> When using "icx" (Intel(R) oneAPI DPC++/C++ Compiler) to build DPDK,
> meson reports the toolchain as "intel-llvm"[1]. This value is used
> directly to define the RTE_TOOLCHAIN macros, which means that we end up
> with the invalid macro name "RTE_TOOLCHAIN_INTEL-LLVM", and getting the
> compiler warning:
>
> ./rte_build_config.h:422:28: warning: ISO C99 requires whitespace after the macro name [-Wc99-extensions]
>
> This can be fixed, and the macro generation made more robust generally,
> by adding "underscorify()" on the string. This replaces the "-", and
> any other invalid characters, with "_" [2].
>
> [1] https://mesonbuild.com/Reference-tables.html#compiler-ids
> [2] https://mesonbuild.com/Reference-manual_elementary_str.html#strunderscorify
>
> Fixes: afd18fa21b5e ("build: set toolchain info during meson configure")
> Cc: stable@dpdk.org
>
> Reported-by: Keith Wiles <keith.wiles@intel.com>
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
Resending Keith's ack, since patchwork doesn't seem to have picked it up
from Keith's email.
Acked-by: Keith Wiles <keith.wiles@intel.com>
On Tue, Feb 07, 2023 at 03:22:00PM +0000, Bruce Richardson wrote:
> When using "icx" (Intel(R) oneAPI DPC++/C++ Compiler) to build DPDK,
> meson reports the toolchain as "intel-llvm"[1]. This value is used
> directly to define the RTE_TOOLCHAIN macros, which means that we end up
> with the invalid macro name "RTE_TOOLCHAIN_INTEL-LLVM", and getting the
> compiler warning:
>
> ./rte_build_config.h:422:28: warning: ISO C99 requires whitespace after the macro name [-Wc99-extensions]
>
> This can be fixed, and the macro generation made more robust generally,
> by adding "underscorify()" on the string. This replaces the "-", and
> any other invalid characters, with "_" [2].
>
> [1] https://mesonbuild.com/Reference-tables.html#compiler-ids
> [2] https://mesonbuild.com/Reference-manual_elementary_str.html#strunderscorify
>
> Fixes: afd18fa21b5e ("build: set toolchain info during meson configure")
> Cc: stable@dpdk.org
>
> Reported-by: Keith Wiles <keith.wiles@intel.com>
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
08/02/2023 19:08, Tyler Retzlaff:
> On Tue, Feb 07, 2023 at 03:22:00PM +0000, Bruce Richardson wrote:
> > When using "icx" (Intel(R) oneAPI DPC++/C++ Compiler) to build DPDK,
> > meson reports the toolchain as "intel-llvm"[1]. This value is used
> > directly to define the RTE_TOOLCHAIN macros, which means that we end up
> > with the invalid macro name "RTE_TOOLCHAIN_INTEL-LLVM", and getting the
> > compiler warning:
> >
> > ./rte_build_config.h:422:28: warning: ISO C99 requires whitespace after the macro name [-Wc99-extensions]
> >
> > This can be fixed, and the macro generation made more robust generally,
> > by adding "underscorify()" on the string. This replaces the "-", and
> > any other invalid characters, with "_" [2].
> >
> > [1] https://mesonbuild.com/Reference-tables.html#compiler-ids
> > [2] https://mesonbuild.com/Reference-manual_elementary_str.html#strunderscorify
> >
> > Fixes: afd18fa21b5e ("build: set toolchain info during meson configure")
> > Cc: stable@dpdk.org
> >
> > Reported-by: Keith Wiles <keith.wiles@intel.com>
> > Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
>
> Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
Applied, thanks.
@@ -139,7 +139,7 @@ endif
toolchain = cc.get_id()
dpdk_conf.set_quoted('RTE_TOOLCHAIN', toolchain)
-dpdk_conf.set('RTE_TOOLCHAIN_' + toolchain.to_upper(), 1)
+dpdk_conf.set('RTE_TOOLCHAIN_' + toolchain.to_upper().underscorify(), 1)
dpdk_conf.set('RTE_ARCH_64', cc.sizeof('void *') == 8)
dpdk_conf.set('RTE_ARCH_32', cc.sizeof('void *') == 4)