summaryrefslogtreecommitdiff
path: root/gas/config/tc-i386.c
diff options
context:
space:
mode:
Diffstat (limited to 'gas/config/tc-i386.c')
-rw-r--r--gas/config/tc-i386.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 16376dccdf..0f6396ff03 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -3032,11 +3032,17 @@ process_suffix (void)
&& (i.tm.opcode_modifier & NoRex64) == 0)
{
/* Special case for xchg %rax,%rax. It is NOP and doesn't
- need rex64. */
- if (i.operands != 2
- || i.types [0] != (Acc | Reg64)
- || i.types [1] != (Acc | Reg64)
- || i.tm.base_opcode != 0x90)
+ need rex64. cmpxchg8b is also a special case. */
+ if (! (i.operands == 2
+ && i.tm.base_opcode == 0x90
+ && i.tm.extension_opcode == None
+ && i.types [0] == (Acc | Reg64)
+ && i.types [1] == (Acc | Reg64))
+ && ! (i.operands == 1
+ && i.tm.base_opcode == 0xfc7
+ && i.tm.extension_opcode == 1
+ && (i.types [0] & Reg) == 0
+ && (i.types [0] & AnyMem) != 0))
i.rex |= REX_W;
}