[gcc] GCC 4.5.0=>4.5.1

gcc/gcc/testsuite/obj-c++.dg/const-str-7.mm

Index: gcc/gcc/testsuite/obj-c++.dg/const-str-7.mm
diff --git a/gcc/gcc/testsuite/obj-c++.dg/const-str-7.mm b/gcc/gcc/testsuite/obj-c++.dg/const-str-7.mm
index 3691579381d3a931b3697862998782ab77bc1cd5..755b0452be20a3cefe2678f67191825c91ccef04 100644
--- a/gcc/gcc/testsuite/obj-c++.dg/const-str-7.mm
+++ b/gcc/gcc/testsuite/obj-c++.dg/const-str-7.mm
@@ -2,17 +2,16 @@
    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 "-fnext-runtime -fconstant-string-class=Foo -lobjc" } */
-/* { dg-do run { target *-*-darwin* } } */
-
-
+#include "../objc-obj-c++-shared/Object1.h"
+#include "../objc-obj-c++-shared/next-mapping.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <memory.h>
 #include <objc/objc.h>
-#include <objc/Object.h>
-
 
 @interface Foo: Object {
   char *cString;
@@ -21,8 +20,11 @@
 - (char *)customString;
 @end
 
+#ifdef NEXT_OBJC_USE_NEW_INTERFACE
+struct fudge_objc_class _FooClassReference;
+#else
 struct objc_class _FooClassReference;
-
+#endif
 
 @implementation Foo : Object
 - (char *)customString {
@@ -36,11 +38,10 @@ int main () {
   {
     Foo *string2 = @"bla";
 
-
     if(string != string2)
       abort();
     printf("Strings are being uniqued properly\n");
    }
   return 0;
 }
-
+#include "../objc-obj-c++-shared/Object1-implementation.h"