Merge pull request #97 from ianlancetaylor/master

Don't use flate asm code when building for gccgo.
klauspost · Nov 10, 2018 · 30be604 · 30be604
2 parents b500177 + c9ae1bf
commit 30be604
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/flate/crc32_amd64.go b/flate/crc32_amd64.go
@@ -1,5 +1,6 @@
 //+build !noasm
 //+build !appengine
+//+build !gccgo
 
 // Copyright 2015, Klaus Post, see LICENSE for details.
 

diff --git a/flate/crc32_amd64.s b/flate/crc32_amd64.s
@@ -1,5 +1,6 @@
 //+build !noasm
 //+build !appengine
+//+build !gccgo
 
 // Copyright 2015, Klaus Post, see LICENSE for details.
 

diff --git a/flate/crc32_noasm.go b/flate/crc32_noasm.go
@@ -1,4 +1,4 @@
-//+build !amd64 noasm appengine
+//+build !amd64 noasm appengine gccgo
 
 // Copyright 2015, Klaus Post, see LICENSE for details.