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

Conflicts:
	libdw/ChangeLog

diff --cc libdw/ChangeLog
index 9b9be90,b0415d8..51ab6e9
--- 1/libdw/ChangeLog
--- 2/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 6dda8ee,56c7a2f..5f84abd
--- 1/libdw/Makefile.am
--- 2/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)

diff --cc libdw/dwarf.h
Simple merge