Merge upstream SHA '9d1e236'

* git merge 9d1e236
* See all upstream changes since the previous merge
  in branch aosp/upstream-master:
    git diff b47fb23..9d1e236
* Android relevant upstream changes:
    Move nested functions to file scope to compile with clang/llvm:
      libdw/dwarf_entry_breakpoints.c
      libdw/libdw_visit_scopes.c
      libdwfl/core-file.c
      libdwfl/dwfl_module_addrsym.c
      libdwfl/dwfl_module_getdwarf.c
      libdwfl/link_map.c
      libdwfl/linux-proc-maps.c
* Other upstream changes:
    backends: sparc: support for live backtraces
    elfcmp: Fix leaking Ebl handles.
    libdw: Don't leak fake_loc_cu.
    libdw: Don't leak duplicate FDEs.
    libdw: Don't use a FDE if it doesn't actually cover a real code range.
    libdw: Make sure Ebl is always freed from cfi frame cache.
    libdwfl: Don't leak core Elf and core file descriptor from argp-std.
    libdwfl: Fix memory leak in link_map.c dwfl_link_map_report.
    libdwfl: make the unwinder aware of the backend defined ra_offset.
    libebl: new backend attribute ra_offset.
    nm: Don't leak duplicate Dwarf local names.
    nm: If the file is ET_REL and we need Dwarf use libdwfl to get it relocated.
    tests: Fix some memory leaks in testcases.
    tests: Use valgrind --leak-check=full.
    unstrip: Don't leak new section data.
* No changes to the following generated files:
    version.h, config.h, libdw/known-dwarf.h
* Post merge change:
    Enable clang compilation in the libdw directory.

Change-Id: Ifa9e60b1d5ab1c70da69410509cc9f3abdf58661

1 files changed, 11 insertions, 0 deletions

diff --git a/tests/run-backtrace-demangle.sh b/tests/run-backtrace-demangle.sh
index 71a73518..2d253240 100755
--- a/tests/run-backtrace-demangle.sh
+++ b/tests/run-backtrace-demangle.sh
@@ -26,6 +26,11 @@ child=testfile-backtrace-demangle
 testfiles $child{,.core}
 tempfiles $child.{bt,err}
 
+# Disable valgrind while dumping because of a bug unmapping libc.so.
+# https://bugs.kde.org/show_bug.cgi?id=327427
+SAVED_VALGRIND_CMD="$VALGRIND_CMD"
+unset VALGRIND_CMD
+
 # There can be more than 3 frames, but depending on the system/installed
 # glibc we might not be able to unwind fully till the end.
 # cxxfunc -> f -> main
@@ -33,6 +38,12 @@ tempfiles $child.{bt,err}
 # (exit code 1)
 testrun ${abs_top_builddir}/src/stack -n 2 -e $child --core $child.core >$child.bt 2>$child.err || exitcode=$?
 cat $child.{bt,err}
+
+if [ "x$SAVED_VALGRIND_CMD" != "x" ]; then
+  VALGRIND_CMD="$SAVED_VALGRIND_CMD"
+  export VALGRIND_CMD
+fi
+
 if test $exitcode != 1 || ! grep "shown max number of frames" $child.err; then
   echo >&2 $2: expected more than 2 frames
   false