]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/compile, cmd/link: create from 5g, 5l, etc
authorRuss Cox <rsc@golang.org>
Thu, 21 May 2015 17:28:10 +0000 (13:28 -0400)
committerRuss Cox <rsc@golang.org>
Thu, 21 May 2015 17:31:51 +0000 (17:31 +0000)
Trivial merging of 5g, 6g, ... into go tool compile,
and similarlly 5l, 6l, ... into go tool link.
The files compile/main.go and link/main.go are new.
Everything else in those directories is a move followed by
change of imports and package name.

This CL breaks the build. Manual fixups are in the next CL.

See golang-dev thread titled "go tool compile, etc" for background.

Change-Id: Id35ff5a5859ad9037c61275d637b1bd51df6828b
Reviewed-on: https://go-review.googlesource.com/10287
Reviewed-by: Dave Cheney <dave@cheney.net>
Reviewed-by: Rob Pike <r@golang.org>
156 files changed:
src/cmd/6l/z.go [deleted file]
src/cmd/compile/internal/amd64/cgen.go [moved from src/cmd/6g/cgen.go with 98% similarity]
src/cmd/compile/internal/amd64/galign.go [moved from src/cmd/6g/galign.go with 98% similarity]
src/cmd/compile/internal/amd64/ggen.go [moved from src/cmd/6g/ggen.go with 99% similarity]
src/cmd/compile/internal/amd64/gsubr.go [moved from src/cmd/6g/gsubr.go with 99% similarity]
src/cmd/compile/internal/amd64/peep.go [moved from src/cmd/6g/peep.go with 99% similarity]
src/cmd/compile/internal/amd64/prog.go [moved from src/cmd/6g/prog.go with 99% similarity]
src/cmd/compile/internal/amd64/reg.go [moved from src/cmd/6g/reg.go with 98% similarity]
src/cmd/compile/internal/arm/cgen.go [moved from src/cmd/5g/cgen.go with 99% similarity]
src/cmd/compile/internal/arm/cgen64.go [moved from src/cmd/5g/cgen64.go with 99% similarity]
src/cmd/compile/internal/arm/galign.go [moved from src/cmd/5g/galign.go with 97% similarity]
src/cmd/compile/internal/arm/ggen.go [moved from src/cmd/5g/ggen.go with 99% similarity]
src/cmd/compile/internal/arm/gsubr.go [moved from src/cmd/5g/gsubr.go with 99% similarity]
src/cmd/compile/internal/arm/peep.go [moved from src/cmd/5g/peep.go with 99% similarity]
src/cmd/compile/internal/arm/prog.go [moved from src/cmd/5g/prog.go with 99% similarity]
src/cmd/compile/internal/arm/reg.go [moved from src/cmd/5g/reg.go with 98% similarity]
src/cmd/compile/internal/arm64/cgen.go [moved from src/cmd/7g/cgen.go with 98% similarity]
src/cmd/compile/internal/arm64/galign.go [moved from src/cmd/7g/galign.go with 97% similarity]
src/cmd/compile/internal/arm64/ggen.go [moved from src/cmd/7g/ggen.go with 99% similarity]
src/cmd/compile/internal/arm64/gsubr.go [moved from src/cmd/7g/gsubr.go with 99% similarity]
src/cmd/compile/internal/arm64/peep.go [moved from src/cmd/7g/peep.go with 99% similarity]
src/cmd/compile/internal/arm64/prog.go [moved from src/cmd/7g/prog.go with 99% similarity]
src/cmd/compile/internal/arm64/reg.go [moved from src/cmd/7g/reg.go with 98% similarity]
src/cmd/compile/internal/big/accuracy_string.go [moved from src/cmd/internal/gc/big/accuracy_string.go with 100% similarity]
src/cmd/compile/internal/big/arith.go [moved from src/cmd/internal/gc/big/arith.go with 100% similarity]
src/cmd/compile/internal/big/arith_decl.go [moved from src/cmd/internal/gc/big/arith_decl.go with 100% similarity]
src/cmd/compile/internal/big/arith_test.go [moved from src/cmd/internal/gc/big/arith_test.go with 100% similarity]
src/cmd/compile/internal/big/bits_test.go [moved from src/cmd/internal/gc/big/bits_test.go with 100% similarity]
src/cmd/compile/internal/big/calibrate_test.go [moved from src/cmd/internal/gc/big/calibrate_test.go with 100% similarity]
src/cmd/compile/internal/big/decimal.go [moved from src/cmd/internal/gc/big/decimal.go with 100% similarity]
src/cmd/compile/internal/big/decimal_test.go [moved from src/cmd/internal/gc/big/decimal_test.go with 100% similarity]
src/cmd/compile/internal/big/example_test.go [moved from src/cmd/internal/gc/big/example_test.go with 100% similarity]
src/cmd/compile/internal/big/float.go [moved from src/cmd/internal/gc/big/float.go with 100% similarity]
src/cmd/compile/internal/big/float_test.go [moved from src/cmd/internal/gc/big/float_test.go with 100% similarity]
src/cmd/compile/internal/big/floatconv.go [moved from src/cmd/internal/gc/big/floatconv.go with 100% similarity]
src/cmd/compile/internal/big/floatconv_test.go [moved from src/cmd/internal/gc/big/floatconv_test.go with 100% similarity]
src/cmd/compile/internal/big/floatexample_test.go [moved from src/cmd/internal/gc/big/floatexample_test.go with 100% similarity]
src/cmd/compile/internal/big/ftoa.go [moved from src/cmd/internal/gc/big/ftoa.go with 100% similarity]
src/cmd/compile/internal/big/gcd_test.go [moved from src/cmd/internal/gc/big/gcd_test.go with 100% similarity]
src/cmd/compile/internal/big/hilbert_test.go [moved from src/cmd/internal/gc/big/hilbert_test.go with 100% similarity]
src/cmd/compile/internal/big/int.go [moved from src/cmd/internal/gc/big/int.go with 100% similarity]
src/cmd/compile/internal/big/int_test.go [moved from src/cmd/internal/gc/big/int_test.go with 100% similarity]
src/cmd/compile/internal/big/intconv.go [moved from src/cmd/internal/gc/big/intconv.go with 100% similarity]
src/cmd/compile/internal/big/intconv_test.go [moved from src/cmd/internal/gc/big/intconv_test.go with 100% similarity]
src/cmd/compile/internal/big/nat.go [moved from src/cmd/internal/gc/big/nat.go with 100% similarity]
src/cmd/compile/internal/big/nat_test.go [moved from src/cmd/internal/gc/big/nat_test.go with 100% similarity]
src/cmd/compile/internal/big/natconv.go [moved from src/cmd/internal/gc/big/natconv.go with 100% similarity]
src/cmd/compile/internal/big/natconv_test.go [moved from src/cmd/internal/gc/big/natconv_test.go with 100% similarity]
src/cmd/compile/internal/big/rat.go [moved from src/cmd/internal/gc/big/rat.go with 100% similarity]
src/cmd/compile/internal/big/rat_test.go [moved from src/cmd/internal/gc/big/rat_test.go with 100% similarity]
src/cmd/compile/internal/big/ratconv.go [moved from src/cmd/internal/gc/big/ratconv.go with 100% similarity]
src/cmd/compile/internal/big/ratconv_test.go [moved from src/cmd/internal/gc/big/ratconv_test.go with 100% similarity]
src/cmd/compile/internal/big/roundingmode_string.go [moved from src/cmd/internal/gc/big/roundingmode_string.go with 100% similarity]
src/cmd/compile/internal/big/vendor.bash [moved from src/cmd/internal/gc/big/vendor.bash with 100% similarity]
src/cmd/compile/internal/gc/align.go [moved from src/cmd/internal/gc/align.go with 100% similarity]
src/cmd/compile/internal/gc/builtin.go [moved from src/cmd/internal/gc/builtin.go with 100% similarity]
src/cmd/compile/internal/gc/builtin/runtime.go [moved from src/cmd/internal/gc/builtin/runtime.go with 100% similarity]
src/cmd/compile/internal/gc/builtin/unsafe.go [moved from src/cmd/internal/gc/builtin/unsafe.go with 100% similarity]
src/cmd/compile/internal/gc/bv.go [moved from src/cmd/internal/gc/bv.go with 100% similarity]
src/cmd/compile/internal/gc/cgen.go [moved from src/cmd/internal/gc/cgen.go with 100% similarity]
src/cmd/compile/internal/gc/closure.go [moved from src/cmd/internal/gc/closure.go with 100% similarity]
src/cmd/compile/internal/gc/const.go [moved from src/cmd/internal/gc/const.go with 99% similarity]
src/cmd/compile/internal/gc/cplx.go [moved from src/cmd/internal/gc/cplx.go with 100% similarity]
src/cmd/compile/internal/gc/dcl.go [moved from src/cmd/internal/gc/dcl.go with 100% similarity]
src/cmd/compile/internal/gc/esc.go [moved from src/cmd/internal/gc/esc.go with 100% similarity]
src/cmd/compile/internal/gc/export.go [moved from src/cmd/internal/gc/export.go with 100% similarity]
src/cmd/compile/internal/gc/fmt.go [moved from src/cmd/internal/gc/fmt.go with 100% similarity]
src/cmd/compile/internal/gc/gen.go [moved from src/cmd/internal/gc/gen.go with 100% similarity]
src/cmd/compile/internal/gc/go.go [moved from src/cmd/internal/gc/go.go with 99% similarity]
src/cmd/compile/internal/gc/go.y [moved from src/cmd/internal/gc/go.y with 100% similarity]
src/cmd/compile/internal/gc/gsubr.go [moved from src/cmd/internal/gc/gsubr.go with 100% similarity]
src/cmd/compile/internal/gc/init.go [moved from src/cmd/internal/gc/init.go with 100% similarity]
src/cmd/compile/internal/gc/inl.go [moved from src/cmd/internal/gc/inl.go with 100% similarity]
src/cmd/compile/internal/gc/lex.go [moved from src/cmd/internal/gc/lex.go with 100% similarity]
src/cmd/compile/internal/gc/mkbuiltin.go [moved from src/cmd/internal/gc/mkbuiltin.go with 100% similarity]
src/cmd/compile/internal/gc/mparith2.go [moved from src/cmd/internal/gc/mparith2.go with 99% similarity]
src/cmd/compile/internal/gc/mparith3.go [moved from src/cmd/internal/gc/mparith3.go with 99% similarity]
src/cmd/compile/internal/gc/obj.go [moved from src/cmd/internal/gc/obj.go with 100% similarity]
src/cmd/compile/internal/gc/opnames.go [moved from src/cmd/internal/gc/opnames.go with 100% similarity]
src/cmd/compile/internal/gc/order.go [moved from src/cmd/internal/gc/order.go with 100% similarity]
src/cmd/compile/internal/gc/pgen.go [moved from src/cmd/internal/gc/pgen.go with 100% similarity]
src/cmd/compile/internal/gc/plive.go [moved from src/cmd/internal/gc/plive.go with 100% similarity]
src/cmd/compile/internal/gc/popt.go [moved from src/cmd/internal/gc/popt.go with 100% similarity]
src/cmd/compile/internal/gc/racewalk.go [moved from src/cmd/internal/gc/racewalk.go with 100% similarity]
src/cmd/compile/internal/gc/range.go [moved from src/cmd/internal/gc/range.go with 100% similarity]
src/cmd/compile/internal/gc/reflect.go [moved from src/cmd/internal/gc/reflect.go with 100% similarity]
src/cmd/compile/internal/gc/reg.go [moved from src/cmd/internal/gc/reg.go with 100% similarity]
src/cmd/compile/internal/gc/select.go [moved from src/cmd/internal/gc/select.go with 100% similarity]
src/cmd/compile/internal/gc/sinit.go [moved from src/cmd/internal/gc/sinit.go with 100% similarity]
src/cmd/compile/internal/gc/subr.go [moved from src/cmd/internal/gc/subr.go with 100% similarity]
src/cmd/compile/internal/gc/swt.go [moved from src/cmd/internal/gc/swt.go with 100% similarity]
src/cmd/compile/internal/gc/syntax.go [moved from src/cmd/internal/gc/syntax.go with 100% similarity]
src/cmd/compile/internal/gc/typecheck.go [moved from src/cmd/internal/gc/typecheck.go with 100% similarity]
src/cmd/compile/internal/gc/unsafe.go [moved from src/cmd/internal/gc/unsafe.go with 100% similarity]
src/cmd/compile/internal/gc/util.go [moved from src/cmd/internal/gc/util.go with 100% similarity]
src/cmd/compile/internal/gc/walk.go [moved from src/cmd/internal/gc/walk.go with 100% similarity]
src/cmd/compile/internal/gc/y.go [moved from src/cmd/internal/gc/y.go with 100% similarity]
src/cmd/compile/internal/gc/y.output [moved from src/cmd/internal/gc/y.output with 100% similarity]
src/cmd/compile/internal/ppc64/cgen.go [moved from src/cmd/9g/cgen.go with 98% similarity]
src/cmd/compile/internal/ppc64/galign.go [moved from src/cmd/9g/galign.go with 97% similarity]
src/cmd/compile/internal/ppc64/ggen.go [moved from src/cmd/9g/ggen.go with 99% similarity]
src/cmd/compile/internal/ppc64/gsubr.go [moved from src/cmd/9g/gsubr.go with 99% similarity]
src/cmd/compile/internal/ppc64/opt.go [moved from src/cmd/9g/opt.go with 96% similarity]
src/cmd/compile/internal/ppc64/peep.go [moved from src/cmd/9g/peep.go with 99% similarity]
src/cmd/compile/internal/ppc64/prog.go [moved from src/cmd/9g/prog.go with 99% similarity]
src/cmd/compile/internal/ppc64/reg.go [moved from src/cmd/9g/reg.go with 98% similarity]
src/cmd/compile/internal/x86/cgen.go [moved from src/cmd/8g/cgen.go with 98% similarity]
src/cmd/compile/internal/x86/cgen64.go [moved from src/cmd/8g/cgen64.go with 99% similarity]
src/cmd/compile/internal/x86/galign.go [moved from src/cmd/8g/galign.go with 98% similarity]
src/cmd/compile/internal/x86/ggen.go [moved from src/cmd/8g/ggen.go with 99% similarity]
src/cmd/compile/internal/x86/gsubr.go [moved from src/cmd/8g/gsubr.go with 99% similarity]
src/cmd/compile/internal/x86/peep.go [moved from src/cmd/8g/peep.go with 99% similarity]
src/cmd/compile/internal/x86/prog.go [moved from src/cmd/8g/prog.go with 99% similarity]
src/cmd/compile/internal/x86/reg.go [moved from src/cmd/8g/reg.go with 98% similarity]
src/cmd/compile/main.go [new file with mode: 0644]
src/cmd/link/internal/amd64/asm.go [moved from src/cmd/6l/asm.go with 99% similarity]
src/cmd/link/internal/amd64/l.go [moved from src/cmd/6l/l.go with 99% similarity]
src/cmd/link/internal/amd64/obj.go [moved from src/cmd/6l/obj.go with 99% similarity]
src/cmd/link/internal/amd64/z.go [new file with mode: 0644]
src/cmd/link/internal/arm/asm.go [moved from src/cmd/5l/asm.go with 99% similarity]
src/cmd/link/internal/arm/l.go [moved from src/cmd/5l/l.go with 99% similarity]
src/cmd/link/internal/arm/obj.go [moved from src/cmd/5l/obj.go with 98% similarity]
src/cmd/link/internal/arm64/asm.go [moved from src/cmd/7l/asm.go with 99% similarity]
src/cmd/link/internal/arm64/l.go [moved from src/cmd/7l/l.go with 99% similarity]
src/cmd/link/internal/arm64/obj.go [moved from src/cmd/7l/obj.go with 98% similarity]
src/cmd/link/internal/ld/ar.go [moved from src/cmd/internal/ld/ar.go with 100% similarity]
src/cmd/link/internal/ld/arch.go [moved from src/cmd/internal/ld/arch.go with 100% similarity]
src/cmd/link/internal/ld/data.go [moved from src/cmd/internal/ld/data.go with 100% similarity]
src/cmd/link/internal/ld/decodesym.go [moved from src/cmd/internal/ld/decodesym.go with 100% similarity]
src/cmd/link/internal/ld/dwarf.go [moved from src/cmd/internal/ld/dwarf.go with 100% similarity]
src/cmd/link/internal/ld/dwarf_defs.go [moved from src/cmd/internal/ld/dwarf_defs.go with 100% similarity]
src/cmd/link/internal/ld/elf.go [moved from src/cmd/internal/ld/elf.go with 100% similarity]
src/cmd/link/internal/ld/go.go [moved from src/cmd/internal/ld/go.go with 100% similarity]
src/cmd/link/internal/ld/ld.go [moved from src/cmd/internal/ld/ld.go with 100% similarity]
src/cmd/link/internal/ld/ldelf.go [moved from src/cmd/internal/ld/ldelf.go with 100% similarity]
src/cmd/link/internal/ld/ldmacho.go [moved from src/cmd/internal/ld/ldmacho.go with 100% similarity]
src/cmd/link/internal/ld/ldpe.go [moved from src/cmd/internal/ld/ldpe.go with 100% similarity]
src/cmd/link/internal/ld/lib.go [moved from src/cmd/internal/ld/lib.go with 100% similarity]
src/cmd/link/internal/ld/link.go [moved from src/cmd/internal/ld/link.go with 100% similarity]
src/cmd/link/internal/ld/macho.go [moved from src/cmd/internal/ld/macho.go with 100% similarity]
src/cmd/link/internal/ld/macho_combine_dwarf.go [moved from src/cmd/internal/ld/macho_combine_dwarf.go with 100% similarity]
src/cmd/link/internal/ld/objfile.go [moved from src/cmd/internal/ld/objfile.go with 100% similarity]
src/cmd/link/internal/ld/pcln.go [moved from src/cmd/internal/ld/pcln.go with 100% similarity]
src/cmd/link/internal/ld/pe.go [moved from src/cmd/internal/ld/pe.go with 100% similarity]
src/cmd/link/internal/ld/pobj.go [moved from src/cmd/internal/ld/pobj.go with 100% similarity]
src/cmd/link/internal/ld/sym.go [moved from src/cmd/internal/ld/sym.go with 100% similarity]
src/cmd/link/internal/ld/symtab.go [moved from src/cmd/internal/ld/symtab.go with 100% similarity]
src/cmd/link/internal/ld/textflag.go [moved from src/cmd/internal/ld/textflag.go with 100% similarity]
src/cmd/link/internal/ld/util.go [moved from src/cmd/internal/ld/util.go with 100% similarity]
src/cmd/link/internal/ppc64/asm.go [moved from src/cmd/9l/asm.go with 99% similarity]
src/cmd/link/internal/ppc64/l.go [moved from src/cmd/9l/l.go with 99% similarity]
src/cmd/link/internal/ppc64/obj.go [moved from src/cmd/9l/obj.go with 98% similarity]
src/cmd/link/internal/x86/asm.go [moved from src/cmd/8l/asm.go with 99% similarity]
src/cmd/link/internal/x86/l.go [moved from src/cmd/8l/l.go with 99% similarity]
src/cmd/link/internal/x86/obj.go [moved from src/cmd/8l/obj.go with 99% similarity]
src/cmd/link/main.go [new file with mode: 0644]

