diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2019-11-09 20:07:01 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2019-11-09 20:07:01 +0000 |
| commit | 79ae1b85e00b046d6b83378e2374a08e91d8c79c (patch) | |
| tree | 48a44463abbea2016493120f3beed6dd69e657f8 /sys/arch/sparc64 | |
| parent | f297199eb02ce6fac9f8f676bcb421a30a7740ff (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/sparc64')
| -rw-r--r-- | sys/arch/sparc64/conf/ld.script | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/sparc64/conf/ld.script b/sys/arch/sparc64/conf/ld.script index a0a28b89b69..bff7290e6dd 100644 --- a/sys/arch/sparc64/conf/ld.script +++ b/sys/arch/sparc64/conf/ld.script @@ -1,4 +1,4 @@ -/* $OpenBSD: ld.script,v 1.11 2017/05/27 09:01:22 kettenis Exp $ */ +/* $OpenBSD: ld.script,v 1.12 2019/11/09 20:07:00 guenther Exp $ */ /* * Copyright (c) 2013 Mark Kettenis <kettenis@openbsd.org> @@ -42,7 +42,11 @@ SECTIONS } .openbsd.randomdata : { - *(.openbsd.randomdata) + __retguard_start = ABSOLUTE(.); + *(.openbsd.randomdata.retguard .openbsd.randomdata.retguard.*) + /* XXX . = ALIGN(0x1000); */ + __retguard_end = ABSOLUTE(.); + *(.openbsd.randomdata .openbsd.randomdata.*) } :text :openbsd_randomize . = 0x01c00000; .data : |