- Adding ARM cross compilation toolchain

- Fixing some cross compilation issues - Fixing non standard include
STEllAR-GROUP · Apr 21, 2015 · 9303e9a · hkaiser · Apr 21, 2015 · hkaiser
1 parent 3172c9a
commit 9303e9a
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 4 deletions.
diff --git a/cmake/toolchains/ARM-gcc.cmake b/cmake/toolchains/ARM-gcc.cmake
@@ -0,0 +1,15 @@
+set(CMAKE_SYSTEM_NAME Linux)
+
+set(CMAKE_CROSSCOMPILING ON)
+
+# Set the gcc Compiler
+set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++-4.8)
+set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc-4.8)
+
+set(HPX_WITH_GENERIC_CONTEXT_COROUTINES ON CACHE BOOL "enable generic coroutines")
+
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+
diff --git a/hpx/util/hardware/timestamp.hpp b/hpx/util/hardware/timestamp.hpp
@@ -19,7 +19,7 @@
    || defined(_M_IX86) || defined(__X86__) || defined(_X86_)            \
    || defined(__THW_INTEL__) || defined(__I86__) || defined(__INTEL__)
     #include <hpx/util/hardware/timestamp/linux_x86_32.hpp>
-#elif defined(__ANDROID__) && defined(ANDROID)
+#elif (defined(__ANDROID__) && defined(ANDROID)) || defined(__arm__)
     #include <hpx/util/hardware/timestamp/linux_generic.hpp>
 #elif defined(__powerpc__)
     #include <hpx/util/hardware/timestamp/linux_generic.hpp>

diff --git a/tests/unit/build/CMakeLists.txt b/tests/unit/build/CMakeLists.txt
@@ -14,12 +14,24 @@ macro(create_cmake_test name hpx_dir)
   add_custom_target(${name}.make_build_dir
     COMMAND "${CMAKE_COMMAND}" -E make_directory "${build_dir}" VERBATIM
   )
+  set(ADDITIONAL_CMAKE_OPTIONS)
+  if(CMAKE_TOOLCHAIN_FILE)
+    set(ADDITIONAL_CMAKE_OPTIONS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE})
+  endif()
+  if(CMAKE_MAKE_COMMAND)
+    set(ADDITIONAL_CMAKE_OPTIONS ${ADDITIONAL_CMAKE_OPTIONS} -DCMAKE_MAKE_COMMAND=${CMAKE_MAKE_COMMAND})
+  endif()
+  if(CMAKE_SYSROOT)
+    set(ADDITIONAL_CMAKE_OPTIONS ${ADDITIONAL_CMAKE_OPTIONS} -DCMAKE_SYSROOT=${CMAKE_SYSROOT})
+  endif()
   add_custom_target(${name}.make_configure
     COMMAND
       "${CMAKE_COMMAND}" -E chdir "${build_dir}" "${CMAKE_COMMAND}"
       "${hpx_SOURCE_DIR}/tests/unit/build/src"
       -DHPX_DIR=${hpx_dir}
+      ${ADDITIONAL_CMAKE_OPTIONS}
       -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+      -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
       -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS_SAFE}
       -DCMAKE_BUILD_TYPE=$<CONFIGURATION> VERBATIM)
   add_dependencies(${name}.make_configure ${name}.make_build_dir hpx iostreams_component)
@@ -99,7 +111,12 @@ set(tests
   build_dir
   install_dir)
 
-foreach(system cmake pkgconfig)
+set(build_systems cmake)
+if(NOT CMAKE_TOOLCHAIN_FILE)
+  set(build_systems ${build_sytems} pkgconfig)
+endif()
+
+foreach(system ${build_systems})
   add_hpx_pseudo_target(tests.unit.build.${system})
   foreach(test ${tests})
     add_hpx_pseudo_target(tests.unit.build.${system}.${test})

diff --git a/tests/unit/util/stencil3_iterator.cpp b/tests/unit/util/stencil3_iterator.cpp
@@ -9,7 +9,7 @@
 
 #include <hpx/util/transform_iterator.hpp>
 
-#include <strstream>
+#include <sstream>
 
 ///////////////////////////////////////////////////////////////////////////////
 namespace test

diff --git a/tests/unit/util/transform_iterator.cpp b/tests/unit/util/transform_iterator.cpp
@@ -9,7 +9,7 @@
 
 #include <hpx/util/transform_iterator.hpp>
 
-#include <strstream>
+#include <sstream>
 #include <iterator>
 #include <vector>
 #include <algorithm>