diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 4533f544088..93c5f2936eb 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-08  Kazu Hirata  <kazu@codesourcery.com>
+
+	* lib/gas-dg.exp (gas-dg-test): Treat $dir as a literal.
+
 2006-09-08  Paul Brook  <paul@codesourcery.com>
 
 	* gas/arm/arm-it.s: New test.
diff --git a/gas/testsuite/lib/gas-dg.exp b/gas/testsuite/lib/gas-dg.exp
index 92f7f3136c1..801b9b4e93c 100644
--- a/gas/testsuite/lib/gas-dg.exp
+++ b/gas/testsuite/lib/gas-dg.exp
@@ -36,7 +36,8 @@ proc gas-dg-test { prog do_what tool_flags } {
     regsub -all "//" $dir "/" dir
     regsub -all "//" $prog "/" prog
     if [string match "$dir/*" $prog] {
-	regsub "$dir" $prog "" prog
+	# We use (?q) to treat $dir as a literal.
+	regsub "(?q)$dir" $prog "" prog
     }
 
     # FIXME: This should be gas_start but it doesn't set comp_output.