diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2017-03-19 03:05:24 +0100 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2017-03-19 03:05:24 +0100 |
| commit | da9b38c75c11cc7f18415849b5bf14579ef8317c (patch) | |
| tree | 427a69021fef7444f35b9880677c6bdce63e68d9 /sys/src/cmd/kl | |
| parent | bd178b6dc6a6d6a81be05c0a1f7c03b352f833c1 (diff) | |
5l,6l,8l,kl,ql,vl: allow duplicate GLOBAL symbols (from Ori Bernstein)
The plan 9 assemblers support the DUPOK flag on text symbols. They parse and
ignore it on GLOBL symbols. This patch makes it work in the linkers.
The reason I ran into this is because my programming language (Myrddin) uses
data symbols to generate type information, and it's useful to avoid
duplicating all of the type info in every file that gets generated.
Diffstat (limited to 'sys/src/cmd/kl')
| -rw-r--r-- | sys/src/cmd/kl/asm.c | 2 | ||||
| -rw-r--r-- | sys/src/cmd/kl/l.h | 1 | ||||
| -rw-r--r-- | sys/src/cmd/kl/obj.c | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/sys/src/cmd/kl/asm.c b/sys/src/cmd/kl/asm.c index 62fe60b70..e2ad134c1 100644 --- a/sys/src/cmd/kl/asm.c +++ b/sys/src/cmd/kl/asm.c @@ -396,7 +396,7 @@ datblk(long s, long n) } if(l >= n) continue; - if(p->as != AINIT && p->as != ADYNT) { + if(p->as != AINIT && p->as != ADYNT && !p->from.sym->dupok) { for(j=l+(c-i)-1; j>=l; j--) if(buf.dbuf[j]) { print("%P\n", p); diff --git a/sys/src/cmd/kl/l.h b/sys/src/cmd/kl/l.h index 2045e3207..94fa2b40f 100644 --- a/sys/src/cmd/kl/l.h +++ b/sys/src/cmd/kl/l.h @@ -65,6 +65,7 @@ struct Sym short version; short become; short frame; + char dupok; long value; Sym *link; }; diff --git a/sys/src/cmd/kl/obj.c b/sys/src/cmd/kl/obj.c index 2608349b4..381bcf1dc 100644 --- a/sys/src/cmd/kl/obj.c +++ b/sys/src/cmd/kl/obj.c @@ -737,6 +737,8 @@ loop: diag("GLOBL must have a name\n%P", p); errorexit(); } + if(p->reg & DUPOK) + s->dupok = 1; if(s->type == 0 || s->type == SXREF) { s->type = SBSS; s->value = 0; @@ -951,6 +953,7 @@ lookup(char *symb, int v) s->type = 0; s->version = v; s->value = 0; + s->dupok = 0; hash[h] = s; return s; } |