diff --git a/src/cmd/6l/z.go b/src/cmd/6l/z.go
deleted file mode 100644 (file)
index 06ab7d0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-package main
similarity index 98%
rename from src/cmd/6g/cgen.go
rename to src/cmd/compile/internal/amd64/cgen.go
index 23e2d1b57ff7c59ae5a22d0bbd579fbfa1442f16..71f8f8832280e1193b2109a434608a512bf4fddb 100644 (file)
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main
+package amd64
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/x86"
 )
similarity index 98%
rename from src/cmd/6g/galign.go
rename to src/cmd/compile/internal/amd64/galign.go
index 17d78f399d36e7c92fb74e69f2b784c6eabc0911..79bf94a0752e36cb4b8f1e4a4406b452901aa7dc 100644 (file)
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main
+package amd64
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/x86"
 )
@@ -65,7 +65,7 @@ func betypeinit() {
        }
 }
 
-func main() {
+func Main() {
        if obj.Getgoos() == "nacl" {
                resvd = append(resvd, x86.REG_BP, x86.REG_R15)
        } else if obj.Framepointer_enabled != 0 {
similarity index 99%
rename from src/cmd/6g/ggen.go
rename to src/cmd/compile/internal/amd64/ggen.go
index e0e1b8a4df8bbc4080b27067940bf038c1395b9b..6425633818ce4552736444c374a6c6221fa4b492 100644 (file)
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main
+package amd64
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/x86"
 )
similarity index 99%
rename from src/cmd/6g/gsubr.go
rename to src/cmd/compile/internal/amd64/gsubr.go
index 9b9141468ee58957aa451250d1821494ebfb3d7b..a8e4170bee54647887849e8ac91c44dc96effdf4 100644 (file)
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package amd64
 
 import (
-       "cmd/internal/gc"
-       "cmd/internal/gc/big"
+       "cmd/compile/internal/big"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/x86"
        "fmt"
similarity index 99%
rename from src/cmd/6g/peep.go
rename to src/cmd/compile/internal/amd64/peep.go
index cd07199ed1b26ca3a328b0790985ab1d5b8343e2..19db68e944981e67f834627dfee304eabcdf987f 100644 (file)
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package amd64
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/x86"
        "fmt"
similarity index 99%
rename from src/cmd/6g/prog.go
rename to src/cmd/compile/internal/amd64/prog.go
index 5f604742c37842124f854f5fea3b2bb52d46c048..00918c869185d21e86c551a0e318ff9879721be7 100644 (file)
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main
+package amd64
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/x86"
 )
similarity index 98%
rename from src/cmd/6g/reg.go
rename to src/cmd/compile/internal/amd64/reg.go
index cab07b5b4ebfe07cd241e150b85e7f071cf9b4ea..7d4f40641de72f14b7f5d2c1013ad446516b52c3 100644 (file)
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package amd64
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/x86"
 )
similarity index 99%
rename from src/cmd/5g/cgen.go
rename to src/cmd/compile/internal/arm/cgen.go
index c0d7651584b43614f7ebd48701d38de072f517d8..8ea6c5f3f2d4e870846bcc09f8292894bcc423e2 100644 (file)
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main
+package arm
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/arm"
 )
