Merge commit 'origin/master' into dwarf

Conflicts:
	ChangeLog
	libdw/ChangeLog
	src/ChangeLog

diff --cc ChangeLog
index 3e3e425a6d554c24bd7c7e8708ab8186785fab01,554da44371967ad83b28d038d31acf49e71aa1af..fcd9119b78a6f65e91dcfaf07ab15b0c8e806dc3
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,9 +1,13 @@@
 +2009-01-10  Roland McGrath  <roland@redhat.com>
 +
 +      * configure.ac: Add AC_PROG_CXX.
 +
+ 2009-01-10  Ulrich Drepper  <drepper@redhat.com>
+ 
+       * configure.ac: Require gcc with TLS support.
+       Rename USE_TLS to USE_LOCKS.  The option is renamed to
+       --enable-thread-safety.
+ 
  2009-01-08  Roland McGrath  <roland@redhat.com>
  
        * configure.ac (eu_ZIPLIB): Moved to m4/zip.am.

diff --cc configure.ac
Simple merge

diff --cc libdw/ChangeLog
index 505b8424e5c315ce6c3f31a29fa65c622631aba4,cefb900b9dd737da454da0a1384093237e6821fc..c9e27245990ce1a7f4b7c96ca2406db32dfb7a53
--- 1/libdw/ChangeLog
--- 2/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@@ -1,14 -1,7 +1,18 @@@
 +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-10  Ulrich Drepper  <drepper@redhat.com>
+ 
+       * dwarf_error.c: Always use __thread.  Remove all !USE_TLS code.
+ 
  2009-01-08  Roland McGrath  <roland@redhat.com>
  
        * Makefile.am (libdw.so): Don't depend on $(zip_LIBS), just link it in.

diff --cc src/ChangeLog
index a7f6218d79827e1e45a38dcccea5434cd8a54fb4,854ad699d3250be1999ad944b316bb67447e31b7..bc7355e533fe69c298b4253c92811fc36ddb18bd
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,49 -1,7 +1,53 @@@
 +2009-01-10  Roland McGrath  <roland@redhat.com>
 +
 +      * dwarfcmp.cc (test_writer): New variable.
 +      (options, parse_opt): Grok -T/--test-writer to set it.
 +      (main): When set, exercise dwarf_output constructors and comparators.
 +
 +      * dwarflint.c (options, parse_opt): Replace --gnu with
 +      -i/--ignore-missing, to match dwarfcmp.
 +
 +2009-01-10  Petr Machata  <pmachata@redhat.com>
 +
 +      * dwarflint.c: Implement --no-debug: silently accept file, if its
 +      debug info is not available.
 +
 +2009-01-10  Roland McGrath  <roland@redhat.com>
 +
 +      * dwarfcmp.cc: New file.
 +      * Makefile.am (bin_PROGRAMS): Add dwarfcmp.
 +      (dwarfcmp_SOURCES): New variable.
 +      (dwarfcmp_no_Wformat, dwarfcmp_LDADD): New variables.
 +
 +2009-01-10  Petr Machata  <pmachata@redhat.com>
 +
 +      * dwarflint.c: Implement fine-grained message selection.  Each
 +      message has a category, which is bitwise OR of category options.
 +      There are acceptance and rejection criteria for warnings and
 +      errors, which can be tuned using command-line options (currently
 +      --strict and --gnu).
 +      Use dwarfstrings.h in two messages.
 +
 +2009-01-10  Petr Machata  <pmachata@redhat.com>
 +
 +      * readelf.c: Extract functions that format dwarf enums into a file
 +      of its own, so it can be shared with dwarflint.
 +      * dwarfstrings.h: That file.
 +
 +2009-01-09  Petr Machata  <pmachata@redhat.com>
 +
 +      * dwarflint.c: Sort the abbrev tables and look up abbreviations
 +      with bisect search.
 +
 +2009-01-09  Petr Machata  <pmachata@redhat.com>
 +
 +      * dwarflint.c: Checking for zero padding and unreferenced bytes.
 +      CU size and padding at the end of CU are now checked.
 +
+ 2009-01-10  Ulrich Drepper  <drepper@redhat.com>
+ 
+       * strings.c (read_block): Fix typo in error message string.
+ 
  2009-01-07  Ulrich Drepper  <drepper@redhat.com>
  
        * ld.c (ld_new_searchdir): Fix adding to search path list.