diff options
| author | Keith Randall <khr@golang.org> | 2016-08-04 10:51:10 -0700 |
|---|---|---|
| committer | Keith Randall <khr@golang.org> | 2016-08-04 10:52:24 -0700 |
| commit | 01dbfb81a0d444cdaa867c30c6306b756c91dea6 (patch) | |
| tree | cd312ba492daa203f2f983521eb27c1141b8d851 | |
| parent | d2286ea2843569c7d277587f3d3ef06ae4092b78 (diff) | |
| parent | f135c326402aaa757aa96aad283a91873d4ae124 (diff) | |
| download | go-01dbfb81a0d444cdaa867c30c6306b756c91dea6.tar.gz go-01dbfb81a0d444cdaa867c30c6306b756c91dea6.zip | |
[dev.ssa] Merge commit 'f135c326402aaa757aa96aad283a91873d4ae124' into mergebranch
Pick up shared library fix in dev.ssa.
Change-Id: I5bdd0e9e0f1d6f7c14b518343ee323ed9a894b9c
| -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) |