diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2010-11-04 18:57:51 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2010-11-04 18:57:51 +0000 |
| commit | 714d4612dff6d2721f0bc6c658a075615272aa1e (patch) | |
| tree | 97d4e892bc752fd46c09105a8a508d299a552199 /sys/conf/ldscript.amd64 | |
| parent | 8aa660204b3601b1baeeb12f8c9858213a659105 (diff) | |
Notes
Diffstat (limited to 'sys/conf/ldscript.amd64')
| -rw-r--r-- | sys/conf/ldscript.amd64 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/conf/ldscript.amd64 b/sys/conf/ldscript.amd64 index 5cc4a81ed3d2c..a62604b1ac726 100644 --- a/sys/conf/ldscript.amd64 +++ b/sys/conf/ldscript.amd64 @@ -6,7 +6,7 @@ SEARCH_DIR("/usr/lib"); SECTIONS { /* Read-only sections, merged into text segment: */ - . = kernbase + 0x00100000 + SIZEOF_HEADERS; + . = kernbase + CONSTANT (MAXPAGESIZE) + SIZEOF_HEADERS; .interp : { *(.interp) } .hash : { *(.hash) } .dynsym : { *(.dynsym) } @@ -61,7 +61,8 @@ SECTIONS .eh_frame_hdr : { *(.eh_frame_hdr) } /* Adjust the address for the data segment. We want to adjust up to the same address within the page on the next page up. */ - . = DATA_SEGMENT_ALIGN(0x100000, 0x1000); + . = ALIGN (CONSTANT (MAXPAGESIZE)) - ((CONSTANT (MAXPAGESIZE) - .) & (CONSTANT (MAXPAGESIZE) - 1)); + . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE)); /* Ensure the __preinit_array_start label is properly aligned. We could instead move the label definition inside the section, but the linker would then create the section even if it turns out to |