Revert "runtime: fix ARM assembly code in cgocallback"

This reverts CL 479255.

Reason for revert: need to revert CL 392854, and this caused a conflict.

Change-Id: I6cb105c62e51b47de3f652df5f5ee92673a93919
Reviewed-on: https://go-review.googlesource.com/c/go/+/481058
Run-TryBot: Cherry Mui <cherryyz@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Michael Pratt <mpratt@google.com>

diff --git a/src/runtime/asm_arm.s b/src/runtime/asm_arm.s
index 01906dff4a5eb723574e0947981264470a962b1c..88e518b0c4fa2a619e2b5e09747b2c1acc5e0d38 100644 (file)
--- a/src/runtime/asm_arm.s
+++ b/src/runtime/asm_arm.s
@@ -633,7 +633,6 @@ TEXT        ·cgocallback(SB),NOSPLIT,$12-12
        // Skip cgocallbackg, just dropm when fn is nil, and frame is the saved g.
        // It is used to dropm while thread is exiting.
        MOVW    fn+0(FP), R1
-       CMP     $0, R1
        B.NE    loadg
        // Restore the g from frame.
        MOVW    frame+4(FP), g