From 4b9f07ebf31eec3f7a151f450761297266bf2cc2 Mon Sep 17 00:00:00 2001 From: Andreas Krebbel Date: Wed, 4 Mar 2015 14:43:14 +0000 Subject: [PATCH] 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 --- gcc/ChangeLog | 5 +++++ gcc/config/s390/s390.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c8c26b46471..58f421f6398 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-03-04 Andreas Krebbel + + * gcc/config/s390/s390.c (s390_expand_builtin): Exlude non-htm + builtins from checking for -mhtm option. + 2015-03-03 Jan Hubicka * 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 1924f2acb68..593c0cc8ee2 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 -- 2.30.2