Copy elftoolchain binutils replacements from vendor branch

Sponsored by:	The FreeBSD Foundation

3 files changed, 584 insertions, 0 deletions

diff --git a/contrib/elftoolchain/addr2line/Makefile b/contrib/elftoolchain/addr2line/Makefile
new file mode 100644
index 0000000..e388bc0
--- /dev/null
+++ b/contrib/elftoolchain/addr2line/Makefile
@@ -0,0 +1,15 @@
+# $Id: Makefile 2066 2011-10-26 15:40:28Z jkoshy $
+
+TOP=	..
+
+PROG=	addr2line
+SRCS=	addr2line.c
+
+WARNS?=	6
+
+DPADD=	${LIBELF} ${LIBELFTC} ${LIBDWARF}
+LDADD=	-lelftc -ldwarf -lelf
+
+MAN1=	addr2line.1
+
+.include "${TOP}/mk/elftoolchain.prog.mk"
diff --git a/contrib/elftoolchain/addr2line/addr2line.1 b/contrib/elftoolchain/addr2line/addr2line.1
new file mode 100644
index 0000000..98edda5
--- /dev/null
+++ b/contrib/elftoolchain/addr2line/addr2line.1
@@ -0,0 +1,159 @@
+.\" Copyright (c) 2009,2010 Joseph Koshy <jkoshy@users.sourceforge.net>
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer
+.\"    in this position and unchanged.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.\" $Id: addr2line.1 2066 2011-10-26 15:40:28Z jkoshy $
+.\"
+.Dd July 25, 2010
+.Os
+.Dt ADDR2LINE 1
+.Sh NAME
+.Nm addr2line
+.Nd translate program addresses to source file names and line numbers
+.Sh SYNOPSIS
+.Nm
+.Op Fl b Ar target | Fl -target Ns = Ns Ar target
+.Op Fl e Ar pathname | Fl -exe Ns = Ns Ar pathname
+.Op Fl f | Fl -functions
+.Op Fl j Ar sectionname | Fl -section Ns = Ns Ar sectionname
+.Op Fl s | Fl -basename
+.Op Fl C | Fl -demangle
+.Op Fl H | Fl -help
+.Op Fl V | Fl -version
+.Op Ar hexaddress Ns ...
+.Sh DESCRIPTION
+The
+.Nm
+utility translates program addresses specified by the command line
+arguments
+.Ar hexaddress
+to their corresponding source file names and line numbers.
+If no arguments are given to
+.Nm ,
+it will read these addresses from standard input.
+.Pp
+Program addresses specified by arguments
+.Ar hexaddress
+are encoded using the conventions accepted by
+.Xr strtoull 3 .
+.Pp
+By default,
+.Nm
+will use the executable
+.Dq Pa a.out .
+The
+.Fl e
+option may be used to specified a different ELF object.
+.Pp
+The
+.Nm
+utility recognizes the following options:
+.Bl -tag -width indent
+.It Fl b Ar target | Fl -target Ns = Ns Ar target
+This option is recognized by
+.Nm
+but is ignored.
+It is supported for compatibility with GNU binutils.
+.It Fl e Ar pathname | Fl -exe Ns = Ns Ar pathname
+Use the ELF object specified by argument
+.Ar pathname
+to translate addresses.
+If this option is not specified,
+.Nm
+will use the file
+.Dq Pa a.out .
+.It Fl f | Fl -functions
+Display function names in addition to file and line number information.
+.It Fl j Ar sectionname | Fl -section Ns = Ns Ar sectionname
+The values specified by arguments
+.Ar hexaddress
+are to be treated as offsets into the section named
+.Ar sectionname .
+.It Fl s | -basename
+Display only the base name for each file name.
+.It Fl C | Fl -demangle
+Demangle C++ names.
+.It Fl H | Fl -help
+Print a help message.
+.It Fl V | Fl -version
+Print a version identifier and exit.
+.El
+.Sh OUTPUT FORMAT
+If the 
+.Fl f
+option was not specified,
+.Nm
+will print the file name and line number for each address specified
+on a separate line.
+.Pp
+If the
+.Fl f
+option was specified,
+.Nm
+will print a line containing the name of the function corresponding
+to program address
+.Ar hexaddress ,
+followed by a line with the file name and line number.
+.Pp
+The
+.Nm
+utility prints the file name and line number using the format
+.Dq FILENAME:LINENUMBER .
+.Pp
+If a file or function name could not be determined,
+.Nm
+will print a question mark in their place.
+If the line number could not be determined,
+.Nm
+will print a zero in its place.
+.Sh EXAMPLES
+To map address 080483c4 in the default executable
+.Pa a.out
+to a source file name and line number use:
+.D1 "% addr2line 080483c4"
+.Pp
+To map address 080483c4 in executable
+.Pa helloworld ,
+use:
+.D1 "% addr2line -e helloworld 080483c4"
+.Pp
+To have
+.Nm
+act as a filter reading addresses from its standard input use:
+.D1 "% addr2line"
+.Pp
+To print the function name corresponding to an address in addition to
+its source file and line number use:
+.D1 "% addr2line -f 080483c4"
+.Sh EXIT STATUS
+.Ex -std
+.Sh SEE ALSO
+.Xr nm 1 ,
+.Xr elfdump 1 ,
+.Xr elfcopy 1 ,
+.Xr strtoull 3
+.Sh AUTHORS
+The
+.Nm
+utility was written by
+.An "Kai Wang" Aq kaiwang27@users.sourceforge.net .
diff --git a/contrib/elftoolchain/addr2line/addr2line.c b/contrib/elftoolchain/addr2line/addr2line.c
new file mode 100644
index 0000000..b58b4b3
--- /dev/null
+++ b/contrib/elftoolchain/addr2line/addr2line.c
@@ -0,0 +1,410 @@
+/*-
+ * Copyright (c) 2009 Kai Wang
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+#include <sys/param.h>
+#include <dwarf.h>
+#include <err.h>
+#include <fcntl.h>
+#include <gelf.h>
+#include <getopt.h>
+#include <libdwarf.h>
+#include <libelftc.h>
+#include <libgen.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "_elftc.h"
+
+ELFTC_VCSID("$Id: addr2line.c 2185 2011-11-19 16:07:16Z jkoshy $");
+
+static struct option longopts[] = {
+	{"target" , required_argument, NULL, 'b'},
+	{"demangle", no_argument, NULL, 'C'},
+	{"exe", required_argument, NULL, 'e'},
+	{"functions", no_argument, NULL, 'f'},
+	{"section", required_argument, NULL, 'j'},
+	{"basename", no_argument, NULL, 's'},
+	{"help", no_argument, NULL, 'H'},
+	{"version", no_argument, NULL, 'V'},
+	{NULL, 0, NULL, 0}
+};
+static int demangle, func, base;
+static char unknown[] = { '?', '?', '\0' };
+static Dwarf_Addr section_base;
+
+#define	USAGE_MESSAGE	"\
+Usage: %s [options] hexaddress...\n\
+  Map program addresses to source file names and line numbers.\n\n\
+  Options:\n\
+  -b TGT  | --target=TGT      (Accepted but ignored).\n\
+  -e EXE  | --exec=EXE        Use program \"EXE\" to translate addresses.\n\
+  -f      | --functions       Display function names.\n\
+  -j NAME | --section=NAME    Values are offsets into section \"NAME\".\n\
+  -s      | --basename        Only show the base name for each file name.\n\
+  -C      | --demangle        Demangle C++ names.\n\
+  -H      | --help            Print a help message.\n\
+  -V      | --version         Print a version identifier and exit.\n"
+
+static void
+usage(void)
+{
+	(void) fprintf(stderr, USAGE_MESSAGE, ELFTC_GETPROGNAME());
+	exit(1);
+}
+
+static void
+version(void)
+{
+
+	fprintf(stderr, "%s (%s)\n", ELFTC_GETPROGNAME(), elftc_version());
+	exit(0);
+}
+
+static void
+search_func(Dwarf_Debug dbg, Dwarf_Die die, Dwarf_Addr addr,
+    const char **rlt_func)
+{
+	Dwarf_Die ret_die, spec_die;
+	Dwarf_Error de;
+	Dwarf_Half tag;
+	Dwarf_Unsigned lopc, hipc;
+	Dwarf_Off ref;
+	Dwarf_Attribute sub_at, spec_at;
+	char *func0;
+	int ret;
+
+	if (*rlt_func != NULL)
+		return;
+
+	if (dwarf_tag(die, &tag, &de)) {
+		warnx("dwarf_tag: %s", dwarf_errmsg(de));
+		goto cont_search;
+	}
+	if (tag == DW_TAG_subprogram) {
+		if (dwarf_attrval_unsigned(die, DW_AT_low_pc, &lopc, &de) ||
+		    dwarf_attrval_unsigned(die, DW_AT_high_pc, &hipc, &de))
+			goto cont_search;
+		if (addr < lopc || addr >= hipc)
+			goto cont_search;
+
+		/* Found it! */
+
+		*rlt_func = unknown;
+		ret = dwarf_attr(die, DW_AT_name, &sub_at, &de);
+		if (ret == DW_DLV_ERROR)
+			return;
+		if (ret == DW_DLV_OK) {
+			if (dwarf_formstring(sub_at, &func0, &de))
+				*rlt_func = unknown;
+			else
+				*rlt_func = func0;
+			return;
+		}
+
+		/*
+		 * If DW_AT_name is not present, but DW_AT_specification is
+		 * present, then probably the actual name is in the DIE
+		 * referenced by DW_AT_specification.
+		 */
+		if (dwarf_attr(die, DW_AT_specification, &spec_at, &de))
+			return;
+		if (dwarf_global_formref(spec_at, &ref, &de))
+			return;
+		if (dwarf_offdie(dbg, ref, &spec_die, &de))
+			return;
+		if (dwarf_attrval_string(spec_die, DW_AT_name, rlt_func, &de))
+			*rlt_func = unknown;
+
+		return;
+	}
+
+cont_search:
+
+	/* Search children. */
+	ret = dwarf_child(die, &ret_die, &de);
+	if (ret == DW_DLV_ERROR)
+		errx(EXIT_FAILURE, "dwarf_child: %s", dwarf_errmsg(de));
+	else if (ret == DW_DLV_OK)
+		search_func(dbg, ret_die, addr, rlt_func);
+
+	/* Search sibling. */
+	ret = dwarf_siblingof(dbg, die, &ret_die, &de);
+	if (ret == DW_DLV_ERROR)
+		errx(EXIT_FAILURE, "dwarf_siblingof: %s", dwarf_errmsg(de));
+	else if (ret == DW_DLV_OK)
+		search_func(dbg, ret_die, addr, rlt_func);
+}
+
+static void
+translate(Dwarf_Debug dbg, const char* addrstr)
+{
+	Dwarf_Die die;
+	Dwarf_Line *lbuf;
+	Dwarf_Error de;
+	Dwarf_Half tag;
+	Dwarf_Unsigned lopc, hipc, addr, lineno, plineno;
+	Dwarf_Signed lcount;
+	Dwarf_Addr lineaddr, plineaddr;
+	const char *funcname;
+	char *file, *file0, *pfile;
+	char demangled[1024];
+	int i, ret;
+
+	addr = strtoull(addrstr, NULL, 16);
+	addr += section_base;
+	lineno = 0;
+	file = unknown;
+
+	while ((ret = dwarf_next_cu_header(dbg, NULL, NULL, NULL, NULL, NULL,
+	    &de)) ==  DW_DLV_OK) {
+		die = NULL;
+		while (dwarf_siblingof(dbg, die, &die, &de) == DW_DLV_OK) {
+			if (dwarf_tag(die, &tag, &de) != DW_DLV_OK) {
+				warnx("dwarf_tag failed: %s",
+				    dwarf_errmsg(de));
+				goto out;
+			}
+			/* XXX: What about DW_TAG_partial_unit? */
+			if (tag == DW_TAG_compile_unit)
+				break;
+		}
+		if (die == NULL) {
+			warnx("could not find DW_TAG_compile_unit die");
+			goto out;
+		}
+		if (!dwarf_attrval_unsigned(die, DW_AT_low_pc, &lopc, &de) &&
+		    !dwarf_attrval_unsigned(die, DW_AT_high_pc, &hipc, &de)) {
+			/*
+			 * Check if the address falls into the PC range of
+			 * this CU.
+			 */
+			if (addr < lopc || addr >= hipc)
+				continue;
+		}
+
+		if (dwarf_srclines(die, &lbuf, &lcount, &de) != DW_DLV_OK) {
+			warnx("dwarf_srclines: %s", dwarf_errmsg(de));
+			goto out;
+		}
+
+		plineaddr = ~0ULL;
+		plineno = 0;
+		pfile = unknown;
+		for (i = 0; i < lcount; i++) {
+			if (dwarf_lineaddr(lbuf[i], &lineaddr, &de)) {
+				warnx("dwarf_lineaddr: %s",
+				    dwarf_errmsg(de));
+				goto out;
+			}
+			if (dwarf_lineno(lbuf[i], &lineno, &de)) {
+				warnx("dwarf_lineno: %s",
+				    dwarf_errmsg(de));
+				goto out;
+			}
+			if (dwarf_linesrc(lbuf[i], &file0, &de)) {
+				warnx("dwarf_linesrc: %s",
+				    dwarf_errmsg(de));
+			} else
+				file = file0;
+			if (addr == lineaddr)
+				goto out;
+			else if (addr < lineaddr && addr > plineaddr) {
+				lineno = plineno;
+				file = pfile;
+				goto out;
+			}
+			plineaddr = lineaddr;
+			plineno = lineno;
+			pfile = file;
+		}
+	}
+
+out:
+	funcname = NULL;
+	if (ret == DW_DLV_OK && func)
+		search_func(dbg, die, addr, &funcname);
+
+	if (func) {
+		if (funcname == NULL)
+			funcname = unknown;
+		if (demangle &&
+		    !elftc_demangle(funcname, demangled, sizeof(demangled), 0))
+			printf("%s\n", demangled);
+		else
+			printf("%s\n", funcname);
+	}
+
+	(void) printf("%s:%ju\n", base ? basename(file) : file, lineno);
+
+	/*
+	 * Reset internal CU pointer, so we will start from the first CU
+	 * next round.
+	 */
+	while (ret != DW_DLV_NO_ENTRY) {
+		if (ret == DW_DLV_ERROR)
+			errx(EXIT_FAILURE, "dwarf_next_cu_header: %s",
+			    dwarf_errmsg(de));
+		ret = dwarf_next_cu_header(dbg, NULL, NULL, NULL, NULL, NULL,
+		    &de);
+	}
+}
+
+static void
+find_section_base(const char *exe, Elf *e, const char *section)
+{
+	Dwarf_Addr off;
+	Elf_Scn *scn;
+	GElf_Ehdr eh;
+	GElf_Shdr sh;
+	size_t shstrndx;
+	int elferr;
+	const char *name;
+
+	if (gelf_getehdr(e, &eh) != &eh) {
+		warnx("gelf_getehdr failed: %s", elf_errmsg(-1));
+		return;
+	}
+
+	if (!elf_getshstrndx(e, &shstrndx)) {
+		warnx("elf_getshstrndx failed: %s", elf_errmsg(-1));
+		return;
+	}
+
+	(void) elf_errno();
+	off = 0;
+	scn = NULL;
+	while ((scn = elf_nextscn(e, scn)) != NULL) {
+		if (gelf_getshdr(scn, &sh) == NULL) {
+			warnx("gelf_getshdr failed: %s", elf_errmsg(-1));
+			continue;
+		}
+		if ((name = elf_strptr(e, shstrndx, sh.sh_name)) == NULL)
+			goto next;
+		if (!strcmp(section, name)) {
+			if (eh.e_type == ET_EXEC || eh.e_type == ET_DYN) {
+				/*
+				 * For executables, section base is the virtual
+				 * address of the specified section.
+				 */
+				section_base = sh.sh_addr;
+			} else if (eh.e_type == ET_REL) {
+				/*
+				 * For relocatables, section base is the
+				 * relative offset of the specified section
+				 * to the start of the first section.
+				 */
+				section_base = off;
+			} else
+				warnx("unknown e_type %u", eh.e_type);
+			return;
+		}
+	next:
+		off += sh.sh_size;
+	}
+	elferr = elf_errno();
+	if (elferr != 0)
+		warnx("elf_nextscn failed: %s", elf_errmsg(elferr));
+
+	errx(EXIT_FAILURE, "%s: cannot find section %s", exe, section);
+}
+
+int
+main(int argc, char **argv)
+{
+	Elf *e;
+	Dwarf_Debug dbg;
+	Dwarf_Error de;
+	const char *exe, *section;
+	char line[1024];
+	int fd, i, opt;
+
+	exe = NULL;
+	section = NULL;
+	while ((opt = getopt_long(argc, argv, "b:Ce:fj:sHV", longopts, NULL)) !=
+	    -1) {
+		switch (opt) {
+		case 'b':
+			/* ignored */
+			break;
+		case 'C':
+			demangle = 1;
+			break;
+		case 'e':
+			exe = optarg;
+			break;
+		case 'f':
+			func = 1;
+			break;
+		case 'j':
+			section = optarg;
+			break;
+		case 's':
+			base = 1;
+			break;
+		case 'H':
+			usage();
+		case 'V':
+			version();
+		default:
+			usage();
+		}
+	}
+
+	argv += optind;
+	argc -= optind;
+
+	if (exe == NULL)
+		exe = "a.out";
+
+	if ((fd = open(exe, O_RDONLY)) < 0)
+		err(EXIT_FAILURE, "%s", exe);
+
+	if (dwarf_init(fd, DW_DLC_READ, NULL, NULL, &dbg, &de))
+		errx(EXIT_FAILURE, "dwarf_init: %s", dwarf_errmsg(de));
+
+	if (dwarf_get_elf(dbg, &e, &de) != DW_DLV_OK)
+		errx(EXIT_FAILURE, "dwarf_get_elf: %s", dwarf_errmsg(de));
+
+	if (section)
+		find_section_base(exe, e, section);
+	else
+		section_base = 0;
+
+	if (argc > 0)
+		for (i = 0; i < argc; i++)
+			translate(dbg, argv[i]);
+	else
+		while (fgets(line, sizeof(line), stdin) != NULL)
+			translate(dbg, line);
+
+	dwarf_finish(dbg, &de);
+
+	(void) elf_end(e);
+
+	exit(0);
+}