Skip to content

xtensa/config/core.h: provide UINT32_C() not just for __ZEPHYR__ #9442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kv2019i merged 1 commit into from
Sep 6, 2024
Merged

xtensa/config/core.h: provide UINT32_C() not just for __ZEPHYR__ #9442

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 9 additions & 15 deletions src/arch/xtensa/include/xtensa/config/core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,22 +36,16 @@
#ifndef XTENSA_CONFIG_CORE_H
#define XTENSA_CONFIG_CORE_H

/*
* This define is used by the 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.
/* xt-clang uses UINT32_C() without import it. This affects both Zephyr and XTOS.
* See #9413 for the longer story.
*/

#if defined(__ZEPHYR__)

#ifndef __UINT32_C
#define __UINT32_C(x) x ## U
#endif

#ifndef UINT32_C
#define UINT32_C(x) __UINT32_C(x)
#endif

#if defined(_ASMLANGUAGE) || defined(__ASSEMBLER__)
# ifndef UINT32_C
# define UINT32_C(x) x
# endif
#else
/* UINT32_C(x) x ## U */
# include <stdint.h>
#endif

/* CONFIGURATION INDEPENDENT DEFINITIONS: */
Expand Down