darwin.c (darwin_override_options): Add a hunk missed from the commit of r168571.

gcc:
	* 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.

From-SVN: r170069

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 294ad1349f16eb9acbfbbc605fa7112c2b833c02..9c87513bf72dba6c62e108a74fc1ef6d582db3fd 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+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

diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index 8ccf18c4426729434538486fc14d4293e47ab1df..c31aeed4c4e10e575b35cc0f7cd6c9cdb88c8c8a 100644 (file)
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -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)
     {