From: Peter Bergner <bergner@vnet.ibm.com>
Date: Tue, 16 Jul 2013 16:35:10 +0000 (-0500)
Subject: rs6000.c (rs6000_option_override_internal): Do not enable extra ISA flags with TARGET... 
X-Git-Tag: upstream/12.2.0~68809
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c694dc0100d6c68389a32726d878c4890874172b;p=platform%2Fupstream%2Fgcc.git

rs6000.c (rs6000_option_override_internal): Do not enable extra ISA flags with TARGET_HTM.

	* config/rs6000/rs6000.c (rs6000_option_override_internal): Do not
	enable extra ISA flags with TARGET_HTM.

From-SVN: r200985
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c5d96e3..6a8580c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-16  Peter Bergner <bergner@vnet.ibm.com>
+
+	* config/rs6000/rs6000.c (rs6000_option_override_internal): Do not
+	enable extra ISA flags with TARGET_HTM.
+
 2013-07-16  Maciej W. Rozycki  <macro@codesourcery.com>
 
 	* config/mips/mips.h (ISA_HAS_MULS, ISA_HAS_MSAC, ISA_HAS_MACC):
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 742a530..3d86bd1 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -2999,7 +2999,7 @@ rs6000_option_override_internal (bool global_init_p)
 
   /* For the newer switches (vsx, dfp, etc.) set some of the older options,
      unless the user explicitly used the -mno-<option> to disable the code.  */
-  if (TARGET_P8_VECTOR || TARGET_DIRECT_MOVE || TARGET_CRYPTO || TARGET_HTM)
+  if (TARGET_P8_VECTOR || TARGET_DIRECT_MOVE || TARGET_CRYPTO)
     rs6000_isa_flags |= (ISA_2_7_MASKS_SERVER & ~rs6000_isa_flags_explicit);
   else if (TARGET_VSX)
     rs6000_isa_flags |= (ISA_2_6_MASKS_SERVER & ~rs6000_isa_flags_explicit);