From 62c7e66634f227c7bbc47552ecb5acf4bb92d833 Mon Sep 17 00:00:00 2001 From: abhikran Date: Thu, 25 May 2023 19:14:26 +0530 Subject: [PATCH 1/2] [Hexagon] Update instructions to compile hexagon runtime Also, added include path of dlfcn.h which is applicable from Hexagon SDK 5.3.0.0 --- cmake/modules/HexagonSDK.cmake | 1 + src/runtime/hexagon/README.md | 2 ++ 2 files changed, 3 insertions(+) diff --git a/cmake/modules/HexagonSDK.cmake b/cmake/modules/HexagonSDK.cmake index ddb158cad95e..2e5d244dfd02 100644 --- a/cmake/modules/HexagonSDK.cmake +++ b/cmake/modules/HexagonSDK.cmake @@ -166,6 +166,7 @@ function(_get_hexagon_sdk_property_impl "${_hexagon_sdk_root}/rtos/qurt/${_hexarch_dir}/include/posix" "${_hexagon_sdk_root}/rtos/qurt/${_hexarch_dir}/include/qurt" "${_hexagon_sdk_root}/ipc/fastrpc/rtld/ship/${_rtld_dir}" + "${_hexagon_sdk_root}/ipc/fastrpc/rtld/ship/inc" ) elseif(_property STREQUAL "QURT_LIB") set(_dirs "${_hexagon_sdk_root}/rtos/qurt/${_hexarch_dir}/lib/pic") diff --git a/src/runtime/hexagon/README.md b/src/runtime/hexagon/README.md index 7e19105a9ce8..d73a043bebc0 100644 --- a/src/runtime/hexagon/README.md +++ b/src/runtime/hexagon/README.md @@ -65,6 +65,8 @@ CMAKE_CXX_COMPILER=hexagon-clang++ USE_HEXAGON=ON USE_HEXAGON_ARCH=v65|v66|v68|v69 USE_HEXAGON_SDK=/path/to/sdk +USE_RPC=OFF +USE_LIBBACKTRACE=OFF ``` As mentioned before, only build the `runtime` component (e.g. `make runtime`). From 48e601dd5332f620fe8edcb4934949d0975dc5e6 Mon Sep 17 00:00:00 2001 From: abhikran Date: Mon, 29 May 2023 11:59:52 +0530 Subject: [PATCH 2/2] Add condition to enable dlfcn path from SDK 5.3.0.0 --- cmake/modules/HexagonSDK.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/modules/HexagonSDK.cmake b/cmake/modules/HexagonSDK.cmake index 2e5d244dfd02..ccf74fabfe05 100644 --- a/cmake/modules/HexagonSDK.cmake +++ b/cmake/modules/HexagonSDK.cmake @@ -166,8 +166,11 @@ function(_get_hexagon_sdk_property_impl "${_hexagon_sdk_root}/rtos/qurt/${_hexarch_dir}/include/posix" "${_hexagon_sdk_root}/rtos/qurt/${_hexarch_dir}/include/qurt" "${_hexagon_sdk_root}/ipc/fastrpc/rtld/ship/${_rtld_dir}" - "${_hexagon_sdk_root}/ipc/fastrpc/rtld/ship/inc" ) + _check_path_exists("${_hexagon_sdk_root}/ipc/fastrpc/rtld/ship/inc" _sdk_dlfcn) + if(_sdk_dlfcn) + list(APPEND _dirs "${_hexagon_sdk_root}/ipc/fastrpc/rtld/ship/inc") + endif() elseif(_property STREQUAL "QURT_LIB") set(_dirs "${_hexagon_sdk_root}/rtos/qurt/${_hexarch_dir}/lib/pic") elseif(_property STREQUAL "RPCMEM_ROOT")