From: Russ Cox <rsc@golang.org>
Date: Mon, 16 Mar 2015 23:03:09 +0000 (-0400)
Subject: cmd/internal/gc: mv builtins builtin
X-Git-Tag: go1.5beta1~1549
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=e5be6432a8c7b4295281635b9bcb30e21946d22d;p=gostls13.git

cmd/internal/gc: mv builtins builtin

This directory is processed by mkbuiltin.go and generates builtin.go.
It should be named builtin too, not builtins, both for consistency
and because file and directory names in general are singular unless
forced otherwise.

Commented on CL 6233 too.

Change-Id: Ic5d3671443ae9292b69fda118f61a11c88d823fa
Reviewed-on: https://go-review.googlesource.com/7660
Reviewed-by: Minux Ma <minux@golang.org>
---

diff --git a/src/cmd/internal/gc/builtins/runtime.go b/src/cmd/internal/gc/builtin/runtime.go
similarity index 100%
rename from src/cmd/internal/gc/builtins/runtime.go
rename to src/cmd/internal/gc/builtin/runtime.go
diff --git a/src/cmd/internal/gc/builtins/unsafe.go b/src/cmd/internal/gc/builtin/unsafe.go
similarity index 100%
rename from src/cmd/internal/gc/builtins/unsafe.go
rename to src/cmd/internal/gc/builtin/unsafe.go
diff --git a/src/cmd/internal/gc/mkbuiltin.go b/src/cmd/internal/gc/mkbuiltin.go
index f32a75b747..b2362a6f01 100644
--- a/src/cmd/internal/gc/mkbuiltin.go
+++ b/src/cmd/internal/gc/mkbuiltin.go
@@ -50,7 +50,7 @@ func main() {
 
 // Compile .go file, import data from .6 file, and write Go string version.
 func mkbuiltin(w io.Writer, gochar string, name string) {
-	if err := exec.Command("go", "tool", gochar+"g", "-A", "builtins/"+name+".go").Run(); err != nil {
+	if err := exec.Command("go", "tool", gochar+"g", "-A", "builtin/"+name+".go").Run(); err != nil {
 		log.Fatal(err)
 	}
 	obj := fmt.Sprintf("%s.%s", name, gochar)