diff options
| author | Russ Cox <rsc@golang.org> | 2015-01-26 15:14:23 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2015-01-30 03:15:44 +0000 |
| commit | 5a2771e286433c64a20fbe5ae6252080418dfa5c (patch) | |
| tree | 8f17c55da751ecb0ee1b8af0906faafd39ff1dae /src/liblink/data.c | |
| parent | 2ec293123f5769ea679ed547455e6f2b41838196 (diff) | |
| download | go-5a2771e286433c64a20fbe5ae6252080418dfa5c.tar.xz | |
cmd/gc, cmd/ld, liblink: update for portable Prog, Addr changes
Change-Id: Ia6f8badca56565b9df80c8dbe28c47f6cf7e653f
Reviewed-on: https://go-review.googlesource.com/3515
Reviewed-by: Austin Clements <austin@google.com>
Reviewed-by: Aram Hăvărneanu <aram@mgk.ro>
Diffstat (limited to 'src/liblink/data.c')
| -rw-r--r-- | src/liblink/data.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/liblink/data.c b/src/liblink/data.c index e5efa2eb2d..3de86fe050 100644 --- a/src/liblink/data.c +++ b/src/liblink/data.c @@ -87,7 +87,7 @@ savedata(Link *ctxt, LSym *s, Prog *p, char *pn) ctxt->diag("data out of order (already have %d)\n%P", p); symgrow(ctxt, s, off+siz); - if(p->to.type == ctxt->arch->D_FCONST) { + if(p->to.type == TYPE_FCONST) { switch(siz) { default: case 4: @@ -102,10 +102,10 @@ savedata(Link *ctxt, LSym *s, Prog *p, char *pn) s->p[off+i] = cast[fnuxi8[i]]; break; } - } else if(p->to.type == ctxt->arch->D_SCONST) { + } else if(p->to.type == TYPE_SCONST) { for(i=0; i<siz; i++) s->p[off+i] = p->to.u.sval[i]; - } else if(p->to.type == ctxt->arch->D_CONST) { + } else if(p->to.type == TYPE_CONST) { if(p->to.sym) goto addr; o = p->to.offset; @@ -132,7 +132,7 @@ savedata(Link *ctxt, LSym *s, Prog *p, char *pn) s->p[off+i] = cast[inuxi8[i]]; break; } - } else if(p->to.type == ctxt->arch->D_ADDR) { + } else if(p->to.type == TYPE_ADDR) { addr: r = addrel(s); r->off = off; |