Merge branch 'master' into dwarf

Signed-off-by: Richard Fontana <rfontana@redhat.com>
Signed-off-by: Mark Wielaard <mjw@redhat.com>

diff --cc ChangeLog
Simple merge

diff --cc Makefile.am
index d5a94585a9c529a2e90bc3009793fac1744fd073,305bbfcb6397fc73d148ae6c2a23e7064bc40b53..1f7efda9cff48859d3a049ad4c6e4a8bfd378d53
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -31,9 -24,10 +24,10 @@@ pkginclude_HEADERS = version.
  
  # Add doc back when we have some real content.
  SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \
 -        src po tests
 +        src po tests dwarflint
  
- EXTRA_DIST = elfutils.spec GPG-KEY NOTES EXCEPTION
+ EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
+            COPYING COPYING-GPLV2 COPYING-LGPLV3
  
  # Make sure the test install uses lib64 when $LIB will yield lib64.
  # Make sure the test build uses the same compiler, which on e.g. ppc64

diff --cc config/eu.am
Simple merge

diff --cc configure.ac
index 40a01a2ab5388a09a0082056f15defc53f8e6635,10699e6d37cb9055727f7757b3e4fe80786ece8f..977162fff7a41ef67fe32bab1907db363d5dcd9a
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -152,10 -166,9 +167,10 @@@ AC_SUBST([DEBUGPRED], $use_debugpred
  
  dnl Enable gprof suport.
  AC_ARG_ENABLE([gprof],
- AS_HELP_STRING([--enable-gprof],[build binaries with gprof support]), [use_gprof=yes], [use_gprof=no])
+ AS_HELP_STRING([--enable-gprof],[build binaries with gprof support]), [use_gprof=$enableval], [use_gprof=no])
  if test "$use_gprof" = yes; then
    CFLAGS="$CFLAGS -pg"
 +  CXXFLAGS="$CXXFLAGS -pg"
    LDFLAGS="$LDFLAGS -pg"
  fi
  AM_CONDITIONAL(GPROF, test "$use_gprof" = yes)

diff --cc lib/ChangeLog
Simple merge

diff --cc lib/eu-config.h
Simple merge

diff --cc libdw/ChangeLog
Simple merge

diff --cc libdw/Makefile.am
Simple merge

diff --cc libdw/libdwP.h
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/Makefile.am
index f2b22d8dfa958f9fc64733bab638a57c553afea2,cf4875ef06d246c275a57ec6a448e6cf987aa3dc..75b51d9727c23bc19fd7bb75ac7d6d22ff2e9a47
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -69,20 -59,10 +61,20 @@@ endi
  ld_SOURCES = ld.c ldgeneric.c ldlex.l ldscript.y symbolhash.c sectionhash.c \
             versionhash.c
  
- libar_a_SOURCES = arlib.c arlib2.c
+ libar_a_SOURCES = arlib.c arlib2.c arlib-argp.c
  
 +dwarfcmp_SOURCES = dwarfcmp.cc
 +
 +# dwarfcmp-test is just dwarfcmp built with -DTEST.
 +dwarfcmp_test_CPPFLAGS = -DTEST
 +dwarfcmp_test_SOURCES = $(dwarfcmp_SOURCES)
 +dwarfcmp_test_LDADD = $(dwarfcmp_LDADD)
 +
 +readelf_SOURCES = readelf.c dwarfstrings.c
 +
  noinst_HEADERS = ld.h symbolhash.h sectionhash.h versionhash.h \
 -               ldscript.h xelf.h unaligned.h
 +               ldscript.h xelf.h unaligned.h dwarfstrings.h \
 +               dwarf-opcodes.h
  
  EXTRA_DIST = elf32-i386.script libld_elf_i386.map $(ld_modules) arlib.h \
             debugpred.h
@@@ -104,19 -84,20 +96,24 @@@ endi
  libebl = ../libebl/libebl.a
  libeu = ../lib/libeu.a
  
 +# XXX later the C++ stuff will be in libdw.so directly
 +libdwpp = ../libdw/libdwpp.a $(libdw)
 +
+ if DEMANGLE
+ demanglelib = -lstdc++
+ endif
+ 
  nm_no_Wformat = yes
  size_no_Wformat = yes
  strings_no_Wformat = yes
  addr2line_no_Wformat = yes
  # XXX While the file is not finished, don't warn about this
  ldgeneric_no_Wunused = yes
 +dwarfcmp_no_Wformat = yes
  
  readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
- nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
+ nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \
+          $(demanglelib)
  size_LDADD = $(libelf) $(libeu) $(libmudflap)
  strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
  ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl

diff --cc src/readelf.c
Simple merge

diff --cc tests/ChangeLog
Simple merge

diff --cc tests/Makefile.am
index b60e4cc93a8d54f87e9b609706241bd46f55e473,ced7831bbd68309c10426935e30453c9c4141b8a..3f75e1be89ff1e385b71540ef7c298a7de88e111
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -59,10 -49,8 +51,9 @@@ noinst_PROGRAMS = arextract arsymtest n
                  dwfl-bug-addr-overflow arls dwfl-bug-fd-leak \
                  dwfl-addr-sect dwfl-bug-report early-offscn \
                  dwfl-bug-getmodules dwarf-getmacros addrcfi \
 +                dwarf-print dwarf_edit dwarf_edit_output \
                  test-flag-nobits dwarf-getstring rerequest_tag \
-                 alldts
- 
+                 alldts md5-sha1-test typeiter low_high_pc
  asm_TESTS = asm-tst1 asm-tst2 asm-tst3 asm-tst4 asm-tst5 \
            asm-tst6 asm-tst7 asm-tst8 asm-tst9
  
@@@ -88,17 -77,13 +80,17 @@@ 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-dwarf-attributes.sh \
 +      run-dwarf_edit.sh dwarf_edit_output \
        run-test-flag-nobits.sh run-prelink-addr-test.sh \
-       run-dwarf-getstring.sh run-rerequest_tag.sh \
 -      run-dwarf-getstring.sh run-rerequest_tag.sh run-typeiter.sh \
++      run-dwarf-getstring.sh run-rerequest_tag.sh run-typeiter.sh\
 +      run-dwarflint-self.sh \
-       run-dwarfcmp-self.sh run-dwarfcmp-test-self.sh
- # run-show-ciefde.sh
++      run-dwarfcmp-self.sh run-dwarfcmp-test-self.sh \
+       run-readelf-d.sh run-unstrip-n.sh run-low_high_pc.sh
  
  if !STANDALONE
- noinst_PROGRAMS += msg_tst sha1-tst
- TESTS += msg_tst sha1-tst
+ noinst_PROGRAMS += msg_tst md5-sha1-test
+ TESTS += msg_tst md5-sha1-test
  endif
  
  if HAVE_LIBASM
@@@ -127,9 -114,7 +121,9 @@@ EXTRA_DIST = run-arextract.sh run-arsym
             run-addrname-test.sh run-dwfl-bug-offline-rel.sh \
             run-dwfl-addr-sect.sh run-early-offscn.sh \
             run-dwarf-getmacros.sh run-test-flag-nobits.sh \
-            run-dwarf-getstring.sh run-alldts.sh \
 +           run-dwarfcmp-self.sh run-dwarfcmp-test-self.sh \
 +           run-dwarflint-self.sh run-dwarf-attributes.sh run-dwarf_edit.sh \
+            run-dwarf-getstring.sh run-rerequest_tag.sh run-alldts.sh \
             testfile15.bz2 testfile15.debug.bz2 \
             testfile16.bz2 testfile16.debug.bz2 \
             testfile17.bz2 testfile17.debug.bz2 \

diff --cc tests/run-elflint-self.sh
Simple merge