similarity index 99%
rename from src/cmd/5g/cgen64.go
rename to src/cmd/compile/internal/arm/cgen64.go
index c55e000adcbfd835cb10d6786b64ca1b3b88c305..6c88b76e2020654be5d806332c17fd8b38f901fb 100644 (file)
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main
+package arm
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/arm"
 )
similarity index 97%
rename from src/cmd/5g/galign.go
rename to src/cmd/compile/internal/arm/galign.go
index 55782e1dae83b835876c00e236afcbc12a294eb5..60a39d3fe48f2c70dc61b3113b1309113deb6a77 100644 (file)
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main
+package arm
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/arm"
 )
@@ -37,7 +37,7 @@ func betypeinit() {
        gc.Widthreg = 4
 }
 
-func main() {
+func Main() {
        gc.Thearch.Thechar = thechar
        gc.Thearch.Thestring = thestring
        gc.Thearch.Thelinkarch = thelinkarch
similarity index 99%
rename from src/cmd/5g/ggen.go
rename to src/cmd/compile/internal/arm/ggen.go
index 2ab5d521bb2f613491f93443f821c60759ebdeb7..663335103242e845b07f33d15ce949e9550ecdf1 100644 (file)
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main
+package arm
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/arm"
 )
similarity index 99%
rename from src/cmd/5g/gsubr.go
rename to src/cmd/compile/internal/arm/gsubr.go
index 2a23580b583e0c7d4e8868337e5d0c4c1bd214bf..5263f15ac2bf228f177cbb1ba114a14abc32ebec 100644 (file)
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package arm
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/arm"
        "fmt"
similarity index 99%
rename from src/cmd/5g/peep.go
rename to src/cmd/compile/internal/arm/peep.go
index b76719d74e853658596e4167193107b5a4b76776..66eba417c02f231b1ee42b80a7fcd247b9081e76 100644 (file)
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package arm
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/arm"
        "fmt"
similarity index 99%
rename from src/cmd/5g/prog.go
rename to src/cmd/compile/internal/arm/prog.go
index c472cdf04282a01cd7636bf3e115ae566e94ba6f..cdf9d29192ac4ccbec26f1ae10fe6bd56269c100 100644 (file)
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main
+package arm
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/arm"
 )
