From patchwork Wed Dec 5 18:22:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aldy Hernandez X-Patchwork-Id: 203918 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]) by ozlabs.org (Postfix) with SMTP id B400A2C00A7 for ; Thu, 6 Dec 2012 05:22:44 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1355336566; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject: References:In-Reply-To:Content-Type:Mailing-List:Precedence: List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=byslS4++2Dr0XHsqnPXIJaOjMvM=; b=ZPbH8ZWFMhi+VvC Obqk+RBEwpK9/sXVzmYnsuvLEKN7ddHVL8SOUl9Xg5AMbnbCQg3NDJyst16dBJTS eu+g3CzG/MqA1clKlRmfknSTEeHIVN6fG1b6btRiD84fgjh7zNOKDhO/YQAGSFj3 vVB3qMxebVbIacTjPc81V2q2Wd2c= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:References:In-Reply-To:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=JprEI1A6qGMaPsAGjfa4Ek7JU6WUjt/r7sVxVVL/EdMKbV0rxZSVYmbtSZsElK ZuPg32uQXlojMb+X1FSBkDwlWgUTnoQ6b0+S9jSgccDJZ1wqGDTwFYfH9pX83zWK Fyc4ieWlE5B3tSENgpBXYVtWkv5dQi+ydn3XbYgS30Elo=; Received: (qmail 32186 invoked by alias); 5 Dec 2012 18:22:41 -0000 Received: (qmail 32173 invoked by uid 22791); 5 Dec 2012 18:22:41 -0000 X-SWARE-Spam-Status: No, hits=-7.0 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, KHOP_SPAMHAUS_DROP, KHOP_THREADED, RCVD_IN_DNSWL_HI, RCVD_IN_HOSTKARMA_W, RP_MATCHES_RCVD, SPF_HELO_PASS, TW_BJ X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 05 Dec 2012 18:22:35 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qB5IM4rS031877 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 5 Dec 2012 13:22:05 -0500 Received: from reynosa.quesejoda.com (vpn-11-205.rdu.redhat.com [10.11.11.205]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qB5IM2Xj015795; Wed, 5 Dec 2012 13:22:03 -0500 Message-ID: <50BF90CA.7090908@redhat.com> Date: Wed, 05 Dec 2012 12:22:02 -0600 From: Aldy Hernandez User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121016 Thunderbird/16.0.1 MIME-Version: 1.0 To: gcc-patches CC: mikestump@comcast.net, echristo@gmail.com, stanshebs@earthlink.net, iains@gcc.gnu.org, Jakub Jelinek Subject: Re: [patch] PR target/54160: Only set __OBJC2__ when compiling OBJC. References: <50BE7844.8000409@redhat.com> <50BF6092.3020601@redhat.com> In-Reply-To: <50BF6092.3020601@redhat.com> 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 Adjusted ChangeLog entry as suggested by Jakub on IRC. OK? commit ddc4494409331e5a75814a6c8a57aa0646257fb2 Author: Aldy Hernandez Date: Wed Dec 5 08:38:10 2012 -0600 PR target/54160 * config/t-darwin (darwin-c.o): Depend on $(CPP_INTERNAL_H). * config/darwin-c.c (darwin_cpp_builtins): Only set __OBJC2__ * when in obj mode. Include libcpp/internal.h. diff --git a/gcc/config/darwin-c.c b/gcc/config/darwin-c.c index 8e48c30..ec8aa9c 100644 --- a/gcc/config/darwin-c.c +++ b/gcc/config/darwin-c.c @@ -38,6 +38,7 @@ along with GCC; see the file COPYING3. If not see #include "c-family/c-target.h" #include "c-family/c-target-def.h" #include "cgraph.h" +#include "../../libcpp/internal.h" /* Pragmas. */ @@ -632,7 +633,7 @@ darwin_cpp_builtins (cpp_reader *pfile) builtin_define ("__weak="); } - if (flag_objc_abi == 2) + if (CPP_OPTION (pfile, objc) && flag_objc_abi == 2) builtin_define ("__OBJC2__"); } diff --git a/gcc/config/t-darwin b/gcc/config/t-darwin index e2bd74d..0e8346b 100644 --- a/gcc/config/t-darwin +++ b/gcc/config/t-darwin @@ -29,7 +29,7 @@ darwin.o: $(srcdir)/config/darwin.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ darwin-c.o: $(srcdir)/config/darwin-c.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(TM_H) $(CPPLIB_H) $(TREE_H) $(C_PRAGMA_H) $(TM_P_H) \ - incpath.h flags.h $(C_COMMON_H) $(C_TARGET_H) $(C_TARGET_DEF_H) + incpath.h flags.h $(C_COMMON_H) $(C_TARGET_H) $(C_TARGET_DEF_H) $(CPP_INTERNAL_H) $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ $(srcdir)/config/darwin-c.c $(PREPROCESSOR_DEFINES)