qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-19 17:24:41 -07:00
Code Releases Activity

[dev.cc] cmd/dist, cmd/go: build new6g etc and verify against 6g

Browse Source 
Change-Id: Ide7cff506274ec76d26bdffe7890ca2c28737f2b
Reviewed-on: https://go-review.googlesource.com/4852
Reviewed-by: Rob Pike <r@golang.org>
This commit is contained in:
Russ Cox 2015-02-13 14:43:41 -05:00
parent 575bdd6753
commit 09d7db3bbb
2 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/cmd/dist/buildtool.go vendored
View File

@ -23,21 +23,26 @@ import (
// which are commands, and entries beginning with internal/, which are // which are commands, and entries beginning with internal/, which are
// packages supporting the commands. // packages supporting the commands.
var bootstrapDirs = []string{ var bootstrapDirs = []string{
"internal/asm",
"internal/obj",
"internal/obj/arm",
"internal/obj/i386",
"internal/obj/ppc64",
"internal/obj/x86",
"asm", "asm",
"asm/internal/arch", "asm/internal/arch",
"asm/internal/asm", "asm/internal/asm",
"asm/internal/flags", "asm/internal/flags",
"asm/internal/lex", "asm/internal/lex",
"internal/asm",
"internal/gc",
"internal/obj",
"internal/obj/arm",
"internal/obj/i386",
"internal/obj/ppc64",
"internal/obj/x86",
"new5a", "new5a",
"new6a", "new6a",
"new8a", "new8a",
"new9a", "new9a",
"new5g",
"new6g",
"new8g",
"new9g",
"objwriter", "objwriter",
} }

28
src/cmd/go/build.go
View File

@ -1627,6 +1627,11 @@ func (gcToolchain) linker() string {
return tool(archChar + "l") return tool(archChar + "l")
} }
// verifyCompiler specifies whether to check the compilers written in Go
// against the assemblers written in C. If set, asm will run both (say) 6g and new6g
// and fail if the two produce different output files.
const verifyCompiler = true
func (gcToolchain) gc(b *builder, p *Package, archive, obj string, asmhdr bool, importArgs []string, gofiles []string) (ofile string, output []byte, err error) { func (gcToolchain) gc(b *builder, p *Package, archive, obj string, asmhdr bool, importArgs []string, gofiles []string) (ofile string, output []byte, err error) {
if archive != "" { if archive != "" {
ofile = archive ofile = archive
@ -1660,7 +1665,7 @@ func (gcToolchain) gc(b *builder, p *Package, archive, obj string, asmhdr bool,
gcargs = append(gcargs, "-installsuffix", buildContext.InstallSuffix) gcargs = append(gcargs, "-installsuffix", buildContext.InstallSuffix)
} }
args := stringList(buildToolExec, tool(archChar+"g"), "-o", ofile, "-trimpath", b.work, buildGcflags, gcargs, "-D", p.localPrefix, importArgs) args := []interface{}{buildToolExec, tool(archChar + "g"), "-o", ofile, "-trimpath", b.work, buildGcflags, gcargs, "-D", p.localPrefix, importArgs}
if ofile == archive { if ofile == archive {
args = append(args, "-pack") args = append(args, "-pack")
} }
@ -1671,7 +1676,12 @@ func (gcToolchain) gc(b *builder, p *Package, archive, obj string, asmhdr bool,
args = append(args, mkAbs(p.Dir, f)) args = append(args, mkAbs(p.Dir, f))
} }
output, err = b.runOut(p.Dir, p.ImportPath, nil, args) output, err = b.runOut(p.Dir, p.ImportPath, nil, args...)
if err == nil && verifyCompiler {
if err := toolVerify(b, p, "new"+archChar+"g", ofile, args); err != nil {
return ofile, output, err
}
}
return ofile, output, err return ofile, output, err
} }
@ -1689,12 +1699,12 @@ func (gcToolchain) asm(b *builder, p *Package, obj, ofile, sfile string) error {
return err return err
} }
if verifyAsm { if verifyAsm {
if err := asmVerify(b, p, "new"+archChar+"a", ofile, args); err != nil { if err := toolVerify(b, p, "new"+archChar+"a", ofile, args); err != nil {
return err return err
} }
switch goarch { switch goarch {
case "386", "amd64", "amd64p32", "arm": // Asm only supports these architectures so far. case "386", "amd64", "amd64p32", "arm": // Asm only supports these architectures so far.
if err := asmVerify(b, p, "asm", ofile, args); err != nil { if err := toolVerify(b, p, "asm", ofile, args); err != nil {
return err return err
} }
} }
@ -1702,12 +1712,12 @@ func (gcToolchain) asm(b *builder, p *Package, obj, ofile, sfile string) error {
return nil return nil
} }
// asmVerify checks that the assembly run for the specified assembler (asm) agrees // toolVerify checks that the command line args writes the same output file
// with the C-implemented original assembly output, bit for bit. // if run using newTool instead.
func asmVerify(b *builder, p *Package, asm string, ofile string, args []interface{}) error { func toolVerify(b *builder, p *Package, newTool string, ofile string, args []interface{}) error {
newArgs := make([]interface{}, len(args)) newArgs := make([]interface{}, len(args))
copy(newArgs, args) copy(newArgs, args)
newArgs[1] = tool(asm) newArgs[1] = tool(newTool)
newArgs[3] = ofile + ".new" // x.6 becomes x.6.new newArgs[3] = ofile + ".new" // x.6 becomes x.6.new
if err := b.run(p.Dir, p.ImportPath, nil, newArgs...); err != nil { if err := b.run(p.Dir, p.ImportPath, nil, newArgs...); err != nil {
return err return err
@ -1721,7 +1731,7 @@ func asmVerify(b *builder, p *Package, asm string, ofile string, args []interfac
return err return err
} }
if !bytes.Equal(data1, data2) { if !bytes.Equal(data1, data2) {
return fmt.Errorf("%sa and %s produced different output files:\n%s\n%s", archChar, asm, strings.Join(stringList(args...), " "), strings.Join(stringList(newArgs...), " ")) return fmt.Errorf("%s and %s produced different output files:\n%s\n%s", filepath.Base(args[1].(string)), newTool, strings.Join(stringList(args...), " "), strings.Join(stringList(newArgs...), " "))
} }
return nil return nil
} }