[src/trunk]: src/sys/arch/sparc/stand/ofwboot Handle kernels with data+BSS se...

[eeh <eeh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4e7de6cee63a
branches:  trunk
changeset: 514360:4e7de6cee63a
user:      eeh <eeh%NetBSD.org@localhost>
date:      Thu Aug 30 23:00:19 2001 +0000

description:
Handle kernels with data+BSS segments larger than 4MB.

diffstat:

 sys/arch/sparc/stand/ofwboot/elfXX_exec.c |  4 ++--
 sys/arch/sparc/stand/ofwboot/version      |  5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r cf121f56effd -r 4e7de6cee63a sys/arch/sparc/stand/ofwboot/elfXX_exec.c
--- a/sys/arch/sparc/stand/ofwboot/elfXX_exec.c Thu Aug 30 22:58:30 2001 +0000
+++ b/sys/arch/sparc/stand/ofwboot/elfXX_exec.c Thu Aug 30 23:00:19 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: elfXX_exec.c,v 1.2 2001/08/15 20:08:15 eeh Exp $       */
+/*     $NetBSD: elfXX_exec.c,v 1.3 2001/08/30 23:00:19 eeh Exp $       */
 
 /*
  * Copyright (c) 1998-2000 Eduardo Horvath.  All rights reserved.
@@ -107,7 +107,7 @@
                if ((phdr.p_vaddr & (4*MEG-1)) == 0)
                        align = 4*MEG;
                if (phdr.p_filesz < phdr.p_memsz)
-                       phdr.p_memsz = 4*MEG;
+                       phdr.p_memsz = (phdr.p_memsz + 4*MEG) & ~(4*MEG-1);
                if (OF_claim((void *)(long)phdr.p_vaddr, phdr.p_memsz, align) ==
                    (void *)-1)
                        panic("cannot claim memory");
diff -r cf121f56effd -r 4e7de6cee63a sys/arch/sparc/stand/ofwboot/version
--- a/sys/arch/sparc/stand/ofwboot/version      Thu Aug 30 22:58:30 2001 +0000
+++ b/sys/arch/sparc/stand/ofwboot/version      Thu Aug 30 23:00:19 2001 +0000
@@ -1,4 +1,4 @@
-$NetBSD: version,v 1.5 2001/08/16 23:57:08 eeh Exp $
+$NetBSD: version,v 1.6 2001/08/30 23:00:20 eeh Exp $
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important - make sure the entries are appended on end, last item
@@ -7,4 +7,5 @@
 1.1:
 1.2:   get it to work with non-start-of-disk partitions
 1.3:   Support verbose/quiet boot.
-1.4:   Align end of BSS on 4MB boundary
\ No newline at end of file
+1.4:   Align end of BSS on 4MB boundary
+1.5:   Fix previous.