From 77a49f75aee8259c97cbb3621af9dccecf0500ed Mon Sep 17 00:00:00 2001 From: SaiSurya Ch Date: Thu, 5 Sep 2024 18:12:42 +0530 Subject: [PATCH 1/2] src: arch: xtensa: exc-sethandler: Invert the header file inclusion. Invert the header file inclusion order. Signed-off-by: SaiSurya Ch --- src/arch/xtensa/xtos/exc-sethandler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/arch/xtensa/xtos/exc-sethandler.c b/src/arch/xtensa/xtos/exc-sethandler.c index 9df2eff8ea89..ffdbcfc644c5 100644 --- a/src/arch/xtensa/xtos/exc-sethandler.c +++ b/src/arch/xtensa/xtos/exc-sethandler.c @@ -24,8 +24,8 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include #include "xtos-internal.h" +#include #if XCHAL_HAVE_EXCEPTIONS From 345c95d4570b61955d43c5c14e1b6762d877f6eb Mon Sep 17 00:00:00 2001 From: SaiSurya Ch Date: Wed, 14 Aug 2024 15:42:02 +0530 Subject: [PATCH 2/2] src: xtensa: core: Declare UINT32_C Add UINT32_C definition required for core file of platform ACP_7_0. Signed-off-by: SaiSurya Ch --- src/arch/xtensa/include/xtensa/config/core.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/arch/xtensa/include/xtensa/config/core.h b/src/arch/xtensa/include/xtensa/config/core.h index 4cf7606df707..ba3e61762ce7 100644 --- a/src/arch/xtensa/include/xtensa/config/core.h +++ b/src/arch/xtensa/include/xtensa/config/core.h @@ -37,22 +37,28 @@ #define XTENSA_CONFIG_CORE_H /* - * This define is used by the new 2023 xt-clang toolchain and, while there are a few definitions + * This define is used by Assembly files of platform ACP_7_0's toolchain. + * Else condition has new 2023 xt-clang toolchain and, while there are a few definitions * (identical to this one) in various implementations such as newlib, none of them is in use when * building SOF with Zephyr and XtensaTools. */ -#if defined(__ZEPHYR__) +#if defined (_ASMLANGUAGE) || defined (__ASSEMBLER__) + +#ifndef UINT32_C +#define UINT32_C(x) x +#endif + +#else #ifndef __UINT32_C #define __UINT32_C(x) x ## U #endif - #ifndef UINT32_C #define UINT32_C(x) __UINT32_C(x) #endif -#endif +#endif /*_ASMLANGUAGE or __ASSEMBLER__*/ /* CONFIGURATION INDEPENDENT DEFINITIONS: */ #ifdef __XTENSA__