1 files changed, 7 insertions, 20 deletions
diff --git a/gcc/testsuite/obj-c++.dg/property/fsf-property-named-ivar.mm b/gcc/testsuite/obj-c++.dg/property/fsf-property-named-ivar.mm
index 4b29c92c7b1..8538a1f5601 100644
--- a/gcc/testsuite/obj-c++.dg/property/fsf-property-named-ivar.mm
+++ b/gcc/testsuite/obj-c++.dg/property/fsf-property-named-ivar.mm
@@ -1,25 +1,16 @@
 /* Basic test, auto-generated getter/setter based on named ivar  */
 /* { dg-do run } */
-/* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { ! objc2 } } } { "-fnext-runtime" } { "" } } */
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-extern int printf (const char *fmt,...) ;
-extern void abort (void);
-
-typedef struct objc_class *Class;
-
-#ifdef __NEXT_RUNTIME__
-
-extern id class_createInstance(Class, long);
-#define class_create_instance(C) class_createInstance(C, 0)
 
-#else
+extern int printf (const char *fmt,...);
+extern void abort (void);
 
-extern id class_create_instance(Class);
+#include <objc/objc.h>
+#include <objc/runtime.h>
 
-#endif
 #ifdef __cplusplus
 }
 #endif
@@ -27,11 +18,7 @@ extern id class_create_instance(Class);
 @interface Bar
 {
 @public
-#ifdef __NEXT_RUNTIME__
   Class isa;
-#else
-  Class class_pointer;
-#endif
   int var;
 }
 + (id) initialize;
@@ -44,11 +31,11 @@ extern id class_create_instance(Class);
 @implementation Bar
 
 +initialize { return self;}
-+ (id) alloc { return class_create_instance(self);}
++ (id) alloc { return class_createInstance (self, 0); }
 
 - (id) init {return self;}
 
-@property (ivar = var) int FooBar ;
+@synthesize FooBar = var;
 @end
 
 int main(int argc, char *argv[]) {
@@ -67,7 +54,7 @@ int main(int argc, char *argv[]) {
   if (res != 1234 )
     { printf ("[f FooBar] = %d\n",  res); abort ();}
   
-  /* Now check the short-cut CLASS.property syntax.  */
+  /* Now check the short-cut object.property syntax.  */
   /* Read .... */
   res = f.FooBar;
   if (res != 1234 )