summaryrefslogtreecommitdiff
path: root/usr.sbin/vmd/loadfile_elf.c
diff options
context:
space:
mode:
authorJasper Lievisse Adriaanse <jasper@cvs.openbsd.org>2016-09-13 19:07:48 +0000
committerJasper Lievisse Adriaanse <jasper@cvs.openbsd.org>2016-09-13 19:07:48 +0000
commitfeec50a1b0fb243a6cfdb9e9997ca864f64a4aa9 (patch)
treea8d0fac58d2159a05d1148864e0af487c4838be9 /usr.sbin/vmd/loadfile_elf.c
parent200e948e8fa5aa7c10bac9b8dcf49a32e2e63edf (diff)
sync with sys/lib/libsa/loadfile_elf.c -r1.12 and load the .SUNW_ctf section
pointed out by mlarkin@
Diffstat (limited to 'usr.sbin/vmd/loadfile_elf.c')
-rw-r--r--usr.sbin/vmd/loadfile_elf.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/vmd/loadfile_elf.c b/usr.sbin/vmd/loadfile_elf.c
index fdb84914239..44c322dddaf 100644
--- a/usr.sbin/vmd/loadfile_elf.c
+++ b/usr.sbin/vmd/loadfile_elf.c
@@ -1,5 +1,5 @@
/* $NetBSD: loadfile.c,v 1.10 2000/12/03 02:53:04 tsutsui Exp $ */
-/* $OpenBSD: loadfile_elf.c,v 1.17 2016/09/01 16:04:47 stefan Exp $ */
+/* $OpenBSD: loadfile_elf.c,v 1.18 2016/09/13 19:07:47 jasper Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -778,7 +778,8 @@ elf64_exec(int fd, Elf64_Ehdr *elf, u_long *marks, int flags)
for (first = 1, i = 0; i < elf->e_shnum; i++) {
if (shp[i].sh_type == SHT_SYMTAB ||
shp[i].sh_type == SHT_STRTAB ||
- !strcmp(shstr + shp[i].sh_name, ".debug_line")) {
+ !strcmp(shstr + shp[i].sh_name, ".debug_line") ||
+ !strcmp(shstr + shp[i].sh_name, ".SUNW_ctf")) {
if (havesyms && (flags & LOAD_SYM)) {
if (lseek(fd, (off_t)shp[i].sh_offset,
SEEK_SET) == -1) {