From 558a213d55beb23846e45a4500f3388f91dadb75 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Mon, 8 Feb 2016 22:51:34 -0500 Subject: [PATCH] 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 Run-TryBot: Russ Cox TryBot-Result: Gobot Gobot --- misc/nacl/testzip.proto | 24 +++++++++---------- src/cmd/internal/objfile/disasm.go | 4 ++-- .../golang.org/x/arch/arm/armasm/Makefile | 0 .../golang.org/x/arch/arm/armasm/decode.go | 0 .../x/arch/arm/armasm/decode_test.go | 0 .../golang.org/x/arch/arm/armasm/ext_test.go | 0 .../golang.org/x/arch/arm/armasm/gnu.go | 0 .../golang.org/x/arch/arm/armasm/inst.go | 0 .../x/arch/arm/armasm/objdump_test.go | 0 .../x/arch/arm/armasm/objdumpext_test.go | 0 .../golang.org/x/arch/arm/armasm/plan9x.go | 0 .../golang.org/x/arch/arm/armasm/tables.go | 0 .../x/arch/arm/armasm/testdata/Makefile | 0 .../x/arch/arm/armasm/testdata/decode.txt | 0 .../golang.org/x/arch/x86/x86asm/Makefile | 0 .../golang.org/x/arch/x86/x86asm/decode.go | 0 .../x/arch/x86/x86asm/decode_test.go | 0 .../golang.org/x/arch/x86/x86asm/ext_test.go | 0 .../golang.org/x/arch/x86/x86asm/gnu.go | 0 .../golang.org/x/arch/x86/x86asm/inst.go | 0 .../golang.org/x/arch/x86/x86asm/inst_test.go | 0 .../golang.org/x/arch/x86/x86asm/intel.go | 0 .../x/arch/x86/x86asm/objdump_test.go | 0 .../x/arch/x86/x86asm/objdumpext_test.go | 0 .../x/arch/x86/x86asm/plan9ext_test.go | 0 .../golang.org/x/arch/x86/x86asm/plan9x.go | 0 .../x/arch/x86/x86asm/plan9x_test.go | 0 .../golang.org/x/arch/x86/x86asm/tables.go | 0 .../x/arch/x86/x86asm/testdata/Makefile | 0 .../x/arch/x86/x86asm/testdata/decode.txt | 0 .../x/arch/x86/x86asm/testdata/libmach8db.c | 0 .../golang.org/x/arch/x86/x86asm/xed_test.go | 0 .../x/arch/x86/x86asm/xedext_test.go | 0 .../{vendor => internal/unvendor}/vendor.json | 0 34 files changed, 14 insertions(+), 14 deletions(-) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/arm/armasm/Makefile (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/arm/armasm/decode.go (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/arm/armasm/decode_test.go (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/arm/armasm/ext_test.go (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/arm/armasm/gnu.go (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/arm/armasm/inst.go (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/arm/armasm/objdump_test.go (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/arm/armasm/objdumpext_test.go (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/arm/armasm/plan9x.go (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/arm/armasm/tables.go (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/arm/armasm/testdata/Makefile (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/arm/armasm/testdata/decode.txt (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/x86/x86asm/Makefile (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/x86/x86asm/decode.go (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/x86/x86asm/decode_test.go (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/x86/x86asm/ext_test.go (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/x86/x86asm/gnu.go (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/x86/x86asm/inst.go (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/x86/x86asm/inst_test.go (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/x86/x86asm/intel.go (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/x86/x86asm/objdump_test.go (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/x86/x86asm/objdumpext_test.go (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/x86/x86asm/plan9ext_test.go (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/x86/x86asm/plan9x.go (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/x86/x86asm/plan9x_test.go (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/x86/x86asm/tables.go (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/x86/x86asm/testdata/Makefile (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/x86/x86asm/testdata/decode.txt (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/x86/x86asm/testdata/libmach8db.c (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/x86/x86asm/xed_test.go (100%) rename src/cmd/{vendor => internal/unvendor}/golang.org/x/arch/x86/x86asm/xedext_test.go (100%) rename src/cmd/{vendor => internal/unvendor}/vendor.json (100%) 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/arm/armasm/Makefile rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/arm/armasm/decode.go rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/arm/armasm/decode_test.go rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/arm/armasm/ext_test.go rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/arm/armasm/gnu.go rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/arm/armasm/inst.go rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/arm/armasm/objdump_test.go rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/arm/armasm/objdumpext_test.go rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/arm/armasm/plan9x.go rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/arm/armasm/tables.go rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/arm/armasm/testdata/Makefile rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/arm/armasm/testdata/decode.txt rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/x86/x86asm/Makefile rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/x86/x86asm/decode.go rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/x86/x86asm/decode_test.go rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/x86/x86asm/ext_test.go rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/x86/x86asm/gnu.go rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/x86/x86asm/inst.go rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/x86/x86asm/inst_test.go rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/x86/x86asm/intel.go rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/x86/x86asm/objdump_test.go rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/x86/x86asm/objdumpext_test.go rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/x86/x86asm/plan9ext_test.go rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/x86/x86asm/plan9x.go rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/x86/x86asm/plan9x_test.go rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/x86/x86asm/tables.go rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/x86/x86asm/testdata/Makefile rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/x86/x86asm/testdata/decode.txt rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/x86/x86asm/testdata/libmach8db.c rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/x86/x86asm/xed_test.go rename to 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 similarity index 100% rename from src/cmd/vendor/golang.org/x/arch/x86/x86asm/xedext_test.go rename to 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 similarity index 100% rename from src/cmd/vendor/vendor.json rename to src/cmd/internal/unvendor/vendor.json -- 2.50.0