summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@felloff.net>2014-02-01 09:52:06 +0100
committercinap_lenrek <cinap_lenrek@felloff.net>2014-02-01 09:52:06 +0100
commit010af9ba12213ccaf92a1d863dc1c971185ff7fb (patch)
tree185408e4ae61c20e116a73f342057cdb3fd97e87
parentbbe6fe51b3151cb87d26db2c28c043f29d473e56 (diff)
downloadplan9front-010af9ba12213ccaf92a1d863dc1c971185ff7fb.tar.xz
6l: fix warning, setmalloctag declaration, missing header type cases
-rw-r--r--sys/src/cmd/6l/asm.c2
-rw-r--r--sys/src/cmd/6l/compat.c2
-rw-r--r--sys/src/cmd/6l/span.c3
3 files changed, 3 insertions, 4 deletions
diff --git a/sys/src/cmd/6l/asm.c b/sys/src/cmd/6l/asm.c
index 5056aca19..71e1bb67a 100644
--- a/sys/src/cmd/6l/asm.c
+++ b/sys/src/cmd/6l/asm.c
@@ -132,6 +132,7 @@ asmb(void)
default:
diag("unknown header type %ld", HEADTYPE);
case 2:
+ case 3:
case 5:
seek(cout, HEADR+textsize, 0);
break;
@@ -165,6 +166,7 @@ asmb(void)
switch(HEADTYPE) {
default:
case 2:
+ case 3:
case 5:
seek(cout, HEADR+textsize+datsize, 0);
break;
diff --git a/sys/src/cmd/6l/compat.c b/sys/src/cmd/6l/compat.c
index 32e99ee05..2d2a9631b 100644
--- a/sys/src/cmd/6l/compat.c
+++ b/sys/src/cmd/6l/compat.c
@@ -50,6 +50,6 @@ mysbrk(ulong size)
}
void
-setmalloctag(void*, ulong)
+setmalloctag(void*, uintptr)
{
}
diff --git a/sys/src/cmd/6l/span.c b/sys/src/cmd/6l/span.c
index ec36e1490..78399a2b3 100644
--- a/sys/src/cmd/6l/span.c
+++ b/sys/src/cmd/6l/span.c
@@ -668,9 +668,6 @@ asmandsz(Adr *a, int r, int rex, int m64)
rex &= (0x40 | Rxr);
v = a->offset;
- if ((vlong)v != a->offset)
- print("asmandsz: Trying to emit %#ullx and 32 bits is not sufficient\n",
- a->offset);
t = a->type;
if(a->index != D_NONE) {
if(t >= D_INDIR) {