From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15509 invoked by alias); 11 May 2017 19:16:20 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 15310 invoked by uid 89); 11 May 2017 19:16:09 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-10.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM,GIT_PATCH_2,GIT_PATCH_3,KAM_ASCII_DIVIDERS,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM,SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-yb0-f175.google.com Received: from mail-yb0-f175.google.com (HELO mail-yb0-f175.google.com) (209.85.213.175) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 11 May 2017 19:16:06 +0000 Received: by mail-yb0-f175.google.com with SMTP id 8so8972709ybw.1 for ; Thu, 11 May 2017 12:16:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language; bh=PcDx/HNAi4KjGrGe4deHTgLYSL7GsG9P9WcesZqut0M=; b=Hlyqg+yhrjtdEf9O45IUK67RSD9CYzjt7jOE23qFFYzurEDZgpspcSBvPBih62S/uo MI2yBpyd19JcgSwR55euCYi9ircSDAx4w0+iDVN9WfIm/BAINIMLKiR3oAZRGhrB1UYp oLubtwhWaP4v6wOPgdJdVcugcdG36RZf8e356FxVeTAEGecia3Xwn7ovgYvh8F3yF18c QpJcmt90m3j46qrP24qRr5vRGoUo+WJcQRG5Yz0VpdutQuOI1Fg4ClBrnCUaHDxNAE3d CWcdeFGWHtYf3wx7VxKwiuRXrYHT2IjsaYc4sc1IH9Ic8roOjaQU6q0On7dQvF0D02Lx UaAw== X-Gm-Message-State: AODbwcBD2VDqsLcrvILEAaIHWL2k7/hy0CPXu4ng0FOEy2S/RVUJ0kx3 QYSN87XlwZOc9w== X-Received: by 10.37.172.219 with SMTP id x27mr111720ybd.122.1494530167297; Thu, 11 May 2017 12:16:07 -0700 (PDT) Received: from ?IPv6:2620:10d:c0a3:20fb:f6d0:5ac5:64cd:f102? ([2620:10d:c091:200::7:4a1a]) by smtp.googlemail.com with ESMTPSA id e62sm107434ywa.62.2017.05.11.12.16.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 May 2017 12:16:06 -0700 (PDT) Subject: Re: [PATCH] decl lang hooks To: Rainer Orth Cc: Joseph Myers , GCC Patches References: <90b92a42-d32e-a108-5094-b59224ab7755@acm.org> <78a60fee-020a-c4d6-61be-521b46b37068@acm.org> From: Nathan Sidwell Message-ID: <820555c8-88e5-75f1-cdbd-84133e1247d2@acm.org> Date: Thu, 11 May 2017 19:16:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/mixed; boundary="------------06CD20BDA82829C3CD9BC9FC" X-SW-Source: 2017-05/txt/msg00950.txt.bz2 This is a multi-part message in MIME format. --------------06CD20BDA82829C3CD9BC9FC Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-length: 351 On 05/11/2017 01:50 PM, Rainer Orth wrote: > Hi Nathan, > >> On 05/08/2017 05:34 PM, Joseph Myers wrote: > ^~~~~~~~~~~~~~~~~~~~~~ > make: *** [Makefile:1102: objcp/objcp-lang.o] Error 1 Having learnt how to spell --enable-languages properly today, here's the fix, which I have applied. nathan -- Nathan Sidwell --------------06CD20BDA82829C3CD9BC9FC Content-Type: text/x-patch; name="objc.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="objc.diff" Content-length: 3342 2017-05-11 Nathan Sidwell * cp-lang.c (get_global_decls, cxx_pushdecl, LANG_HOOK_GETDECLS, LANG_HOOKS_PUSHDECL): Move to ... * cp-objcp-common.c (cp_get_global_decls, cp_pushdec, LANG_HOOK_DECLS, LANG_HOOKS_PUSHDECL): ... here. * cp-objcp-common.h (cp_get_global_decls, cp_pushdecl): Declare. Index: cp-lang.c =================================================================== --- cp-lang.c (revision 247916) +++ cp-lang.c (working copy) @@ -35,8 +35,6 @@ static tree cp_eh_personality (void); static tree get_template_innermost_arguments_folded (const_tree); static tree get_template_argument_pack_elems_folded (const_tree); static tree cxx_enum_underlying_base_type (const_tree); -static tree get_global_decls (); -static tree cxx_pushdecl (tree); /* Lang hooks common to C++ and ObjC++ are declared in cp/cp-objcp-common.h; consequently, there should be very few hooks below. */ @@ -80,10 +78,6 @@ static tree cxx_pushdecl (tree); #define LANG_HOOKS_EH_RUNTIME_TYPE build_eh_type_type #undef LANG_HOOKS_ENUM_UNDERLYING_BASE_TYPE #define LANG_HOOKS_ENUM_UNDERLYING_BASE_TYPE cxx_enum_underlying_base_type -#undef LANG_HOOKS_GETDECLS -#define LANG_HOOKS_GETDECLS get_global_decls -#undef LANG_HOOKS_PUSHDECL -#define LANG_HOOKS_PUSHDECL cxx_pushdecl /* Each front end provides its own lang hook initializer. */ struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER; @@ -235,21 +229,6 @@ tree cxx_enum_underlying_base_type (cons return underlying_type; } -/* Return the list of decls in the global namespace. */ - -static tree -get_global_decls () -{ - return NAMESPACE_LEVEL (global_namespace)->names; -} - -/* Push DECL into the current scope. */ - -static tree -cxx_pushdecl (tree decl) -{ - return pushdecl (decl); -} #include "gt-cp-cp-lang.h" #include "gtype-cp.h" Index: cp-objcp-common.c =================================================================== --- cp-objcp-common.c (revision 247916) +++ cp-objcp-common.c (working copy) @@ -336,6 +336,22 @@ cxx_block_may_fallthru (const_tree stmt) } } +/* Return the list of decls in the global namespace. */ + +tree +cp_get_global_decls () +{ + return NAMESPACE_LEVEL (global_namespace)->names; +} + +/* Push DECL into the current scope. */ + +tree +cp_pushdecl (tree decl) +{ + return pushdecl (decl); +} + void cp_common_init_ts (void) { Index: cp-objcp-common.h =================================================================== --- cp-objcp-common.h (revision 247916) +++ cp-objcp-common.h (working copy) @@ -31,6 +31,8 @@ extern int cp_decl_dwarf_attribute (cons extern int cp_type_dwarf_attribute (const_tree, int); extern void cp_common_init_ts (void); extern tree cp_unit_size_without_reusable_padding (tree); +extern tree cp_get_global_decls (); +extern tree cp_pushdecl (tree); /* Lang hooks that are shared between C++ and ObjC++ are defined here. Hooks specific to C++ or ObjC++ go in cp/cp-lang.c and objcp/objcp-lang.c, @@ -165,4 +167,9 @@ extern tree cp_unit_size_without_reusabl #undef LANG_HOOKS_EH_PROTECT_CLEANUP_ACTIONS #define LANG_HOOKS_EH_PROTECT_CLEANUP_ACTIONS cp_protect_cleanup_actions + +#undef LANG_HOOKS_GETDECLS +#define LANG_HOOKS_GETDECLS cp_get_global_decls +#undef LANG_HOOKS_PUSHDECL +#define LANG_HOOKS_PUSHDECL cp_pushdecl #endif /* GCC_CP_OBJCP_COMMON */ --------------06CD20BDA82829C3CD9BC9FC--