1 files changed, 17 insertions, 28 deletions

diff --git a/gcc/testsuite/obj-c++.dg/property/fsf-property-basic.mm b/gcc/testsuite/obj-c++.dg/property/fsf-property-basic.mm
index 502ac0d806e..e7f8cbb7730 100644
--- a/gcc/testsuite/obj-c++.dg/property/fsf-property-basic.mm
+++ b/gcc/testsuite/obj-c++.dg/property/fsf-property-basic.mm
@@ -1,26 +1,16 @@
 /* Basic test, auto-generated getter/setter based on property name.  */
 /* { 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 int printf (const char *fmt,...);
 extern void abort (void);
 
-typedef struct objc_class *Class;
+#include <objc/objc.h>
+#include <objc/runtime.h>
 
-#ifdef __NEXT_RUNTIME__
-
-extern id class_createInstance(Class, long);
-#define class_create_instance(C) class_createInstance(C, 0)
-
-#else
-
-extern id class_create_instance(Class);
-
-#endif
 #ifdef __cplusplus
 }
 #endif
@@ -28,28 +18,25 @@ extern id class_create_instance(Class);
 @interface Bar
 {
 @public
-#ifdef __NEXT_RUNTIME__
   Class isa;
-#else
-  Class class_pointer;
-#endif
-  int var;
+  int FooBar;
 }
 + (id) initialize;
 + (id) alloc ;
- - (id) init;
-
+- (id) init;
+- (int) whatIsFooBar;
 @property int FooBar;
 @end
 
 @implementation Bar
 
 +initialize { return self;}
-+ (id) alloc { return class_create_instance(self);}
++ (id) alloc { return class_createInstance (self, 0); }
 
 - (id) init {return self;}
 
-@property int FooBar ;
+- (int) whatIsFooBar { return self->FooBar; }
+@synthesize FooBar;
 @end
 
 int main(int argc, char *argv[]) {
@@ -60,21 +47,23 @@ int main(int argc, char *argv[]) {
      and operate correctly.  */
   [f setFooBar:1];
 
-  if (f->_FooBar != 1)
-    { printf ("setFooBar did not set _FooBar\n"); abort ();}
+  if ([f whatIsFooBar] != 1)
+    { printf ("setFooBar did not set FooBar\n"); abort ();}
       
   res = [f FooBar];
     
   if (res != 1 )
     { 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 != 1 )
-    { printf ("f,FooBar = %d\n",  res); abort ();}
-    
+    { printf ("f.FooBar = %d\n",  res); abort ();}
+  
+  /* .... write. */
   f.FooBar = 0;
-  printf ("seems OK\n",  res);
+  /* printf ("seems OK\n",  res); */
   return f.FooBar;
 }