From: Tyler Retzlaff <roretzla@linux.microsoft.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>,
Tyler Retzlaff <roretzla@linux.microsoft.com>
Subject: [PATCH v2] build: set rte toolchain macros from predefined macros
Date: Tue, 2 Jan 2024 16:11:15 -0800 [thread overview]
Message-ID: <1704240675-3964-1-git-send-email-roretzla@linux.microsoft.com> (raw)
In-Reply-To: <1704238041-25304-1-git-send-email-roretzla@linux.microsoft.com>
Stop writing RTE_TOOLCHAIN_XXX macros to rte_build_config.h. When an
application builds it doesn't necessarily use the same toolchain that
DPDK was built with.
Instead evaluate toolchain predefined macros and define
RTE_TOOLCHAIN_XXX macros as appropriate each time rte_config.h is
preprocessed.
Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
v2:
* use defined(macro) to correctly test for predefined macros
config/meson.build | 2 --
config/rte_config.h | 11 +++++++++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/config/meson.build b/config/meson.build
index a9ccd56..0c3550e 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -180,8 +180,6 @@ if not is_ms_compiler
endif
toolchain = cc.get_id()
-dpdk_conf.set_quoted('RTE_TOOLCHAIN', toolchain)
-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)
diff --git a/config/rte_config.h b/config/rte_config.h
index da265d7..d743a5c 100644
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -14,6 +14,17 @@
#include <rte_build_config.h>
+#if defined(__clang__)
+#define RTE_TOOLCHAIN "clang"
+#define RTE_TOOLCHAIN_CLANG 1
+#elif defined(__GNUC__)
+#define RTE_TOOLCHAIN "gcc"
+#define RTE_TOOLCHAIN_GCC 1
+#elif defined(_MSC_VER)
+#define RTE_TOOLCHAIN "msvc"
+#define RTE_TOOLCHAIN_MSVC 1
+#endif
+
/* legacy defines */
#ifdef RTE_EXEC_ENV_LINUX
#define RTE_EXEC_ENV_LINUXAPP 1
--
1.8.3.1
next prev parent reply other threads:[~2024-01-03 0:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-02 23:27 [PATCH] " Tyler Retzlaff
2024-01-03 0:11 ` Tyler Retzlaff [this message]
2024-01-08 11:18 ` [PATCH v2] " Bruce Richardson
2024-02-19 1:51 ` Thomas Monjalon
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=1704240675-3964-1-git-send-email-roretzla@linux.microsoft.com \
--to=roretzla@linux.microsoft.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
/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).