xcc: fix building errors related to logging #43174
Conversation
|
i did test these with XCC for all adsp targets with the issues mentioned in #43087 and now everything builds as expected without the _pragma related errors |
6359abe to
50e3dfb
Compare
include/logging/log_msg2.h
Outdated
| @@ -34,6 +35,12 @@ typedef uint64_t log_timestamp_t; | |||
| typedef uint32_t log_timestamp_t; | |||
| #endif | |||
|
|
|||
| #if !defined(CONFIG_LOG) && \ | |||
| !GCC_VERSION_AT_LEAST(4, 9, 0) && \ | |||
| !CLANG_VERSION_AT_LEAST(3, 8, 0) | |||
There was a problem hiding this comment.
Nitpick: abstraction-wise, might be better to have toolchain.h define "TOOLCHAIN_HAS_AUTO_TYPE" or somesuch instead of putting the logic here in logging.
There was a problem hiding this comment.
It also guards against using _Pragma() within functions, so not exactly about auto type only.
There was a problem hiding this comment.
i'm also for moving flags to toolchain.h.
TOOLCHAIN_HAS_AUTO_TYPE, TOOLCHAIN_HAS_C11_GENERIC, maybe TOOLCHAIN_HAS_DIAGNOSTIC_PRAGMAS (seems that this was introduced in 4.6).
It's already third place i'm aware of where we do that (one in PR
).50e3dfb to
3e90f6c
Compare
|
I have previously reported that XCC cannot compile the current LOG code without optimization (with the -O0 parameter). The PR I submitted seems to be uninteresting. I don't know if this PR can solve this issue.@dcpleung |
Adds a GCC_VERSION macro to make it easier to write preprocessor conditionals. Signed-off-by: Daniel Leung <daniel.leung@intel.com>
Adds a CLANG_VERSION macro to make it easier to write preprocessor conditionals. Signed-off-by: Daniel Leung <daniel.leung@intel.com>
3e90f6c to
277b568
Compare
This introduces the macro TOOLCHAIN_HAS_PRAGMA_DIAG to indicate that the toolchain supports #pragma diagnostics. This is supported since GCC 4.6.0 and, AFAIK, all Clang. Signed-off-by: Daniel Leung <daniel.leung@intel.com>
This introduces the macro TOOLCHAIN_HAS_C_GENERIC to indicate that the toolchain supports C Generic (i.e. _Generic keyword). This is introduced in C11, and is also supported since GCC 4.9.0 and Clang 3.8.0. Signed-off-by: Daniel Leung <daniel.leung@intel.com>
This introduces the macro TOOLCHAIN_HAS_C_AUTO_TYPE to indicate that the toolchain supports __auto_type. This is supported since GCC 4.9.0 and Clang 3.8.0. Signed-off-by: Daniel Leung <daniel.leung@intel.com>
For GCC < 4.9.0 and Clang < 3.8.0, auto type is not supported. But the previous behavior to depend on CONFIG_LOG2_ALWAYS_RUNTIME to be enabled doesn't work because this kconfig is not available when CONFIG_LOG is not enabled, as LOG_*() are still being expanded when CONFIG_LOG=n, resulting in toolchain complaining about unknown keyword. So when CONFIG_LOG=n and old toolchains, force it to use runtime packaging to avoid the issue. Signed-off-by: Daniel Leung <daniel.leung@intel.com>
XCC is based on GCC 4.2.0 which doesn't support auto type. So force CONFIG_LOG2_ALWAYS_RUNTIME to be enabled if XCC is being used. Signed-off-by: Daniel Leung <daniel.leung@intel.com>
277b568 to
143d4f3
Compare
XCC is based on very old GCC (sigh...) that there is no auto type, and _Pragma cannot be used within functions. The latest logging changes related to argument evaluation resulted in build errors regarding these. See individual commits for more details.