summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/conf
diff options
context:
space:
mode:
authorPhilip Guenther <guenther@cvs.openbsd.org>2018-06-14 20:01:00 +0000
committerPhilip Guenther <guenther@cvs.openbsd.org>2018-06-14 20:01:00 +0000
commit1c855f16cc3f4737c2893e0f3ae5183c0b2db27e (patch)
treef0988d6284fe541e2945fbfdc5a1b9bfa3646e97 /sys/arch/amd64/conf
parente9bb752af5469ebc0bbb6b67f8ad7d87683801ec (diff)
Put the .openbsd.randomdata.retguard input section at the start of the
.openbsd.randomdata output section with symbols around it so that hibernate+resume code can fix them up. tested by mlarkin@ WIP
Diffstat (limited to 'sys/arch/amd64/conf')
-rw-r--r--sys/arch/amd64/conf/ld.script7
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/ld.script b/sys/arch/amd64/conf/ld.script
index e38604bae4c..21887db492c 100644
--- a/sys/arch/amd64/conf/ld.script
+++ b/sys/arch/amd64/conf/ld.script
@@ -1,4 +1,4 @@
-/* $OpenBSD: ld.script,v 1.10 2018/03/01 06:47:29 deraadt Exp $ */
+/* $OpenBSD: ld.script,v 1.11 2018/06/14 20:00:59 guenther Exp $ */
/*
* Copyright (c) 2009 Tobias Weingartner <weingart@tepid.org>
@@ -79,7 +79,10 @@ SECTIONS
__kernel_randomdata_phys = (. - __kernel_virt_base) + 0x1000000;
.openbsd.randomdata : AT (__kernel_randomdata_phys)
{
- *(.openbsd.randomdata)
+ __retguard_start = ABSOLUTE(.);
+ *(.openbsd.randomdata.retguard)
+ __retguard_end = ABSOLUTE(.);
+ *(.openbsd.randomdata .openbsd.randomdata.*)
} :rodata :openbsd_randomize =0xcccccccc
. = ALIGN(0x1000);
PROVIDE (erodata = .);