diff options
author | Russ Cox <rsc@golang.org> | 2016-02-08 22:51:34 -0500 |
---|---|---|
committer | Russ Cox <rsc@golang.org> | 2016-02-09 20:36:08 +0000 |
commit | 558a213d55beb23846e45a4500f3388f91dadb75 (patch) | |
tree | 0c58fa07807f4401ddca9e0bdaa40ff0ed161596 | |
parent | 97572d5552699fbc7cce215f83d7b02265e7f1de (diff) | |
download | go-558a213d55beb23846e45a4500f3388f91dadb75.tar.gz go-558a213d55beb23846e45a4500f3388f91dadb75.zip |
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/19384
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
-rw-r--r-- | misc/nacl/testzip.proto | 24 | ||||
-rw-r--r-- | src/cmd/internal/objfile/disasm.go | 4 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/Makefile (renamed from src/cmd/vendor/golang.org/x/arch/arm/armasm/Makefile) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/decode.go (renamed from src/cmd/vendor/golang.org/x/arch/arm/armasm/decode.go) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/decode_test.go (renamed from src/cmd/vendor/golang.org/x/arch/arm/armasm/decode_test.go) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/ext_test.go (renamed from src/cmd/vendor/golang.org/x/arch/arm/armasm/ext_test.go) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/gnu.go (renamed from src/cmd/vendor/golang.org/x/arch/arm/armasm/gnu.go) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/inst.go (renamed from src/cmd/vendor/golang.org/x/arch/arm/armasm/inst.go) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/objdump_test.go (renamed from src/cmd/vendor/golang.org/x/arch/arm/armasm/objdump_test.go) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/objdumpext_test.go (renamed from src/cmd/vendor/golang.org/x/arch/arm/armasm/objdumpext_test.go) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/plan9x.go (renamed from src/cmd/vendor/golang.org/x/arch/arm/armasm/plan9x.go) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/tables.go (renamed from src/cmd/vendor/golang.org/x/arch/arm/armasm/tables.go) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/testdata/Makefile (renamed from src/cmd/vendor/golang.org/x/arch/arm/armasm/testdata/Makefile) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/testdata/decode.txt (renamed from src/cmd/vendor/golang.org/x/arch/arm/armasm/testdata/decode.txt) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/Makefile (renamed from src/cmd/vendor/golang.org/x/arch/x86/x86asm/Makefile) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/decode.go (renamed from src/cmd/vendor/golang.org/x/arch/x86/x86asm/decode.go) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/decode_test.go (renamed from src/cmd/vendor/golang.org/x/arch/x86/x86asm/decode_test.go) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/ext_test.go (renamed from src/cmd/vendor/golang.org/x/arch/x86/x86asm/ext_test.go) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/gnu.go (renamed from src/cmd/vendor/golang.org/x/arch/x86/x86asm/gnu.go) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/inst.go (renamed from src/cmd/vendor/golang.org/x/arch/x86/x86asm/inst.go) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/inst_test.go (renamed from src/cmd/vendor/golang.org/x/arch/x86/x86asm/inst_test.go) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/intel.go (renamed from src/cmd/vendor/golang.org/x/arch/x86/x86asm/intel.go) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/objdump_test.go (renamed from src/cmd/vendor/golang.org/x/arch/x86/x86asm/objdump_test.go) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/objdumpext_test.go (renamed from src/cmd/vendor/golang.org/x/arch/x86/x86asm/objdumpext_test.go) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/plan9ext_test.go (renamed from src/cmd/vendor/golang.org/x/arch/x86/x86asm/plan9ext_test.go) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/plan9x.go (renamed from src/cmd/vendor/golang.org/x/arch/x86/x86asm/plan9x.go) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/plan9x_test.go (renamed from src/cmd/vendor/golang.org/x/arch/x86/x86asm/plan9x_test.go) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/tables.go (renamed from src/cmd/vendor/golang.org/x/arch/x86/x86asm/tables.go) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/testdata/Makefile (renamed from src/cmd/vendor/golang.org/x/arch/x86/x86asm/testdata/Makefile) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/testdata/decode.txt (renamed from src/cmd/vendor/golang.org/x/arch/x86/x86asm/testdata/decode.txt) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/testdata/libmach8db.c (renamed from src/cmd/vendor/golang.org/x/arch/x86/x86asm/testdata/libmach8db.c) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/xed_test.go (renamed from src/cmd/vendor/golang.org/x/arch/x86/x86asm/xed_test.go) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/xedext_test.go (renamed from src/cmd/vendor/golang.org/x/arch/x86/x86asm/xedext_test.go) | 0 | ||||
-rw-r--r-- | src/cmd/internal/unvendor/vendor.json (renamed from src/cmd/vendor/vendor.json) | 0 |
34 files changed, 14 insertions, 14 deletions
diff --git a/misc/nacl/testzip.proto b/misc/nacl/testzip.proto index b51e8da5c7..dcb156350a 100644 --- a/misc/nacl/testzip.proto +++ b/misc/nacl/testzip.proto @@ -27,6 +27,18 @@ go src=.. internal objfile objfile.go + unvendor + golang.org + x + arch + arm + armasm + testdata + + + x86 + x86asm + testdata + + gofmt gofmt.go gofmt_test.go @@ -35,18 +47,6 @@ go src=.. newlink testdata + - vendor - golang.org - x - arch - arm - armasm - testdata - + - x86 - x86asm - testdata - + archive tar testdata diff --git a/src/cmd/internal/objfile/disasm.go b/src/cmd/internal/objfile/disasm.go index 6495dfb356..f038883dc0 100644 --- a/src/cmd/internal/objfile/disasm.go +++ b/src/cmd/internal/objfile/disasm.go @@ -15,8 +15,8 @@ import ( "strings" "text/tabwriter" - "golang.org/x/arch/arm/armasm" - "golang.org/x/arch/x86/x86asm" + "cmd/internal/unvendor/golang.org/x/arch/arm/armasm" + "cmd/internal/unvendor/golang.org/x/arch/x86/x86asm" ) // Disasm is a disassembler for a given File. diff --git a/src/cmd/vendor/golang.org/x/arch/arm/armasm/Makefile b/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/Makefile index a3f57001f6..a3f57001f6 100644 --- a/src/cmd/vendor/golang.org/x/arch/arm/armasm/Makefile +++ b/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/Makefile diff --git a/src/cmd/vendor/golang.org/x/arch/arm/armasm/decode.go b/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/decode.go index 6b4d73841b..6b4d73841b 100644 --- a/src/cmd/vendor/golang.org/x/arch/arm/armasm/decode.go +++ b/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/decode.go diff --git a/src/cmd/vendor/golang.org/x/arch/arm/armasm/decode_test.go b/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/decode_test.go index e2d9127348..e2d9127348 100644 --- a/src/cmd/vendor/golang.org/x/arch/arm/armasm/decode_test.go +++ b/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/decode_test.go diff --git a/src/cmd/vendor/golang.org/x/arch/arm/armasm/ext_test.go b/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/ext_test.go index 98192b324e..98192b324e 100644 --- a/src/cmd/vendor/golang.org/x/arch/arm/armasm/ext_test.go +++ b/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/ext_test.go diff --git a/src/cmd/vendor/golang.org/x/arch/arm/armasm/gnu.go b/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/gnu.go index 1a97a5a844..1a97a5a844 100644 --- a/src/cmd/vendor/golang.org/x/arch/arm/armasm/gnu.go +++ b/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/gnu.go diff --git a/src/cmd/vendor/golang.org/x/arch/arm/armasm/inst.go b/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/inst.go index 60d633bdb6..60d633bdb6 100644 --- a/src/cmd/vendor/golang.org/x/arch/arm/armasm/inst.go +++ b/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/inst.go diff --git a/src/cmd/vendor/golang.org/x/arch/arm/armasm/objdump_test.go b/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/objdump_test.go index db51902cc7..db51902cc7 100644 --- a/src/cmd/vendor/golang.org/x/arch/arm/armasm/objdump_test.go +++ b/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/objdump_test.go diff --git a/src/cmd/vendor/golang.org/x/arch/arm/armasm/objdumpext_test.go b/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/objdumpext_test.go index 74fb47d2db..74fb47d2db 100644 --- a/src/cmd/vendor/golang.org/x/arch/arm/armasm/objdumpext_test.go +++ b/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/objdumpext_test.go diff --git a/src/cmd/vendor/golang.org/x/arch/arm/armasm/plan9x.go b/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/plan9x.go index fae0ca62a5..fae0ca62a5 100644 --- a/src/cmd/vendor/golang.org/x/arch/arm/armasm/plan9x.go +++ b/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/plan9x.go diff --git a/src/cmd/vendor/golang.org/x/arch/arm/armasm/tables.go b/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/tables.go index 58f51fe1f5..58f51fe1f5 100644 --- a/src/cmd/vendor/golang.org/x/arch/arm/armasm/tables.go +++ b/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/tables.go diff --git a/src/cmd/vendor/golang.org/x/arch/arm/armasm/testdata/Makefile b/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/testdata/Makefile index 1adab68517..1adab68517 100644 --- a/src/cmd/vendor/golang.org/x/arch/arm/armasm/testdata/Makefile +++ b/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/testdata/Makefile diff --git a/src/cmd/vendor/golang.org/x/arch/arm/armasm/testdata/decode.txt b/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/testdata/decode.txt index cc1ea0abe5..cc1ea0abe5 100644 --- a/src/cmd/vendor/golang.org/x/arch/arm/armasm/testdata/decode.txt +++ b/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/testdata/decode.txt diff --git a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/Makefile b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/Makefile index 9eb4557c11..9eb4557c11 100644 --- a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/Makefile +++ b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/Makefile diff --git a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/decode.go b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/decode.go index e4122c1e6d..e4122c1e6d 100644 --- a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/decode.go +++ b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/decode.go diff --git a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/decode_test.go b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/decode_test.go index b6098b898e..b6098b898e 100644 --- a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/decode_test.go +++ b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/decode_test.go diff --git a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/ext_test.go b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/ext_test.go index eadfd71bf5..eadfd71bf5 100644 --- a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/ext_test.go +++ b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/ext_test.go diff --git a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/gnu.go b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/gnu.go index e2ff801183..e2ff801183 100644 --- a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/gnu.go +++ b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/gnu.go diff --git a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/inst.go b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/inst.go index ef74025e08..ef74025e08 100644 --- a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/inst.go +++ b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/inst.go diff --git a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/inst_test.go b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/inst_test.go index 23ac523207..23ac523207 100644 --- a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/inst_test.go +++ b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/inst_test.go diff --git a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/intel.go b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/intel.go index 90af9dd638..90af9dd638 100644 --- a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/intel.go +++ b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/intel.go diff --git a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/objdump_test.go b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/objdump_test.go index 3d4e1460f8..3d4e1460f8 100644 --- a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/objdump_test.go +++ b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/objdump_test.go diff --git a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/objdumpext_test.go b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/objdumpext_test.go index f720dc6cb7..f720dc6cb7 100644 --- a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/objdumpext_test.go +++ b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/objdumpext_test.go diff --git a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/plan9ext_test.go b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/plan9ext_test.go index 9bd296cf75..9bd296cf75 100644 --- a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/plan9ext_test.go +++ b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/plan9ext_test.go diff --git a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/plan9x.go b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/plan9x.go index afe6a92e90..afe6a92e90 100644 --- a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/plan9x.go +++ b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/plan9x.go diff --git a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/plan9x_test.go b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/plan9x_test.go index f2ea28cd90..f2ea28cd90 100644 --- a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/plan9x_test.go +++ b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/plan9x_test.go diff --git a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/tables.go b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/tables.go index 3d08d5ebe3..3d08d5ebe3 100644 --- a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/tables.go +++ b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/tables.go diff --git a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/testdata/Makefile b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/testdata/Makefile index 9cb44127a4..9cb44127a4 100644 --- a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/testdata/Makefile +++ b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/testdata/Makefile diff --git a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/testdata/decode.txt b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/testdata/decode.txt index a899d75fdb..a899d75fdb 100644 --- a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/testdata/decode.txt +++ b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/testdata/decode.txt diff --git a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/testdata/libmach8db.c b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/testdata/libmach8db.c index 90ace5241d..90ace5241d 100644 --- a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/testdata/libmach8db.c +++ b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/testdata/libmach8db.c diff --git a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/xed_test.go b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/xed_test.go index 91cf822727..91cf822727 100644 --- a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/xed_test.go +++ b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/xed_test.go diff --git a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/xedext_test.go b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/xedext_test.go index e27cdc07c4..e27cdc07c4 100644 --- a/src/cmd/vendor/golang.org/x/arch/x86/x86asm/xedext_test.go +++ b/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/xedext_test.go diff --git a/src/cmd/vendor/vendor.json b/src/cmd/internal/unvendor/vendor.json index 565498ff8a..565498ff8a 100644 --- a/src/cmd/vendor/vendor.json +++ b/src/cmd/internal/unvendor/vendor.json |