michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arch/xtensa: Fix xcc regression with ZSR

Browse source 
Turns out that xt-xcc will bail when faced with a real core-isa.h (it
wants you to rely on the builtins in the compiler).  Undefine __XCC__
to force it to actually parse and emit declarations for its own
header.

(Also adds a newline to the generated one-line C file to silence a warning)

Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
This commit is contained in:
Andy Ross 2022-01-20 11:11:08 -08:00 • committed by Anas Nashif
commit 50a9c29d08
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
arch/xtensa/core/CMakeLists.txt
View file

@ -31,12 +31,14 @@ add_subdirectory(startup)
# as "core-isa-dM.h". This can be easily parsed by non-C tooling. # as "core-isa-dM.h". This can be easily parsed by non-C tooling.
# #
# Note that this adds the SOC/HAL include directory explicitly, they # Note that this adds the SOC/HAL include directory explicitly, they
# are the official places where we find core-isa.h. # are the official places where we find core-isa.h. (Also that we
# undefine __XCC_ because that compiler actually trips an error trying
# to build this file to protect against mismatched versions.)
set(CORE_ISA_DM ${CMAKE_BINARY_DIR}/zephyr/include/generated/core-isa-dM.h) set(CORE_ISA_DM ${CMAKE_BINARY_DIR}/zephyr/include/generated/core-isa-dM.h)
set(CORE_ISA_IN ${CMAKE_BINARY_DIR}/zephyr/include/generated/core-isa-dM.c) set(CORE_ISA_IN ${CMAKE_BINARY_DIR}/zephyr/include/generated/core-isa-dM.c)
file(WRITE ${CORE_ISA_IN} "#include <xtensa/config/core-isa.h>") file(WRITE ${CORE_ISA_IN} "#include <xtensa/config/core-isa.h>\n")
add_custom_command(OUTPUT ${CORE_ISA_DM} add_custom_command(OUTPUT ${CORE_ISA_DM}
COMMAND ${CMAKE_C_COMPILER} -E -dM COMMAND ${CMAKE_C_COMPILER} -E -dM -U__XCC__
-I${ZEPHYR_XTENSA_MODULE_DIR}/zephyr/soc/${CONFIG_SOC} -I${ZEPHYR_XTENSA_MODULE_DIR}/zephyr/soc/${CONFIG_SOC}
-I${SOC_DIR}/${ARCH}/${SOC_PATH} -I${SOC_DIR}/${ARCH}/${SOC_PATH}
${CORE_ISA_IN} -o ${CORE_ISA_DM}) ${CORE_ISA_IN} -o ${CORE_ISA_DM})