[binutils-gdb/binutils-2_33-branch] AArch64: Fix objdump tests

[Tamar Christina]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=7bfaf47869572604492a4ab051e5d1bca77cf4e6

commit 7bfaf47869572604492a4ab051e5d1bca77cf4e6
Author: Tamar Christina <tamar.christina@arm.com>
Date:   Thu Sep 19 13:15:02 2019 +0100

    AArch64: Fix objdump tests
    
    The newly added objdump -S tests check for source line mapping of a static
    variable.  But the test doesn't dump any data sections so this should never
    pass.
    
    This changes the test to dump all sections so the source mapping can be found.
    
    binutils/ChangeLog:
    
    	* testsuite/binutils-all/objdump.exp (objdump -S): Update testcases.
    
    (cherry picked from commit 4e28d4cc5b134a4027b4103ddaf09c19b8e0230b)

Diff:
---
 binutils/ChangeLog                          | 4 ++++
 binutils/testsuite/binutils-all/objdump.exp | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 596f36a..167e937 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2019-09-19  Tamar Christina  <tamar.christina@arm.com>
+
+	* testsuite/binutils-all/objdump.exp (objdump -S): Update testcase.
+
 2019-09-16  Phil Blundell  <pb@pbcl.net>
 
 	* Makefile.in, doc/Makefile.in, configure: Regenerated.
diff --git a/binutils/testsuite/binutils-all/objdump.exp b/binutils/testsuite/binutils-all/objdump.exp
index 9630bac..58b66d4 100644
--- a/binutils/testsuite/binutils-all/objdump.exp
+++ b/binutils/testsuite/binutils-all/objdump.exp
@@ -818,7 +818,7 @@ proc test_objdump_S { } {
 	return
     }
 
-    set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -S tmpdir/testprog"]
+    set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -D -S tmpdir/testprog"]
 
     set want "static int local = 2"
 
@@ -830,7 +830,7 @@ proc test_objdump_S { } {
 
     set test "objdump --source-comment"
 
-    set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS --source-comment=// tmpdir/testprog"]
+    set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS --disassemble-all --source-comment=// tmpdir/testprog"]
 
     set want "//static int local = 2"