]> Cypherpunks repositories - gostls13.git/commit
projects / gostls13.git / commit
summary | shortlog | log | commit | commitdiff | tree
(parent: 3583a44) | patch
runtime: fix conflict resolution in golang.org/cl/14207
authorMichael Hudson-Doyle <michael.hudson@canonical.com>
Wed, 25 Nov 2015 01:27:26 +0000 (14:27 +1300)
committerMichael Hudson-Doyle <michael.hudson@canonical.com>
Wed, 25 Nov 2015 01:32:55 +0000 (01:32 +0000)
commitfd2bc8681d10d3ca98647f4911e498d4e341ab65
tree9de3cd18db794dbe474b53545cffe43809317380tree
parent3583a44ed2ae27495626caaa431b197187dcf01bcommit | diff
runtime: fix conflict resolution in golang.org/cl/14207

Fixes testshared on arm64 and ppc64le.

Change-Id: Ie94bc0c85c7666fbb5ab6fc6d3dbb180407a9955
Reviewed-on: https://go-review.googlesource.com/17212
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
src/runtime/asm_arm64.s diff | blob | history
src/runtime/asm_ppc64x.s diff | blob | history
Go GOST TLS 1.3