Merge remote-tracking branch 'origin/ompd' into ompd-devices

Conflicts:
	runtime/src/ompd-specific.h

Author: manorom

runtime/src/ompd-specific.cpp

@@ -22,8 +22,7 @@ OMPD_FOREACH_BITFIELD(ompd_declare_bitfield)
 OMPD_FOREACH_SIZEOF(ompd_declare_sizeof)
 #undef ompd_declare_sizeof
 
-const char * * ompd_dll_locations=NULL;
-const char * ompd_my_dll_locations[2] = {"libompd.so",NULL};
+volatile const char * * ompd_dll_locations=NULL;
 uint64_t ompd_state=0;
 
 int ompd_rtl_version = 7;
@@ -64,6 +63,9 @@ void ompd_init()
   OMPD_FOREACH_SIZEOF(ompd_init_sizeof)
 #undef ompd_init_sizeof
 
+  volatile static const char * ompd_my_dll_locations[2] = {"libompd.so",NULL};
+
+
   const char *ompd_env_var = getenv("OMP_OMPD");
   if (ompd_env_var && !strcmp(ompd_env_var, "on"))
   {

runtime/src/ompd-specific.h

@@ -7,19 +7,19 @@
 #ifdef OMPD_SUPPORT
 
 void ompd_init();
-extern const char * * ompd_dll_locations;
+extern volatile const char * * ompd_dll_locations;
 extern int ompd_rtl_version;
 
 #ifdef  __cplusplus
 extern "C" {
 #endif
-void ompd_dll_locations_valid ( void );
-void ompd_bp_parallel_begin ( void );
-void ompd_bp_parallel_end ( void );
-void ompd_bp_task_begin ( void );
-void ompd_bp_task_end ( void );
-void ompd_bp_thread_begin ( void );
-void ompd_bp_thread_end ( void );
+void __attribute__ ((noinline)) ompd_dll_locations_valid ( void );
+void __attribute__ ((noinline)) ompd_bp_parallel_begin ( void );
+void __attribute__ ((noinline)) ompd_bp_parallel_end ( void );
+void __attribute__ ((noinline)) ompd_bp_task_begin ( void );
+void __attribute__ ((noinline)) ompd_bp_task_end ( void );
+void __attribute__ ((noinline)) ompd_bp_thread_begin ( void );
+void __attribute__ ((noinline)) ompd_bp_thread_end ( void );
 #ifdef  __cplusplus
 } /* extern "C" */
 #endif