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 9260304b404ad790ce3186fbf4dbf1156603d2b0..1c52ea89d2748f00506863e54d3c9bed9b2009e3 100644 (file)
--- 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 60dd64e848d6ced167c80f40ebf9a9d08506244f..6ac226712676d2be23553e3021d9837d10efc86f 100644 (file)
--- 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 6d5b5411800f446452623358013d2f70275ed22e..feda761394bcab9884e07d7dfe7491aeafcffc82 100644 (file)
--- 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 b5dae93a7b804d95f2508800612ea118ff3f0b5f..78c868e340aeeb04db87daf1a1e8c897feafe1ce 100644 (file)
--- 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++;