[llvm-commits] [llvm-gcc-4.2] r117075 - /llvm-gcc-4.2/trunk/gcc/config/darwin.h

[Stuart Hastings]

Author: stuart
Date: Thu Oct 21 17:05:37 2010
New Revision: 117075

URL: http://llvm.org/viewvc/llvm-project?rev=117075&view=rev
Log:
Respect -fno-exceptions when compiling ObjC.  Radar 6635085.

Modified:
    llvm-gcc-4.2/trunk/gcc/config/darwin.h

Modified: llvm-gcc-4.2/trunk/gcc/config/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/darwin.h?rev=117075&r1=117074&r2=117075&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/darwin.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/darwin.h Thu Oct 21 17:05:37 2010
@@ -863,7 +863,10 @@
           flag_objc_zerocost_exceptions = 1;                            \
         if (flag_objc_zerocost_exceptions)                              \
           {                                                             \
-            flag_exceptions = 1;                                        \
+            /* APPLE LOCAL begin 6635085 */                             \
+            if (flag_exceptions == 2)                                   \
+              flag_exceptions = 1;                                      \
+            /* APPLE LOCAL end 6635085 */                               \
             flag_objc_sjlj_exceptions = 0;                              \
           }                                                             \
         /* APPLE LOCAL end radar 5023725 */                             \