From patchwork Wed Apr 6 07:44:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tristan Gingold X-Patchwork-Id: 89993 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 5B6591007D1 for ; Wed, 6 Apr 2011 17:45:07 +1000 (EST) Received: (qmail 15727 invoked by alias); 6 Apr 2011 07:45:03 -0000 Received: (qmail 15584 invoked by uid 22791); 6 Apr 2011 07:45:01 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from mel.act-europe.fr (HELO mel.act-europe.fr) (194.98.77.210) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 06 Apr 2011 07:44:56 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id BD941CB0224; Wed, 6 Apr 2011 09:44:55 +0200 (CEST) Received: from mel.act-europe.fr ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wAgKLaRIyU95; Wed, 6 Apr 2011 09:44:52 +0200 (CEST) Received: from ulanbator.act-europe.fr (ulanbator.act-europe.fr [10.10.1.67]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mel.act-europe.fr (Postfix) with ESMTP id 9ABEFCB024B; Wed, 6 Apr 2011 09:44:52 +0200 (CEST) Subject: Re: [PATCH] fix PR bootstrap/48471 Mime-Version: 1.0 (Apple Message framework v1082) From: Tristan Gingold In-Reply-To: <20110406010648.GA12247@nightcrawler> Date: Wed, 6 Apr 2011 09:44:52 +0200 Cc: Nathan Froyd Message-Id: <8A64F4A5-F1F5-48D9-B3EF-CFB63546D531@adacore.com> References: <20110406010648.GA12247@nightcrawler> To: "gcc-patches@gcc.gnu.org Patches" X-IsSubscribed: yes 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 On Apr 6, 2011, at 3:06 AM, Nathan Froyd wrote: > My changes that moved bits of final.c to dbxout.c caused compilation > failures on targets that *didn't* enable DBX_DEBUGGING_INFO, since some > now-static symbols could be unused. To fix this, the patch below moves > all the new static variables and two macros that use some of said > variables below an #ifdef DBX_DEBUGGING_INFO. Steve Ellcey verified > that the patch fixes the problems on ia64-hp-hpux11.23 (thanks Steve!) > and I verified that the changes still bootstrap on > x86_64-unknown-linux-gnu. > > Committed as obvious. Sorry about all the build breakage today, not one > of my better cleanup days... Nathan, bootstrap still fails for xcoff targets (eg aix). I can fix the failure with this patch. Ok for trunk ? Tristan. 2011-04-06 Tristan Gingold * dbxout.c: (debug_nesting, symbol_queue, symbol_queue_index) (symbol_queue_size, DBXOUT_DECR_NESTING) (DBXOUT_DECR_NESTING_AND_RETURN): Also define if XCOFF_DEBUGGING_INFO. --- a/gcc/dbxout.c +++ b/gcc/dbxout.c @@ -903,7 +903,7 @@ dbxout_finish_complex_stabs (tree sym, stab_code_type code, obstack_free (&stabstr_ob, str); } -#if defined (DBX_DEBUGGING_INFO) +#if defined (DBX_DEBUGGING_INFO) || defined (XCOFF_DEBUGGING_INFO) /* When -gused is used, emit debug info for only used symbols. But in addition to the standard intercepted debug_hooks there are some @@ -926,6 +926,10 @@ static int symbol_queue_size = 0; #define DBXOUT_DECR_NESTING_AND_RETURN(x) \ do {--debug_nesting; return (x);} while (0) +#endif /* DBX_DEBUGGING_INFO || XCOFF_DEBUGGING_INFO */ + +#if defined (DBX_DEBUGGING_INFO) + static void dbxout_function_end (tree decl ATTRIBUTE_UNUSED) {