mirror of
https://github.com/PX4/PX4-Autopilot.git
synced 2026-05-31 02:16:53 +08:00
Merge pull request #3042 from mcharleb/hexagon-7.2.10-toolchain
qurt: Change to Hexagon 7.2.10 compiler
This commit is contained in:
@@ -492,7 +492,6 @@ function(px4_add_common_flags)
|
|||||||
-Wpointer-arith
|
-Wpointer-arith
|
||||||
-Wmissing-declarations
|
-Wmissing-declarations
|
||||||
-Wno-unused-parameter
|
-Wno-unused-parameter
|
||||||
-Wno-varargs
|
|
||||||
-Werror=format-security
|
-Werror=format-security
|
||||||
-Werror=array-bounds
|
-Werror=array-bounds
|
||||||
-Wfatal-errors
|
-Wfatal-errors
|
||||||
@@ -517,6 +516,7 @@ function(px4_add_common_flags)
|
|||||||
if (NOT ${OS} STREQUAL "qurt")
|
if (NOT ${OS} STREQUAL "qurt")
|
||||||
list(APPEND warnings
|
list(APPEND warnings
|
||||||
-Wno-unused-const-variable
|
-Wno-unused-const-variable
|
||||||
|
-Wno-varargs
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
else()
|
else()
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
include(qurt/px4_impl_qurt)
|
include(qurt/px4_impl_qurt)
|
||||||
|
|
||||||
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchains/Toolchain-hexagon-7.4.cmake)
|
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchains/Toolchain-hexagon-7.2.10.cmake)
|
||||||
|
|
||||||
set(config_module_list
|
set(config_module_list
|
||||||
drivers/device
|
drivers/device
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
include(qurt/px4_impl_qurt)
|
include(qurt/px4_impl_qurt)
|
||||||
|
|
||||||
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchains/Toolchain-hexagon-7.4.cmake)
|
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchains/Toolchain-hexagon-7.2.10.cmake)
|
||||||
|
|
||||||
set(config_module_list
|
set(config_module_list
|
||||||
drivers/device
|
drivers/device
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
include(qurt/px4_impl_qurt)
|
include(qurt/px4_impl_qurt)
|
||||||
|
|
||||||
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchains/Toolchain-hexagon-7.4.cmake)
|
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchains/Toolchain-hexagon-7.2.10.cmake)
|
||||||
|
|
||||||
set(config_module_list
|
set(config_module_list
|
||||||
drivers/device
|
drivers/device
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ set(target_libraries
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchains/Toolchain-hexagon-7.4.cmake)
|
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchains/Toolchain-hexagon-7.2.10.cmake)
|
||||||
|
|
||||||
set(config_module_list
|
set(config_module_list
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
include(qurt/px4_impl_qurt)
|
include(qurt/px4_impl_qurt)
|
||||||
|
|
||||||
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchains/Toolchain-hexagon-7.4.cmake)
|
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchains/Toolchain-hexagon-7.2.10.cmake)
|
||||||
|
|
||||||
set(config_module_list
|
set(config_module_list
|
||||||
drivers/device
|
drivers/device
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ include(qurt/px4_impl_qurt)
|
|||||||
# Run a full link with build stubs to make sure qurt target isn't broken
|
# Run a full link with build stubs to make sure qurt target isn't broken
|
||||||
set(QURT_ENABLE_STUBS "1")
|
set(QURT_ENABLE_STUBS "1")
|
||||||
|
|
||||||
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchains/Toolchain-hexagon-7.4.cmake)
|
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchains/Toolchain-hexagon-7.2.10.cmake)
|
||||||
|
|
||||||
set(config_module_list
|
set(config_module_list
|
||||||
drivers/device
|
drivers/device
|
||||||
|
|||||||
+3
-2
@@ -35,7 +35,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
|
|||||||
include(common/px4_base)
|
include(common/px4_base)
|
||||||
|
|
||||||
if(NOT HEXAGON_TOOLS_ROOT)
|
if(NOT HEXAGON_TOOLS_ROOT)
|
||||||
set(HEXAGON_TOOLS_ROOT /opt/7.4/Tools)
|
set(HEXAGON_TOOLS_ROOT /opt/HEXAGON_Tools/7.2.10/Tools)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
macro (list2string out in)
|
macro (list2string out in)
|
||||||
@@ -53,7 +53,7 @@ set(HEXAGON_LIB_DIR ${HEXAGON_TOOLS_ROOT}/gnu/hexagon/lib)
|
|||||||
set(HEXAGON_ISS_DIR ${HEXAGON_TOOLS_ROOT}/lib/iss)
|
set(HEXAGON_ISS_DIR ${HEXAGON_TOOLS_ROOT}/lib/iss)
|
||||||
set(TOOLSLIB ${HEXAGON_TOOLS_ROOT}/target/hexagon/lib/${V_ARCH}/G0)
|
set(TOOLSLIB ${HEXAGON_TOOLS_ROOT}/target/hexagon/lib/${V_ARCH}/G0)
|
||||||
|
|
||||||
# Use the HexagonTools compiler (6.4.05)
|
# Use the HexagonTools compiler (7.2.10)
|
||||||
set(CMAKE_C_COMPILER ${HEXAGON_BIN}/${CROSSDEV}clang)
|
set(CMAKE_C_COMPILER ${HEXAGON_BIN}/${CROSSDEV}clang)
|
||||||
set(CMAKE_CXX_COMPILER ${HEXAGON_BIN}/${CROSSDEV}clang++)
|
set(CMAKE_CXX_COMPILER ${HEXAGON_BIN}/${CROSSDEV}clang++)
|
||||||
|
|
||||||
@@ -82,6 +82,7 @@ set(ARCHCPUFLAGS
|
|||||||
add_definitions(
|
add_definitions(
|
||||||
-D_PID_T -D_UID_T -D_TIMER_T
|
-D_PID_T -D_UID_T -D_TIMER_T
|
||||||
-Dnoreturn_function=
|
-Dnoreturn_function=
|
||||||
|
-D_HAS_C9X
|
||||||
-D__EXPORT=
|
-D__EXPORT=
|
||||||
-Drestrict=
|
-Drestrict=
|
||||||
-D_DEBUG
|
-D_DEBUG
|
||||||
@@ -234,14 +234,6 @@ __END_DECLS
|
|||||||
// Missing math.h defines
|
// Missing math.h defines
|
||||||
#define PX4_ISFINITE(x) __builtin_isfinite(x)
|
#define PX4_ISFINITE(x) __builtin_isfinite(x)
|
||||||
|
|
||||||
// FIXME - these are missing for clang++ but not for clang
|
|
||||||
#if defined(__cplusplus)
|
|
||||||
#define isfinite(x) true
|
|
||||||
#define isnan(x) false
|
|
||||||
#define isinf(x) false
|
|
||||||
#define fminf(x, y) ((x) > (y) ? y : x)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
Reference in New Issue
Block a user