local merge with master

runtime/CMakeLists.txt

@@ -317,6 +317,11 @@ endif()
 set(LIBOMP_OMPD_SUPPORT FALSE CACHE BOOL
   "OMPD-support?")
 
+# Error check hwloc support after config-ix has run
+if(LIBOMP_USE_HWLOC AND (NOT LIBOMP_HAVE_HWLOC))
+  libomp_error_say("Hwloc requested but not available")
+endif()
+
 # Setting final library name
 set(LIBOMP_DEFAULT_LIB_NAME libomp)
 if(${PROFILE_LIBRARY})

runtime/src/kmp_tasking.c

@@ -1166,10 +1166,23 @@ __kmp_invoke_task( kmp_int32 gtid, kmp_task_t *task, kmp_taskdata_t * current_ta
         KMP_COUNT_BLOCK(TASK_executed);
         KMP_TIME_BLOCK (TASK_execution);
 #endif // OMP_40_ENABLED
+
 #if OMPD_SUPPORT
     if ( ompd_state & OMPD_ENABLE_BP )
         ompd_bp_task_begin ();
 #endif
+
+#if OMPT_SUPPORT && OMPT_TRACE
+        /* let OMPT know that we're about to run this task */
+        if (ompt_enabled &&
+             ompt_callbacks.ompt_callback(ompt_event_task_switch))
+        {
+          ompt_callbacks.ompt_callback(ompt_event_task_switch)(
+            current_task->ompt_task_info.task_id,
+            taskdata->ompt_task_info.task_id);
+        }
+#endif
+
 #ifdef KMP_GOMP_COMPAT
         if (taskdata->td_flags.native) {
             ((void (*)(void *))(*(task->routine)))(task->shareds);

runtime/src/kmp_wait_release.h

@@ -574,7 +574,7 @@ class kmp_flag_oncore : public kmp_flag<kmp_uint64> {
         return ret;
 #else
         return __kmp_execute_tasks_oncore(this_thr, gtid, this, final_spin, thread_finished
-                                      USE_ITT_BUILD_ARG(itt_sync_obj), is_constrained);
+                                          USE_ITT_BUILD_ARG(itt_sync_obj), is_constrained);
 #endif
     }
     kmp_uint8 *get_stolen() { return NULL; }