diff options
| author | Austin Clements <austin@google.com> | 2014-10-22 13:25:37 -0400 |
|---|---|---|
| committer | Austin Clements <austin@google.com> | 2014-10-22 13:25:37 -0400 |
| commit | 800a826ae560191d4dbb6c529eea15cf4349a06f (patch) | |
| tree | c4206bb02365c3b9c66e2946031b86f0ee527faf /src/cmd/ld/lib.c | |
| parent | 2c586384223e980fd3303625ea6b02ed5d9fb9c0 (diff) | |
| parent | 1678ee65674b332e900a703de296eb66fbadcf45 (diff) | |
| download | go-800a826ae560191d4dbb6c529eea15cf4349a06f.tar.gz | |
build: merge the great pkg/ rename into dev.power64
This also removes pkg/runtime/traceback_lr.c, which was ported
to Go in an earlier commit and then moved to
runtime/traceback.go.
Reviewer: rsc@golang.org
rsc: LGTM
Diffstat (limited to 'src/cmd/ld/lib.c')
| -rw-r--r-- | src/cmd/ld/lib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cmd/ld/lib.c b/src/cmd/ld/lib.c index 7b997464d..0e2107fd5 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)) @@ -900,7 +900,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) |