diff options
| author | Andreas Krebbel <krebbel@linux.vnet.ibm.com> | 2015-03-04 14:43:14 +0000 |
|---|---|---|
| committer | Andreas Krebbel <krebbel@gcc.gnu.org> | 2015-03-04 14:43:14 +0000 |
| commit | 4b9f07ebf31eec3f7a151f450761297266bf2cc2 (patch) | |
| tree | 9c068120337d2712a7b96fd549235f7d0b0e9ac2 | |
| parent | 85799cb98e9e3ed25eeeb43ece1c5aaea4a2a4fc (diff) | |
| download | gcc-4b9f07ebf31eec3f7a151f450761297266bf2cc2.zip gcc-4b9f07ebf31eec3f7a151f450761297266bf2cc2.tar.gz gcc-4b9f07ebf31eec3f7a151f450761297266bf2cc2.tar.bz2 | |
S/390: Fix check for builtins valid with -mhtm
* gcc/config/s390/s390.c (s390_expand_builtin): Exlude non-htm
builtins from checking for -mhtm option.
From-SVN: r221184
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/config/s390/s390.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c8c26b4..58f421f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-03-04 Andreas Krebbel <krebbel@linux.vnet.ibm.com> + + * gcc/config/s390/s390.c (s390_expand_builtin): Exlude non-htm + builtins from checking for -mhtm option. + 2015-03-03 Jan Hubicka <hubicka@ucw.cz> * tree-sra.c (convert_callers): Use call_for_symbol_and_aliases. diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c index 1924f2a..593c0cc 100644 --- a/gcc/config/s390/s390.c +++ b/gcc/config/s390/s390.c @@ -10122,7 +10122,7 @@ s390_expand_builtin (tree exp, rtx target, rtx subtarget ATTRIBUTE_UNUSED, if (icode == 0) internal_error ("bad builtin fcode"); - if (!TARGET_HTM) + if (!TARGET_HTM && fcode <= S390_BUILTIN_TX_ASSIST) error ("Transactional execution builtins not enabled (-mhtm)\n"); /* Set a flag in the machine specific cfun part in order to support |