From: Roland McGrath <roland@redhat.com>
Date: Sun, 11 Jan 2009 09:36:06 +0000 (-0800)
Subject: Merge branch 'roland/known-dwarf' into dwarf
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c3d2d969b7c15d800a7a75ca32d1acd6c7331b84;p=thirdparty%2Felfutils.git

Merge branch 'roland/known-dwarf' into dwarf

Conflicts:
	libdw/ChangeLog
---

c3d2d969b7c15d800a7a75ca32d1acd6c7331b84
diff --cc libdw/ChangeLog
index c9e272459,9b9be90c7..3e8c618d3
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@@ -1,14 -1,11 +1,22 @@@
 +2009-01-10  Roland McGrath  <roland@redhat.com>
 +
 +	* c++/dwarf: New file.
 +	* Makefile.am (pkginclude_HEADERS): Add it.
 +
 +2008-01-06  Roland McGrath  <roland@redhat.com>
 +
 +	* libdwP.h (struct Dwarf_Abbrev): Change type of 'has_children' to bool.
 +	Reorder members.
 +	* dwarf_haschildren.c: Return -1 for error case, not 0.
 +
+ 2009-01-11  Roland McGrath  <roland@redhat.com>
+ 
+ 	* dwarf.h: Add description comments for DW_LANG_* values.
+ 
+ 	* Makefile.am [MAINTAINER_MODE]
+ 	($(srcdir)/known-dwarf.h): New target.
+ 	(BUILT_SOURCES): Add it.
+ 
  2009-01-10  Ulrich Drepper  <drepper@redhat.com>
  
  	* dwarf_error.c: Always use __thread.  Remove all !USE_TLS code.