From 28baf121d3bb8c2b6c68d673a5cce81153f55871 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@redhat.com>
Date: Wed, 23 Sep 2009 13:44:12 +0000
Subject: [PATCH] profopt.exp (profopt-get-options): Set tool_flags for
 current_compiler_flags.

* lib/profopt.exp (profopt-get-options): Set tool_flags for
current_compiler_flags.  Fix typos.

From-SVN: r152068
---
 gcc/testsuite/ChangeLog       | 5 +++++
 gcc/testsuite/lib/profopt.exp | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cd283032f30..5b611f7bb91 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-23  Andreas Schwab  <schwab@redhat.com>
+
+	* lib/profopt.exp (profopt-get-options): Set tool_flags for
+	current_compiler_flags.  Fix typos.
+
 2009-09-23  Yuri Gribov  <tetra2005@googlemail.com>
 
 	* gcc.c-torture/execute/980526-2.c: Skip if sizeof (int) > 4.
diff --git a/gcc/testsuite/lib/profopt.exp b/gcc/testsuite/lib/profopt.exp
index 2e417645733..a9989b43ea4 100644
--- a/gcc/testsuite/lib/profopt.exp
+++ b/gcc/testsuite/lib/profopt.exp
@@ -177,6 +177,10 @@ proc profopt-get-options { src } {
     # dg-require-* sets dg-do-what.
     upvar dg-do-what dg-do-what 
 
+    # current_compiler_flags reads tool_flags from the same stack frame
+    # as dg-extra-tool-flags
+    set tool_flags ""
+
     set tmp [dg-get-options $src]
     foreach op $tmp {
 	set cmd [lindex $op 0]
@@ -188,13 +192,13 @@ proc profopt-get-options { src } {
 	     || [string match "dg-require-*" $cmd]  } {
 	    set status [catch "$op" errmsg]
 	    if { $status != 0 } {
-		perror "src: $errmsg for \"$op\"\n"
+		perror "$src: $errmsg for \"$op\"\n"
 		unresolved "$src: $errmsg for \"$op\""
 		return
 	    }
 	} else {
 	    # Ignore unrecognized dg- commands, but warn about them.
-	    warning "compat.exp does not support $cmd"
+	    warning "profopt.exp does not support $cmd"
 	}
     }