svn commit: r219552 - projects/altix/sys/conf

[Marcel Moolenaar]

Author: marcel
Date: Sat Mar 12 00:08:58 2011
New Revision: 219552
URL: http://svn.freebsd.org/changeset/base/219552

Log:
  Link the kernel at the PBVM base address and align the data segment
  at the PBVM page boundary.

Modified:
  projects/altix/sys/conf/ldscript.ia64

Modified: projects/altix/sys/conf/ldscript.ia64
==============================================================================
--- projects/altix/sys/conf/ldscript.ia64	Fri Mar 11 23:16:04 2011	(r219551)
+++ projects/altix/sys/conf/ldscript.ia64	Sat Mar 12 00:08:58 2011	(r219552)
@@ -3,7 +3,7 @@ OUTPUT_FORMAT("elf64-ia64-freebsd", "elf
 OUTPUT_ARCH(ia64)
 ENTRY(__start)
 SEARCH_DIR(/usr/lib);
-kernel_text = 0xe000003400000000;	/* XXX_ALTIX_TODO */
+kernel_text = 0x9ffc000000000000;
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
@@ -55,12 +55,12 @@ SECTIONS
   .opd            : { *(.opd) }
   .IA_64.unwind_info   : { *(.IA_64.unwind_info* .gnu.linkonce.ia64unwi.*) }
   .IA_64.unwind   : { *(.IA_64.unwind* .gnu.linkonce.ia64unw.*) }
-  /* Adjust the address for the data segment.  We want to adjust up to
-     the same address within the page on the next page up.  */
-  . = . + 8192;
+  /* Adjust the address for the data segment.  We want to start in the next
+     page in the loader virtual memory. */
+  . = ALIGN(65536);
   .data           :
   {
-    *(.data.proc0 .data .data.* .gnu.linkonce.d.*)
+    *(.data.kstack .data .data.* .gnu.linkonce.d.*)
     SORT(CONSTRUCTORS)
   }
   .data1          : { *(.data1) }