From patchwork Sat Feb 12 10:54:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Sandoe X-Patchwork-Id: 82899 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 8D2B8B711C for ; Sat, 12 Feb 2011 21:54:39 +1100 (EST) Received: (qmail 23104 invoked by alias); 12 Feb 2011 10:54:37 -0000 Received: (qmail 23092 invoked by uid 22791); 12 Feb 2011 10:54:36 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE X-Spam-Check-By: sourceware.org Received: from c2beaomr07.btconnect.com (HELO mail.btconnect.com) (213.123.26.185) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 12 Feb 2011 10:54:29 +0000 Received: from host81-138-1-83.in-addr.btopenworld.com (EHLO thor.office) ([81.138.1.83]) by c2beaomr07.btconnect.com with ESMTP id BTB58882; Sat, 12 Feb 2011 10:54:24 +0000 (GMT) Cc: Mike Stump Message-Id: <0967E377-222C-4B27-B685-00D0F376CE28@sandoe-acoustics.co.uk> From: IainS To: GCC Patches In-Reply-To: <608EAC6C-CAC5-4071-9D9C-78ABFA9E9741@comcast.net> Mime-Version: 1.0 (Apple Message framework v936) Subject: Re: [Patch] Fix anonymous code atoms problem on Darwin. Date: Sat, 12 Feb 2011 10:54:22 +0000 References: <217CD416-F4B9-4F82-AF96-0820498443DB@sandoe-acoustics.co.uk> <6466C461-AC3F-42AD-A0E3-52F24BA1E2C4@sandoe-acoustics.co.uk> <7F9538A1-5F81-4609-A436-AC828BA1940F@sandoe-acoustics.co.uk> <608EAC6C-CAC5-4071-9D9C-78ABFA9E9741@comcast.net> X-Mirapoint-IP-Reputation: reputation=Fair-1, source=Queried, refid=tid=0001.0A0B0302.4D5666DF.00B3, actions=tag X-Junkmail-Signature-Raw: score=unknown, refid=str=0001.0A0B0206.4D5666E0.0142, ss=1, fgs=0, ip=0.0.0.0, so=2010-07-22 22:03:31, dmn=2009-09-10 00:05:08, mode=single engine 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 8 Feb 2011, at 20:49, Mike Stump wrote: > On Feb 8, 2011, at 5:35 AM, IainS wrote: >> OK to commit this to correct it? > > Ok, if the indentation level is good... If you use emacs, just hit > tab on each of the lines in question... I fixed the over-length comment lines, incorrect indenting of the last three if clauses ... ... and added the missed hunk. committed as attached, r170069. Iain Index: gcc/ChangeLog =================================================================== --- gcc/ChangeLog (revision 170068) +++ gcc/ChangeLog (working copy) @@ -1,5 +1,11 @@ 2011-02-12 Iain Sandoe + * config/darwin.c (darwin_override_options): Add a hunk missed + from the commit of r168571. Trim comment line lengths and + correct indents of the preceding block. + +2011-02-12 Iain Sandoe + * gcc.c (driver_handle_option): Concatenate the argument to -F with the switch. Index: gcc/config/darwin.c =================================================================== --- gcc/config/darwin.c (revision 170068) +++ gcc/config/darwin.c (working copy) @@ -2580,22 +2580,29 @@ darwin_override_options (void) && !TARGET_64BIT) global_options.x_flag_asynchronous_unwind_tables = 0; - /* Disable -freorder-blocks-and-partition when unwind tables are being emitted - for Darwin < 10 (OSX 10.6). - The strategy is, "Unless the User has specifically set/unset an unwind flag - we will switch off -freorder-blocks-and-partition when unwind tables will be - generated". If the User specifically sets flags... we assume (s)he knows - why... */ + /* Disable -freorder-blocks-and-partition when unwind tables are being + emitted for Darwin < 9 (OSX 10.5). + The strategy is, "Unless the User has specifically set/unset an unwind + flag we will switch off -freorder-blocks-and-partition when unwind tables + will be generated". If the User specifically sets flags... we assume + (s)he knows why... */ if (generating_for_darwin_version < 9 && global_options_set.x_flag_reorder_blocks_and_partition && ((global_options.x_flag_exceptions /* User, c++, java */ && !global_options_set.x_flag_exceptions) /* User specified... */ || (global_options.x_flag_unwind_tables - && !global_options_set.x_flag_unwind_tables) + && !global_options_set.x_flag_unwind_tables) || (global_options.x_flag_non_call_exceptions - && !global_options_set.x_flag_non_call_exceptions) + && !global_options_set.x_flag_non_call_exceptions) || (global_options.x_flag_asynchronous_unwind_tables - && !global_options_set.x_flag_asynchronous_unwind_tables))) + && !global_options_set.x_flag_asynchronous_unwind_tables))) + { + inform (input_location, + "-freorder-blocks-and-partition does not work with exceptions " + "on this architecture"); + flag_reorder_blocks_and_partition = 0; + flag_reorder_blocks = 1; + } if (flag_mkernel || flag_apple_kext) {