Radar 4512786.

Oked by Mike.


git-svn-id: https://gcc.gnu.org/svn/gcc/branches/apple/trunk@113353 138bc75d-0d04-0410-961f-82ee72b054a4

6 files changed, 45 insertions, 6 deletions

diff --git a/gcc/ChangeLog.apple-ppc b/gcc/ChangeLog.apple-ppc
index c8cbafdd649..26d1dec7dca 100644
--- a/gcc/ChangeLog.apple-ppc
+++ b/gcc/ChangeLog.apple-ppc
@@ -1,3 +1,9 @@
+2006-04-28 Fariborz Jahanian <fjahanian@apple.com>
+
+        Radar 4512786
+	* doc/invoke.texi (fobjc-exceptions): Say it is
+	on by default.
+	
 2006-04-26 Fariborz Jahanian <fjahanian@apple.com>
 
 	Radar 3803157 (method attributes)
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 1233854920e..862b6a96b74 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -2201,7 +2201,8 @@ support for invoking the @code{- (id) .cxx_construct} and
 @opindex fobjc-exceptions
 Enable syntactic support for structured exception handling in Objective-C,
 similar to what is offered by C++ and Java.  Currently, this option is only
-available in conjunction with the NeXT runtime on Mac OS X 10.3 and later.
+available in conjunction with the NeXT runtime on Mac OS X 10.3 and later
+and is on by default.
 
 @smallexample
   @@try @{
diff --git a/gcc/objc/ChangeLog.apple-ppc b/gcc/objc/ChangeLog.apple-ppc
index 8d3d4d4b760..5c6654f9517 100644
--- a/gcc/objc/ChangeLog.apple-ppc
+++ b/gcc/objc/ChangeLog.apple-ppc
@@ -1,3 +1,8 @@
+2006-04-28 Fariborz Jahanian <fjahanian@apple.com>
+
+	Radar 4512786
+	* objc/objc-act.c (objc_init_exceptions): Remove warning.
+
 2006-04-26 Fariborz Jahanian <fjahanian@apple.com>
 
         Radar 4523837
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index e7a3ff12868..c0c34f31a65 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -5707,11 +5707,8 @@ objc_init_exceptions (void)
 
   if (flag_objc_sjlj_exceptions)
     {
-      /* On Darwin, ObjC exceptions require a sufficiently recent
-	 version of the runtime, so the user must ask for them explicitly.  */
-      if (!flag_objc_exceptions)
-	warning ("use %<-fobjc-exceptions%> to enable Objective-C "
-		 "exception syntax");
+      /* APPE LOCAL radar 4512786. */
+      /* code removed */
     }
 #ifndef OBJCPLUS
   else
diff --git a/gcc/testsuite/ChangeLog.apple-ppc b/gcc/testsuite/ChangeLog.apple-ppc
index d110435929e..c0bd5504f5b 100644
--- a/gcc/testsuite/ChangeLog.apple-ppc
+++ b/gcc/testsuite/ChangeLog.apple-ppc
@@ -1,3 +1,8 @@
+2006-04-28 Fariborz Jahanian <fjahanian@apple.com>
+
+        Radar 4512786
+	* objc.dg/no-fobjc-exception.m: New.
+
 2006-04-26 Fariborz Jahanian <fjahanian@apple.com>
 
 	Radar 4523837
diff --git a/gcc/testsuite/objc.dg/no-fobjc-exception.m b/gcc/testsuite/objc.dg/no-fobjc-exception.m
new file mode 100644
index 00000000000..b5000b40612
--- /dev/null
+++ b/gcc/testsuite/objc.dg/no-fobjc-exception.m
@@ -0,0 +1,25 @@
+/* APPLE LOCAL file 4512786 */
+/* { dg-do run } */
+#include <objc/objc.h>
+#include <objc/Object.h>
+
+@interface M : Object
+- (void) foo;
+@end
+
+@implementation M : Object
+- (void) foo
+{
+    @try {
+    } @catch (Object *localException) {
+    }
+
+}
+@end
+
+int main()
+{
+	M *p = [M new];
+	[p foo];
+	return 0;
+}