similarity index 98%
rename from src/cmd/5g/reg.go
rename to src/cmd/compile/internal/arm/reg.go
index 2afdf1241612f2c88cd82d575e4000dd9f02cc36..b72ccc98158479c1f677cb041219ac36685f9af2 100644 (file)
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package arm
 
 import "cmd/internal/obj/arm"
-import "cmd/internal/gc"
+import "cmd/compile/internal/gc"
 
 const (
        NREGVAR = 32
similarity index 98%
rename from src/cmd/7g/cgen.go
rename to src/cmd/compile/internal/arm64/cgen.go
index 6f268b41856c111b6d4ecb9a1098f3c53ee6c383..30326d73e27b205d6f16bfd6ce204a3d97ce549c 100644 (file)
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main
+package arm64
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/arm64"
 )
similarity index 97%
rename from src/cmd/7g/galign.go
rename to src/cmd/compile/internal/arm64/galign.go
index 8a6184efd04a08a214f3b5b57a63c4edd14c5877..38def8f5a496e9049eb610ab898f7dbdcfe89b4f 100644 (file)
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main
+package arm64
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/arm64"
 )
@@ -37,7 +37,7 @@ func betypeinit() {
        gc.Widthreg = 8
 }
 
-func main() {
+func Main() {
        gc.Thearch.Thechar = thechar
        gc.Thearch.Thestring = thestring
        gc.Thearch.Thelinkarch = thelinkarch
similarity index 99%
rename from src/cmd/7g/ggen.go
rename to src/cmd/compile/internal/arm64/ggen.go
index ec2eb09e385898e0440eaebcbd6bb46b99e7115d..851ca4e30f7a4d9af6f05904021cb1dc11d9b438 100644 (file)
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main
+package arm64
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/arm64"
        "fmt"
similarity index 99%
rename from src/cmd/7g/gsubr.go
rename to src/cmd/compile/internal/arm64/gsubr.go
index 0f617079ad178c5c75124839b061c4eedfd3a4dd..0a14654d83758b9e8f210e25bb76a40ee9c73df1 100644 (file)
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package arm64
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/arm64"
        "fmt"
similarity index 99%
rename from src/cmd/7g/peep.go
rename to src/cmd/compile/internal/arm64/peep.go
index 49bc69b132eb70fed65f785c8e55ab82dc284ae6..1c3b2891aa044e2ec568aab79a13fe29c3f5cab3 100644 (file)
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package arm64
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/arm64"
        "fmt"
similarity index 99%
rename from src/cmd/7g/prog.go
rename to src/cmd/compile/internal/arm64/prog.go
index 023f302e14adf4cf544f76fd9b12fd6ffb5611ba..1106e788a53141bc98672f9d76df157118a28a6e 100644 (file)
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main
+package arm64
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/arm64"
 )
similarity index 98%
rename from src/cmd/7g/reg.go
rename to src/cmd/compile/internal/arm64/reg.go
index 0e5ac7349928b00e2da03c352d06b5d187797fd8..7bc756b7bf0361112fc7bcf409fdd39422b1b750 100644 (file)
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package arm64
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj/arm64"
 )
 
