diff options
| author | Andreas Krebbel <Andreas.Krebbel@de.ibm.com> | 2013-07-17 11:15:24 +0000 |
|---|---|---|
| committer | Andreas Krebbel <krebbel@gcc.gnu.org> | 2013-07-17 11:15:24 +0000 |
| commit | 167f68ede42b2bb0bf287769951c5a6aca3e7281 (patch) | |
| tree | 7c128616f0a4ca4d09f410d31fee5de4433fc49c /gcc | |
| parent | 1b2d0112c5dd2d847aaa4e6bf529fc74e78158fb (diff) | |
| download | gcc-167f68ede42b2bb0bf287769951c5a6aca3e7281.zip gcc-167f68ede42b2bb0bf287769951c5a6aca3e7281.tar.gz gcc-167f68ede42b2bb0bf287769951c5a6aca3e7281.tar.bz2 | |
s390.c: (s390_expand_builtin): Allow -mhtm to be enabled without -march=zEC12.
2013-07-17 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
* config/s390/s390.c: (s390_expand_builtin): Allow -mhtm to be
enabled without -march=zEC12.
* config/s390/s390.h (TARGET_HTM): Do not require EC12 machine
flags to be set.
2013-07-17 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
* acinclude.m4: Add htm asm check for s390.
* configure.tgt: Add -mhtm and -Wa,-march=zEC12 to the options.
* configure: Regenerate.
* config/s390/target.h: Remove __HTM__ check.
(htm_available): Call getauxval to get hwcaps and check whether
HTM is available or not.
From-SVN: r201004
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/config/s390/s390.c | 7 | ||||
| -rw-r--r-- | gcc/config/s390/s390.h | 3 |
3 files changed, 10 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b4f6287..60c176d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2013-07-17 Andreas Krebbel <Andreas.Krebbel@de.ibm.com> + + * config/s390/s390.c: (s390_expand_builtin): Allow -mhtm to be + enabled without -march=zEC12. + * config/s390/s390.h (TARGET_HTM): Do not require EC12 machine + flags to be set. + 2013-07-16 Maciej W. Rozycki <macro@codesourcery.com> * config/mips/mips.h (ISA_HAS_FP4): Correct formatting. diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c index 7ce0c30..ab4cc8b 100644 --- a/gcc/config/s390/s390.c +++ b/gcc/config/s390/s390.c @@ -9771,11 +9771,8 @@ s390_expand_builtin (tree exp, rtx target, rtx subtarget ATTRIBUTE_UNUSED, if (icode == 0) internal_error ("bad builtin fcode"); - if (!TARGET_ZEC12) - error ("Transactional execution builtins require zEC12 or later\n"); - - if (!TARGET_HTM && TARGET_ZEC12) - error ("Transactional execution builtins not enabled (-mtx)\n"); + if (!TARGET_HTM) + error ("Transactional execution builtins not enabled (-mhtm)\n"); /* Set a flag in the machine specific cfun part in order to support saving/restoring of FPRs. */ diff --git a/gcc/config/s390/s390.h b/gcc/config/s390/s390.h index d53fed7..bca18fe 100644 --- a/gcc/config/s390/s390.h +++ b/gcc/config/s390/s390.h @@ -81,8 +81,7 @@ enum processor_flags (TARGET_ZARCH && TARGET_CPU_Z196) #define TARGET_ZEC12 \ (TARGET_ZARCH && TARGET_CPU_ZEC12) -#define TARGET_HTM \ - (TARGET_ZARCH && TARGET_CPU_HTM && TARGET_OPT_HTM) +#define TARGET_HTM (TARGET_OPT_HTM) #define TARGET_AVOID_CMP_AND_BRANCH (s390_tune == PROCESSOR_2817_Z196) |