summaryrefslogtreecommitdiff
path: root/sys/arch/luna88k
diff options
context:
space:
mode:
authorPhilip Guenther <guenther@cvs.openbsd.org>2019-11-09 20:07:01 +0000
committerPhilip Guenther <guenther@cvs.openbsd.org>2019-11-09 20:07:01 +0000
commit79ae1b85e00b046d6b83378e2374a08e91d8c79c (patch)
tree48a44463abbea2016493120f3beed6dd69e657f8 /sys/arch/luna88k
parentf297199eb02ce6fac9f8f676bcb421a30a7740ff (diff)
Retguard will start using sections named ".openbsd.randomdata.retguard.*"
and not just ".openbsd.randomdata.retguard". Accept both in the kernel ldscripts so that they're placed together between the __retguard_{start,end} symbols. Similarly, match not just ".openbsd.randomdata" but also ".openbsd.randomdata.*" to pick up other random (pun intended) items. While here, stub in those retguard bits into all the ldscripts. ok deraadt@
Diffstat (limited to 'sys/arch/luna88k')
-rw-r--r--sys/arch/luna88k/conf/ld.script9
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/arch/luna88k/conf/ld.script b/sys/arch/luna88k/conf/ld.script
index 33e690a2258..50a6223e6c4 100644
--- a/sys/arch/luna88k/conf/ld.script
+++ b/sys/arch/luna88k/conf/ld.script
@@ -1,4 +1,4 @@
-/* $OpenBSD: ld.script,v 1.5 2017/03/16 18:08:58 miod Exp $ */
+/* $OpenBSD: ld.script,v 1.6 2019/11/09 20:07:00 guenther Exp $ */
/*
* Copyright (c) 2012 Miodrag Vallat.
@@ -47,7 +47,12 @@ SECTIONS
} :data
.openbsd.randomdata :
{
- *(.openbsd.randomdata)
+ /* XXX shouldn't this be placed next to rodata? */
+ __retguard_start = ABSOLUTE(.);
+ *(.openbsd.randomdata.retguard .openbsd.randomdata.retguard.*)
+ /* XXX . = ALIGN(0x80000); */
+ __retguard_end = ABSOLUTE(.);
+ *(.openbsd.randomdata .openbsd.randomdata.*)
} :data :openbsd_randomize
PROVIDE(edata = ABSOLUTE(.));
.bss :