summaryrefslogtreecommitdiff
path: root/src/liblink
diff options
context:
space:
mode:
authorAustin Clements <austin@google.com>2014-10-22 13:25:37 -0400
committerAustin Clements <austin@google.com>2014-10-22 13:25:37 -0400
commit800a826ae560191d4dbb6c529eea15cf4349a06f (patch)
treec4206bb02365c3b9c66e2946031b86f0ee527faf /src/liblink
parent2c586384223e980fd3303625ea6b02ed5d9fb9c0 (diff)
parent1678ee65674b332e900a703de296eb66fbadcf45 (diff)
downloadgo-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/liblink')
-rw-r--r--src/liblink/asm5.c2
-rw-r--r--src/liblink/asm6.c2
-rw-r--r--src/liblink/asm8.c2
-rw-r--r--src/liblink/asm9.c2
-rw-r--r--src/liblink/obj5.c2
-rw-r--r--src/liblink/obj6.c2
-rw-r--r--src/liblink/obj8.c2
-rw-r--r--src/liblink/obj9.c4
-rw-r--r--src/liblink/sym.c2
9 files changed, 10 insertions, 10 deletions
diff --git a/src/liblink/asm5.c b/src/liblink/asm5.c
index 65c4ca199..96df9f791 100644
--- a/src/liblink/asm5.c
+++ b/src/liblink/asm5.c
@@ -35,7 +35,7 @@
#include <bio.h>
#include <link.h>
#include "../cmd/5l/5.out.h"
-#include "../pkg/runtime/stack.h"
+#include "../runtime/stack.h"
typedef struct Optab Optab;
typedef struct Oprang Oprang;
diff --git a/src/liblink/asm6.c b/src/liblink/asm6.c
index 999507650..428eb9442 100644
--- a/src/liblink/asm6.c
+++ b/src/liblink/asm6.c
@@ -35,7 +35,7 @@
#include <bio.h>
#include <link.h>
#include "../cmd/6l/6.out.h"
-#include "../pkg/runtime/stack.h"
+#include "../runtime/stack.h"
enum
{
diff --git a/src/liblink/asm8.c b/src/liblink/asm8.c
index 6035017b2..b6627d5fd 100644
--- a/src/liblink/asm8.c
+++ b/src/liblink/asm8.c
@@ -35,7 +35,7 @@
#include <bio.h>
#include <link.h>
#include "../cmd/8l/8.out.h"
-#include "../pkg/runtime/stack.h"
+#include "../runtime/stack.h"
enum
{
diff --git a/src/liblink/asm9.c b/src/liblink/asm9.c
index 56582fe27..47d515e05 100644
--- a/src/liblink/asm9.c
+++ b/src/liblink/asm9.c
@@ -34,7 +34,7 @@
#include <bio.h>
#include <link.h>
#include "../cmd/9l/9.out.h"
-#include "../pkg/runtime/stack.h"
+#include "../runtime/stack.h"
enum {
FuncAlign = 8,
diff --git a/src/liblink/obj5.c b/src/liblink/obj5.c
index 0b6b8deb5..6630a5923 100644
--- a/src/liblink/obj5.c
+++ b/src/liblink/obj5.c
@@ -33,7 +33,7 @@
#include <bio.h>
#include <link.h>
#include "../cmd/5l/5.out.h"
-#include "../pkg/runtime/stack.h"
+#include "../runtime/stack.h"
static Prog zprg = {
.as = AGOK,
diff --git a/src/liblink/obj6.c b/src/liblink/obj6.c
index 3c62470be..6a7ff48b0 100644
--- a/src/liblink/obj6.c
+++ b/src/liblink/obj6.c
@@ -33,7 +33,7 @@
#include <bio.h>
#include <link.h>
#include "../cmd/6l/6.out.h"
-#include "../pkg/runtime/stack.h"
+#include "../runtime/stack.h"
static Prog zprg = {
.back = 2,
diff --git a/src/liblink/obj8.c b/src/liblink/obj8.c
index fa1e1ca24..03f12462e 100644
--- a/src/liblink/obj8.c
+++ b/src/liblink/obj8.c
@@ -33,7 +33,7 @@
#include <bio.h>
#include <link.h>
#include "../cmd/8l/8.out.h"
-#include "../pkg/runtime/stack.h"
+#include "../runtime/stack.h"
static Prog zprg = {
.back = 2,
diff --git a/src/liblink/obj9.c b/src/liblink/obj9.c
index d0c14dfb5..3906181a3 100644
--- a/src/liblink/obj9.c
+++ b/src/liblink/obj9.c
@@ -32,8 +32,8 @@
#include <bio.h>
#include <link.h>
#include "../cmd/9l/9.out.h"
-#include "../pkg/runtime/stack.h"
-#include "../pkg/runtime/funcdata.h"
+#include "../runtime/stack.h"
+#include "../runtime/funcdata.h"
static Prog zprg = {
.as = AGOK,
diff --git a/src/liblink/sym.c b/src/liblink/sym.c
index ec07957f4..bd8551846 100644
--- a/src/liblink/sym.c
+++ b/src/liblink/sym.c
@@ -163,7 +163,7 @@ linknew(LinkArch *arch)
case Hdarwin:
/*
* OS X system constants - offset from 0(GS) to our TLS.
- * Explained in ../../pkg/runtime/cgo/gcc_darwin_*.c.
+ * Explained in ../../runtime/cgo/gcc_darwin_*.c.
*/
switch(ctxt->arch->thechar) {
default: