Skip to content

toolchain updates for flight pro 8096 kyro cross compilation #24

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

Open
plusk01 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

toolchain updates for flight pro 8096 kyro cross compilation #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b8329b
correct sysroot and compiler path for sfpro toolchain
plusk01 Jul 17, 2019
710b5d7
allow linker to use the sysroot to find the correct sdsprpc.so (softfp)
plusk01 Jul 17, 2019
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
2 changes: 1 addition & 1 deletion fastrpc.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ set(FASTRPC_ARM_LINUX_INCLUDES
if ("${DSP_TYPE}" STREQUAL "ADSP")
set(ADSPRPC -L${HEXAGON_SDK_ROOT}/${SDKLIB}/common/remote/ship/UbuntuARM_${RELEASE} -ladsprpc)
elseif("${DSP_TYPE}" STREQUAL "SLPI")
set(ADSPRPC -L${HEXAGON_SDK_ROOT}/${SDKLIB}/common/remote/ship/UbuntuARM_${RELEASE} -lsdsprpc)
set(ADSPRPC -lsdsprpc)
else()
message(FATAL_ERROR "DSP_TYPE not defined")
endif()
Expand Down
20 changes: 6 additions & 14 deletions toolchain/Toolchain-arm-oemllib32-linux-gnueabi.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,10 @@

include(CMakeForceCompiler)

if ("$ENV{HEXAGON_SDK_ROOT}" STREQUAL "")
message(FATAL_ERROR "HEXAGON_SDK_ROOT not set")
if ("$ENV{SDKROOT}" STREQUAL "")
message(FATAL_ERROR "SDKROOT not set")
else()
set(HEXAGON_SDK_ROOT $ENV{HEXAGON_SDK_ROOT})
endif()

if ("$ENV{HEXAGON_ARM_SYSROOT}" STREQUAL "")
message(FATAL_ERROR "HEXAGON_ARM_SYSROOT not set")
else()
set(HEXAGON_ARM_SYSROOT $ENV{HEXAGON_ARM_SYSROOT})
set(SDKROOT $ENV{SDKROOT})
endif()

# this one is important
Expand All @@ -67,8 +61,8 @@ set(CMAKE_SYSTEM_VERSION 1)
# specify the cross compiler

#temporary variables to set up the cross compilation environment
set(ARM_CROSS_COMPILIER_PREFIX "arm-oemllib32-linux-gnueabi" )
set(ARM_COMPILER_PATH "${HEXAGON_ARM_SYSROOT}/x86_64-linux/usr/bin/${ARM_CROSS_COMPILIER_PREFIX}" )
set(ARM_CROSS_COMPILIER_PREFIX "arm-oemllib32-linux" )
set(ARM_COMPILER_PATH "${SDKROOT}/sysroots/x86_64-oesdk-linux/usr/bin/${ARM_CROSS_COMPILIER_PREFIX}" )
set(ARM_C_COMPILER "${ARM_CROSS_COMPILIER_PREFIX}-gcc" )
set(ARM_CPP_COMPILER "${ARM_CROSS_COMPILIER_PREFIX}-g++" )

Expand Down Expand Up @@ -113,9 +107,7 @@ foreach(tool echo grep rm mkdir nm cp touch make unzip)
endif()
endforeach()

#override the ARM sysroot.
set(CMAKE_SYSROOT "${HEXAGON_ARM_SYSROOT}/lib32-apq8096" )
set(CMAKE_EXE_LINKER_FLAGS "-Wl,-gc-sections -Wl,-rpath-link,${CMAKE_SYSROOT}/usr/lib/${ARM_CROSS_COMPILIER_PREFIX} -Wl,-rpath-link,${CMAKE_SYSROOT}/lib/${ARM_CROSS_COMPILIER_PREFIX}" )
set(CMAKE_SYSROOT ${SDKROOT}/sysroots/aarch64-oe-linux)

# where is the target environment
set(CMAKE_FIND_ROOT_PATH get_file_component(${C_COMPILER} PATH))
Expand Down