From: Hans-Peter Nilsson <hp@axis.com>
Date: Thu, 17 May 2012 12:06:55 +0000 (+0000)
Subject: 	* lib/ld-lib.exp (run_dump_test): For options "warning" and
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=134fa82ef4b30284ea5f18b2a3902f6f3d3e2fa4;p=deliverable%2Fbinutils-gdb.git

	* lib/ld-lib.exp (run_dump_test): For options "warning" and
	"error", append to earlier option values without adding a space.
---

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index e726c76ff4..91ad2040e6 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-17  Hans-Peter Nilsson  <hp@axis.com>
+
+	* lib/ld-lib.exp (run_dump_test): For options "warning" and
+	"error", append to earlier option values without adding a space.
+
 2012-05-17  Alan Modra  <amodra@gmail.com>
 
 	* ld-m68k/tls-ld-1.d: Update.
diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
index 9797dffe0f..a481ce7219 100644
--- a/ld/testsuite/lib/ld-lib.exp
+++ b/ld/testsuite/lib/ld-lib.exp
@@ -623,7 +623,18 @@ proc run_dump_test { name } {
 	if { $opt_name == "as" || $opt_name == "ld" } {
 	    set opt_val [subst $opt_val]
 	}
-	set opts($opt_name) [concat $opts($opt_name) $opt_val]
+
+	# Append differently whether it's a message (without space) or
+	# an option or list (with space).
+	switch -- $opt_name {
+	    warning -
+	    error {
+		append opts($opt_name) $opt_val
+	    }
+	    default {
+		set opts($opt_name) [concat $opts($opt_name) $opt_val]
+	    }
+	}
     }
     foreach opt { as ld } {
 	regsub {\[big_or_little_endian\]} $opts($opt) \