CFStrings for Darwin

[pf3gnuchains/gcc-fork.git] / gcc / testsuite / obj-c++.dg / torture / strings / const-str-7.mm

diff --git a/gcc/testsuite/obj-c++.dg/const-str-7.mm b/gcc/testsuite/obj-c++.dg/torture/strings/const-str-7.mm
similarity index 70%
rename from gcc/testsuite/obj-c++.dg/const-str-7.mm
rename to gcc/testsuite/obj-c++.dg/torture/strings/const-str-7.mm
index fc423bd..d58cb91 100644 (file)
--- a/gcc/testsuite/obj-c++.dg/const-str-7.mm
+++ b/gcc/testsuite/obj-c++.dg/torture/strings/const-str-7.mm
@@ -2,12 +2,12 @@
    scopes.  */
 /* Developed by Andrew Pinski <pinskia@physics.uc.edu> */
 
-/* { dg-options "-fconstant-string-class=Foo" } */
 /* { dg-do run } */
-/* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { ! objc2 } } } { "-fnext-runtime" } { "" } } */
+/* { 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.mm" } */
 
-#include "../objc-obj-c++-shared/Object1.h"
-#include "../objc-obj-c++-shared/next-mapping.h"
+#include "../../../objc-obj-c++-shared/Object1.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -21,7 +21,7 @@
 @end
 
 #ifdef NEXT_OBJC_USE_NEW_INTERFACE
-struct fudge_objc_class _FooClassReference;
+Class  _FooClassReference;
 #else
 struct objc_class _FooClassReference;
 #endif
@@ -44,4 +44,3 @@ int main () {
    }
   return 0;
 }
-#include "../objc-obj-c++-shared/Object1-implementation.h"