[gcc] GCC 4.5.0=>4.5.1

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

Index: gcc/gcc/testsuite/obj-c++.dg/const-str-11.mm
diff --git a/gcc/gcc/testsuite/obj-c++.dg/const-str-11.mm b/gcc/gcc/testsuite/obj-c++.dg/const-str-11.mm
index 3b7ec7ad51f5c38aa82e87dd36ee2cbc3e0d63f1..ea9371091b8cf195541203fe80d19475936a359e 100644
--- a/gcc/gcc/testsuite/obj-c++.dg/const-str-11.mm
+++ b/gcc/gcc/testsuite/obj-c++.dg/const-str-11.mm
@@ -2,10 +2,11 @@
    constant string classes get derived.  */
 /* Contributed by Ziemowit Laski <zlaski@apple.com>  */
 
-/* { dg-options "-fnext-runtime -fconstant-string-class=XStr" } */
-/* { dg-do compile { target *-*-darwin* } } */
+/* { dg-do compile } */
+/* { dg-skip-if "" { *-*-* } { "-fgnu-runtime" } { "" } } */
+/* { dg-options "-fconstant-string-class=XStr" } */
 
-#include <objc/Object.h>
+#include "../objc-obj-c++-shared/Object1.h"
 
 @interface XString: Object {
 @protected
@@ -19,9 +20,14 @@
 }
 @end
 
+#ifndef NEXT_OBJC_USE_NEW_INTERFACE
 extern struct objc_class _XStrClassReference;
+#else
+extern Class _XStrClassReference;
+#endif
 
 const XStr *appKey = @"MyApp";
 
 /* { dg-final { scan-assembler ".section __OBJC, __cstring_object" } } */
-/* { dg-final { scan-assembler ".long\t__XStrClassReference\n\t.long\t.*\n\t.long\t5\n\t.data" } } */
+/* { dg-final { scan-assembler ".long\t__XStrClassReference\n\t.long\t.*\n\t.long\t5\n\t.data" { target { *-*-darwin* && { ! lp64 } } } } } */
+/* { dg-final { scan-assembler ".quad\t__XStrClassReference\n\t.quad\t.*\n\t.long\t5\n\t.space 4\n\t.data" { target { *-*-darwin* && { lp64 } } } } } */