From e916eb8e201a5f125fcc1e81428efa21a224f872 Mon Sep 17 00:00:00 2001 From: emaste Date: Fri, 17 Feb 2017 00:44:48 +0000 Subject: MFC r313562: kldxref: s/sections/segments/ in warning message The message refers to program header segments, not sections. PR: 216975 --- usr.sbin/kldxref/ef.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'usr.sbin/kldxref/ef.c') diff --git a/usr.sbin/kldxref/ef.c b/usr.sbin/kldxref/ef.c index 88fbc34..aa3fc2e 100644 --- a/usr.sbin/kldxref/ef.c +++ b/usr.sbin/kldxref/ef.c @@ -600,7 +600,7 @@ ef_open(const char *filename, struct elf_file *efile, int verbose) filename); break; } else if (nsegs > MAXSEGS) { - warnx("%s: too many sections", filename); + warnx("%s: too many segments", filename); break; } ef->ef_nsegs = nsegs; -- cgit v1.1 From 5c643bff82c9f278176bb56ca84ef4b5d7f38946 Mon Sep 17 00:00:00 2001 From: emaste Date: Fri, 17 Feb 2017 00:46:16 +0000 Subject: MFC r313563: kldxref: bump MAXSEGS to 3 ld.bfd generates two PT_LOAD segments, but certain linkers or linker configurations generate three PT_LOAD segments (one additional for RELRO). PR: 216975 --- usr.sbin/kldxref/ef.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'usr.sbin/kldxref/ef.c') diff --git a/usr.sbin/kldxref/ef.c b/usr.sbin/kldxref/ef.c index aa3fc2e..d700b2a 100644 --- a/usr.sbin/kldxref/ef.c +++ b/usr.sbin/kldxref/ef.c @@ -47,7 +47,7 @@ #include "ef.h" -#define MAXSEGS 2 +#define MAXSEGS 3 struct ef_file { char* ef_name; struct elf_file *ef_efile; -- cgit v1.1