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 c0c3cf2..ecbac5f 100644 (file)
--- 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 (file)
--- 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++)