diff options
| author | Alan Modra <amodra@gmail.com> | 2014-11-12 14:54:23 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2014-11-12 15:04:25 +1030 |
| commit | 6d19a37a8f3be44fb006c7854a12f9edcb74080d (patch) | |
| tree | a4d8f9395262a954d6e2a0100a686b17fcda1e8f /gas | |
| parent | d50abe23863b5bbb40fab2b785f0df8917b1b7dd (diff) | |
Fix x86 non-ELF build breakage
PR ld/17482
* config/tc-i386.c (output_insn): Don't test x86_elf_abi when
not ELF.
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 6 | ||||
| -rw-r--r-- | gas/config/tc-i386.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index d1360d4500..6fd80b6ac9 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 cdd4ed49bb..51d58c173f 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++) |