commit fdcf383c31829e12d35ad5cdc37e9587d7328a16
author xiaohu.huang <xiaohu.huang@amlogic.com> Wed Mar 13 17:15:30 2024 +0800
committer xiaohu.huang <xiaohu.huang@amlogic.com> Wed Mar 13 17:23:48 2024 +0800
tree d30cffcfacacb68b3d1bdc09dfc3646410ff7fd4
parent fe62a52bb73ab46941ccb57e6bad5bc78ee7fc78

[SoC a1 a5 t2x s6] build: Add clang toolchain support for xtensa. [1/1]

PD#SWPL-160352

Problem:
Add clang toolchain support for xtensa.

Solution:
Add clang toolchain support for xtensa.

Verify:
N/A

Change-Id: Ic5f6e04419209feb409c575f9b126f1d9f7ebf21
Signed-off-by: xiaohu.huang <xiaohu.huang@amlogic.com>

cmake/root.cmake

diff --git a/cmake/root.cmake b/cmake/root.cmake
index cd5fc5e..0f1451c 100755
--- a/cmake/root.cmake
+++ b/cmake/root.cmake
@@ -46,7 +46,9 @@
         add_compile_options(-fdiagnostics-color=always)
     endif()
 elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-    add_compile_options(-fcolor-diagnostics)
+    if(NOT "${ARCH}" STREQUAL "xtensa")
+        add_compile_options(-fcolor-diagnostics)
+    endif()
 endif()
 
 include(${SDK_BASE}/build_system/cmake/extensions.cmake)

cmake/toolchains/xtensa_compiler.cmake

diff --git a/cmake/toolchains/xtensa_compiler.cmake b/cmake/toolchains/xtensa_compiler.cmake
index 6880fc4..6b5ff4c 100755
--- a/cmake/toolchains/xtensa_compiler.cmake
+++ b/cmake/toolchains/xtensa_compiler.cmake
@@ -7,17 +7,23 @@
 set(CMAKE_SYSTEM_NAME Generic)
 
 # Find GCC for XTENSA.
-aml_find_compiler(COMPILER_CC xt-xcc)
-aml_find_compiler(COMPILER_CXX xt-xc++)
-aml_find_compiler(COMPILER_ASM xt-xcc)
+aml_find_compiler(COMPILER_GCC_CC xt-xcc)
+aml_find_compiler(COMPILER_GCC_CXX xt-xc++)
+aml_find_compiler(COMPILER_GCC_ASM xt-xcc)
+
+# Find CLANG for XTENSA.
+aml_find_compiler(COMPILER_CLANG_CC xt-clang)
+aml_find_compiler(COMPILER_CLANG_CXX xt-clang++)
+aml_find_compiler(COMPILER_CLANG_ASM xt-clang)
+
 aml_find_compiler(COMPILER_OBJCOPY xt-objcopy)
 aml_find_compiler(COMPILER_OBJDUMP xt-objdump)
 aml_find_compiler(COMPILER_LD_GEN xt-genldscripts)
 
 # Specify the cross compiler.
-set(CMAKE_C_COMPILER ${COMPILER_CC} CACHE FILEPATH "C compiler")
-set(CMAKE_CXX_COMPILER ${COMPILER_CXX} CACHE FILEPATH "C++ compiler")
-set(CMAKE_ASM_COMPILER ${COMPILER_ASM} CACHE FILEPATH "ASM compiler")
+set(CMAKE_C_COMPILER ${COMPILER_GCC_CC} CACHE FILEPATH "C compiler")
+set(CMAKE_CXX_COMPILER ${COMPILER_GCC_CXX} CACHE FILEPATH "C++ compiler")
+set(CMAKE_ASM_COMPILER ${COMPILER_GCC_ASM} CACHE FILEPATH "ASM compiler")
 set(CMAKE_OBJCOPY_COMPILER ${COMPILER_OBJCOPY} CACHE FILEPATH "objcopy compiler")
 set(CMAKE_OBJDUMP_COMPILER ${COMPILER_OBJDUMP} CACHE FILEPATH "objdump compiler")
 set(CMAKE_LDGEN_COMPILER ${COMPILER_LD_GEN} CACHE FILEPATH "genldscripts compiler")