From: Russ Cox <rsc@golang.org>
Date: Wed, 8 Dec 2010 20:44:59 +0000 (-0500)
Subject: 5l (and 6l, 8l, ld): more arm build fixes
X-Git-Tag: weekly.2010-12-15~84
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=839abc2ea7de28a6544ddd4822c465f5eec960fe;p=gostls13.git

5l (and 6l, 8l, ld): more arm build fixes

R=ken2
CC=golang-dev
https://golang.org/cl/3521041
---

diff --git a/src/cmd/6l/l.h b/src/cmd/6l/l.h
index 9260304b40..1c52ea89d2 100644
--- a/src/cmd/6l/l.h
+++ b/src/cmd/6l/l.h
@@ -110,6 +110,7 @@ struct	Prog
 	char	mode;	/* 16, 32, or 64 */
 };
 #define	datasize	from.scale
+#define	textflag	from.scale
 
 struct	Auto
 {
diff --git a/src/cmd/8l/l.h b/src/cmd/8l/l.h
index 60dd64e848..6ac2267126 100644
--- a/src/cmd/8l/l.h
+++ b/src/cmd/8l/l.h
@@ -108,7 +108,8 @@ struct	Prog
 	uchar	back;
 	uchar	bigjmp;
 };
-#define datasize from.scale
+#define	datasize	from.scale
+#define	textflag	from.scale
 
 struct	Auto
 {
diff --git a/src/cmd/ld/ldelf.c b/src/cmd/ld/ldelf.c
index 6d5b541180..feda761394 100644
--- a/src/cmd/ld/ldelf.c
+++ b/src/cmd/ld/ldelf.c
@@ -660,12 +660,11 @@ ldelf(Biobuf *f, char *pkg, int64 len, char *pn)
 				diag("%s: duplicate definition of %s", pn, s->name);
 			// build a TEXT instruction with a unique pc
 			// just to make the rest of the linker happy.
-			// TODO: this is too 6l-specific ?
 			p = prg();
 			p->as = ATEXT;
 			p->from.type = D_EXTERN;
 			p->from.sym = s;
-			p->from.scale = 7;
+			p->textflag = 7;
 			p->to.type = D_CONST;
 			p->link = nil;
 			p->pc = pc++;
diff --git a/src/cmd/ld/ldmacho.c b/src/cmd/ld/ldmacho.c
index b5dae93a7b..78c868e340 100644
--- a/src/cmd/ld/ldmacho.c
+++ b/src/cmd/ld/ldmacho.c
@@ -640,7 +640,7 @@ ldmacho(Biobuf *f, char *pkg, int64 len, char *pn)
 			p->as = ATEXT;
 			p->from.type = D_EXTERN;
 			p->from.sym = s;
-			p->from.scale = 7;
+			p->textflag = 7;
 			p->to.type = D_CONST;
 			p->link = nil;
 			p->pc = pc++;