Merge branch 'debug_macro'

diff --cc src/ChangeLog
index a474bb92020e342e5bdac88be7eb6aa8eaf88fae,fcb6534e53184ebfb7ecffc63efc541e4fd6246a..2b657f8338ac0d4226501e9eb4465a71dfc12912
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,9 -1,12 +1,18 @@@
+ 2012-07-11  Mark Wielaard  <mjw@redhat.com>
+ 
+       * readelf.c (options): Add macro to help of debug-dump.
+       (section_e): Add section_macro.
+       (section_all): Add section_macro.
+       (parse_opt): Handle macro.
+       (print_debug_macro_section): New function.
+       (print_debug): Add NEW_SECTION (macro).
+ 
 +2012-07-10  Mark Wielaard  <mjw@redhat.com>
 +
 +      * readelf.c (print_gdb_index_section): Add version 7 support.
 +      Keep track of cu_nr. Print kind and static/global flag for each
 +      symbol. When a symbol is in the TU list add 'T'.
 +
  2012-06-26  Mark Wielaard  <mjw@redhat.com>
  
        * readelf.c (dwarf_attr_string): Add DW_AT_GNU_macros.

diff --cc src/readelf.c
Simple merge

diff --cc tests/ChangeLog
index 03662b6a870958f5eee3d5a9cf20a6782ee2240e,48337f6ac1f7f8bd39dd5826ba0f902c564d10b9..63ca9b7b574427b6c5f22c297410b2bbf5e61efa
--- 1/tests/ChangeLog
--- 2/tests/ChangeLog
+++ b/tests/ChangeLog
@@@ -1,21 -1,10 +1,28 @@@
+ 2012-07-11  Mark Wielaard  <mjw@redhat.com>
+ 
+       * run-readelf-macro.sh: New test.
+       * testfilemacro.bz2: New testfile.
+       * Makefile.am (TESTS): Add run-readelf-macro.sh.
+       (EXTRA_DIST): Add run-readelf-macro.sh and testfilemacro.bz2.
+ 
 +2012-06-27  Mark Wielaard  <mjw@redhat.com>
 +
 +      * run-readelf-gdb-index.sh: New test.
 +      * testfilegdbindex5.bz2: New testfile.
 +      * testfilegdbindex7.bz2: Likewise.
 +      * Makefile.am (TESTS): Add run-readelf-gdb-index.sh.
 +      (EXTRA_DIST): run-readelf-gdb_index.sh, testfilegdbindex5.bz2 and
 +      testfilegdbindex7.bz2.
 +
 +2012-07-17  Mark Wielaard  <mjw@redhat.com>
 +
 +      * testcore-rtlib-ppc.bz2: New testfile.
 +      * run-unstrip-n.sh: Check new ppc core testfile.
 +
 +2012-06-26  Mike Frysinger  <vapier@gentoo.org>
 +
 +      * Makefile.am (check_PROGRAMS): Rename from noinst_PROGRAMS.
 +
  2012-06-26  Mark Wielaard  <mjw@redhat.com>
  
        * run-macro-test.sh: New test.

diff --cc tests/Makefile.am
Simple merge