[memstomp] Load libmemstomp-backtrace-symbols too

[Jeffrey Law]

commit 2a17819221c81d867f62c21311d80cbd3be94492
Author: Jeff Law <law at redhat.com>
Date:   Tue Aug 26 14:32:01 2014 -0600

    Load libmemstomp-backtrace-symbols too

 memstomp-rh1133815.patch |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/memstomp-rh1133815.patch b/memstomp-rh1133815.patch
index 0f378a7..9e9514d 100644
--- a/memstomp-rh1133815.patch
+++ b/memstomp-rh1133815.patch
@@ -18,6 +18,21 @@ diff -Nrup a/memstomp.c b/memstomp.c
          char **const strings = real_backtrace_symbols(retaddr, n);
          assert(strings);
  
+diff -Nrup a/testsuite/lib/memstomp.exp b/testsuite/lib/memstomp.exp
+--- a/testsuite/lib/memstomp.exp	2014-08-26 13:13:29.964485869 -0600
++++ b/testsuite/lib/memstomp.exp	2014-08-26 14:29:37.334241044 -0600
+@@ -13,3 +13,11 @@ proc find_libmemstomp {} {
+   set file [findfile $base_dir/../.libs/libmemstomp.so $base_dir/../.libs/libmemstomp.so libmemstomp.so]
+   return $file
+ }
++
++proc find_libmemstomp_backtrace_symbols {} {
++  global tool_root_dir 
++  global base_dir
++
++  set file [findfile $base_dir/../.libs/libmemstomp-backtrace-symbols.so $base_dir/../.libs/libmemstomp-backtrace-symbols.so libmemstomp-backtrace-symbols.so]
++  return $file
++}
 diff -Nrup a/testsuite/memstomp.lineinfo/linenumber.c b/testsuite/memstomp.lineinfo/linenumber.c
 --- a/testsuite/memstomp.lineinfo/linenumber.c	1969-12-31 17:00:00.000000000 -0700
 +++ b/testsuite/memstomp.lineinfo/linenumber.c	2014-08-26 13:23:12.535518727 -0600
@@ -47,7 +62,7 @@ diff -Nrup a/testsuite/memstomp.lineinfo/linenumber.c b/testsuite/memstomp.linei
 +
 diff -Nrup a/testsuite/memstomp.lineinfo/linenumber.exp b/testsuite/memstomp.lineinfo/linenumber.exp
 --- a/testsuite/memstomp.lineinfo/linenumber.exp	1969-12-31 17:00:00.000000000 -0700
-+++ b/testsuite/memstomp.lineinfo/linenumber.exp	2014-08-26 13:23:12.535518727 -0600
++++ b/testsuite/memstomp.lineinfo/linenumber.exp	2014-08-26 14:30:19.094163290 -0600
 @@ -0,0 +1,63 @@
 +# Copyright (C) 2014 Free Software Foundation, Inc.
 +
@@ -73,8 +88,8 @@ diff -Nrup a/testsuite/memstomp.lineinfo/linenumber.exp b/testsuite/memstomp.lin
 +#
 +
 +load_lib memstomp.exp
-+set memstomp [find_memstomp]
 +set libmemstomp [find_libmemstomp]
++set libmemstomp_backtrace_symbols [find_libmemstomp_backtrace_symbols]
 +
 +if $tracelevel then {
 +    strace $tracelevel
@@ -85,8 +100,8 @@ diff -Nrup a/testsuite/memstomp.lineinfo/linenumber.exp b/testsuite/memstomp.lin
 +#
 +
 +proc compile-and-execute { sources } {
-+  global memstomp
 +  global libmemstomp
++  global libmemstomp_backtrace_symbols
 +
 +  set src [lindex $sources 0]
 +
@@ -96,7 +111,7 @@ diff -Nrup a/testsuite/memstomp.lineinfo/linenumber.exp b/testsuite/memstomp.lin
 +    pass "$src compilation $results"
 +  }
 +
-+  catch {exec /bin/bash -c "LD_PRELOAD=$libmemstomp $memstomp -d ./a.out"} results
++  catch {exec /bin/bash -c "LD_PRELOAD=$libmemstomp:$libmemstomp_backtrace_symbols ./a.out"} results
 +  if {[regexp "linenumber.c:8" $results]} {
 +    pass "$src found overlap on right line $results"
 +  } else {