code review 12485044: undo CL 12486043 / ab644299d124

src/pkg/go/build/build.go

Index: src/pkg/go/build/build.go
===================================================================
--- a/src/pkg/go/build/build.go
+++ b/src/pkg/go/build/build.go
@@ -877,7 +877,7 @@
 
 		// Split at colon.
 		line = strings.TrimSpace(line[4:])
-		i := strings.IndexByte(line, ':')
+		i := strings.Index(line, ":")
 		if i < 0 {
 			return fmt.Errorf("%s: invalid #cgo line: %s", filename, orig)
 		}
@@ -1022,7 +1022,7 @@
 	if name == "" {
 		return false
 	}
-	if i := strings.IndexByte(name, ','); i >= 0 {
+	if i := strings.Index(name, ","); i >= 0 {
 		// comma-separated list
 		return ctxt.match(name[:i]) && ctxt.match(name[i+1:])
 	}
@@ -1076,7 +1076,7 @@
 //     name_$(GOOS)_$(GOARCH)_test.*
 //
 func (ctxt *Context) goodOSArchFile(name string) bool {
-	if dot := strings.IndexByte(name, '.'); dot != -1 {
+	if dot := strings.Index(name, "."); dot != -1 {
 		name = name[:dot]
 	}
 	l := strings.Split(name, "_")