From: Nicola Pero <nicola.pero@meta-innovation.com>
Date: Fri, 10 Sep 2010 09:54:04 +0000 (+0000)
Subject: objc-act.c (objc_begin_try_stmt): Generate an error if -fobjc-exceptions was not... 
X-Git-Tag: releases/gcc-4.6.0~4449
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=96cb32ac1990c15cf8da1bff4ca7e1a39aa7fc1b;p=thirdparty%2Fgcc.git

objc-act.c (objc_begin_try_stmt): Generate an error if -fobjc-exceptions was not used.

        * objc/objc-act.c (objc_begin_try_stmt): Generate an error if
        -fobjc-exceptions was not used.  (objc_build_throw_stmt): Same
        change.

From-SVN: r164150
---

diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index de6cbebd2ad0..aff287b91568 100644
--- a/gcc/objc/ChangeLog
+++ b/gcc/objc/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-10  Nicola Pero  <nicola.pero@meta-innovation.com>
+
+	* objc/objc-act.c (objc_begin_try_stmt): Generate an error if
+	-fobjc-exceptions was not used.  (objc_build_throw_stmt): Same
+	change.
+
 2010-07-15  Nathan Froyd  <froydnj@codesourcery.com>
 
 	* objc-act.c: Carefully replace TREE_CHAIN with DECL_CHAIN.
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index 81aba84eb974..38420c7a03c3 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -3822,13 +3822,16 @@ objc_begin_try_stmt (location_t try_locus, tree body)
   c->end_try_locus = input_location;
   cur_try_context = c;
 
-  if (flag_objc_sjlj_exceptions)
+  /* -fobjc-exceptions is required to enable Objective-C exceptions.
+     For example, on Darwin, ObjC exceptions require a sufficiently
+     recent version of the runtime, so the user must ask for them
+     explicitly.  On other platforms, at the moment -fobjc-exceptions
+     triggers -fexceptions which again is required for exceptions to
+     work.
+  */
+  if (!flag_objc_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 (0, "use %<-fobjc-exceptions%> to enable Objective-C "
-		 "exception syntax");
+      error_at (try_locus, "%<-fobjc-exceptions%> is required to enable Objective-C exception syntax");
     }
 
   if (flag_objc_sjlj_exceptions)
@@ -3979,13 +3982,9 @@ objc_build_throw_stmt (location_t loc, tree throw_expr)
 {
   tree args;
 
-  if (flag_objc_sjlj_exceptions)
+  if (!flag_objc_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 (0, "use %<-fobjc-exceptions%> to enable Objective-C "
-		 "exception syntax");
+      error_at (loc, "%<-fobjc-exceptions%> is required to enable Objective-C exception syntax");
     }
 
   if (throw_expr == NULL)