From 3d146acbef811ec6c2d4789e9a1c6e695864d123 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Mon, 13 Aug 2001 13:31:44 -0400
Subject: [PATCH] * lib/scanasm.exp (scan-assembler*): Use expr instead of
 concat.

From-SVN: r44861
---
 gcc/testsuite/ChangeLog       | 4 ++++
 gcc/testsuite/lib/scanasm.exp | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c360084b36b..69a94506842 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-13  Jason Merrill  <jason_merrill@redhat.com>
+
+	* lib/scanasm.exp (scan-assembler*): Use expr instead of concat.
+
 2001-08-11  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
 
 	* g++.dg/template/unify1.C: New test.
diff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp
index 105da61c2f0..e1e1fadaeb9 100644
--- a/gcc/testsuite/lib/scanasm.exp
+++ b/gcc/testsuite/lib/scanasm.exp
@@ -23,7 +23,7 @@ proc scan-assembler { pattern args } {
     # This assumes that we are two frames down from dg-test, and that
     # it still stores the filename of the testcase in a local variable "name".
     # A cleaner solution would require a new dejagnu release.
-    set testcase [uplevel 2 { concat "$name" }]
+    set testcase [uplevel 2 { expr { $name } }]
 
     # This must match the rule in gcc-dg.exp.
     set output_file "[file rootname [file tail $testcase]].s"
@@ -46,7 +46,7 @@ proc scan-assembler { pattern args } {
 
 # Call pass if pattern is not present, otherwise fail.
 proc scan-assembler-not { pattern args } {
-    set testcase [uplevel 2 { concat "$name" }]
+    set testcase [uplevel 2 { expr { $name } }]
     set output_file "[file rootname [file tail $testcase]].s"
 
     set fd [open $output_file r]
@@ -79,7 +79,7 @@ proc scan-assembler-dem { pattern args } {
 	verbose -log "c++filt is $cxxfilt"
     }
 
-    set testcase [uplevel 2 { concat "$name" }]
+    set testcase [uplevel 2 { expr { $name } }]
     set output_file "[file rootname [file tail $testcase]].s"
 
     set fd [open "| $cxxfilt < $output_file" r]
@@ -111,7 +111,7 @@ proc scan-assembler-dem-not { pattern args } {
 	verbose -log "c++filt is $cxxfilt"
     }
 
-    set testcase [uplevel 2 { concat "$name" }]
+    set testcase [uplevel 2 { expr { $name } }]
     set output_file "[file rootname [file tail $testcase]].s"
 
     set fd [open "| $cxxfilt < $output_file" r]
-- 
2.30.2