Skip to content

build/cmake: Fix hexagon toolchain SDK path and V_ARCH compatibility for SDK 6.x #91

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
quic-plai merged 3 commits into from
Jun 5, 2026
+6 −5
Merged

build/cmake: Fix hexagon toolchain SDK path and V_ARCH compatibility for SDK 6.x #91

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f541df7
build/cmake: Fix stale FastRPC SDK paths in hexagon toolchain
quic-aditrath Jun 3, 2026
30dbf6c
build/cmake: Fix hardcoded computev65 in HEXAGON_SDK_QURT_INCLUDES
quic-aditrath Jun 3, 2026
a1bed69
build/cmake: Extend V_ARCH validation list for Hexagon SDK 6.x variants
quic-aditrath Jun 3, 2026
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
11 changes: 6 additions & 5 deletions scripts/cmake/hexagon-toolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# VARIABLES:
#
# V_ARCH: Hexagon Architecture version number
# Supported Values: v5, v55, v60, v61, v62, v65, v66
# Supported Values: v5, v55, v60, v61, v62, v65, v66, v68, v69, v73, v75, v79, v81
#
# HEXAGON_TOOLS_ROOT: Path to Hexagon Toolchain
#
Expand All @@ -26,7 +26,7 @@ if (NOT HEXAGON_TOOLS_ROOT AND CONFIG_HEXAGON_TOOLS_ROOT)
set(HEXAGON_TOOLS_ROOT ${CONFIG_HEXAGON_TOOLS_ROOT})
endif()

if (NOT V_ARCH MATCHES "^(v5|v55|v60|v61|v62|v65|v66)")
if (NOT V_ARCH MATCHES "^(v5|v55|v60|v61|v62|v65|v66|v68|v69|v73|v75|v79|v81)")
message(FATAL_ERROR
" Please specify valid Hexagon processor version.\n")
endif()
Expand All @@ -35,9 +35,10 @@ message(STATUS "Preparing Hexagon ${V_ARCH} build with\n\tToolchain: ${CONFIG_HE

set(HEXAGON_SDK_INCLUDES ${HEXAGON_SDK_ROOT}/incs)
set(HEXAGON_SDK_STDDEF_INCLUDES ${HEXAGON_SDK_ROOT}/incs/stddef)
set(HEXAGON_SDK_REMOTE_INCLUDES ${HEXAGON_SDK_ROOT}/libs/common/remote/ship/hexagon_Debug_dynamic_toolv81_v65)
set(HEXAGON_SDK_RPCMEM_INCLUDES ${HEXAGON_SDK_ROOT}/libs/common/rpcmem/hexagon_Debug_dynamic_toolv81_v65/ship)
set(HEXAGON_SDK_QURT_INCLUDES ${HEXAGON_SDK_ROOT}/rtos/qurt/computev65/include/qurt)
set(HEXAGON_SDK_REMOTE_INCLUDES ${HEXAGON_SDK_ROOT}/ipc/fastrpc/remote/ship)
set(HEXAGON_SDK_RPCMEM_INCLUDES ${HEXAGON_SDK_ROOT}/ipc/fastrpc/rpcmem/inc)
string(REGEX REPLACE "^v" "" V_ARCH_NUM "${V_ARCH}")
set(HEXAGON_SDK_QURT_INCLUDES ${HEXAGON_SDK_ROOT}/rtos/qurt/computev${V_ARCH_NUM}/include/qurt)
set(HEXAGON_SDK_AUDIO_INCLUDES ${HEXAGON_SDK_ROOT}/incs/audio)
set(HEXAGON_LIB_DIR ${HEXAGON_TOOLS_ROOT}/Tools/target/hexagon/lib)
set(HEXAGON_ISS_DIR ${HEXAGON_TOOLS_ROOT}/Tools/lib/iss)
Expand Down
Loading