diff options
| author | Russ Cox <rsc@golang.org> | 2014-10-16 15:00:08 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-10-16 15:00:08 -0400 |
| commit | 78db2eb9c66d478bee0d56edcc55d4f865f8c6c7 (patch) | |
| tree | d08da7ddd82570422ae87dc9d3ac061f8ce3b648 /include/link.h | |
| parent | af64ab79c0ad72decf083d78cf54257d009741b5 (diff) | |
| parent | 25c63c2c30f4807b073f849d248144d97893ce70 (diff) | |
| download | go-78db2eb9c66d478bee0d56edcc55d4f865f8c6c7.tar.gz | |
all: merge default branch into dev.garbage
hg was unable to create a CL on the code review server for this,
so I am submitting the merge by hand.
The only manual edits are in mgc0.c, to reapply the
removal of cached/ncached to the new code.
Diffstat (limited to 'include/link.h')
| -rw-r--r-- | include/link.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/link.h b/include/link.h index 845f9338d..05e117c87 100644 --- a/include/link.h +++ b/include/link.h @@ -373,6 +373,7 @@ struct Link char* trimpath; char* goroot; char* goroot_final; + int32 enforce_data_order; // for use by assembler // hash table of all symbols LSym* hash[LINKHASH]; @@ -542,6 +543,7 @@ vlong adduint8(Link *ctxt, LSym *s, uint8 v); vlong adduintxx(Link *ctxt, LSym *s, uint64 v, int wid); void mangle(char *file); void savedata(Link *ctxt, LSym *s, Prog *p, char *pn); +void savedata1(Link *ctxt, LSym *s, Prog *p, char *pn, int enforce_order); vlong setaddr(Link *ctxt, LSym *s, vlong off, LSym *t); vlong setaddrplus(Link *ctxt, LSym *s, vlong off, LSym *t, vlong add); vlong setuint16(Link *ctxt, LSym *s, vlong r, uint16 v); |