diff options
Diffstat (limited to 'openmp')
-rw-r--r-- | openmp/runtime/src/dllexports | 2 | ||||
-rw-r--r-- | openmp/runtime/src/kmp_os.h | 2 | ||||
-rw-r--r-- | openmp/runtime/src/kmp_utility.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/openmp/runtime/src/dllexports b/openmp/runtime/src/dllexports index 2fd1d90982a3..a541f582a940 100644 --- a/openmp/runtime/src/dllexports +++ b/openmp/runtime/src/dllexports @@ -1243,7 +1243,6 @@ kmp_set_disp_num_buffers 890 %ifdef IS_IA_ARCH __kmpc_atomic_float10_max 2139 __kmpc_atomic_float10_min 2140 - %endif __kmpc_atomic_float10_max_cpt 2141 __kmpc_atomic_float10_min_cpt 2142 @@ -1263,6 +1262,7 @@ kmp_set_disp_num_buffers 890 __kmpc_atomic_val_2_cas_cpt 2156 __kmpc_atomic_val_4_cas_cpt 2157 __kmpc_atomic_val_8_cas_cpt 2158 + %endif %endif diff --git a/openmp/runtime/src/kmp_os.h b/openmp/runtime/src/kmp_os.h index 458609cb6fe7..1a802ced69c1 100644 --- a/openmp/runtime/src/kmp_os.h +++ b/openmp/runtime/src/kmp_os.h @@ -456,7 +456,7 @@ enum kmp_mem_fence_type { // Synchronization primitives -#if KMP_ASM_INTRINS && KMP_OS_WINDOWS +#if KMP_ASM_INTRINS && KMP_OS_WINDOWS && !(KMP_ARCH_AARCH64 && defined(__GNUC__)) #if KMP_MSVC_COMPAT && !KMP_COMPILER_CLANG #pragma intrinsic(InterlockedExchangeAdd) diff --git a/openmp/runtime/src/kmp_utility.cpp b/openmp/runtime/src/kmp_utility.cpp index 48d31e5ee7b7..53ff1788a074 100644 --- a/openmp/runtime/src/kmp_utility.cpp +++ b/openmp/runtime/src/kmp_utility.cpp @@ -370,7 +370,7 @@ void __kmp_expand_file_name(char *result, size_t rlen, char *pattern) { case 'I': case 'i': { pid_t id = getpid(); -#if KMP_ARCH_X86_64 && defined(__MINGW32__) +#if (KMP_ARCH_X86_64 || KMP_ARCH_AARCH64) && defined(__MINGW32__) snp_result = KMP_SNPRINTF(pos, end - pos + 1, "%0*lld", width, id); #else snp_result = KMP_SNPRINTF(pos, end - pos + 1, "%0*d", width, id); |