Lorenz Meier
10 years ago
22 changed files with 345 additions and 60 deletions
@ -1,17 +1,37 @@
@@ -1,17 +1,37 @@
|
||||
This patch is required for QuRT. complex.h defines "I" and it replaces "I" in the
|
||||
enum definition without this patch creating an error.
|
||||
|
||||
diff --git a/Eigen/src/Core/SolveTriangular.h b/Eigen/src/Core/SolveTriangular.h
|
||||
index ef17f28..1116270 100644
|
||||
--- a/Eigen/src/Core/SolveTriangular.h
|
||||
+++ b/Eigen/src/Core/SolveTriangular.h
|
||||
@@ -112,6 +112,9 @@ template<typename Lhs, typename Rhs, int Mode, int Index, int Size,
|
||||
bool Stop = Index==Size>
|
||||
struct triangular_solver_unroller;
|
||||
diff --git a/Eigen/src/Core/util/Macros.h b/Eigen/src/Core/util/Macros.h
|
||||
index 1ca1d66..9bc928b 100644
|
||||
--- a/Eigen/src/Core/util/Macros.h
|
||||
+++ b/Eigen/src/Core/util/Macros.h
|
||||
@@ -194,6 +194,12 @@
|
||||
#define EIGEN_ARCH_PPC 0
|
||||
#endif
|
||||
|
||||
+#ifdef __PX4_QURT
|
||||
+#undef I
|
||||
+/// \internal EIGEN_ARCH_HEXAGON set to 1 if the architecture is Hexagon
|
||||
+#ifdef __HEXAGON_ARCH__
|
||||
+ #define EIGEN_ARCH_HEXAGON 1
|
||||
+#else
|
||||
+ #define EIGEN_ARCH_HEXAGON 0
|
||||
+#endif
|
||||
template<typename Lhs, typename Rhs, int Mode, int Index, int Size>
|
||||
struct triangular_solver_unroller<Lhs,Rhs,Mode,Index,Size,false> {
|
||||
enum {
|
||||
|
||||
|
||||
// Operating system identification, EIGEN_OS_*
|
||||
@@ -334,15 +340,16 @@
|
||||
#endif
|
||||
|
||||
// Do we support r-value references?
|
||||
-#if (__has_feature(cxx_rvalue_references) || \
|
||||
+#if ((__has_feature(cxx_rvalue_references) || \
|
||||
(defined(__cplusplus) && __cplusplus >= 201103L) || \
|
||||
defined(__GXX_EXPERIMENTAL_CXX0X__) || \
|
||||
- (EIGEN_COMP_MSVC >= 1600))
|
||||
+ (EIGEN_COMP_MSVC >= 1600)) && (!defined(EIGEN_ARCH_HEXAGON)))
|
||||
#define EIGEN_HAVE_RVALUE_REFERENCES
|
||||
#endif
|
||||
|
||||
// Does the compiler support result_of?
|
||||
-#if (__has_feature(cxx_lambdas) || (defined(__cplusplus) && __cplusplus >= 201103L))
|
||||
+#if ((__has_feature(cxx_lambdas) || (defined(__cplusplus) && __cplusplus >= 201103L)) && \
|
||||
+ (!defined(EIGEN_ARCH_HEXAGON)))
|
||||
#define EIGEN_HAS_STD_RESULT_OF 1
|
||||
#endif
|
||||
|
||||
|
||||
@ -0,0 +1,240 @@
@@ -0,0 +1,240 @@
|
||||
# |
||||
# Copyright (C) 2015 Mark Charlebois. All rights reserved. |
||||
# |
||||
# Redistribution and use in source and binary forms, with or without |
||||
# modification, are permitted provided that the following conditions |
||||
# are met: |
||||
# |
||||
# 1. Redistributions of source code must retain the above copyright |
||||
# notice, this list of conditions and the following disclaimer. |
||||
# 2. Redistributions in binary form must reproduce the above copyright |
||||
# notice, this list of conditions and the following disclaimer in |
||||
# the documentation and/or other materials provided with the |
||||
# distribution. |
||||
# 3. Neither the name PX4 nor the names of its contributors may be |
||||
# used to endorse or promote products derived from this software |
||||
# without specific prior written permission. |
||||
# |
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS |
||||
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE |
||||
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, |
||||
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
||||
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS |
||||
# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED |
||||
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
||||
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN |
||||
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
||||
# POSSIBILITY OF SUCH DAMAGE. |
||||
# |
||||
|
||||
include(CMakeForceCompiler) |
||||
|
||||
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) |
||||
include(common/px4_base) |
||||
|
||||
if(NOT HEXAGON_TOOLS_ROOT) |
||||
set(HEXAGON_TOOLS_ROOT /opt/7.4/Tools) |
||||
endif() |
||||
|
||||
macro (list2string out in) |
||||
set(list ${ARGV}) |
||||
list(REMOVE_ITEM list ${out}) |
||||
foreach(item ${list}) |
||||
set(${out} "${${out}} ${item}") |
||||
endforeach() |
||||
endmacro(list2string) |
||||
|
||||
set(V_ARCH "v5") |
||||
set(CROSSDEV "hexagon-") |
||||
set(HEXAGON_BIN ${HEXAGON_TOOLS_ROOT}/bin) |
||||
set(HEXAGON_LIB_DIR ${HEXAGON_TOOLS_ROOT}/gnu/hexagon/lib) |
||||
set(HEXAGON_ISS_DIR ${HEXAGON_TOOLS_ROOT}/lib/iss) |
||||
set(TOOLSLIB ${HEXAGON_TOOLS_ROOT}/target/hexagon/lib/${V_ARCH}/G0) |
||||
|
||||
# Use the HexagonTools compiler (6.4.05) |
||||
set(CMAKE_C_COMPILER ${HEXAGON_BIN}/${CROSSDEV}clang) |
||||
set(CMAKE_CXX_COMPILER ${HEXAGON_BIN}/${CROSSDEV}clang++) |
||||
|
||||
set(CMAKE_AR ${HEXAGON_BIN}/${CROSSDEV}ar CACHE FILEPATH "Archiver") |
||||
set(CMAKE_RANLIB ${HEXAGON_BIN}/${CROSSDEV}ranlib) |
||||
set(CMAKE_LINKER ${HEXAGON_BIN}/${CROSSDEV}ld.qcld) |
||||
set(CMAKE_NM ${HEXAGON_BIN}/${CROSSDEV}nm) |
||||
set(CMAKE_OBJDUMP ${HEXAGON_BIN}/${CROSSDEV}objdump) |
||||
set(CMAKE_OBJCOPY ${HEXAGON_BIN}/${CROSSDEV}objcopy) |
||||
|
||||
list2string(HEXAGON_INCLUDE_DIRS |
||||
-I${HEXAGON_TOOLS_ROOT}/target/hexagon/include |
||||
) |
||||
|
||||
#set(DYNAMIC_LIBS -Wl,${TOOLSLIB}/pic/libstdc++.a) |
||||
|
||||
#set(MAXOPTIMIZATION -O0) |
||||
|
||||
# Base CPU flags for each of the supported architectures. |
||||
# |
||||
set(ARCHCPUFLAGS |
||||
-m${V_ARCH} |
||||
-G0 |
||||
) |
||||
|
||||
add_definitions( |
||||
-D_PID_T -D_UID_T -D_TIMER_T |
||||
-Dnoreturn_function= |
||||
-D__EXPORT= |
||||
-Drestrict= |
||||
-D_DEBUG |
||||
-Wno-error=shadow |
||||
) |
||||
|
||||
# optimisation flags |
||||
# |
||||
set(ARCHOPTIMIZATION |
||||
-O0 |
||||
-g |
||||
-fno-strict-aliasing |
||||
-fdata-sections |
||||
-fno-zero-initialized-in-bss |
||||
) |
||||
|
||||
# Language-specific flags |
||||
# |
||||
set(ARCHCFLAGS |
||||
-std=gnu99 |
||||
-D__CUSTOM_FILE_IO__ |
||||
) |
||||
set(ARCHCXXFLAGS |
||||
-fno-exceptions |
||||
-fno-rtti |
||||
-std=c++11 |
||||
-fno-threadsafe-statics |
||||
-DCONFIG_WCHAR_BUILTIN |
||||
-D__CUSTOM_FILE_IO__ |
||||
) |
||||
|
||||
set(ARCHWARNINGS |
||||
-Wall |
||||
-Wextra |
||||
-Werror |
||||
-Wno-unused-parameter |
||||
-Wno-unused-function |
||||
-Wno-unused-variable |
||||
-Wno-gnu-array-member-paren-init |
||||
-Wno-cast-align |
||||
-Wno-missing-braces |
||||
-Wno-strict-aliasing |
||||
# -Werror=float-conversion - works, just needs to be phased in with some effort and needs GCC 4.9+ |
||||
# -Wcast-qual - generates spurious noreturn attribute warnings, try again later |
||||
# -Wconversion - would be nice, but too many "risky-but-safe" conversions in the code |
||||
# -Wcast-align - would help catch bad casts in some cases, but generates too many false positives |
||||
) |
||||
|
||||
# C-specific warnings |
||||
# |
||||
set(ARCHCWARNINGS |
||||
${ARCHWARNINGS} |
||||
-Wstrict-prototypes |
||||
-Wnested-externs |
||||
) |
||||
|
||||
# C++-specific warnings |
||||
# |
||||
set(ARCHWARNINGSXX |
||||
${ARCHWARNINGS} |
||||
-Wno-missing-field-initializers |
||||
) |
||||
exec_program(${CMAKE_CXX_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ARGS -print-libgcc-file-name OUTPUT_VARIABLE LIBGCC) |
||||
exec_program(${CMAKE_CXX_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ARGS -print-file-name=libm.a OUTPUT_VARIABLE LIBM) |
||||
set(EXTRA_LIBS ${EXTRA_LIBS} ${LIBM}) |
||||
|
||||
# Flags we pass to the C compiler |
||||
# |
||||
list2string(CFLAGS |
||||
${ARCHCFLAGS} |
||||
${ARCHCWARNINGS} |
||||
${ARCHOPTIMIZATION} |
||||
${ARCHCPUFLAGS} |
||||
${ARCHINCLUDES} |
||||
${INSTRUMENTATIONDEFINES} |
||||
${ARCHDEFINES} |
||||
${EXTRADEFINES} |
||||
${EXTRACFLAGS} |
||||
${HEXAGON_INCLUDE_DIRS} |
||||
) |
||||
|
||||
# Flags we pass to the C++ compiler |
||||
# |
||||
list2string(CXXFLAGS |
||||
${ARCHCXXFLAGS} |
||||
${ARCHWARNINGSXX} |
||||
${ARCHOPTIMIZATION} |
||||
${ARCHCPUFLAGS} |
||||
${ARCHXXINCLUDES} |
||||
${INSTRUMENTATIONDEFINES} |
||||
${ARCHDEFINES} |
||||
${EXTRADEFINES} |
||||
${EXTRACXXFLAGS} |
||||
${HEXAGON_INCLUDE_DIRS} |
||||
) |
||||
|
||||
# Flags we pass to the assembler |
||||
# |
||||
list2string(AFLAGS |
||||
${CFLAGS} |
||||
-D__ASSEMBLY__ |
||||
${EXTRADEFINES} |
||||
${EXTRAAFLAGS} |
||||
) |
||||
|
||||
# Set cmake flags |
||||
# |
||||
list2string(CMAKE_C_FLAGS |
||||
${CMAKE_C_FLAGS} |
||||
${CFLAGS} |
||||
) |
||||
|
||||
set(QURT_CMAKE_C_FLAGS ${CMAKE_C_FLAGS} CACHE STRING "cflags") |
||||
|
||||
message(STATUS "CMAKE_C_FLAGS: -${CMAKE_C_FLAGS}-") |
||||
|
||||
list2string(CMAKE_CXX_FLAGS |
||||
${CMAKE_CXX_FLAGS} |
||||
${CXXFLAGS} |
||||
) |
||||
|
||||
set(QURT_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} CACHE STRING "cxxflags") |
||||
|
||||
message(STATUS "CMAKE_CXX_FLAGS: -${CMAKE_CXX_FLAGS}-") |
||||
|
||||
# Flags we pass to the linker |
||||
# |
||||
list2string(CMAKE_EXE_LINKER_FLAGS |
||||
-g |
||||
-mv5 |
||||
-mG0lib |
||||
-G0 |
||||
-fpic |
||||
-shared |
||||
-Wl,-Bsymbolic |
||||
-Wl,--wrap=malloc |
||||
-Wl,--wrap=calloc |
||||
-Wl,--wrap=free |
||||
-Wl,--wrap=realloc |
||||
-Wl,--wrap=memalign |
||||
-Wl,--wrap=__stack_chk_fail |
||||
-lc |
||||
${EXTRALDFLAGS} |
||||
) |
||||
|
||||
# where is the target environment |
||||
set(CMAKE_FIND_ROOT_PATH get_file_component(${C_COMPILER} PATH)) |
||||
|
||||
set(CMAKE_C_COMPILER_ID, "Clang") |
||||
set(CMAKE_CXX_COMPILER_ID, "Clang") |
||||
|
||||
# search for programs in the build host directories |
||||
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) |
||||
# for libraries and headers in the target directories |
||||
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) |
||||
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) |
||||
@ -1 +1 @@
@@ -1 +1 @@
|
||||
Subproject commit 229f2f4d8471564f01fe8330e5de1554a9b7aeb6 |
||||
Subproject commit 95e91546f42e6d88d34a2bb29d0f428a8706c9e4 |
||||
Loading…
Reference in new issue