From b1a2d7a0e57abc06e6ec99c88ca9992780f45f71 Mon Sep 17 00:00:00 2001
From: "Maciej W. Rozycki" <macro@imgtec.com>
Date: Tue, 27 Jun 2017 02:58:27 +0100
Subject: [PATCH] MIPS/LD/testsuite: mips-elf-flags: Use `-h' only with
 `readelf'

For the purpose of link-time object compatibility handling verification
code in the `good_combination' procedure from the `mips-elf-flags.exp'
test script only examines the `e_flags' member of the ELF file header
and ignores data from any ELF program or section headers present.  Use
`readelf -h' rather than `readelf --headers' then to obtain data for
examination, avoiding unnecessary processing to extract this extraneous
information.

	ld/
	* testsuite/ld-mips-elf/mips-elf-flags.exp (good_combination):
	Use `readelf -h' rather than `readelf --headers'.
---
 ld/ChangeLog                                | 5 +++++
 ld/testsuite/ld-mips-elf/mips-elf-flags.exp | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index b92a82bb0d..0bc18760b5 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-27  Maciej W. Rozycki  <macro@imgtec.com>
+
+	* testsuite/ld-mips-elf/mips-elf-flags.exp (good_combination):
+	Use `readelf -h' rather than `readelf --headers'.
+
 2017-06-26  Maciej W. Rozycki  <macro@imgtec.com>
 
 	* testsuite/ld-mips-elf/lsi-4010-isa.d: New test.
diff --git a/ld/testsuite/ld-mips-elf/mips-elf-flags.exp b/ld/testsuite/ld-mips-elf/mips-elf-flags.exp
index dd84c9c18b..cea2774b52 100644
--- a/ld/testsuite/ld-mips-elf/mips-elf-flags.exp
+++ b/ld/testsuite/ld-mips-elf/mips-elf-flags.exp
@@ -56,7 +56,7 @@ proc assemble_for_flags {arglist} {
 }
 
 # Assemble a file using each set of arguments in ARGLIST.  Check that
-# the objects can be linked together and that the readelf output
+# the objects can be linked together and that the `readelf -h' output
 # includes each flag named in FLAGS.
 proc good_combination {arglist flags} {
     global ld ldemul READELF
@@ -70,7 +70,7 @@ proc good_combination {arglist flags} {
     } elseif {![ld_link "$ld $ldemul" $finalobj "-r $objs"]} {
 	fail $testname
     } else {
-	catch "exec $READELF --headers $finalobj" output
+	catch "exec $READELF -h $finalobj" output
 	if {![regexp "Flags: *(\[^\n\]*)" $output full gotflags]} {
 	    unresolved $testname
 	} else {