diff options
| author | Russ Cox <rsc@golang.org> | 2014-09-08 00:06:45 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-09-08 00:06:45 -0400 |
| commit | 220a6de47eced55956eb8af8d643d4f5b67fd634 (patch) | |
| tree | 42b42e46557bf21b1d1917d9a6b8d04c721472bf /src/cmd/ld | |
| parent | 36ca636fab865cb8d5d01927d274ed54153c4e73 (diff) | |
| download | go-220a6de47eced55956eb8af8d643d4f5b67fd634.tar.xz | |
build: adjustments for move from src/pkg to src
This CL adjusts code referring to src/pkg to refer to src.
Immediately after submitting this CL, I will submit
a change doing 'hg mv src/pkg/* src'.
That change will be too large to review with Rietveld
but will contain only the 'hg mv'.
This CL will break the build.
The followup 'hg mv' will fix it.
For more about the move, see golang.org/s/go14nopkg.
LGTM=r
R=r
CC=golang-codereviews
https://golang.org/cl/134570043
Diffstat (limited to 'src/cmd/ld')
| -rw-r--r-- | src/cmd/ld/data.c | 2 | ||||
| -rw-r--r-- | src/cmd/ld/decodesym.c | 4 | ||||
| -rw-r--r-- | src/cmd/ld/dwarf.c | 2 | ||||
| -rw-r--r-- | src/cmd/ld/lib.c | 6 | ||||
| -rw-r--r-- | src/cmd/ld/pcln.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/cmd/ld/data.c b/src/cmd/ld/data.c index 098403a743..71624c3304 100644 --- a/src/cmd/ld/data.c +++ b/src/cmd/ld/data.c @@ -35,7 +35,7 @@ #include "../ld/elf.h" #include "../ld/macho.h" #include "../ld/pe.h" -#include "../../pkg/runtime/mgc0.h" +#include "../../runtime/mgc0.h" void dynreloc(void); diff --git a/src/cmd/ld/decodesym.c b/src/cmd/ld/decodesym.c index b5fe47ce9f..c530669425 100644 --- a/src/cmd/ld/decodesym.c +++ b/src/cmd/ld/decodesym.c @@ -4,10 +4,10 @@ #include "l.h" #include "lib.h" -#include "../../pkg/runtime/typekind.h" +#include "../../runtime/typekind.h" // Decoding the type.* symbols. This has to be in sync with -// ../../pkg/runtime/type.go, or more specificaly, with what +// ../../runtime/type.go, or more specificaly, with what // ../gc/reflect.c stuffs in these. static Reloc* diff --git a/src/cmd/ld/dwarf.c b/src/cmd/ld/dwarf.c index 3f93f58184..4efb0ed537 100644 --- a/src/cmd/ld/dwarf.c +++ b/src/cmd/ld/dwarf.c @@ -19,7 +19,7 @@ #include "../ld/elf.h" #include "../ld/macho.h" #include "../ld/pe.h" -#include "../../pkg/runtime/typekind.h" +#include "../../runtime/typekind.h" /* * Offsets and sizes of the debug_* sections in the cout file. diff --git a/src/cmd/ld/lib.c b/src/cmd/ld/lib.c index 51e10bb99d..651705a2e6 100644 --- a/src/cmd/ld/lib.c +++ b/src/cmd/ld/lib.c @@ -33,8 +33,8 @@ #include "lib.h" #include "../ld/elf.h" #include "../ld/dwarf.h" -#include "../../pkg/runtime/stack.h" -#include "../../pkg/runtime/funcdata.h" +#include "../../runtime/stack.h" +#include "../../runtime/funcdata.h" #include <ar.h> #if !(defined(_WIN32) || defined(PLAN9)) @@ -899,7 +899,7 @@ unmal(void *v, uint32 n) * escaping are %, ., and ", but we escape all control characters too. * * If you edit this, edit ../gc/subr.c:/^pathtoprefix too. - * If you edit this, edit ../../pkg/debug/goobj/read.go:/importPathToPrefix too. + * If you edit this, edit ../../debug/goobj/read.go:/importPathToPrefix too. */ static char* pathtoprefix(char *s) diff --git a/src/cmd/ld/pcln.c b/src/cmd/ld/pcln.c index 3cd9e65dad..69671c0fc9 100644 --- a/src/cmd/ld/pcln.c +++ b/src/cmd/ld/pcln.c @@ -4,7 +4,7 @@ #include "l.h" #include "lib.h" -#include "../../pkg/runtime/funcdata.h" +#include "../../runtime/funcdata.h" static void addvarint(Pcdata *d, uint32 val) |