similarity index 99%
rename from src/cmd/internal/gc/const.go
rename to src/cmd/compile/internal/gc/const.go
index 986e2c33372b2654144ca48750379f6603467354..b3605ab206c6de0d740b677574add7bb4cfd2228 100644 (file)
@@ -5,7 +5,7 @@
 package gc
 
 import (
-       "cmd/internal/gc/big"
+       "cmd/compile/internal/big"
        "cmd/internal/obj"
        "strings"
 )
similarity index 99%
rename from src/cmd/internal/gc/go.go
rename to src/cmd/compile/internal/gc/go.go
index 6a3379b896e4a25e0e51866379e3ebfc9df071cd..dc33f62ba4811b3310202c213e2a99dfd32fea6d 100644 (file)
@@ -6,7 +6,7 @@ package gc
 
 import (
        "bytes"
-       "cmd/internal/gc/big"
+       "cmd/compile/internal/big"
        "cmd/internal/obj"
 )
 
similarity index 99%
rename from src/cmd/internal/gc/mparith2.go
rename to src/cmd/compile/internal/gc/mparith2.go
index 2456dbf60a69c7dc57720a2522fda106d1a2dee7..2c7e5176acb3a9a77930e86e521592b5b6f6c007 100644 (file)
@@ -5,7 +5,7 @@
 package gc
 
 import (
-       "cmd/internal/gc/big"
+       "cmd/compile/internal/big"
        "cmd/internal/obj"
        "fmt"
 )
