]> Cypherpunks repositories - gostls13.git/commitdiff
[dev.typeparams] runtime: use ABI0 handler addresses on Windows/ARM64
authorCherry Mui <cherryyz@google.com>
Thu, 20 May 2021 23:04:33 +0000 (19:04 -0400)
committerCherry Mui <cherryyz@google.com>
Fri, 21 May 2021 21:52:51 +0000 (21:52 +0000)
The handler address is passed to sigtramp, which calls it using
ABI0 calling convention. Use ABI0 symbols.

Change-Id: I5c16abef5e74a992d972fa5e100fed0ffb9f090a
Reviewed-on: https://go-review.googlesource.com/c/go/+/321951
Trust: Cherry Mui <cherryyz@google.com>
Run-TryBot: Cherry Mui <cherryyz@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Michael Knyszek <mknyszek@google.com>
src/runtime/sys_windows_arm64.s

index 1cf877dce90b9fa852682315c0751c9ef7ecfa37..e8593715089d4b13b01931f2de6c6a10dfe8b947 100644 (file)
@@ -291,15 +291,15 @@ TEXT sigresume<>(SB),NOSPLIT|NOFRAME,$0
        B       (R1)
 
 TEXT runtime·exceptiontramp(SB),NOSPLIT|NOFRAME,$0
-       MOVD    $runtime·exceptionhandler<ABIInternal>(SB), R1
+       MOVD    $runtime·exceptionhandler(SB), R1
        B       sigtramp<>(SB)
 
 TEXT runtime·firstcontinuetramp(SB),NOSPLIT|NOFRAME,$0
-       MOVD    $runtime·firstcontinuehandler<ABIInternal>(SB), R1
+       MOVD    $runtime·firstcontinuehandler(SB), R1
        B       sigtramp<>(SB)
 
 TEXT runtime·lastcontinuetramp(SB),NOSPLIT|NOFRAME,$0
-       MOVD    $runtime·lastcontinuehandler<ABIInternal>(SB), R1
+       MOVD    $runtime·lastcontinuehandler(SB), R1
        B       sigtramp<>(SB)
 
 GLOBL runtime·cbctxts(SB), NOPTR, $4