From: Cherry Mui Date: Fri, 31 Mar 2023 19:02:33 +0000 (+0000) Subject: Revert "runtime: fix ARM assembly code in cgocallback" X-Git-Tag: go1.21rc1~1075 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=99276aeb5e8b40ff9cd3cafd47ce11c58ba0130c;p=gostls13.git 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 TryBot-Result: Gopher Robot Reviewed-by: Michael Pratt --- diff --git a/src/runtime/asm_arm.s b/src/runtime/asm_arm.s index 01906dff4a..88e518b0c4 100644 --- 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