summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2015-04-28 22:29:25 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2015-04-28 22:29:25 +0000
commit56bfcc588c941213380099743aae36f09ec980e8 (patch)
tree9adad81559191f5f558070c9da832f900a6282be /sys/arch/amd64
parentb6d6b0199bde9403e42c812c7c1f2cc062a7b83e (diff)
Explicitly include .codepatch and .codepatchend in .rodata such that
the binutils 2.17 linker doesn't make them disappear. ok deraadt@, guenther@
Diffstat (limited to 'sys/arch/amd64')
-rw-r--r--sys/arch/amd64/conf/ld.script5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/ld.script b/sys/arch/amd64/conf/ld.script
index 15178e33788..fbe23c7a8c8 100644
--- a/sys/arch/amd64/conf/ld.script
+++ b/sys/arch/amd64/conf/ld.script
@@ -1,4 +1,4 @@
-/* $OpenBSD: ld.script,v 1.2 2014/12/21 16:27:07 mlarkin Exp $ */
+/* $OpenBSD: ld.script,v 1.3 2015/04/28 22:29:24 kettenis Exp $ */
/*
* Copyright (c) 2009 Tobias Weingartner <weingart@tepid.org>
@@ -69,6 +69,8 @@ SECTIONS
__rodata_size = SIZEOF(.rodata);
__rodata_load = LOADADDR(.rodata);
*(.rodata .rodata.*)
+ *(.codepatch)
+ *(.codepatchend)
} :rodata
PROVIDE (erodata = .);
_erodata = .;
@@ -122,4 +124,3 @@ SECTIONS
*(.eh_frame)
}
}
-