diff --git a/sql/sql.go b/sql/sql.go
index ed4a62ea3..339750d7f 100644
--- a/sql/sql.go
+++ b/sql/sql.go
@@ -1,4 +1,5 @@
 // +build !arm
+// +build !386
 
 package sql
 
diff --git a/sql/sql_arm.go b/sql/sql_32bit.go
similarity index 96%
rename from sql/sql_arm.go
rename to sql/sql_32bit.go
index bb37232e0..ceae5352a 100644
--- a/sql/sql_arm.go
+++ b/sql/sql_32bit.go
@@ -1,4 +1,4 @@
-// +build arm
+// +build arm 386
 
 package sql