Merge commit 'elfutils-0.151' into dwarf

Conflicts:
	tests/Makefile.am

diff --cc configure.ac
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc tests/ChangeLog
index dadc395c5bf74cd6253db764d1f16fe4a2f80f39,9ba08acb70e66767ed7da755c033ee8f39cb7fe5..28a88d22d68d529e24ee66547a60beab6728c23c
--- 1/tests/ChangeLog
--- 2/tests/ChangeLog
+++ b/tests/ChangeLog
@@@ -1,7 -1,46 +1,50 @@@
+ 2011-01-12  Roland McGrath  <roland@redhat.com>
+ 
+       * run-prelink-addr-test.sh: Make symlinks to find .debug files
+       corresponding to .noshdrs files.
+ 
+ 2011-01-11  Josh Stone  <jistone@redhat.com>
+ 
+       * run-prelink-addr-test.sh: Add testfile54, 32 and 64-bit.
+       * testfile54-32.so.bz2, testfile54-32.so.debug.bz2,
+       testfile54-32.prelink.so.bz2, testfile54-32.noshdrs.so.bz2,
+       testfile54-64.so.bz2, testfile54-64.so.debug.bz2,
+       testfile54-64.prelink.so.bz2, testfile54-64.noshdrs.so.bz2: New.
+       * Makefile.am (EXTRA_DIST): Add and update all.
+ 
+       * run-prelink-addr-test.sh: Run 32 and 64-bit testfile53 tests.
+       * testfile53.bz2, testfile53.debug.bz2,
+       testfile53.prelink.bz2: Deleted, so...
+       * testfile53-64.bz2, testfile53-64.debug.bz2,
+       testfile53-64.prelink.bz2: Recreated with 64-bit names.
+       * testfile53-32.bz2, testfile53-32.debug.bz2,
+       testfile53-32.prelink.bz2: New in 32-bit.
+       * Makefile.am (EXTRA_DIST): Add and update all.
+ 
+       * run-prelink-addr-test.sh: Run 32 and 64-bit testfile52 tests.
+       * testfile52.so.bz2, testfile52.so.debug.bz2,
+       testfile52.prelink.so.bz2: Deleted, so...
+       * testfile52-32.so.bz2, testfile52-32.so.debug.bz2,
+       testfile52-32.prelink.so.bz2: Recreated with 32-bit names.
+       * testfile52-32.noshdrs.so.bz2: New data file, stripped of headers.
+       * testfile52-64.so.bz2, testfile52-64.so.debug.bz2,
+       testfile52-64.prelink.so.bz2, testfile52-64.noshdrs.so.bz2: New files.
+       * Makefile.am (EXTRA_DIST): Add and update all.
+ 
+ 2011-01-10  Josh Stone  <jistone@redhat.com>
+ 
+       * run-prelink-addr-test.sh: New test for prelinked addrs.
+       * Makefile.am (TESTS, EXTRA_DIST): Add it.
+       * testfile52.so.bz2, testfile52.so.debug.bz2: New data files.
+       * testfile52.prelink.so.bz2: New data file, shows REL->RELA.
+       * testfile53.bz2, testfile53.debug.bz2: New data files.
+       * testfile53.prelink.bz2: New data file, shows ET_EXEC remap.
+       * Makefile.am (EXTRA_DIST): Add them.
+ 
 +2010-08-19  Mark Wielaard  <mjw@redhat.com>
 +
 +      * tests/run-dwarflint-self.sh: Test new dwarflint/dwarflint location.
 +
  2010-06-04  Roland McGrath  <roland@redhat.com>
  
        * run-unstrip-test.sh: Also test modifying the file in place.

diff --cc tests/Makefile.am
index ff7015770185739e35001bf43ac20b4b83e44861,04805f057d2693aed224f6116bbaa9d8fa813d25..34e48e968568865cb2f046c8ef166ca0d358075d
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -1,6 -1,6 +1,6 @@@
  ## Process this file with automake to create Makefile.in
  ##
--## Copyright (C) 1996-2010 Red Hat, Inc.
++## Copyright (C) 1996-2011 Red Hat, Inc.
  ## This file is part of Red Hat elfutils.
  ##
  ## Red Hat elfutils is free software; you can redistribute it and/or modify
@@@ -87,9 -83,7 +87,9 @@@ TESTS = run-arextract.sh run-arsymtest.
        run-dwfl-bug-offline-rel.sh run-dwfl-addr-sect.sh \
        run-disasm-x86.sh run-disasm-x86-64.sh \
        run-early-offscn.sh run-dwarf-getmacros.sh \
-       run-test-flag-nobits.sh
 +      run-dwarfcmp-self.sh run-dwarflint-self.sh run-dwarf-attributes.sh \
 +      run-dwarf_edit.sh dwarf_edit_output run-dwarfcmp-test-self.sh \
+       run-test-flag-nobits.sh run-prelink-addr-test.sh
  # run-show-ciefde.sh
  
  if !STANDALONE