Commit 558a213d authored by Russ Cox's avatar Russ Cox

build: mv cmd/vendor cmd/internal/unvendor

And update two imports in cmd/internal/objfile/disasm.go.
This makes GO15VENDOREXPERIMENT=0 ./make.bash work.
For Go 1.7 we will move it back.

Fixes #14236.

Change-Id: I429c9af4baff8496f83d113b1b03b90e309f4f48
Reviewed-on: https://go-review.googlesource.com/19384Reviewed-by: 's avatarBrad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
parent 97572d55
...@@ -27,15 +27,7 @@ go src=.. ...@@ -27,15 +27,7 @@ go src=..
internal internal
objfile objfile
objfile.go objfile.go
gofmt unvendor
gofmt.go
gofmt_test.go
testdata
+
newlink
testdata
+
vendor
golang.org golang.org
x x
arch arch
...@@ -47,6 +39,14 @@ go src=.. ...@@ -47,6 +39,14 @@ go src=..
x86asm x86asm
testdata testdata
+ +
gofmt
gofmt.go
gofmt_test.go
testdata
+
newlink
testdata
+
archive archive
tar tar
testdata testdata
......
...@@ -15,8 +15,8 @@ import ( ...@@ -15,8 +15,8 @@ import (
"strings" "strings"
"text/tabwriter" "text/tabwriter"
"golang.org/x/arch/arm/armasm" "cmd/internal/unvendor/golang.org/x/arch/arm/armasm"
"golang.org/x/arch/x86/x86asm" "cmd/internal/unvendor/golang.org/x/arch/x86/x86asm"
) )
// Disasm is a disassembler for a given File. // Disasm is a disassembler for a given File.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment