From: Andrew Burgess <andrew.burgess@embecosm.com>
Date: Tue, 28 Jul 2015 18:14:37 +0000 (+0100)
Subject: ld: map option for run_dump_test requires no program.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9c98104c4c8f558176311dad055897c45b7d8032;p=binutils-gdb.git

ld: map option for run_dump_test requires no program.

When using run_dump_test with the map option to compare the linker map
file produced, no additional dump program should be required.  A dump
program can still be given if needed, but leaving it off will no longer
produce an error.

ld/testsuite/ChangeLog:

	* ld/ld-lib.exp (run_dump_test): When using the map option, no
	program is required.
---

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index aaecbeb25ce..727bcaded77 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-04  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* ld/ld-lib.exp (run_dump_test): When using the map option, no
+	program is required.
+
 2015-08-04  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* ld/ld-lib.exp (run_dump_test): Add error_output and
diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
index 8bb06ff5238..6904499a10d 100644
--- a/ld/testsuite/lib/ld-lib.exp
+++ b/ld/testsuite/lib/ld-lib.exp
@@ -761,6 +761,7 @@ proc run_dump_test { name {extra_options {}} } {
 	    }
 	}
 	if { $program == "" \
+                 && $opts(map) == "" \
                  && $opts(warning) == "" \
                  && $opts(warning_output) == "" \
                  && $opts(error) == "" \
@@ -995,6 +996,10 @@ proc run_dump_test { name {extra_options {}} } {
             } else {
                 pass "$testname (map file check)"
             }
+
+            if { $program == "" } then {
+                return
+            }
         }
     } else {
 	set objfile "tmpdir/dump0.o"