Index: openmp/runtime/src/kmp_os.h =================================================================== --- openmp/runtime/src/kmp_os.h +++ openmp/runtime/src/kmp_os.h @@ -338,12 +338,18 @@ #define KMP_ALIAS(alias_of) __attribute__((alias(alias_of))) #endif -#if KMP_HAVE_WEAK_ATTRIBUTE +#if KMP_HAVE_WEAK_ATTRIBUTE && !KMP_DYNAMIC_LIB #define KMP_WEAK_ATTRIBUTE __attribute__((weak)) #else #define KMP_WEAK_ATTRIBUTE /* Nothing */ #endif +#if KMP_HAVE_WEAK_ATTRIBUTE +#define KMP_WEAK_ATTRIBUTE_INTERNAL __attribute__((weak)) +#else +#define KMP_WEAK_ATTRIBUTE_INTERNAL /* Nothing */ +#endif + // Define KMP_VERSION_SYMBOL and KMP_EXPAND_NAME #ifndef KMP_STR #define KMP_STR(x) _KMP_STR(x) Index: openmp/runtime/src/ompt-specific.cpp =================================================================== --- openmp/runtime/src/ompt-specific.cpp +++ openmp/runtime/src/ompt-specific.cpp @@ -27,7 +27,7 @@ #define THREAD_LOCAL __thread #endif -#define OMPT_WEAK_ATTRIBUTE KMP_WEAK_ATTRIBUTE +#define OMPT_WEAK_ATTRIBUTE KMP_WEAK_ATTRIBUTE_INTERNAL //****************************************************************************** // macros