diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2b5f2d0de8b..6c6043e7a0b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2005-03-31  Janis Johnson  <janis187@us.ibm.com>
 
+	* lib/profopt.exp: Treat prof_ext as a list.
+	* gcc.misc-tests/bprob.exp: Ditto.
+	* g++.dg/bprob/bprob.exp: Ditto.
+
 	* g++.dg/opt/nothrow1.C: Use cleanup-tree-dump.
 	g++.dg/tree-ssa/empty-1.C, g++.dg/tree-ssa/nothrow-1.C,
 	g++.dg/tree-ssa/pointer-reference-alias.C,
diff --git a/gcc/testsuite/g++.dg/bprob/bprob.exp b/gcc/testsuite/g++.dg/bprob/bprob.exp
index 90cb99a8228..a6557c3d1fe 100644
--- a/gcc/testsuite/g++.dg/bprob/bprob.exp
+++ b/gcc/testsuite/g++.dg/bprob/bprob.exp
@@ -27,7 +27,7 @@ if { ![check_profiling_available "-fprofile-arcs"] } {
 
 # The procedures in profopt.exp need these parameters.
 set tool g++
-set prof_ext gcda
+set prof_ext "gcda gcno"
 
 if $tracelevel then {
     strace $tracelevel
diff --git a/gcc/testsuite/gcc.misc-tests/bprob.exp b/gcc/testsuite/gcc.misc-tests/bprob.exp
index 554bf76dde9..28cebbded1f 100644
--- a/gcc/testsuite/gcc.misc-tests/bprob.exp
+++ b/gcc/testsuite/gcc.misc-tests/bprob.exp
@@ -27,7 +27,7 @@ if { ![check_profiling_available "-fprofile-arcs"] } {
 
 # The procedures in profopt.exp need these parameters.
 set tool gcc
-set prof_ext gcda
+set prof_ext "gcda gcno"
 set perf_ext tim
 
 # Override the list defined in profopt.exp.
diff --git a/gcc/testsuite/lib/profopt.exp b/gcc/testsuite/lib/profopt.exp
index 8b74967c57d..b24dfff74f0 100644
--- a/gcc/testsuite/lib/profopt.exp
+++ b/gcc/testsuite/lib/profopt.exp
@@ -38,7 +38,7 @@ if ![info exists tool] {
     error "Tools is not specified."
 }
 if ![info exists prof_ext] {
-    error "No profile data file extension specified."
+    error "No profile data file extensions specified."
 }
 
 # The maximum perforance degradation can be defined in the including file.
@@ -66,14 +66,16 @@ set prof_option_list $PROFOPT_OPTIONS
 # profopt-cleanup -- remove profiling or performance results files.
 #
 # TESTCASE is the name of the test
-# EXT is the extension of file to remove
+# EXT is the extensions of files to remove
 #
-proc profopt-cleanup { testcase ext } {
+proc profopt-cleanup { testcase extlist } {
     set basename [file tail $testcase]
     set base [file rootname $basename]
-    set files [glob -nocomplain $base.$ext]
-    if { $files != "" } {
-	eval "remote_file build delete $files"
+    foreach ext $extlist {
+	set files [glob -nocomplain $base.$ext]
+	if { $files != "" } {
+	    eval "remote_file build delete $files"
+	}
     }
 }
 
@@ -181,12 +183,14 @@ proc profopt-execute { src } {
 	if { $status == "pass" } {
 	    set basename [file tail $testcase]
 	    set base [file rootname $basename]
-	    set files [glob -nocomplain $base.$prof_ext]
-	    if { $files == "" } {
-		set status "fail"
-		fail "$testcase execution: file $base.$prof_ext does not exist, $option $profile_option"
-	    } else {
-	        $status "$testcase execution,   $optstr"
+	    foreach ext $prof_ext {
+		set files [glob -nocomplain $base.$ext]
+		if { $files == "" } {
+		    set status "fail"
+		    fail "$testcase execution: file $base.$ext does not exist, $option $profile_option"
+		} else {
+	            $status "$testcase execution,   $optstr"
+		}
 	    }
 	} else {
 	    $status "$testcase execution,   $optstr"