From c5a237e923d40c592d47828bcd20df6cc123dcb2 Mon Sep 17 00:00:00 2001
From: Uros Bizjak <ubizjak@gmail.com>
Date: Tue, 10 Nov 2015 20:26:08 +0100
Subject: [PATCH] i386.md (*movabs<mode>_1): Add explicit size directives for
 -masm=intel.

	* config/i386/i386.md (*movabs<mode>_1): Add explicit
	size directives for -masm=intel.
	(*movabs<mode>_2): Ditto.

From-SVN: r230119
---
 gcc/ChangeLog           | 9 +++++++++
 gcc/config/i386/i386.md | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b5808c10115..59ef30223a5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-11-10  Uros Bizjak  <ubizjak@gmail.com>
+
+	* config/i386/i386.md (*movabs<mode>_1): Add explicit
+	size directives for -masm=intel.
+	(*movabs<mode>_2): Ditto.
+
 2015-11-10  Uros Bizjak  <ubizjak@gmail.com>
 
 	* config/i386/i386.c (ix86_print_operand): Remove dead code that
@@ -9,6 +15,9 @@
 	argument.  Do not use RIP relative addressing when no_rip is set.
 	(ix86_print_operand): Update call to ix86_print_operand_address_as.
 	(ix86_print_operand_address): Ditto.
+	* config/i386/i386.md (*movabs<mode>_1): Use %P modifier for
+	absolute movabs operand 0.  Add square braces for -masm=intel.
+	(*movabs<mode>_2): Ditto for operand 1.
 
 2015-11-10  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index a236199699a..34a6d3f4d82 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -2601,7 +2601,7 @@
   switch (which_alternative)
     {
     case 0:
-      return "movabs{<imodesuffix>}\t{%1, %P0|[%P0], %1}";
+      return "movabs{<imodesuffix>}\t{%1, %P0|<iptrsize> PTR [%P0], %1}";
     case 1:
       return "mov{<imodesuffix>}\t{%1, %0|%0, %1}";
     default:
@@ -2625,7 +2625,7 @@
   switch (which_alternative)
     {
     case 0:
-      return "movabs{<imodesuffix>}\t{%P1, %0|%0, [%P1]}";
+      return "movabs{<imodesuffix>}\t{%P1, %0|%0, <iptrsize> PTR [%P1]}";
     case 1:
       return "mov{<imodesuffix>}\t{%1, %0|%0, %1}";
     default:
-- 
2.30.2