Commit 839abc2e authored by Russ Cox's avatar Russ Cox

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

R=ken2
CC=golang-dev
https://golang.org/cl/3521041
parent b8562ff4
...@@ -110,6 +110,7 @@ struct Prog ...@@ -110,6 +110,7 @@ struct Prog
char mode; /* 16, 32, or 64 */ char mode; /* 16, 32, or 64 */
}; };
#define datasize from.scale #define datasize from.scale
#define textflag from.scale
struct Auto struct Auto
{ {
......
...@@ -108,7 +108,8 @@ struct Prog ...@@ -108,7 +108,8 @@ struct Prog
uchar back; uchar back;
uchar bigjmp; uchar bigjmp;
}; };
#define datasize from.scale #define datasize from.scale
#define textflag from.scale
struct Auto struct Auto
{ {
......
...@@ -660,12 +660,11 @@ ldelf(Biobuf *f, char *pkg, int64 len, char *pn) ...@@ -660,12 +660,11 @@ ldelf(Biobuf *f, char *pkg, int64 len, char *pn)
diag("%s: duplicate definition of %s", pn, s->name); diag("%s: duplicate definition of %s", pn, s->name);
// build a TEXT instruction with a unique pc // build a TEXT instruction with a unique pc
// just to make the rest of the linker happy. // just to make the rest of the linker happy.
// TODO: this is too 6l-specific ?
p = prg(); p = prg();
p->as = ATEXT; p->as = ATEXT;
p->from.type = D_EXTERN; p->from.type = D_EXTERN;
p->from.sym = s; p->from.sym = s;
p->from.scale = 7; p->textflag = 7;
p->to.type = D_CONST; p->to.type = D_CONST;
p->link = nil; p->link = nil;
p->pc = pc++; p->pc = pc++;
......
...@@ -640,7 +640,7 @@ ldmacho(Biobuf *f, char *pkg, int64 len, char *pn) ...@@ -640,7 +640,7 @@ ldmacho(Biobuf *f, char *pkg, int64 len, char *pn)
p->as = ATEXT; p->as = ATEXT;
p->from.type = D_EXTERN; p->from.type = D_EXTERN;
p->from.sym = s; p->from.sym = s;
p->from.scale = 7; p->textflag = 7;
p->to.type = D_CONST; p->to.type = D_CONST;
p->link = nil; p->link = nil;
p->pc = pc++; p->pc = pc++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment