X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=gcc%2Ftestsuite%2Fobjc.dg%2Ftorture%2Fstrings%2Fconst-str-8.m;fp=gcc%2Ftestsuite%2Fobjc.dg%2Fconst-str-8.m;h=c5bacaf437f19a34d51d432f459e5acbe276ebe1;hp=a7da0e102760c2dfd62ad56d380194c24788c1d9;hb=0c93aabd51a8b406ec3d7a77ab5df54961c565e8;hpb=d4238e8bcce578381de9480d78a651830a8f9754

diff --git a/gcc/testsuite/objc.dg/const-str-8.m b/gcc/testsuite/objc.dg/torture/strings/const-str-8.m
similarity index 73%
rename from gcc/testsuite/objc.dg/const-str-8.m
rename to gcc/testsuite/objc.dg/torture/strings/const-str-8.m
index a7da0e10276..c5bacaf437f 100644
--- a/gcc/testsuite/objc.dg/const-str-8.m
+++ b/gcc/testsuite/objc.dg/torture/strings/const-str-8.m
@@ -1,9 +1,11 @@
 /* Test for assigning compile-time constant-string objects to static variables.  */
 /* Contributed by Ziemowit Laski <zlaski@apple.com>  */
-/* { dg-options "-fconstant-string-class=Foo" } */
 /* { dg-do run } */
+/* { dg-options "-fconstant-string-class=Foo" } */
+/* { dg-options "-mno-constant-cfstrings -fconstant-string-class=Foo" { target *-*-darwin* } } */
+/* { dg-additional-sources "../../../objc-obj-c++-shared/Object1.m" } */
 
-#include "../objc-obj-c++-shared/Object1.h"
+#include "../../../objc-obj-c++-shared/Object1.h"
 #include <stdlib.h>
 
 @interface Foo: Object {
@@ -12,10 +14,10 @@
 }
 @end
 
-#ifndef NEXT_OBJC_USE_NEW_INTERFACE
-struct objc_class _FooClassReference;
-#else
+#ifdef NEXT_OBJC_USE_NEW_INTERFACE
 Class _FooClassReference;
+#else
+struct objc_class _FooClassReference;
 #endif
 
 @implementation Foo : Object
@@ -39,5 +41,3 @@ int main () {
   PrefsSynchronize();
   return 0;
 }
-
-#include "../objc-obj-c++-shared/Object1-implementation.h"