[gcc] GCC 4.5.0=>4.5.1

gcc/gcc/testsuite/objc.dg/const-str-9.m

Index: gcc/gcc/testsuite/objc.dg/const-str-9.m
diff --git a/gcc/gcc/testsuite/objc.dg/const-str-9.m b/gcc/gcc/testsuite/objc.dg/const-str-9.m
index 033337452d4efc43b386ba44e87ba70338df2a17..86521c2cead85e709ec3208560c1630e759fd702 100644
--- a/gcc/gcc/testsuite/objc.dg/const-str-9.m
+++ b/gcc/gcc/testsuite/objc.dg/const-str-9.m
@@ -1,10 +1,10 @@
 /* Test if ObjC constant strings get placed in the correct section.  */
 /* Contributed by Ziemowit Laski <zlaski@apple.com>  */
 
-/* { dg-options "-fnext-runtime" } */
-/* { dg-do compile { target *-*-darwin* } } */
+/* { dg-do compile } */
+/* { dg-skip-if "" { *-*-* } { "-fgnu-runtime" } { "" } } */
 
-#include <objc/Object.h>
+#include "../objc-obj-c++-shared/Object1.h"
 
 @interface NSConstantString: Object {
   char *cString;
@@ -12,9 +12,14 @@
 }
 @end
 
+#ifndef NEXT_OBJC_USE_NEW_INTERFACE
 extern struct objc_class _NSConstantStringClassReference;
+#else
+Class _NSConstantStringClassReference;
+#endif
 
-static const NSConstantString *appKey = @"MyApp";
+const NSConstantString *appKey = @"MyApp";
 
 /* { dg-final { scan-assembler ".section __OBJC, __cstring_object" } } */
-/* { dg-final { scan-assembler ".long\t__NSConstantStringClassReference\n\t.long\t.*\n\t.long\t5\n\t.data" } } */
+/* { dg-final { scan-assembler ".long\t__NSConstantStringClassReference\n\t.long\t.*\n\t.long\t5\n\t.data" { target { *-*-darwin* && { ! lp64 } } } } } */
+/* { dg-final { scan-assembler ".quad\t__NSConstantStringClassReference\n\t.quad\t.*\n\t.long\t5\n\t.space" { target { *-*-darwin* && { lp64 } } } } } */