Merge branch 'jankratochvil/basecleanup-basealign-baseaddr' into unwind-perf

Conflicts:
	tests/Makefile.am

diff --cc libdwfl/ChangeLog
index d6e45974b7d5ee11d319613bbcd29a556f1729b5,cdf539e392bf16b3cfc3a458d683fc284b100c35..2a83077c48aa5202e4f961811ce582c272b9ccea
--- 1/libdwfl/ChangeLog
--- 2/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@@ -1,14 -1,12 +1,23 @@@
+ 2012-10-27  Jan Kratochvil  <jan.kratochvil@redhat.com>
+ 
+       * dwfl_report_elf.c (__libdwfl_report_elf): Remove BASE aligning.
+ 
+ 2012-10-27  Jan Kratochvil  <jan.kratochvil@redhat.com>
+ 
+       * dwfl_report_elf.c (__libdwfl_report_elf): Simplify START and BIAS
+       calculation.
+ 
 +2012-10-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
 +
 +      * argp-std.c (offline_find_elf): New function.
 +      (offline_callbacks): Use it for FIND_ELF.
 +      (struct parse_opt): New.
 +      (parse_opt): New KEY ARGP_KEY_INIT.  In other make HOOK struct
 +      parse_opt pointer from former Dwfl pointer.  Delay 'e and OPT_COREFILE
 +      processing till ARGP_KEY_SUCCESS.  Initialize state->INPUT already from
 +      ARGP_KEY_SUCCESS.  Modify the cleanup in ARGP_KEY_ERROR.  Make the final state->INPUT initialization optional.
 +      * libdwfl.h (dwfl_standard_argp): Extend the comment for USERDATA.
 +
  2012-10-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
  
        * dwfl_module_getdwarf.c (mod_verify_build_id): New function with code

diff --cc libdwfl/libdwfl.h
Simple merge

diff --cc libdwfl/libdwflP.h
Simple merge

diff --cc tests/ChangeLog
index 53ebacb2f9f46c421fd973bd1a8ef5ec5d1d2367,896105da1192eca78411b8a63e8c48f7439e3c78..9b6a4c993e73ad164cc16edeea56faff6ecc1529
--- 1/tests/ChangeLog
--- 2/tests/ChangeLog
+++ b/tests/ChangeLog
@@@ -1,9 -1,19 +1,25 @@@
+ 2012-10-27  Jan Kratochvil  <jan.kratochvil@redhat.com>
+ 
+       * Makefile.am (check_PROGRAMS): Add dwfl-report-elf-align.
+       (TESTS): Add run-dwfl-report-elf-align.sh.
+       (EXTRA_DIST): Add run-dwfl-report-elf-align.sh and
+       testfile-dwfl-report-elf-align-shlib.so.bz2 .
+       (dwfl_report_elf_align_LDADD): New.
+       * dwfl-report-elf-align.c: New file.
+       * run-dwfl-report-elf-align.sh: New file.
+       * testfile-dwfl-report-elf-align-shlib.so.bz2: New file.
+ 
+ 2012-10-27  Jan Kratochvil  <jan.kratochvil@redhat.com>
+ 
+       * Makefile.am (EXTRA_DIST): Add testfile64.bz2, testfile65.bz2,
+       testfile69.core.bz2 and testfile69.so.bz2 .
+ 
 +2012-10-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
 +
 +      * run-addrname-test.sh: New test for PIE relocation.
 +      * testfile70.core.bz2: New file.
 +      * testfile70.exec.bz2: New file.
 +
  2012-10-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
  
        * run-addrname-test.sh: New test for DSO with build-id bias.

diff --cc tests/Makefile.am
index 0beeccdcd186643d70839082424eefe8761c886f,a1ed284130198454f1d39a4bb9725996bd1b63e0..df1995a91066ced5f0744f5936ce0cb221fb8e3d
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -51,7 -51,7 +51,8 @@@ check_PROGRAMS = arextract arsymtest ne
                  dwfl-bug-getmodules dwarf-getmacros addrcfi \
                  test-flag-nobits dwarf-getstring rerequest_tag \
                  alldts md5-sha1-test typeiter low_high_pc \
-                 test-elf_cntl_gelf_getshdr backtrace backtrace-child
 -                test-elf_cntl_gelf_getshdr dwfl-report-elf-align
++                test-elf_cntl_gelf_getshdr dwfl-report-elf-align backtrace \
++                backtrace-child
  asm_TESTS = asm-tst1 asm-tst2 asm-tst3 asm-tst4 asm-tst5 \
            asm-tst6 asm-tst7 asm-tst8 asm-tst9
  
@@@ -98,7 -85,7 +99,8 @@@ TESTS = run-arextract.sh run-arsymtest.
        run-readelf-d.sh run-readelf-gdb_index.sh run-unstrip-n.sh \
        run-low_high_pc.sh run-macro-test.sh run-elf_cntl_gelf_getshdr.sh \
        run-test-archive64.sh run-readelf-vmcoreinfo.sh \
-       run-readelf-mixed-corenote.sh run-backtrace.sh
 -      run-readelf-mixed-corenote.sh run-dwfl-report-elf-align.sh
++      run-readelf-mixed-corenote.sh run-dwfl-report-elf-align.sh \
++      run-backtrace.sh
  
  if !STANDALONE
  check_PROGRAMS += msg_tst md5-sha1-test
@@@ -299,9 -289,7 +304,10 @@@ md5_sha1_test_LDADD = $(libeu
  typeiter_LDADD = $(libdw) $(libelf) $(libmudflap)
  low_high_pc_LDADD = $(libdw) $(libelf) $(libmudflap)
  test_elf_cntl_gelf_getshdr_LDADD = $(libelf) $(libmudflap)
+ dwfl_report_elf_align_LDADD = $(libdw) $(libmudflap)
 +backtrace_LDADD = $(libdw) $(libelf) $(libmudflap)
 +backtrace_child_CFLAGS = -fPIE
 +backtrace_child_LDFLAGS = -pie -pthread
  
  if GCOV
  check: check-am coverage