From: Roland McGrath <roland@redhat.com>
Date: Wed, 23 Jun 2010 00:09:37 +0000 (-0700)
Subject: Merge branch 'master' into roland/relocate
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8826a43aba80f2628b4e9686f628636075a0aff4;p=thirdparty%2Felfutils.git

Merge branch 'master' into roland/relocate

Conflicts:
	libdw/ChangeLog
---

8826a43aba80f2628b4e9686f628636075a0aff4
diff --cc libdw/ChangeLog
index 18afa6825,17658581d..e3b631bc4
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@@ -1,15 -1,7 +1,17 @@@
  2010-06-22  Roland McGrath  <roland@redhat.com>
  
 +	* libdw.h (Dwarf_Relocatable): New type.  Declare three new functions.
 +	* dwarf_relocatable_info.c: New file.
 +	* dwarf_form_relocatable.c: New file.
 +	* dwarf_line_relocatable.c: New file.
 +	* Makefile.am (libdw_a_SOURCES): Add them.
 +	* libdw.map (ELFUTILS_0.149): New set; add those.
 +
 +	* relocate.c (__libdw_relocatable): New function.
 +	* libdwP.h: Declare it.
 +
+ 	* dwarf_getlocation.c (check_constant_offset): data[48] are constant.
+ 
  	* dwarf_getsrclines.c: Fix signed comparison warning in extended
  	opcode parsing.