From b51e84c954e63bc52a8d5d4fa1cda7cf4f8ecfb4 Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iains@gcc.gnu.org>
Date: Wed, 7 Apr 2010 19:57:46 +0000
Subject: [PATCH] re PR objc/35996 (ICE while building simple ObjC code with
-fobjc-gc)
gcc/objc/Changelog:
2010-04-07 Iain Sandoe <iains@gcc.gnu.org>
PR objc/35996
* objc-act.c (objc_init): Warn that -fobjc-gc is ignored for
-fgnu-runtime and set flag_objc_gc to zero.
testsuite:
2010-04-07 Iain Sandoe <iains@gcc.gnu.org>
PR objc/35996
* objc.dg/objc-gc-4.m: Run for all targets, prune new warning.
* obj-c++.dg/objc-gc-3.mm: Ditto.
From-SVN: r158083
---
gcc/objc/ChangeLog | 6 ++++++
gcc/objc/objc-act.c | 7 +++++++
gcc/testsuite/ChangeLog | 9 ++++++++-
gcc/testsuite/obj-c++.dg/objc-gc-3.mm | 3 ++-
gcc/testsuite/objc.dg/objc-gc-4.m | 3 ++-
5 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index 472d4aa7ac63..3063af9f3af2 100644
--- a/gcc/objc/ChangeLog
+++ b/gcc/objc/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-07 Iain Sandoe <iains@gcc.gnu.org>
+
+ PR objc/35996
+ * objc-act.c (objc_init): Warn that -fobjc-gc is ignored for
+ -fgnu-runtime and set flag_objc_gc to zero.
+
2010-04-07 Iain Sandoe <iains@gcc.gnu.org>
PR objc++/23716
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index 7e3a2d86115f..f5b754be7239 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -545,6 +545,13 @@ objc_init (void)
structure-returning methods. */
default_constant_string_class_name = "NXConstantString";
flag_typed_selectors = 1;
+ /* GNU runtime does not need the compiler to change code
+ in order to do GC. */
+ if (flag_objc_gc)
+ {
+ warning_at (0, 0, "%<-fobjc-gc%> is ignored for %<-fgnu-runtime%>");
+ flag_objc_gc=0;
+ }
}
init_objc ();
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 816847848746..5c313817f59e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-07 Iain Sandoe <iains@gcc.gnu.org>
+
+ PR objc/35996
+ * objc.dg/objc-gc-4.m: Run for all targets, prune new warning.
+ * obj-c++.dg/objc-gc-3.mm: Ditto.
+
2010-04-07 Simon Baldwin <simonb@google.com>
* gcc.dg/cpp/warn-undef-2.c: New.
@@ -41,7 +47,8 @@
* gfortran.dg/warning-directive-4.F90: New.
2010-04-07 Iain Sandoe <iains@gcc.gnu.org>
-PR objc++/23716
+
+ PR objc++/23716
* obj-c++.dg/comp-types-10.mm: Remove XFAIL.
2010-04-07 Jason Merrill <jason@redhat.com>
diff --git a/gcc/testsuite/obj-c++.dg/objc-gc-3.mm b/gcc/testsuite/obj-c++.dg/objc-gc-3.mm
index efbde1b4b2a9..c0249e7a9622 100644
--- a/gcc/testsuite/obj-c++.dg/objc-gc-3.mm
+++ b/gcc/testsuite/obj-c++.dg/objc-gc-3.mm
@@ -2,8 +2,9 @@
(where component references get rewritten). */
/* Contributed by Ziemowit Laski <zlaski@apple.com> */
-/* { dg-do compile { target *-*-darwin* } } */
+/* { dg-do compile } */
/* { dg-options "-fobjc-gc" } */
+/* { dg-prune-output "cc1objplus: warning: '-fobjc-gc' is ignored for '-fgnu-runtime'" } */
#include "../objc-obj-c++-shared/Object1.h"
diff --git a/gcc/testsuite/objc.dg/objc-gc-4.m b/gcc/testsuite/objc.dg/objc-gc-4.m
index efbde1b4b2a9..097f35e9f251 100644
--- a/gcc/testsuite/objc.dg/objc-gc-4.m
+++ b/gcc/testsuite/objc.dg/objc-gc-4.m
@@ -2,8 +2,9 @@
(where component references get rewritten). */
/* Contributed by Ziemowit Laski <zlaski@apple.com> */
-/* { dg-do compile { target *-*-darwin* } } */
+/* { dg-do compile } */
/* { dg-options "-fobjc-gc" } */
+/* { dg-prune-output "cc1obj: warning: '-fobjc-gc' is ignored for '-fgnu-runtime'" } */
#include "../objc-obj-c++-shared/Object1.h"
--
GitLab