From patchwork Thu Jun 9 13:57:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jambor X-Patchwork-Id: 632769 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 3rQRh93CLFz9sBM for ; Thu, 9 Jun 2016 23:57:28 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=lzTSjBzR; 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=Up8BzufpUNxs8l1f1LmGx0W/i/8WBa6O7DMuk6MfqmHZAMf7+L+cs cNmvYyS0yD+SDCci8ZresND2l1uoa47Q2S5q79Xc0SJylhE1OuGDVcYoY8FOOTef S8HJbrSMLtFPS5/mRY9FcGSkG3i36FO5GWLAxgTHcLkHkNtmRHXYRE= 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=y6AiFcEITAP0GGkUcW5wVEXSS0s=; b=lzTSjBzR6Yy1P5tSL9GD jWsqdv5FmcdjlO0KEL9tkl8NuQfCXDmDvCJaqm3ZxmDqxyBoIhFUh4cy2qtn0mPa EXbQnOtKxwXlRfLJjSHgdsn/UnWjxeacFd2/UYOp0TypdpMX9kGKDgdAE8TYrOoO CQTUX1m6E5rKuD+RNgtLU2c= Received: (qmail 81690 invoked by alias); 9 Jun 2016 13:57:19 -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 81679 invoked by uid 89); 9 Jun 2016 13:57:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00, SPF_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:1458 X-HELO: mx2.suse.de Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (CAMELLIA256-SHA encrypted) ESMTPS; Thu, 09 Jun 2016 13:57:08 +0000 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id C43E8ADB8 for ; Thu, 9 Jun 2016 13:57:05 +0000 (UTC) Date: Thu, 9 Jun 2016 15:57:05 +0200 From: Martin Jambor To: GCC Patches Subject: [hsa-branch] Fix issue with an undefined builtin Message-ID: <20160609135705.GM2962@virgil.suse.cz> Mail-Followup-To: GCC Patches MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.6.0 (2016-04-01) X-IsSubscribed: yes Hi, when I added HSA-only builtins to the HSA branch, I added them only conditionally if HSA was enabled, which however broke non-HSA compilation. This patch fixes this be removing the ifdefs. Now that we have reorganized HSA so that all GTY stuff is in one file (hsa.c), the right thing to do is to conditionally compile all of it. However, this will mean putting ifdefs also to omp-lowering, which is something that I would like to do only after we split omp-low.c and gridification gets its own file. At the branch this does not do any real harm anyway. I will commit this to the branch straight away. Thanks, Martin 2016-06-06 Martin Jambor * builtins.def: Do not enclose DEF_HSA_BUILTIN by an ifdef ENABLE_HSA. diff --git a/gcc/builtins.def b/gcc/builtins.def index 2bc933b..4e1c0ac 100644 --- a/gcc/builtins.def +++ b/gcc/builtins.def @@ -189,14 +189,10 @@ along with GCC; see the file COPYING3. If not see || flag_offload_abi != OFFLOAD_ABI_UNSET)) #undef DEF_HSA_BUILTIN -#ifdef ENABLE_HSA #define DEF_HSA_BUILTIN(ENUM, NAME, TYPE, ATTRS) \ DEF_BUILTIN (ENUM, "__builtin_" NAME, BUILT_IN_NORMAL, TYPE, TYPE, \ false, false, true, ATTRS, false, \ (!flag_disable_hsa)) -#else -#define DEF_HSA_BUILTIN(ENUM, NAME, TYPE, ATTRS) -#endif /* Builtin used by implementation of Cilk Plus. Most of these are decomposed by the compiler but a few are implemented in libcilkrts. */