michaelh/zephyr
1
0
Fork 0
Code Releases Activity

toolchain: rename xcc-clang to xt-clang

Browse source 
This reflects the actual compiler executable name of the Xtensa
LLVM/Clang compiler.

Signed-off-by: Daniel Leung <daniel.leung@intel.com>
This commit is contained in:
Daniel Leung 2023-02-14 10:34:21 -08:00 • committed by Anas Nashif
commit 53316d5c8e
9 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

0
cmake/compiler/xcc-clang/compiler_flags.cmake → cmake/compiler/xt-clang/compiler_flags.cmake
View file

0
cmake/compiler/xcc-clang/generic.cmake → cmake/compiler/xt-clang/generic.cmake
View file

0
cmake/compiler/xcc-clang/target.cmake → cmake/compiler/xt-clang/target.cmake
View file

9
cmake/modules/FindDeprecated.cmake
View file

@ -47,8 +47,13 @@ if("XCC_USE_CLANG" IN_LIST Deprecated_FIND_COMPONENTS)
if ("${ZEPHYR_TOOLCHAIN_VARIANT}" STREQUAL "xcc" if ("${ZEPHYR_TOOLCHAIN_VARIANT}" STREQUAL "xcc"
AND "$ENV{XCC_USE_CLANG}" STREQUAL "1") AND "$ENV{XCC_USE_CLANG}" STREQUAL "1")
set(ZEPHYR_TOOLCHAIN_VARIANT xcc-clang CACHE STRING "Zephyr toolchain variant" FORCE) set(ZEPHYR_TOOLCHAIN_VARIANT xt-clang CACHE STRING "Zephyr toolchain variant" FORCE)
message(DEPRECATION "XCC_USE_CLANG is deprecated. Please set ZEPHYR_TOOLCHAIN_VARIANT to 'xcc-clang'") message(DEPRECATION "XCC_USE_CLANG is deprecated. Please set ZEPHYR_TOOLCHAIN_VARIANT to 'xt-clang'")
endif()
if("${ZEPHYR_TOOLCHAIN_VARIANT}" STREQUAL "xcc-clang")
set(ZEPHYR_TOOLCHAIN_VARIANT xt-clang CACHE STRING "Zephyr toolchain variant" FORCE)
message(DEPRECATION "ZEPHYR_TOOLCHAIN_VARIANT 'xcc-clang' is deprecated. Please set ZEPHYR_TOOLCHAIN_VARIANT to 'xt-clang'")
endif() endif()
endif() endif()

4
cmake/toolchain/xcc-clang/generic.cmake → cmake/toolchain/xt-clang/generic.cmake
View file

@ -2,8 +2,8 @@
include(${ZEPHYR_BASE}/cmake/toolchain/xcc/common.cmake) include(${ZEPHYR_BASE}/cmake/toolchain/xcc/common.cmake)
set(COMPILER xcc-clang) set(COMPILER xt-clang)
set(CC clang) set(CC clang)
set(C++ clang++) set(C++ clang++)
message(STATUS "Found toolchain: xcc-clang (${XTENSA_TOOLCHAIN_PATH})") message(STATUS "Found toolchain: xt-clang (${XTENSA_TOOLCHAIN_PATH})")

0
cmake/toolchain/xcc-clang/target.cmake → cmake/toolchain/xt-clang/target.cmake
View file

6
doc/develop/toolchains/cadence_xcc.rst
View file

@ -28,7 +28,7 @@ Cadence Tensilica Xtensa C/C++ Compiler (XCC)
#. :ref:`Set these environment variables <env_vars>`: #. :ref:`Set these environment variables <env_vars>`:
* Set :envvar:`ZEPHYR_TOOLCHAIN_VARIANT` to ``xcc`` or ``xcc-clang``. * Set :envvar:`ZEPHYR_TOOLCHAIN_VARIANT` to ``xcc`` or ``xt-clang``.
* Set :envvar:`XTENSA_TOOLCHAIN_PATH` to the toolchain installation * Set :envvar:`XTENSA_TOOLCHAIN_PATH` to the toolchain installation
directory. directory.
* Set :envvar:`XTENSA_CORE` to the SoC ID where application is being * Set :envvar:`XTENSA_CORE` to the SoC ID where application is being
@ -49,7 +49,7 @@ Cadence Tensilica Xtensa C/C++ Compiler (XCC)
#. To use Clang-based compiler: #. To use Clang-based compiler:
* Set :envvar:`ZEPHYR_TOOLCHAIN_VARIANT` to ``xcc-clang``. * Set :envvar:`ZEPHYR_TOOLCHAIN_VARIANT` to ``xt-clang``.
* Note that the Clang-based compiler may contain an old LLVM bug which * Note that the Clang-based compiler may contain an old LLVM bug which
results in the following error: results in the following error:
@ -71,4 +71,4 @@ Cadence Tensilica Xtensa C/C++ Compiler (XCC)
* Also note that setting :envvar:`XCC_USE_CLANG` to ``1`` and * Also note that setting :envvar:`XCC_USE_CLANG` to ``1`` and
:envvar:`ZEPHYR_TOOLCHAIN_VARIANT` to ``xcc`` is deprecated. :envvar:`ZEPHYR_TOOLCHAIN_VARIANT` to ``xcc`` is deprecated.
Set :envvar:`ZEPHYR_TOOLCHAIN_VARIANT` to ``xcc-clang`` instead. Set :envvar:`ZEPHYR_TOOLCHAIN_VARIANT` to ``xt-clang`` instead.

2
soc/xtensa/intel_adsp/ace/Kconfig.series
View file

@ -5,7 +5,7 @@ config SOC_SERIES_INTEL_ACE
bool "Intel ACE" bool "Intel ACE"
select SOC_FAMILY_INTEL_ADSP select SOC_FAMILY_INTEL_ADSP
select XTENSA select XTENSA
select XTENSA_HAL if (("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc") && ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc-clang")) select XTENSA_HAL if (("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc") && ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xt-clang"))
select ATOMIC_OPERATIONS_BUILTIN if "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" select ATOMIC_OPERATIONS_BUILTIN if "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc"
select ARCH_HAS_COHERENCE select ARCH_HAS_COHERENCE
select SCHED_IPI_SUPPORTED select SCHED_IPI_SUPPORTED

2
soc/xtensa/intel_adsp/cavs/Kconfig.series
View file

@ -5,7 +5,7 @@ config SOC_SERIES_INTEL_ADSP_CAVS
bool "Intel CAVS" bool "Intel CAVS"
select SOC_FAMILY_INTEL_ADSP select SOC_FAMILY_INTEL_ADSP
select XTENSA select XTENSA
select XTENSA_HAL if ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" && ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc-clang")) select XTENSA_HAL if ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" && ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xt-clang"))
select XTENSA_RESET_VECTOR select XTENSA_RESET_VECTOR
select XTENSA_USE_CORE_CRT1 select XTENSA_USE_CORE_CRT1
select ATOMIC_OPERATIONS_BUILTIN if "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" select ATOMIC_OPERATIONS_BUILTIN if "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc"