summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf
diff options
context:
space:
mode:
authormortimer <mortimer@cvs.openbsd.org>2021-03-07 23:10:55 +0000
committermortimer <mortimer@cvs.openbsd.org>2021-03-07 23:10:55 +0000
commit4f24a984ecfe8b8518e6a973ec0665dae7bd21f9 (patch)
treee178d226a31820a3d8a565e5d230a59e186dc764 /sys/arch/i386/conf
parentc8b5238b8ee05cbc99fb42022a7fc0529de2678e (diff)
Explicitly align kernel text.
lld11 no longer quietly aligns this when given an address, so we do the alignment explicitly. ok kettenis@
Diffstat (limited to 'sys/arch/i386/conf')
-rw-r--r--sys/arch/i386/conf/ld.script5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/ld.script b/sys/arch/i386/conf/ld.script
index 6afd7f3afa2..18d4a8a7ba0 100644
--- a/sys/arch/i386/conf/ld.script
+++ b/sys/arch/i386/conf/ld.script
@@ -1,4 +1,4 @@
-/* $OpenBSD: ld.script,v 1.11 2019/11/09 20:07:00 guenther Exp $ */
+/* $OpenBSD: ld.script,v 1.12 2021/03/07 23:10:54 mortimer Exp $ */
/*
* Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
@@ -46,7 +46,8 @@ SECTIONS
{
__kernel_text_virt = __kernel_base_virt;
__kernel_text_phys = __kernel_base_phys;
- .text (__kernel_text_virt) : AT (__kernel_text_phys)
+ .text ALIGN(__kernel_text_virt, __ALIGN_SIZE) :
+ AT (ALIGN(__kernel_text_phys, __ALIGN_SIZE))
{
__text_start = ABSOLUTE(.) & 0xfffff000;
__text_size = SIZEOF(.text);