From: Shenghou Ma <minux@golang.org>
Date: Wed, 6 Aug 2014 04:24:11 +0000 (-0400)
Subject: runtime: disable aeshash on NaCl at compile time
X-Git-Tag: go1.4beta1~938
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=18ab35f7bace96197aed42b52235468424690664;p=gostls13.git

runtime: disable aeshash on NaCl at compile time

Fixes build for nacl/386.

LGTM=dave
R=khr, bradfitz, dave, dan.kortschak, rsc
CC=golang-codereviews
https://golang.org/cl/121080043
---

diff --git a/src/pkg/runtime/alg.go b/src/pkg/runtime/alg.go
index 9d06197f27..000d4a18b7 100644
--- a/src/pkg/runtime/alg.go
+++ b/src/pkg/runtime/alg.go
@@ -37,13 +37,15 @@ const (
 	alg_max
 )
 
+const nacl = GOOS == "nacl"
+
 var use_aeshash bool
 
 // in asm_*.s
 func aeshash(p unsafe.Pointer, s uintptr, h uintptr) uintptr
 
 func memhash(p unsafe.Pointer, s uintptr, h uintptr) uintptr {
-	if use_aeshash {
+	if !nacl && use_aeshash {
 		return aeshash(p, s, h)
 	}