similarity index 99%
rename from src/cmd/internal/gc/mparith3.go
rename to src/cmd/compile/internal/gc/mparith3.go
index 2700b64a89b9823b506ed1a851ec1a3c752aba3d..181e91c87dbc872b6ce80bcba84d38789cb5dbe2 100644 (file)
@@ -5,7 +5,7 @@
 package gc
 
 import (
-       "cmd/internal/gc/big"
+       "cmd/compile/internal/big"
        "cmd/internal/obj"
        "fmt"
        "math"
similarity index 98%
rename from src/cmd/9g/cgen.go
rename to src/cmd/compile/internal/ppc64/cgen.go
index 5d24a6ff67194185ec93fd57423958fd80e06672..37dd6cefb27c8fc65c48825bf7eba7dd8dd292db 100644 (file)
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main
+package ppc64
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/ppc64"
 )
similarity index 97%
rename from src/cmd/9g/galign.go
rename to src/cmd/compile/internal/ppc64/galign.go
index 6e1612007bb65d589a660eae5ed9a1b71557a712..73aef6fde9423564ea6690703fa4daee540b16ad 100644 (file)
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main
+package ppc64
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/ppc64"
 )
@@ -45,7 +45,7 @@ func betypeinit() {
        gc.Widthreg = 8
 }
 
