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

Message ID	20150304144347.GA25586@maggie
State	New
Headers	show Return-Path: <gcc-patches-return-392980-incoming=patchwork.ozlabs.org@gcc.gnu.org> DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; q=dns; s= default; b=ThtSM13dgJU6Z55RmTNL2Y5rog0kbp2ntpRZNNmRn0nzbCdWPaN9v LjDgFiShXFLLE+iw5QitMfcPTRPE7izBH+tAJ6ViOOF9QiChoZ6vJeLJncJ6oUxg vsH78NyVCg1NtDyOSRhO8tTAafEz0MJWr1FqmWSfJVKzUUx46/nZ3k= Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk Sender: gcc-patches-owner@gcc.gnu.org Gateway: Authorized Use Only! Violators will be prosecuted for <gcc-patches@gcc.gnu.org> from <krebbel@linux.vnet.ibm.com>; Wed, 4 Mar 2015 14:43:53 -0000 Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 4 Mar 2015 14:43:49 -0000 Date: Wed, 4 Mar 2015 15:43:47 +0100 From: Andreas Krebbel <krebbel@linux.vnet.ibm.com> To: gcc-patches@gcc.gnu.org Subject: [Committed] S/390: Fix check for builtins valid with -mhtm Message-ID: <20150304144347.GA25586@maggie> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15)

Message ID

20150304144347.GA25586@maggie

State

New

Headers

DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id
	:list-unsubscribe:list-archive:list-post:list-help:sender:date
	:from:to:subject:message-id:mime-version:content-type; q=dns; s=
	default; b=ThtSM13dgJU6Z55RmTNL2Y5rog0kbp2ntpRZNNmRn0nzbCdWPaN9v
	LjDgFiShXFLLE+iw5QitMfcPTRPE7izBH+tAJ6ViOOF9QiChoZ6vJeLJncJ6oUxg
	vsH78NyVCg1NtDyOSRhO8tTAafEz0MJWr1FqmWSfJVKzUUx46/nZ3k=
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
Sender: gcc-patches-owner@gcc.gnu.org
Date: Wed, 4 Mar 2015 15:43:47 +0100
From: Andreas Krebbel <krebbel@linux.vnet.ibm.com>
To: gcc-patches@gcc.gnu.org
Subject: [Committed] S/390: Fix check for builtins valid with -mhtm
Message-ID: <20150304144347.GA25586@maggie>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.21 (2010-09-15)

Commit Message

Andreas Krebbel March 4, 2015, 2:43 p.m. UTC

Committed to mainline.

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.

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

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

Commit Message

Patch