restore darwin8 objc/c++ test functionality.

	* objc-obj-c++-shared/next-abi.h: Remove dependency on system
	headers.  Add clause to reflect that, pre-10.5, ABI is always 0.
	* objc/execute/forward-1.m: Depend only on __NEXT_RUNTIME__ for
	the method types to forward:.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@161687 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9c91245..8d84acd 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-02  Iain Sandoe  <iains@gcc.gnu.org>
+
+       * objc-obj-c++-shared/next-abi.h: Remove dependency on system
+       headers.  Add clause to reflect that, pre-10.5, ABI is always 0.
+       * objc/execute/forward-1.m: Depend only on __NEXT_RUNTIME__ for
+       the method types to forward:.
+
 2010-06-30  Jason Merrill  <jason@redhat.com>
 
        * g++.dg/cpp0x/nullptr04.C: Use __INTPTR_TYPE__.

diff --git a/gcc/testsuite/objc-obj-c++-shared/next-abi.h b/gcc/testsuite/objc-obj-c++-shared/next-abi.h
index 21a49d3..3ab9804 100644 (file)
--- a/gcc/testsuite/objc-obj-c++-shared/next-abi.h
+++ b/gcc/testsuite/objc-obj-c++-shared/next-abi.h
@@ -19,7 +19,7 @@
 #undef NEXT_OBJC_USE_NEW_INTERFACE
 
 #ifdef __NEXT_RUNTIME__
-#  if (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 || __OBJC2__)
+#  if (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050 || __OBJC2__)
     /* We have to use an updated interface for 32bit NeXT to avoid
      * 'deprecated' warnings. 
      * For 64bit NeXT the ABI is different (and the interfaces 'deprecated'
@@ -36,7 +36,10 @@
        */
 #      define NEXT_OBJC_ABI_VERSION 0
 #    endif
-#  endif
-#endif
+#  else
+      /* Pre-OSX 10.5 all is ABI 0.  */
+#     define NEXT_OBJC_ABI_VERSION 0
+#  endif /* MAC_OS_X_VERSION_MIN_REQUIRED > 10.5 or OBJC2 */
+#endif /* __NEXT_RUNTIME__ */
 
 #endif /* _OBJC_NEXT_ABI_H_ */

diff --git a/gcc/testsuite/objc/execute/forward-1.m b/gcc/testsuite/objc/execute/forward-1.m
index c20f8c4..258a916 100644 (file)
--- a/gcc/testsuite/objc/execute/forward-1.m
+++ b/gcc/testsuite/objc/execute/forward-1.m
@@ -55,13 +55,12 @@ id forwarder, receiver;
     receiver = theReceiver;
     return self;
 }
-#ifdef NEXT_OBJC_USE_NEW_INTERFACE
+#ifdef __NEXT_RUNTIME__
 - forward: (SEL)theSel: (marg_list)theArgFrame
-{
 #else
 -(retval_t) forward: (SEL)theSel: (arglist_t)theArgFrame
-{
 #endif
+{
   /* If we have a reciever try to perform on that object */
     if (receiver)
         return [receiver performv: theSel: theArgFrame];