scanasm.exp (scan-assembler-dem, [...]): Adjust for c++filt moved to binutils.

	* lib/scanasm.exp (scan-assembler-dem, scan-assembler-dem-not):
	Adjust for c++filt moved to binutils.

From-SVN: r57325

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 47578675939905bb4efb054f7ae9a0927df0e6be..1e69b6cf01875da501885ad57dee4a3990374227 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-20  Hans-Peter Nilsson  <hp@bitrange.com>
+
+       * lib/scanasm.exp (scan-assembler-dem, scan-assembler-dem-not):
+       Adjust for c++filt moved to binutils.
+
 2002-09-19  Geoffrey Keating  <geoffk@apple.com>
 
        * gcc.dg/20020312-2.c: Update for darwin.

diff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp
index 637b298ee42da7376d29d335ba178b1107e8f94b..ebca4caac751f57859d30395d3a98dd443cf7dd4 100644 (file)
--- a/gcc/testsuite/lib/scanasm.exp
+++ b/gcc/testsuite/lib/scanasm.exp
@@ -114,9 +114,11 @@ proc scan-assembler-dem { args } {
 
     # Find c++filt like we find g++ in g++.exp.
     if ![info exists cxxfilt]  {
-       set cxxfilt [findfile $base_dir/../c++filt $base_dir/../c++filt \
-                    [findfile $base_dir/c++filt $base_dir/c++filt \
-                     [transform c++filt]]]
+       set cxxfilt [findfile $base_dir/../../binutils/cxxfilt \
+                    $base_dir/../../binutils/cxxfilt \
+                    [findfile $base_dir/../c++filt $base_dir/../c++filt \
+                     [findfile $base_dir/c++filt $base_dir/c++filt \
+                      [transform c++filt]]]]
        verbose -log "c++filt is $cxxfilt"
     }
 
@@ -158,17 +160,11 @@ proc scan-assembler-dem-not { args } {
 
     # Find c++filt like we find g++ in g++.exp.
     if ![info exists cxxfilt]  {
-       set cxxfilt [findfile $base_dir/../c++filt $base_dir/../c++filt \
-                    [findfile $base_dir/c++filt $base_dir/c++filt \
-                     [transform c++filt]]]
-       verbose -log "c++filt is $cxxfilt"
-    }
-
-    # Find c++filt like we find g++ in g++.exp.
-    if ![info exists cxxfilt]  {
-       set cxxfilt [findfile $base_dir/../c++filt $base_dir/../c++filt \
-                    [findfile $base_dir/c++filt $base_dir/c++filt \
-                     [transform c++filt]]]
+       set cxxfilt [findfile $base_dir/../../binutils/cxxfilt \
+                    $base_dir/../../binutils/cxxfilt \
+                    [findfile $base_dir/../c++filt $base_dir/../c++filt \
+                     [findfile $base_dir/c++filt $base_dir/c++filt \
+                      [transform c++filt]]]]
        verbose -log "c++filt is $cxxfilt"
     }