1
0
mirror of https://github.com/golang/go synced 2024-11-26 15:46:54 -07:00

Merge "[dev.ssa] Merge commit 'f135c326402aaa757aa96aad283a91873d4ae124' into mergebranch" into dev.ssa

This commit is contained in:
Gerrit Code Review 2016-08-08 18:21:58 +00:00
commit f3b4e78516
2 changed files with 3 additions and 2 deletions

View File

@ -289,7 +289,7 @@ var aeskeysched [hashRandomBytes]byte
// used in hash{32,64}.go to seed the hash function
var hashkey [4]uintptr
func init() {
func alginit() {
// Install aes hash algorithm if we have the instructions we need
if (GOARCH == "386" || GOARCH == "amd64") &&
GOOS != "nacl" &&

View File

@ -439,7 +439,8 @@ func schedinit() {
stackinit()
mallocinit()
mcommoninit(_g_.m)
typelinksinit()
alginit() // maps must not be used before this call
typelinksinit() // uses maps
itabsinit()
msigsave(_g_.m)