aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/5l/obj.c
diff options
context:
space:
mode:
authorShenghou Ma <minux@golang.org>2014-07-10 15:14:37 -0400
committerShenghou Ma <minux@golang.org>2014-07-10 15:14:37 -0400
commit783bcba84d253227950fa005bf8214a6350d1104 (patch)
tree65b8d7e219969bb5adb024861e925bbc74dbc22b /src/cmd/5l/obj.c
parent6fbade1ec6e3f05a822b72bb90da82d382a5688a (diff)
downloadgo-783bcba84d253227950fa005bf8214a6350d1104.tar.xz
cmd/5c, cmd/5g, cmd/5l, liblink: nacl/arm support
LGTM=dave, rsc R=rsc, iant, dave CC=golang-codereviews https://golang.org/cl/108360043
Diffstat (limited to 'src/cmd/5l/obj.c')
-rw-r--r--src/cmd/5l/obj.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/cmd/5l/obj.c b/src/cmd/5l/obj.c
index 86a0ece2e4..c6f60ee7c8 100644
--- a/src/cmd/5l/obj.c
+++ b/src/cmd/5l/obj.c
@@ -63,6 +63,7 @@ archinit(void)
break;
case Hlinux:
case Hfreebsd:
+ case Hnacl:
break;
}
@@ -82,7 +83,6 @@ archinit(void)
case Hlinux: /* arm elf */
case Hfreebsd:
case Hnetbsd:
- case Hnacl:
debug['d'] = 0; // with dynamic linking
elfinit();
HEADR = ELFRESERVE;
@@ -93,6 +93,17 @@ archinit(void)
if(INITRND == -1)
INITRND = 4096;
break;
+ case Hnacl:
+ elfinit();
+ HEADR = 0x10000;
+ funcalign = 16;
+ if(INITTEXT == -1)
+ INITTEXT = 0x20000;
+ if(INITDAT == -1)
+ INITDAT = 0;
+ if(INITRND == -1)
+ INITRND = 0x10000;
+ break;
}
if(INITDAT != 0 && INITRND != 0)
print("warning: -D0x%ux is ignored because of -R0x%ux\n",