[Committed] S/390: Fix check for builtins valid with -mhtm

[Andreas Krebbel]

Committed to mainline.

2015-03-04  Andreas Krebbel  <kreb...@linux.vnet.ibm.com>

        * gcc/config/s390/s390.c (s390_expand_builtin): Exlude non-htm
        builtins from checking for -mhtm option.

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