Merge branch 'jankratochvil/buildid-bias' into pending

Conflicts:
	libdwfl/ChangeLog
	tests/ChangeLog
	tests/run-addrname-test.sh

diff --cc libdwfl/ChangeLog
index a3aa49d9d9bc55b718dcd5499c90395851c9b7d7,db3c9b7beb96790d8b5ac0f6091d49acddc93e34..a4fdc182cbdd8856d60020a0f6a56256d57eb4f4
--- 1/libdwfl/ChangeLog
--- 2/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@@ -1,10 -1,8 +1,15 @@@
+ 2012-10-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
+ 
+       * dwfl_module_getdwarf.c (__libdwfl_getelf): Do not return yet on
+       matching build-id.  Check ELFERR before closing this MOD file.
+ 
 +2012-10-12  Jan Kratochvil  <jan.kratochvil@redhat.com>
 +
 +      * linux-proc-maps.c: Include system.h.
 +      (PROCEXEFMT, get_pid_class): New.
 +      (grovel_auxv): Detect 32-bit vs. 64-bit auxv, possibly call
 +      get_pid_class.
 +
  2012-10-10  Jan Kratochvil  <jan.kratochvil@redhat.com>
  
        * dwfl_segment_report_module.c (dwfl_segment_report_module):

diff --cc tests/ChangeLog
index db160f74402b33a52e8a3a4a9b2e7e900128d72b,9e8ad2c15e417deff947251a1048cb9fd39951d5..052b13ee36189a69f3da30459b43e7a642634521
--- 1/tests/ChangeLog
--- 2/tests/ChangeLog
+++ b/tests/ChangeLog
@@@ -1,10 -1,9 +1,16 @@@
+ 2012-10-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
+ 
+       * run-addrname-test.sh: New test for DSO with build-id bias.
+       * testfile69.core.bz2: New file.
+       * testfile69.so.bz2: New file.
+ 
 +2012-10-14  Jan Kratochvil  <jan.kratochvil@redhat.com>
 +
 +      * run-readelf-mixed-corenote.sh: New testcase for readelf -n of s390
 +      and s390x core notes.
 +      * testfile67.bz2: New file.
 +      * testfile68.bz2: New file.
 +
  2012-10-10  Jan Kratochvil  <jan.kratochvil@redhat.com>
  
        * run-addrname-test.sh: New test for core vDSO bias.

diff --cc tests/run-addrname-test.sh
index 4dd6018faf01a921690a93cb06d4d5943202dad7,cc8aa335ac2c3ece0201ecbee43180399430be3a..78c70f050d5601ff8ea31a7c2c42c08ad5c538d5
--- 1/tests/run-addrname-test.sh
--- 2/tests/run-addrname-test.sh
+++ b/tests/run-addrname-test.sh
@@@ -298,12 -298,12 +298,20 @@@ __vdso_tim
  ??:0
  EOF
  
 +testfiles testfile66
 +testrun_compare ../src/addr2line -S -e testfile66 0x10340 0x250 <<\EOF
 +func
 +??:0
 +.func
 +??:0
 +EOF
 +
+ testfiles testfile69.core testfile69.so
+ testrun_compare ../src/addr2line --core=./testfile69.core -S 0x7f0bc6a33535 0x7f0bc6a33546 <<\EOF
+ libstatic+0x9
+ ??:0
+ libglobal+0x9
+ ??:0
+ EOF
+ 
  exit 0