-func main() {
+func Main() {
        gc.Thearch.Thechar = thechar
        gc.Thearch.Thestring = thestring
        gc.Thearch.Thelinkarch = thelinkarch
similarity index 99%
rename from src/cmd/9g/ggen.go
rename to src/cmd/compile/internal/ppc64/ggen.go
index 3a10a2a76006830d7fa2da22f91bd2a3a71dc3ac..1b936b8a5f60002f84f271bc217070d3655cd09a 100644 (file)
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main
+package ppc64
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/ppc64"
        "fmt"
similarity index 99%
rename from src/cmd/9g/gsubr.go
rename to src/cmd/compile/internal/ppc64/gsubr.go
index 3a7c884fd11c5f973d1dc9a82083c1744215cec7..2501972846ff968d37322525d6dc8b461e24c5a3 100644 (file)
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package ppc64
 
 import (
-       "cmd/internal/gc"
-       "cmd/internal/gc/big"
+       "cmd/compile/internal/big"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/ppc64"
        "fmt"
similarity index 96%
rename from src/cmd/9g/opt.go
rename to src/cmd/compile/internal/ppc64/opt.go
index 4a134f134ff5c7734732ac7bd1e5806cca8e870e..1704f63c4825f13719c2618e619e18ca6d14dc4f 100644 (file)
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main
+package ppc64
 
 // Many Power ISA arithmetic and logical instructions come in four
 // standard variants.  These bits let us map between variants.
similarity index 99%
rename from src/cmd/9g/peep.go
rename to src/cmd/compile/internal/ppc64/peep.go
index 94c9b1554b45d291e844d75b263be703f00d0885..16eeb39097ce7a785273692df30cb3e3cc2be9aa 100644 (file)
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package ppc64
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/ppc64"
        "fmt"
similarity index 99%
rename from src/cmd/9g/prog.go
rename to src/cmd/compile/internal/ppc64/prog.go
index e28e389fac2c878521cb45b5c15f2d8932f09157..c7e182769dcd517ba4624fcea6d9c10ab1b0912a 100644 (file)
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main
+package ppc64
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/ppc64"
 )
similarity index 98%
rename from src/cmd/9g/reg.go
rename to src/cmd/compile/internal/ppc64/reg.go
index fb0c2e37ec04fdeade7309d9490fb0f1d3d49111..fa1cb71975e511316b44887eb471989503690f6c 100644 (file)
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package ppc64
 
 import "cmd/internal/obj/ppc64"
-import "cmd/internal/gc"
+import "cmd/compile/internal/gc"
 
 const (
        NREGVAR = 64 /* 32 general + 32 floating */
similarity index 98%
rename from src/cmd/8g/cgen.go
rename to src/cmd/compile/internal/x86/cgen.go
index 48d9e9867af3b87e4c3248e34861225d65aaa534..1768674e4296442acccb369f8f5f7c8fab6dab22 100644 (file)
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main
+package x86
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/x86"
 )
similarity index 99%
rename from src/cmd/8g/cgen64.go
rename to src/cmd/compile/internal/x86/cgen64.go
index 80a9642f75ca9e6f4a92a44cf5601d6ee00d3185..0b061ffb60d212e203e3cdd3fadc5f8d4bf480a1 100644 (file)
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main
+package x86
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/x86"
 )
similarity index 98%
rename from src/cmd/8g/galign.go
rename to src/cmd/compile/internal/x86/galign.go
index 3651f509c9ef22df62c016b56bda3dc15da894f1..2b602e1bb3387811c501fd911ecdec9101d2863d 100644 (file)
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main
+package x86
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/x86"
        "fmt"
@@ -39,7 +39,7 @@ func betypeinit() {
        gc.Widthreg = 4
 }
 
-func main() {
+func Main() {
        gc.Thearch.Thechar = thechar
        gc.Thearch.Thestring = thestring
        gc.Thearch.Thelinkarch = thelinkarch
similarity index 99%
rename from src/cmd/8g/ggen.go
rename to src/cmd/compile/internal/x86/ggen.go
index bd2c13e8679b4e948c6f3ef51f7fbda1ddb44ba7..dabc139f302030e755c0775d39e58ab567534db0 100644 (file)
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main
+package x86
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/x86"
 )
similarity index 99%
rename from src/cmd/8g/gsubr.go
rename to src/cmd/compile/internal/x86/gsubr.go
index 99bce6eaba7d2879429550ff44698ed4f9b240bb..baf251781c2c88e581bf49d2ea829bf097de551e 100644 (file)
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package x86
 
 import (
-       "cmd/internal/gc"
-       "cmd/internal/gc/big"
+       "cmd/compile/internal/big"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/x86"
        "fmt"
similarity index 99%
rename from src/cmd/8g/peep.go
rename to src/cmd/compile/internal/x86/peep.go
index e309aea7859d772891c33076f215779fef309bf2..8b50eab077ad1f08ec79517c19b2f4031f2ce710 100644 (file)
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package x86
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/x86"
        "fmt"
similarity index 99%
rename from src/cmd/8g/prog.go
rename to src/cmd/compile/internal/x86/prog.go
index 1346c20f2bf47a4f195b212996df445888662927..f96a1aa9453bbc6c9ae91d6f8376fdacf0d4ca72 100644 (file)
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main
+package x86
 
 import (
-       "cmd/internal/gc"
+       "cmd/compile/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/x86"
 )
similarity index 98%
rename from src/cmd/8g/reg.go
rename to src/cmd/compile/internal/x86/reg.go
index 50b5b97ab1c8963c586df5f8d0b56d414861b844..8c97171e47dfe8e374360afd9d5c5c2a0077f77f 100644 (file)
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package x86
 
 import "cmd/internal/obj/x86"
-import "cmd/internal/gc"
+import "cmd/compile/internal/gc"
 
 const (
        NREGVAR = 16 /* 8 integer + 8 floating */
diff --git a/src/cmd/compile/main.go b/src/cmd/compile/main.go
new file mode 100644 (file)
index 0000000..7b69c34
--- /dev/null
@@ -0,0 +1,34 @@
+// Copyright 2015 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+       "cmd/compile/internal/amd64"
+       "cmd/compile/internal/arm"
+       "cmd/compile/internal/arm64"
+       "cmd/compile/internal/ppc64"
+       "cmd/compile/internal/x86"
+       "cmd/internal/obj"
+       "fmt"
+       "os"
+)
+
+func main() {
+       switch obj.Getgoarch() {
+       default:
+               fmt.Fprintf(os.Stderr, "compile: unknown architecture %q\n", obj.Getgoarch())
+               os.Exit(2)
+       case "386":
+               x86.Main()
+       case "amd64", "amd64p32":
+               amd64.Main()
+       case "arm":
+               arm.Main()
+       case "arm64":
+               arm64.Main()
+       case "ppc64", "ppc64le":
+               ppc64.Main()
+       }
+}
similarity index 99%
rename from src/cmd/6l/asm.go
rename to src/cmd/link/internal/amd64/asm.go
index 02b4c7cdd230b064f77b73cbd5a1953d2e672bda..a4883f1a33c26244027c3c9ee72e2211c8db86e9 100644 (file)
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package amd64
 
 import (
-       "cmd/internal/ld"
        "cmd/internal/obj"
+       "cmd/link/internal/ld"
        "debug/elf"
        "fmt"
        "log"
similarity index 99%
rename from src/cmd/6l/l.go
rename to src/cmd/link/internal/amd64/l.go
index 64466d126a45987d117f196b62aa804344c2914a..2537419eff7623f24d0e826acf12a2e110d12bf6 100644 (file)
@@ -28,7 +28,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package amd64
 
 const (
        thechar   = '6'
similarity index 99%
rename from src/cmd/6l/obj.go
rename to src/cmd/link/internal/amd64/obj.go
index 1dc9e02a8bacda1174f267374c1380733d7abac9..e489bb75a9dd8cd07c4f54151c0f7ab62a4fc7f5 100644 (file)
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package amd64
 
 import (
-       "cmd/internal/ld"
        "cmd/internal/obj"
+       "cmd/link/internal/ld"
        "fmt"
        "log"
 )
 
 // Reading object files.
 
-func main() {
+func Main() {
        linkarchinit()
        ld.Ldmain()
 }
diff --git a/src/cmd/link/internal/amd64/z.go b/src/cmd/link/internal/amd64/z.go
new file mode 100644 (file)
index 0000000..f70035b
--- /dev/null
@@ -0,0 +1 @@
+package amd64
similarity index 99%
rename from src/cmd/5l/asm.go
rename to src/cmd/link/internal/arm/asm.go
index 70d6790fc13fc19f956d5dd93ceffe4443cd03e7..e310d29e9af0e8948a01d0a6458fccef6ffa3e54 100644 (file)
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package arm
 
 import (
-       "cmd/internal/ld"
        "cmd/internal/obj"
+       "cmd/link/internal/ld"
        "fmt"
        "log"
 )
similarity index 99%
rename from src/cmd/5l/l.go
rename to src/cmd/link/internal/arm/l.go
index adc8d286ae702501cfbfadb6dde1d70e9fb2a7c7..4973772163f655b72df2fdf7f80d1b3cd846a7fe 100644 (file)
@@ -28,7 +28,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package arm
 
 // Writing object files.
 
similarity index 98%
rename from src/cmd/5l/obj.go
rename to src/cmd/link/internal/arm/obj.go
index 9c9578343e27f107b6ba3a8e4d6ebfa3997e9700..14fe7a64eb286edf698d0219c9c2b6c2419c2676 100644 (file)
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package arm
 
 import (
-       "cmd/internal/ld"
        "cmd/internal/obj"
+       "cmd/link/internal/ld"
        "fmt"
        "log"
 )
 
 // Reading object files.
 
-func main() {
+func Main() {
        linkarchinit()
        ld.Ldmain()
 }
similarity index 99%
rename from src/cmd/7l/asm.go
rename to src/cmd/link/internal/arm64/asm.go
index 064ff56283f82191c4f2461df41ccca62250112e..9d76f0e0c3c388b6a1a73948e4b9fedfd96f230a 100644 (file)
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package arm64
 
 import (
-       "cmd/internal/ld"
        "cmd/internal/obj"
+       "cmd/link/internal/ld"
        "encoding/binary"
        "fmt"
        "log"
similarity index 99%
rename from src/cmd/7l/l.go
rename to src/cmd/link/internal/arm64/l.go
index 7227cc430fe43fc9e32d50b57bc3e0672d9e24ee..8d0d57e72a65027fc94d06fcfa7626ceba7f0ba9 100644 (file)
@@ -28,7 +28,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package arm64
 
 // Writing object files.
 
similarity index 98%
rename from src/cmd/7l/obj.go
rename to src/cmd/link/internal/arm64/obj.go
index f88584b9387e18771fd7efcaedeaf5ccdeca26b4..56f581590339fb88cc41d9fcc12d67b0709ee0fc 100644 (file)
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package arm64
 
 import (
-       "cmd/internal/ld"
        "cmd/internal/obj"
+       "cmd/link/internal/ld"
        "fmt"
        "log"
 )
 
 // Reading object files.
 
-func main() {
+func Main() {
        linkarchinit()
        ld.Ldmain()
 }
similarity index 99%
rename from src/cmd/9l/asm.go
rename to src/cmd/link/internal/ppc64/asm.go
index 45aa3f84c27457912d12f695824318e9b7c148b3..f070921ecf70e2cfe098967acd53da25ef13912a 100644 (file)
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package ppc64
 
 import (
-       "cmd/internal/ld"
        "cmd/internal/obj"
+       "cmd/link/internal/ld"
        "encoding/binary"
        "fmt"
        "log"
similarity index 99%
rename from src/cmd/9l/l.go
rename to src/cmd/link/internal/ppc64/l.go
index 8723eaeca449af3160fcb345518ba766a61e2bea..1275a34dbb3d2b0a1fed4a9bed438a70d1e5a6ad 100644 (file)
@@ -28,7 +28,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package ppc64
 
 // Writing object files.
 
similarity index 98%
rename from src/cmd/9l/obj.go
rename to src/cmd/link/internal/ppc64/obj.go
index 011f290298fa9b6d940e2b6dd27bb2b4e86fe6c7..d663b6ebae0d16a7ce78bbd63dc46fcca285bc4a 100644 (file)
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package ppc64
 
 import (
-       "cmd/internal/ld"
        "cmd/internal/obj"
+       "cmd/link/internal/ld"
        "fmt"
        "log"
 )
 
 // Reading object files.
 
-func main() {
+func Main() {
        linkarchinit()
        ld.Ldmain()
 }
similarity index 99%
rename from src/cmd/8l/asm.go
rename to src/cmd/link/internal/x86/asm.go
index a736d43686b78d1702952f98404e1e57af94c7f2..7bb99ca8b5eee1a4f8d47180ab78e5391fbe33b1 100644 (file)
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package x86
 
 import (
-       "cmd/internal/ld"
        "cmd/internal/obj"
+       "cmd/link/internal/ld"
        "fmt"
        "log"
 )
similarity index 99%
rename from src/cmd/8l/l.go
rename to src/cmd/link/internal/x86/l.go
index 5cb9f8d8afb6cf6c645a2de6848d5ed224750b21..8a811ff0a2ac9722f01485ba729ddd487babc8aa 100644 (file)
@@ -28,7 +28,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package x86
 
 const (
        thechar   = '8'
similarity index 99%
rename from src/cmd/8l/obj.go
rename to src/cmd/link/internal/x86/obj.go
index bea0d03cfefa4bf1001895231dd9f6d7e16dd7d4..ee408f70c648d9ff2b7c06d8b0e91b847281e360 100644 (file)
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package main
+package x86
 
 import (
-       "cmd/internal/ld"
        "cmd/internal/obj"
+       "cmd/link/internal/ld"
        "fmt"
        "log"
 )
 
 // Reading object files.
 
-func main() {
+func Main() {
        linkarchinit()
        ld.Ldmain()
 }
diff --git a/src/cmd/link/main.go b/src/cmd/link/main.go
new file mode 100644 (file)
index 0000000..0e6c34e
--- /dev/null
@@ -0,0 +1,34 @@
+// Copyright 2015 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+       "cmd/internal/obj"
+       "cmd/link/internal/amd64"
+       "cmd/link/internal/arm"
+       "cmd/link/internal/arm64"
+       "cmd/link/internal/ppc64"
+       "cmd/link/internal/x86"
+       "fmt"
+       "os"
+)
+
+func main() {
+       switch obj.Getgoarch() {
+       default:
+               fmt.Fprintf(os.Stderr, "link: unknown architecture %q\n", obj.Getgoarch())
+               os.Exit(2)
+       case "386":
+               x86.Main()
+       case "amd64", "amd64p32":
+               amd64.Main()
+       case "arm":
+               arm.Main()
+       case "arm64":
+               arm64.Main()
+       case "ppc64", "ppc64le":
+               ppc64.Main()
+       }
+}