From patchwork Wed Mar 4 14:43:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Krebbel X-Patchwork-Id: 446284 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42FA1140134 for ; Thu, 5 Mar 2015 01:44:05 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass reason="1024-bit key; unprotected key" header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=AW1Lp9zq; dkim-adsp=none (unprotected policy); dkim-atps=neutral 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= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; 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; s= default; bh=khblbj3R9eyq1o63M+L9YMfDiVI=; b=AW1Lp9zqOVT7zhFrwX0t wJooJ/B7tSgD6t4XkGqnwHT+qwrUlaUANgDyFs1OjHZpLVUG5WyAYs8d8XvB7mdx 1SbDW3A9G3Ep6xqlHqtIjMboWDx6QhwcZwF16SNEP5vO0BzTBzqOai5oTy6uoEIS T88jGVuybpOWEJllPow38GQ= Received: (qmail 68074 invoked by alias); 4 Mar 2015 14:43:57 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 67340 invoked by uid 89); 4 Mar 2015 14:43:57 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: e06smtp12.uk.ibm.com Received: from e06smtp12.uk.ibm.com (HELO e06smtp12.uk.ibm.com) (195.75.94.108) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Wed, 04 Mar 2015 14:43:56 +0000 Received: from /spool/local by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 4 Mar 2015 14:43:53 -0000 Received: from d06dlp03.portsmouth.uk.ibm.com (9.149.20.15) by e06smtp12.uk.ibm.com (192.168.101.142) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 4 Mar 2015 14:43:49 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id CCBDF1B08072 for ; Wed, 4 Mar 2015 14:44:06 +0000 (GMT) Received: from d06av09.portsmouth.uk.ibm.com (d06av09.portsmouth.uk.ibm.com [9.149.37.250]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t24Ehm1m9896422 for ; Wed, 4 Mar 2015 14:43:48 GMT Received: from d06av09.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t24Ehm5A017404 for ; Wed, 4 Mar 2015 07:43:48 -0700 Received: from bart (dyn-9-152-212-204.boeblingen.de.ibm.com [9.152.212.204]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with SMTP id t24EhlZB017349 for ; Wed, 4 Mar 2015 07:43:47 -0700 Received: by bart (sSMTP sendmail emulation); Wed, 04 Mar 2015 15:43:47 +0100 Date: Wed, 4 Mar 2015 15:43:47 +0100 From: Andreas Krebbel 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-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15030414-0009-0000-0000-00000356600F X-IsSubscribed: yes Committed to mainline. 2015-03-04 Andreas Krebbel * 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