From: Alan Modra <amodra@gmail.com>
Date: Wed, 12 Nov 2014 04:24:23 +0000 (+1030)
Subject: Fix x86 non-ELF build breakage
X-Git-Tag: gdb-7.9.0-release~679
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6d19a37a8f3be44fb006c7854a12f9edcb74080d;p=external%2Fbinutils.git

Fix x86 non-ELF build breakage

	PR ld/17482
	* config/tc-i386.c (output_insn): Don't test x86_elf_abi when
	not ELF.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index d1360d4..6fd80b6 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-12  Alan Modra  <amodra@gmail.com>
+
+	PR ld/17482
+	* config/tc-i386.c (output_insn): Don't test x86_elf_abi when
+	not ELF.
+
 2014-11-11  Nick Clifton  <nickc@redhat.com>
 
 	* po/uk.po: Updated Ukranian translation.
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index cdd4ed4..51d58c1 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -6997,6 +6997,7 @@ check_prefix:
 	      abort ();
 	    }
 
+#if defined (OBJ_MAYBE_ELF) || defined (OBJ_ELF)
 	  /* For x32, add a dummy REX_OPCODE prefix for mov/add with
 	     R_X86_64_GOTTPOFF relocation so that linker can safely
 	     perform IE->LE optimization.  */
@@ -7005,6 +7006,7 @@ check_prefix:
 	      && i.reloc[0] == BFD_RELOC_X86_64_GOTTPOFF
 	      && i.prefix[REX_PREFIX] == 0)
 	    add_prefix (REX_OPCODE);
+#endif
 
 	  /* The prefix bytes.  */
 	  for (j = ARRAY_SIZE (i.prefix), q = i.prefix; j > 0; j--, q++)