diff options
author | Peter Bergner <bergner@vnet.ibm.com> | 2013-07-16 11:35:10 -0500 |
---|---|---|
committer | Peter Bergner <bergner@gcc.gnu.org> | 2013-07-16 11:35:10 -0500 |
commit | c694dc0100d6c68389a32726d878c4890874172b (patch) | |
tree | de1d34b0758a95e57e3a4d29ee24cbe1906a096b /gcc | |
parent | 081e7aadae346fc795dc36fae242d2c43c3d05ca (diff) | |
download | gcc-c694dc0100d6c68389a32726d878c4890874172b.zip gcc-c694dc0100d6c68389a32726d878c4890874172b.tar.gz gcc-c694dc0100d6c68389a32726d878c4890874172b.tar.bz2 |
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
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/config/rs6000/rs6000.c | 2 |
2 files changed, 6 insertions, 1 deletions
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); |