From b8039074d0f27132d6aabc9d27361d7f428bfcc6 Mon Sep 17 00:00:00 2001 From: Andrey Churbanov Date: Mon, 19 Jan 2015 14:00:00 +0000 Subject: [PATCH] Two fixes sent by C.Bergstrom: MB() does real synch for ARM; _Quad is not used when not available. llvm-svn: 226464 --- openmp/runtime/src/kmp_os.h | 2 +- openmp/runtime/src/kmp_tasking.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openmp/runtime/src/kmp_os.h b/openmp/runtime/src/kmp_os.h index 1c9d362..60463ce 100644 --- a/openmp/runtime/src/kmp_os.h +++ b/openmp/runtime/src/kmp_os.h @@ -672,7 +672,7 @@ extern kmp_real64 __kmp_xchg_real64( volatile kmp_real64 *p, kmp_real64 v ); # endif #endif /* KMP_OS_WINDOWS */ -#if KMP_ARCH_PPC64 +#if KMP_ARCH_PPC64 || KMP_ARCH_ARM || KMP_ARCH_AARCH64 # define KMP_MB() __sync_synchronize() #endif diff --git a/openmp/runtime/src/kmp_tasking.c b/openmp/runtime/src/kmp_tasking.c index 9db1565..e87e7a5 100644 --- a/openmp/runtime/src/kmp_tasking.c +++ b/openmp/runtime/src/kmp_tasking.c @@ -835,7 +835,7 @@ __kmp_task_alloc( ident_t *loc_ref, kmp_int32 gtid, kmp_tasking_flags_t *flags, task = KMP_TASKDATA_TO_TASK(taskdata); // Make sure task & taskdata are aligned appropriately -#if KMP_ARCH_X86 +#if KMP_ARCH_X86 || !KMP_HAVE_QUAD KMP_DEBUG_ASSERT( ( ((kmp_uintptr_t)taskdata) & (sizeof(double)-1) ) == 0 ); KMP_DEBUG_ASSERT( ( ((kmp_uintptr_t)task) & (sizeof(double)-1) ) == 0 ); #else -- 2.7.4