diff options
| author | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-08-08 18:21:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-08-08 18:21:58 +0000 |
| commit | f3b4e785164d6047947931724f54139a42b5293e (patch) | |
| tree | 77040812852f636da9e2b72c3ecbf780159f8f23 | |
| parent | 0484052358ffdfb64cd533b3ea55f7c2b9d0b7bd (diff) | |
| parent | 01dbfb81a0d444cdaa867c30c6306b756c91dea6 (diff) | |
| download | go-f3b4e785164d6047947931724f54139a42b5293e.tar.gz go-f3b4e785164d6047947931724f54139a42b5293e.zip | |
Merge "[dev.ssa] Merge commit 'f135c326402aaa757aa96aad283a91873d4ae124' into mergebranch" into dev.ssa
| -rw-r--r-- | src/runtime/alg.go | 2 | ||||
| -rw-r--r-- | src/runtime/proc.go | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/runtime/alg.go b/src/runtime/alg.go index 66943495b5..147332e1fd 100644 --- a/src/runtime/alg.go +++ b/src/runtime/alg.go @@ -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" && diff --git a/src/runtime/proc.go b/src/runtime/proc.go index 1d00930ac5..e693f7e05f 100644 --- a/src/runtime/proc.go +++ b/src/runtime/proc.go @@ -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) |