Fix g++.old-deja/g++.pt/const2.C on Solaris

	* lib/gcc-dg.exp (process-message): Avoid additional whitespace in
	$expmsg.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@255580 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/testsuite/ChangeLog

@@ -1,3 +1,8 @@
+2017-12-12  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* lib/gcc-dg.exp (process-message): Avoid additional whitespace in
+	$expmsg.
+
 2017-12-12  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/83385

gcc/testsuite/lib/gcc-dg.exp

@@ -1103,14 +1103,15 @@ proc process-message { msgproc msgprefix dgargs } {
 	# Remove it from the original expression and move it
 	# to the proper place in the search expression.
 	set expmsg [string range $expmsg [string length $column] end]
+	set column "$column "
     } elseif [string match "" [lindex $newentry 0]] {
 	# The specified line number is 0; don't expect a column number.
     } else {
 	# There is no column number in the search expression, but we
 	# should expect one in the message itself.
-	set column {[0-9]+:}
+	set column {[0-9]+: }
     }
-    set expmsg "$column $msgprefix\[^\n\]*$expmsg"
+    set expmsg "$column$msgprefix\[^\n\]*$expmsg"
     set newentry [lreplace $newentry 2 2 $expmsg]
 
     set dg-messages [lreplace ${dg-messages} end end $newentry]