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

gcc/testsuite/ChangeLog

+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.

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"
     }