[llvm-branch-commits] [openmp] e171ce9 - [openmp] Fix building z_Linux_asm.S for armv5t

[Tobias Hieta via llvm-branch-commits]

Author: Martin Storsjö
Date: 2023-02-13T11:27:53+01:00
New Revision: e171ce96349ada2bb111338e1b319883aa688fb4

URL: https://github.com/llvm/llvm-project/commit/e171ce96349ada2bb111338e1b319883aa688fb4
DIFF: https://github.com/llvm/llvm-project/commit/e171ce96349ada2bb111338e1b319883aa688fb4.diff

LOG: [openmp] Fix building z_Linux_asm.S for armv5t

Don't use the ldrd instruction; that one requires armv5te. Instead
do two separate loads (or only one if OMPT_SUPPORT isn't defined).

This should fix https://github.com/llvm/llvm-project/issues/60370.

Differential Revision: https://reviews.llvm.org/D143683

(cherry picked from commit 89197b59f597995ecb6b6dc2e262a1ecddeee901)

Added: 
    

Modified: 
    openmp/runtime/src/z_Linux_asm.S

Removed: 
    


################################################################################
diff  --git a/openmp/runtime/src/z_Linux_asm.S b/openmp/runtime/src/z_Linux_asm.S
index 557f3784b3c48..8aa48d10c3af3 100644
--- a/openmp/runtime/src/z_Linux_asm.S
+++ b/openmp/runtime/src/z_Linux_asm.S
@@ -1426,7 +1426,10 @@ __tid = 8
 	// for when we call pkfn below
 	push	{r3-r11,lr}
 	// Load p_argv and &exit_frame
-	ldrd	r4, r5, [sp, #10*4]
+	ldr	r4, [sp, #10*4]
+# if OMPT_SUPPORT
+	ldr	r5, [sp, #11*4]
+# endif
 
 # if KMP_OS_DARWIN || (defined(__thumb__) && !KMP_OS_WINDOWS)
 # define FP r7