From: Roland McGrath <roland@redhat.com>
Date: Sat, 17 Jan 2009 22:39:35 +0000 (-0800)
Subject: Merge commit 'origin/master' into roland/known-dwarf
X-Git-Tag: elfutils-0.139~18^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54456d8e63bfe787e2b616993e26aba1c8dffa4d;p=thirdparty%2Felfutils.git

Merge commit 'origin/master' into roland/known-dwarf

Conflicts:
	libdw/ChangeLog
---

54456d8e63bfe787e2b616993e26aba1c8dffa4d
diff --cc libdw/ChangeLog
index 9b9be90c7,b0415d89a..51ab6e946
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@@ -1,11 -1,7 +1,17 @@@
- 2009-01-11  Roland McGrath  <roland@redhat.com>
+ 2009-01-17  Roland McGrath  <roland@redhat.com>
+ 
++	* Makefile.am (known-dwarf.h): Target renamed, not in $(srcdir).
++	Make it unconditional.
++	(BUILT_SOURCES): Updated.
 +
 +	* dwarf.h: Add description comments for DW_LANG_* values.
 +
 +	* Makefile.am [MAINTAINER_MODE]
 +	($(srcdir)/known-dwarf.h): New target.
 +	(BUILT_SOURCES): Add it.
 +
+ 	* dwarf.h: Add DW_OP_GNU_push_tls_address, DW_OP_GNU_uninit.
+ 
  2009-01-10  Ulrich Drepper  <drepper@redhat.com>
  
  	* dwarf_error.c: Always use __thread.  Remove all !USE_TLS code.
diff --cc libdw/Makefile.am
index 6dda8eef9,56c7a2ffe..5f84abd86
--- a/libdw/Makefile.am
+++ b/libdw/Makefile.am
@@@ -85,13 -85,6 +85,11 @@@ libdw_a_SOURCES = dwarf_begin.c dwarf_b
  		  libdw_visit_scopes.c \
  		  dwarf_entry_breakpoints.c
  
- if MAINTAINER_MODE
- BUILT_SOURCES = $(srcdir)/known-dwarf.h
- $(srcdir)/known-dwarf.h: $(top_srcdir)/config/known-dwarf.awk $(srcdir)/dwarf.h
++BUILT_SOURCES = known-dwarf.h
++known-dwarf.h: $(top_srcdir)/config/known-dwarf.awk $(srcdir)/dwarf.h
 +	$(AWK) -f $^ > $@.new
 +	mv -f $@.new $@
- endif
 +
  if !MUDFLAP
  libdw_pic_a_SOURCES =
  am_libdw_pic_a_OBJECTS = $(libdw_a_SOURCES:.c=.os)