From: Cherry Mui <cherryyz@google.com>
Date: Fri, 16 Feb 2024 15:58:56 +0000 (-0500)
Subject: runtime/internal/atomic: correct GOARM=7 guard at a DMB instruction
X-Git-Tag: go1.23rc1~1215
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=a0226c5680f3ce6b0d8a8341f8c69611f3008393;p=gostls13.git

runtime/internal/atomic: correct GOARM=7 guard at a DMB instruction

CL 525637 changed to the guard of DMB instruction from the
compiled-in runtime.goarm value to GOARM_7 macro and CPU feature
detection. It missed a place where runtime.goarm is loaded to a
register and reused later. This CL corrects the condition.

Fixes #65601.

Change-Id: I2ddefd03a1eb1048dbec0254c6e234c65b054279
Reviewed-on: https://go-review.googlesource.com/c/go/+/564855
Run-TryBot: Cherry Mui <cherryyz@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@google.com>
Reviewed-by: Keith Randall <khr@golang.org>
---

diff --git a/src/runtime/internal/atomic/atomic_arm.s b/src/runtime/internal/atomic/atomic_arm.s
index 662b5987f2..1cf7d8f6ef 100644
--- a/src/runtime/internal/atomic/atomic_arm.s
+++ b/src/runtime/internal/atomic/atomic_arm.s
@@ -41,8 +41,10 @@ casl:
 	BNE	casl
 	MOVW	$1, R0
 
-	CMP	$7, R8
-	BLT	2(PC)
+#ifndef GOARM_7
+	CMP	$0, R11
+	BEQ	2(PC)
+#endif
 	DMB	MB_ISH
 
 	MOVB	R0, ret+12(FP)