Module Name: src
Committed By: yamt
Date: Thu May 22 15:48:01 UTC 2014
Modified Files:
src/external/bsd/libdwarf/dist [yamt-pagecache]: dwarf_init.c
dwarf_loc.c
src/external/bsd/libdwarf/lib [yamt-pagecache]: Makefile
Log Message:
sync with head.
for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.
this commit was splitted into small chunks to avoid
a limitation of cvs. ("Protocol error: too many arguments")
To generate a diff of this commit:
cvs rdiff -u -r1.3.6.1 -r1.3.6.2 src/external/bsd/libdwarf/dist/dwarf_init.c
cvs rdiff -u -r1.2.6.1 -r1.2.6.2 src/external/bsd/libdwarf/dist/dwarf_loc.c
cvs rdiff -u -r1.1.6.1 -r1.1.6.2 src/external/bsd/libdwarf/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libdwarf/dist/dwarf_init.c
diff -u src/external/bsd/libdwarf/dist/dwarf_init.c:1.3.6.1 src/external/bsd/libdwarf/dist/dwarf_init.c:1.3.6.2
--- src/external/bsd/libdwarf/dist/dwarf_init.c:1.3.6.1 Wed Jan 23 00:04:38 2013
+++ src/external/bsd/libdwarf/dist/dwarf_init.c Thu May 22 15:48:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dwarf_init.c,v 1.3.6.1 2013/01/23 00:04:38 yamt Exp $ */
+/* $NetBSD: dwarf_init.c,v 1.3.6.2 2014/05/22 15:48:01 yamt Exp $ */
/*-
* Copyright (c) 2007 John Birrell ([email protected])
@@ -468,7 +468,6 @@ dwarf_init_info(Dwarf_Debug dbg, Dwarf_E
{
Dwarf_CU cu;
Elf_Data *d = NULL;
- Elf_Scn *scn;
int i;
int level = 0;
int relocated = 0;
@@ -477,8 +476,6 @@ dwarf_init_info(Dwarf_Debug dbg, Dwarf_E
uint64_t next_offset;
uint64_t offset = 0;
- scn = dbg->dbg_s[DWARF_debug_info].s_scn;
-
d = dbg->dbg_s[DWARF_debug_info].s_data;
while (offset < d->d_size) {
Index: src/external/bsd/libdwarf/dist/dwarf_loc.c
diff -u src/external/bsd/libdwarf/dist/dwarf_loc.c:1.2.6.1 src/external/bsd/libdwarf/dist/dwarf_loc.c:1.2.6.2
--- src/external/bsd/libdwarf/dist/dwarf_loc.c:1.2.6.1 Wed Jan 23 00:04:38 2013
+++ src/external/bsd/libdwarf/dist/dwarf_loc.c Thu May 22 15:48:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dwarf_loc.c,v 1.2.6.1 2013/01/23 00:04:38 yamt Exp $ */
+/* $NetBSD: dwarf_loc.c,v 1.2.6.2 2014/05/22 15:48:01 yamt Exp $ */
/*-
* Copyright (c) 2007 John Birrell ([email protected])
@@ -93,8 +93,6 @@ int
dwarf_op_num(uint8_t pointer_size, uint8_t *p, int len)
{
int count = 0;
- int64_t sval;
- uint64_t uval;
uint8_t *last = p + len;
/*
@@ -242,7 +240,6 @@ dwarf_op_num(uint8_t pointer_size, uint8
case DW_OP_plus_uconst:
case DW_OP_regx:
case DW_OP_piece:
- uval = dwarf_decode_uleb128(&p);
break;
/* Operations with a signed LEB128 operand. */
@@ -280,7 +277,6 @@ dwarf_op_num(uint8_t pointer_size, uint8
case DW_OP_breg30:
case DW_OP_breg31:
case DW_OP_fbreg:
- sval = dwarf_decode_sleb128(&p);
break;
/*
@@ -288,8 +284,6 @@ dwarf_op_num(uint8_t pointer_size, uint8
* followed by a signed LEB128 operand.
*/
case DW_OP_bregx:
- uval = dwarf_decode_uleb128(&p);
- sval = dwarf_decode_sleb128(&p);
break;
/* Target address size operand. */
Index: src/external/bsd/libdwarf/lib/Makefile
diff -u src/external/bsd/libdwarf/lib/Makefile:1.1.6.1 src/external/bsd/libdwarf/lib/Makefile:1.1.6.2
--- src/external/bsd/libdwarf/lib/Makefile:1.1.6.1 Wed Jan 23 00:04:38 2013
+++ src/external/bsd/libdwarf/lib/Makefile Thu May 22 15:48:01 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.6.1 2013/01/23 00:04:38 yamt Exp $
+# $NetBSD: Makefile,v 1.1.6.2 2014/05/22 15:48:01 yamt Exp $
.include <bsd.init.mk>
@@ -26,4 +26,6 @@ CPPFLAGS+= -I${.CURDIR}
WITHOUT_MAN= yes
+LIBDPLIBS+= elf ${NETBSDSRCDIR}/external/bsd/libelf/lib
+
.include <bsd.lib.mk>
