From e0c19ae048ae671883fd4d27d5f617c02020bdf5 Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Fri, 17 May 2019 18:14:10 +0200 Subject: [PATCH] 7l: don't hardcode 4k pagesize, use INITRND --- sys/src/cmd/7l/asm.c | 4 ++-- sys/src/cmd/7l/obj.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/src/cmd/7l/asm.c b/sys/src/cmd/7l/asm.c index 408881ee5..0cc5a27ec 100644 --- a/sys/src/cmd/7l/asm.c +++ b/sys/src/cmd/7l/asm.c @@ -100,7 +100,7 @@ asmb(void) seek(cout, OFFSET, 0); break; case 6: /* no header, padded segments */ - OFFSET = rnd(HEADR+textsize, 4096); + OFFSET = rnd(HEADR+textsize, INITRND); seek(cout, OFFSET, 0); break; } @@ -132,7 +132,7 @@ asmb(void) seek(cout, OFFSET, 0); break; case 6: /* no header, padded segments */ - OFFSET += rnd(datsize, 4096); + OFFSET += rnd(datsize, INITRND); seek(cout, OFFSET, 0); break; case 7: diff --git a/sys/src/cmd/7l/obj.c b/sys/src/cmd/7l/obj.c index 4d2fffb6a..75def5096 100644 --- a/sys/src/cmd/7l/obj.c +++ b/sys/src/cmd/7l/obj.c @@ -35,8 +35,8 @@ isobjfile(char *f) /* * -H0 no header - * -H2 -T0x100028 -R0x100000 is plan9 format - * -H6 -R4096 no header with segments padded to pages + * -H2 -T0x100028 -R0x100000 is plan9 format + * -H6 -R0x10000 no header with segments padded to pages * -H7 is elf */