cleanup

contrib/com_err/compile_et.1

@@ -1,7 +1,6 @@
 .\" Copyright (c) 1988 Massachusetts Institute of Technology,
 .\" Student Information Processing Board.  All rights reserved.
 .\"
-.\" $FreeBSD: stable/10/contrib/com_err/compile_et.1 206622 2010-04-14 19:08:06Z uqs $
 .\"
 .Dd November 22, 1988
 .Dt COMPILE_ET 1

contrib/com_err/version-script.map

@@ -1,4 +1,3 @@
-# $MidnightBSD$
 
 HEIMDAL_COM_ERR_1.0 {
 	global:

contrib/libexecinfo/execinfo.h

@@ -1,5 +1,5 @@
 /*	$NetBSD: execinfo.h,v 1.2 2012/06/09 21:22:17 christos Exp $	*/
-/*	$FreeBSD: stable/11/contrib/libexecinfo/execinfo.h 255177 2013-09-03 13:38:41Z emaste $ */
+/*	$FreeBSD$ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.

contrib/libexecinfo/symtab.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: symtab.c,v 1.2 2013/08/29 15:01:57 christos Exp $	*/
+/*	$NetBSD: symtab.c,v 1.5 2016/04/20 14:00:16 christos Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,12 +29,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: symtab.c,v 1.2 2013/08/29 15:01:57 christos Exp $");
+__RCSID("$NetBSD: symtab.c,v 1.5 2016/04/20 14:00:16 christos Exp $");
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
+#include <stdbool.h>
 #include <err.h>
 #include <dlfcn.h>
 
@@ -47,7 +48,6 @@ __RCSID("$NetBSD: symtab.c,v 1.2 2013/08/29 15:01:57 christos Exp $");
 #define ELF_ST_TYPE(x)          (((unsigned int)x) & 0xf)
 #endif
 
-
 #include "symtab.h"
 
 struct symbol {
@@ -59,6 +59,7 @@ struct symbol {
 struct symtab {
 	size_t nsymbols;
 	struct symbol *symbols;
+	bool ispie;
 };
 
 static int
@@ -86,6 +87,7 @@ symtab_create(int fd, int bind, int type)
 	Elf *elf;
 	symtab_t *st;
 	Elf_Scn *scn = NULL;
+	GElf_Ehdr ehdr;
 
 	if (elf_version(EV_CURRENT) == EV_NONE) {
 		warnx("Elf Library is out of date.");
@@ -103,6 +105,13 @@ symtab_create(int fd, int bind, int type)
 		elf_end(elf);
 		return NULL;
 	}
+	if (gelf_getehdr(elf, &ehdr) == NULL) {
+		warnx("Error getting ELF Ehdr");
+		elf_end(elf);
+		return NULL;
+	}
+
+	st->ispie = ehdr.e_type == ET_DYN;
 
 	while ((scn = elf_nextscn(elf, scn)) != NULL) {
 		GElf_Shdr shdr;
@@ -127,6 +136,13 @@ symtab_create(int fd, int bind, int type)
 			GElf_Sym sym;
                         gelf_getsym(edata, (int)i, &sym);
 
+#ifdef SYMTAB_DEBUG
+			fprintf(stderr, "%s: %s@%#jx=%d,%d\n", __func__,
+			    elf_strptr(elf, shdr.sh_link, sym.st_name),
+			    (uintmax_t)sym.st_value, ELF_ST_BIND(sym.st_info),
+			    ELF_ST_TYPE(sym.st_info));
+#endif
+
 			if (bind != -1 &&
 			    (unsigned)bind != ELF_ST_BIND(sym.st_info))
 				continue;
@@ -159,7 +175,7 @@ symtab_create(int fd, int bind, int type)
 	return NULL;
 }
 
-	
+
 int
 symtab_find(const symtab_t *st, const void *p, Dl_info *dli)
 {
@@ -168,8 +184,15 @@ symtab_find(const symtab_t *st, const void *p, Dl_info *dli)
 	size_t hi = ns;
 	size_t lo = 0;
 	size_t mid = ns / 2;
-	uintptr_t dd, sd, me = (uintptr_t)p;
-
+	uintptr_t fbase = st->ispie ? (uintptr_t)dli->dli_fbase : 0;
+	uintptr_t dd, sd, me = (uintptr_t)p - fbase;
+	uintptr_t ad = (uintptr_t)dli->dli_saddr - fbase;
+
+#ifdef SYMTAB_DEBUG
+	fprintf(stderr, "%s: [fbase=%#jx, saddr=%p, me=%#jx ad=%#jx]\n",
+	    __func__, (uintmax_t)fbase, dli->dli_saddr, (uintmax_t)me,
+	    (uintmax_t)ad);
+#endif
 	for (;;) {
 		if (s[mid].st_value < me)
 			lo = mid;
@@ -183,11 +206,20 @@ symtab_find(const symtab_t *st, const void *p, Dl_info *dli)
 		}
 		mid = (hi + lo) / 2;
 	}
-	dd = me - (uintptr_t)dli->dli_saddr;
+	dd = me - ad;
 	sd = me - s[mid].st_value;
 	if (dd > sd) {
 		dli->dli_saddr = (void *)s[mid].st_value;
 		dli->dli_sname = s[mid].st_name;
+#ifdef SYMTAB_DEBUG
+		fprintf(stderr, "%s: me=%#jx -> [%#jx, %s]\n", __func__,
+		    (uintmax_t)me, (uintmax_t)sd, dli->dli_sname);
+#endif
 	}
+#ifdef SYMTAB_DEBUG
+	else
+		fprintf(stderr, "%s: %#jx -> [%#jx, ***]\n", __func__,
+		    (uintmax_t)me, (uintmax_t)sd);
+#endif
 	return 1;
 }

contrib/libexecinfo/unwind.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: unwind.c,v 1.1 2012/05/26 22:02:29 christos Exp $	*/
+/*	$NetBSD: unwind.c,v 1.3 2019/01/30 22:46:49 mrg Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -51,8 +51,10 @@ tracer(struct _Unwind_Context *ctx, void *arg)
 		return 0;
 	}
 	if (t->n < t->len)
-		t->arr[t->n++] = _Unwind_GetIP(ctx);
-	return 0;
+		t->arr[t->n++] = (void *)_Unwind_GetIP(ctx);
+	else
+		return _URC_END_OF_STACK;
+	return _URC_NO_REASON;
 }
 
 size_t
@@ -65,7 +67,9 @@ backtrace(void **arr, size_t len)
 	ctx.n = (size_t)~0;
 
 	_Unwind_Backtrace(tracer, &ctx);
-	if (ctx.n != (size_t)~0 && ctx.n > 0)
+	if (ctx.n == (size_t)~0)
+		ctx.n = 0;
+	else if (ctx.n > 0)
 		ctx.arr[--ctx.n] = NULL;	/* Skip frame below __start */
 
 	return ctx.n;