From bf2eaa3f2de7adf678876909b33bf0f7c2eb2170 Mon Sep 17 00:00:00 2001
From: Kirill Yukhin <kirill.yukhin@intel.com>
Date: Mon, 12 Mar 2012 09:59:25 +0000
Subject: ChangeLog entry:

	  * doc/invoke.texi: Document -mrtm option.
	  * common/config/i386/i386-common.c (OPTION_MASK_ISA_RTM_SET):
	  New.
	  (OPTION_MASK_ISA_RTM_UNSET): Ditto.
	  (ix86_handle_option): Handle OPT_mrtm.
	  * config.gcc (i[34567]86-*-*): Add rtmintrin.h and
	  xtestintrin.h.
	  (x86_64-*-*): Ditto.
	  * i386-builtin-types.def (INT_FTYPE_VOID): New.
	  * config/i386/i386-c.c (ix86_target_macros_internal): Define
	  __RTM__ if needed.
	  (ix86_target_string): Define -mrtm option.
	  (PTA_RTM): New.
	  (ix86_option_override_internal): Extend "corei7-avx" with
	  RTM option. Handle new option.
	  (ix86_valid_target_attribute_inner_p): Add OPT_mrtm.
	  (ix86_builtins): Add IX86_BUILTIN_XBEGIN, IX86_BUILTIN_XEND,
	  IX86_BUILTIN_XTEST.
	  (bdesc_special_args): Ditto.
	  (ix86_init_mmx_sse_builtins): Add IX86_BUILTIN_XABORT.
	  (ix86_expand_special_args_builtin): Handle new built-in type.
	  (ix86_expand_builtin): Handle XABORT instruction.
	  * config/i386/i386.h (TARGET_RTM): New.
	  * config/i386/i386.md (UNSPECV_XBEGIN): New.
	  (UNSPECV_XEND): Ditto.
	  (UNSPECV_XABORT): Ditto.
	  (UNSPECV_XTEST): Ditto.
	  (xbegin): Ditto.
	  (xbegin_1): Ditto.
	  (xend): Ditto.
	  (xabort): Ditto
	  (xtest): Ditto.
	  (xtest_1): Ditto.
	  * config/i386/i386.opt (mrtm): New.
	  * config/i386/immintrin.h: Include rtmintrin.h and
	  xtestintrin.h.
	  * config/i386/rtmintrin.h: New header.
	  * config/i386/xtestintrin.h: Ditto.

testsuite/ChangeLog entry:
    * gcc.target/i386/rtm-xabort-1.c: New.
    * gcc.target/i386/rtm-xbegin-1.c: Ditto.
    * gcc.target/i386/rtm-xend-1.c: Ditto.
    * gcc.target/i386/rtm-xtest-1.c: Ditto.
    * gcc.target/i386/sse-12.c: Test RTM intrinsics.
    * gcc.target/i386/sse-13.c: Ditto.
    * gcc.target/i386/sse-14.c: Ditto.
    * gcc.target/i386/sse-22.c: Ditto.
    * gcc.target/i386/sse-23.c: Ditto.
    * g++.dg/other/i386-2.C: Ditto.
    * g++.dg/other/i386-3.C: Ditto.

From-SVN: r185218
---
 gcc/common/config/i386/i386-common.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'gcc/common')

diff --git a/gcc/common/config/i386/i386-common.c b/gcc/common/config/i386/i386-common.c
index ac4232f..70b7eb7 100644
--- a/gcc/common/config/i386/i386-common.c
+++ b/gcc/common/config/i386/i386-common.c
@@ -54,6 +54,7 @@ along with GCC; see the file COPYING3.  If not see
   (OPTION_MASK_ISA_FMA | OPTION_MASK_ISA_AVX_SET)
 #define OPTION_MASK_ISA_AVX2_SET \
   (OPTION_MASK_ISA_AVX2 | OPTION_MASK_ISA_AVX_SET)
+#define OPTION_MASK_ISA_RTM_SET OPTION_MASK_ISA_RTM
 
 /* SSE4 includes both SSE4.1 and SSE4.2. -msse4 should be the same
    as -msse4.2.  */
@@ -121,6 +122,7 @@ along with GCC; see the file COPYING3.  If not see
    | OPTION_MASK_ISA_AVX2_UNSET)
 #define OPTION_MASK_ISA_FMA_UNSET OPTION_MASK_ISA_FMA
 #define OPTION_MASK_ISA_AVX2_UNSET OPTION_MASK_ISA_AVX2
+#define OPTION_MASK_ISA_RTM_UNSET OPTION_MASK_ISA_RTM
 
 /* SSE4 includes both SSE4.1 and SSE4.2.  -mno-sse4 should the same
    as -mno-sse4.1. */
@@ -309,6 +311,19 @@ ix86_handle_option (struct gcc_options *opts,
 	}
       return true;
 
+    case OPT_mrtm:
+      if (value)
+	{
+	  opts->x_ix86_isa_flags |= OPTION_MASK_ISA_RTM_SET;
+	  opts->x_ix86_isa_flags_explicit |= OPTION_MASK_ISA_RTM_SET;
+	}
+      else
+	{
+	  opts->x_ix86_isa_flags &= ~OPTION_MASK_ISA_RTM_UNSET;
+	  opts->x_ix86_isa_flags_explicit |= OPTION_MASK_ISA_RTM_UNSET;
+	}
+      return true;
+
     case OPT_msse4:
       opts->x_ix86_isa_flags |= OPTION_MASK_ISA_SSE4_SET;
       opts->x_ix86_isa_flags_explicit |= OPTION_MASK_ISA_SSE4_SET;
-- 
cgit v1.1