diff options
| author | Iain Sandoe <iains@gcc.gnu.org> | 2010-09-30 09:50:55 +0000 |
|---|---|---|
| committer | Iain Sandoe <iains@gcc.gnu.org> | 2010-09-30 09:50:55 +0000 |
| commit | fb9061be7ca8ad0ff459ade8290fd68bb390f24c (patch) | |
| tree | 402838192c43e1a95d4828158b9774939e32c698 | |
| parent | 3bc33871ce3b2eec4048232dc94c92980ee7e4b0 (diff) | |
| download | gcc-fb9061be7ca8ad0ff459ade8290fd68bb390f24c.zip gcc-fb9061be7ca8ad0ff459ade8290fd68bb390f24c.tar.gz gcc-fb9061be7ca8ad0ff459ade8290fd68bb390f24c.tar.bz2 | |
add files missed on previous commit.
From-SVN: r164748
| -rw-r--r-- | gcc/testsuite/obj-c++.dg/const-str-12.mm | 5 | ||||
| -rw-r--r-- | gcc/testsuite/obj-c++.dg/const-str-7.mm | 2 | ||||
| -rw-r--r-- | gcc/testsuite/obj-c++.dg/method-22.mm | 2 | ||||
| -rw-r--r-- | gcc/testsuite/obj-c++.dg/method-23.mm | 2 | ||||
| -rw-r--r-- | gcc/testsuite/obj-c++.dg/threedotthree-abi-1.mm | 2 |
5 files changed, 12 insertions, 1 deletions
diff --git a/gcc/testsuite/obj-c++.dg/const-str-12.mm b/gcc/testsuite/obj-c++.dg/const-str-12.mm index d6bb1be..b92b50b 100644 --- a/gcc/testsuite/obj-c++.dg/const-str-12.mm +++ b/gcc/testsuite/obj-c++.dg/const-str-12.mm @@ -5,6 +5,7 @@ /* { dg-do compile } */ #include "../objc-obj-c++-shared/Object1.h" +#import "../objc-obj-c++-shared/next-mapping.h" @interface Foo: Object { char *cString; @@ -17,7 +18,11 @@ + (Foo *) getString: (int) which; @end +#ifdef NEXT_OBJC_USE_NEW_INTERFACE +struct fudge_objc_class _FooClassReference; +#else struct objc_class _FooClassReference; +#endif @implementation Bar + (Foo *) getString: (int) which { diff --git a/gcc/testsuite/obj-c++.dg/const-str-7.mm b/gcc/testsuite/obj-c++.dg/const-str-7.mm index 755b045..fc423bd 100644 --- a/gcc/testsuite/obj-c++.dg/const-str-7.mm +++ b/gcc/testsuite/obj-c++.dg/const-str-7.mm @@ -10,7 +10,7 @@ #include "../objc-obj-c++-shared/next-mapping.h" #include <stdio.h> #include <stdlib.h> -#include <memory.h> +#include <string.h> #include <objc/objc.h> @interface Foo: Object { diff --git a/gcc/testsuite/obj-c++.dg/method-22.mm b/gcc/testsuite/obj-c++.dg/method-22.mm index 583607b..610c178 100644 --- a/gcc/testsuite/obj-c++.dg/method-22.mm +++ b/gcc/testsuite/obj-c++.dg/method-22.mm @@ -1,6 +1,8 @@ /* Ensure that overload resolution does not produce warnings as side-effects. */ /* { dg-do run } */ +/* { dg-additional-sources "../objc-obj-c++-shared/Object1.mm" } */ +/* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { ! objc2 } } } { "-fnext-runtime" } { "" } } */ #include "../objc-obj-c++-shared/Object1.h" #include <stdlib.h> diff --git a/gcc/testsuite/obj-c++.dg/method-23.mm b/gcc/testsuite/obj-c++.dg/method-23.mm index 9b8625a..2b59cb8 100644 --- a/gcc/testsuite/obj-c++.dg/method-23.mm +++ b/gcc/testsuite/obj-c++.dg/method-23.mm @@ -2,6 +2,8 @@ they should. */ /* { dg-do run } */ /* { dg-options "-O2" } */ +/* { dg-additional-sources "../objc-obj-c++-shared/Object1.mm" } */ +/* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { ! objc2 } } } { "-fnext-runtime" } { "" } } */ #include "../objc-obj-c++-shared/Object1.h" #include <string.h> diff --git a/gcc/testsuite/obj-c++.dg/threedotthree-abi-1.mm b/gcc/testsuite/obj-c++.dg/threedotthree-abi-1.mm index 56fa701..672a311 100644 --- a/gcc/testsuite/obj-c++.dg/threedotthree-abi-1.mm +++ b/gcc/testsuite/obj-c++.dg/threedotthree-abi-1.mm @@ -1,7 +1,9 @@ /* This file tests that things are encoded using the gcc-3.3 ABI which is only used by the NeXT runtime. */ /* { dg-do run { target *-*-darwin* } } */ +/* { dg-require-effective-target ilp32 } */ /* { dg-skip-if "" { *-*-* } { "-fgnu-runtime" } { "" } } */ + #include <stdio.h> #include <string.h> #include "../objc-obj-c++-shared/Protocol1.h" |