diff mbox

Fix anonymous code atoms problem on Darwin.

Message ID 0967E377-222C-4B27-B685-00D0F376CE28@sandoe-acoustics.co.uk
State New
Headers show

Commit Message

Iain Sandoe Feb. 12, 2011, 10:54 a.m. UTC 
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
diff mbox

Patch

Index: gcc/ChangeLog
===================================================================
--- gcc/ChangeLog	(revision 170068)
+++ gcc/ChangeLog	(working copy)
@@ -1,5 +1,11 @@ 
 2011-02-12  Iain Sandoe  <iains@gcc.gnu.org>
 
+	* 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  <iains@gcc.gnu.org>
+
 	* 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)
     {