From 644525ff9975eb641d5837b509c50d282b1bee9f Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 23 Nov 2012 17:05:03 +0100
Subject: [PATCH] asan-dg.exp (asan_symbolize): Remove all "BFD: " prefixed
 lines from the output.

	* lib/asan-dg.exp (asan_symbolize): Remove all "BFD: " prefixed lines
	from the output.

From-SVN: r193763
---
 gcc/testsuite/ChangeLog       | 3 +++
 gcc/testsuite/lib/asan-dg.exp | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a42b0013393..6c5374a2612 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2012-11-23  Jakub Jelinek  <jakub@redhat.com>
 
+	* lib/asan-dg.exp (asan_symbolize): Remove all "BFD: " prefixed lines
+	from the output.
+
 	PR c++/54046
 	* g++.dg/warn/Wreturn-type-8.C: New test.
 
diff --git a/gcc/testsuite/lib/asan-dg.exp b/gcc/testsuite/lib/asan-dg.exp
index 9a435d2dc0c..9d7f39087dd 100644
--- a/gcc/testsuite/lib/asan-dg.exp
+++ b/gcc/testsuite/lib/asan-dg.exp
@@ -128,7 +128,8 @@ proc asan_symbolize { output } {
 	    set status [remote_exec host "$addr2line_name" $args]
 	    if { [lindex $status 0] > 0 } continue
 	    regsub -all "\r\n" [lindex $status 1] "\n" addr2line_output
-	    regsub -all "(^|\n|\r)BFD: \[^\n\r\]*" $addr2line_output "" addr2line_output
+	    regsub -all "\[\n\r\]BFD: \[^\n\r\]*" $addr2line_output "" addr2line_output
+	    regsub -all "^BFD: \[^\n\r\]*\[\n\r\]" $addr2line_output "" addr2line_output
 	    set addr2line_output [regexp -inline -all -line "^\[^\n\r]*" $addr2line_output]
 	    set idx 0
 	    foreach val $arr($key) {