From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed, 17 Oct 2012 20:21:29 +0000 (+0200)
Subject: Merge branch 'jankratochvil/buildid-bias' into pending
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eed2f80811c641a45bb7f4d70c7a4dd763de40b1;p=thirdparty%2Felfutils.git

Merge branch 'jankratochvil/buildid-bias' into pending

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

eed2f80811c641a45bb7f4d70c7a4dd763de40b1
diff --cc libdwfl/ChangeLog
index a4fdc182c,bdd9440f1..acff9fe56
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@@ -1,15 -1,13 +1,20 @@@
  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.
+ 	* dwfl_module_getdwarf.c (mod_verify_build_id): New function with code
+ 	from ...
+ 	(__libdwfl_getelf): ... here.  Call it.
  
 +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-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
+ 
+ 	* libdwfl.h (dwfl_module_getelf): Add __nonnull_attribute__.
+ 
  2012-10-10  Jan Kratochvil  <jan.kratochvil@redhat.com>
  
  	* dwfl_segment_report_module.c (dwfl_segment_report_module):