[Openmp-commits] [PATCH] D41817: [OMPT] Enable OMPT on 32-bit ARM machines

[Paul Osmialowski via Phabricator via Openmp-commits]

pawosm01 updated this revision to Diff 129116.
pawosm01 retitled this revision from "[OMPT] Enable OMPT on 32-bit ARM machines and fix type mismatch in omp_control_tool implementation that makes it run incorrectly on 32-bit machines" to "[OMPT] Enable OMPT on 32-bit ARM machines".

Repository:
  rOMP OpenMP

https://reviews.llvm.org/D41817

Files:
  runtime/cmake/config-ix.cmake
  runtime/test/ompt/callback.h


Index: runtime/test/ompt/callback.h
===================================================================
--- runtime/test/ompt/callback.h
+++ runtime/test/ompt/callback.h
@@ -118,8 +118,8 @@
 #define print_possible_return_addresses(addr) \
   printf("%" PRIu64 ": current_address=%p\n", ompt_get_thread_data()->value, \
          ((char *)addr) - 8)
-#elif KMP_ARCH_AARCH64
-// On AArch64 the NOP instruction is 4 bytes long, can be followed by inserted
+#elif KMP_ARCH_ARM || KMP_ARCH_AARCH64
+// On ARM the NOP instruction is 4 bytes long, can be followed by inserted
 // store instruction (another 4 bytes long).
 #define print_possible_return_addresses(addr) \
   printf("%" PRIu64 ": current_address=%p or %p\n", ompt_get_thread_data()->value, \
Index: runtime/cmake/config-ix.cmake
===================================================================
--- runtime/cmake/config-ix.cmake
+++ runtime/cmake/config-ix.cmake
@@ -239,7 +239,7 @@
   if( # hardware architecture supported?
      ((LIBOMP_ARCH STREQUAL x86_64) OR
       (LIBOMP_ARCH STREQUAL i386) OR
-#      (LIBOMP_ARCH STREQUAL arm) OR
+      ((LIBOMP_ARCH STREQUAL arm) AND (CMAKE_C_COMPILER_ID STREQUAL "Clang")) OR
       (LIBOMP_ARCH STREQUAL aarch64) OR
       (LIBOMP_ARCH STREQUAL ppc64le) OR
       (LIBOMP_ARCH STREQUAL ppc64))


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D41817.129116.patch
Type: text/x-patch
Size: 1302 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20180109/74d696e9/attachment.bin>