summaryrefslogtreecommitdiff
path: root/gcc/testsuite/obj-c++.dg/torture
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/testsuite/obj-c++.dg/torture')
-rw-r--r--gcc/testsuite/obj-c++.dg/torture/dg-torture.exp17
-rw-r--r--gcc/testsuite/obj-c++.dg/torture/strings/const-cfstring-1.mm62
-rw-r--r--gcc/testsuite/obj-c++.dg/torture/strings/const-cfstring-3.mm27
-rw-r--r--gcc/testsuite/obj-c++.dg/torture/strings/const-cfstring-4.mm21
-rw-r--r--gcc/testsuite/obj-c++.dg/torture/strings/const-str-10.mm35
-rw-r--r--gcc/testsuite/obj-c++.dg/torture/strings/const-str-11.mm35
-rw-r--r--gcc/testsuite/obj-c++.dg/torture/strings/const-str-3.mm57
-rw-r--r--gcc/testsuite/obj-c++.dg/torture/strings/const-str-4.mm33
-rw-r--r--gcc/testsuite/obj-c++.dg/torture/strings/const-str-7.mm46
-rw-r--r--gcc/testsuite/obj-c++.dg/torture/strings/const-str-8.mm44
-rw-r--r--gcc/testsuite/obj-c++.dg/torture/strings/const-str-9.mm27
-rw-r--r--gcc/testsuite/obj-c++.dg/torture/strings/string1.mm25
-rw-r--r--gcc/testsuite/obj-c++.dg/torture/strings/strings.exp34
-rw-r--r--gcc/testsuite/obj-c++.dg/torture/tls/diag-1.mm12
-rw-r--r--gcc/testsuite/obj-c++.dg/torture/tls/thr-init-1.mm25
-rw-r--r--gcc/testsuite/obj-c++.dg/torture/tls/thr-init-2.mm45
-rw-r--r--gcc/testsuite/obj-c++.dg/torture/tls/thr-init-3.mm41
-rw-r--r--gcc/testsuite/obj-c++.dg/torture/tls/tls.exp16
-rw-r--r--gcc/testsuite/obj-c++.dg/torture/tls/trivial.mm3
-rw-r--r--gcc/testsuite/obj-c++.dg/torture/trivial.mm12
20 files changed, 617 insertions, 0 deletions
diff --git a/gcc/testsuite/obj-c++.dg/torture/dg-torture.exp b/gcc/testsuite/obj-c++.dg/torture/dg-torture.exp
new file mode 100644
index 000000000..9ef34e995
--- /dev/null
+++ b/gcc/testsuite/obj-c++.dg/torture/dg-torture.exp
@@ -0,0 +1,17 @@
+# This harness is for tests that should be run at all optimisation levels.
+
+load_lib obj-c++-dg.exp
+
+dg-init
+
+# Gather a list of all tests.
+set tests [lsort [glob -nocomplain $srcdir/$subdir/*.mm]]
+
+obj-c++-dg-runtest $tests "-fgnu-runtime"
+
+# darwin targets can also run code with the NeXT runtime.
+if [istarget "*-*-darwin*" ] {
+ obj-c++-dg-runtest $tests "-fnext-runtime"
+}
+
+dg-finish
diff --git a/gcc/testsuite/obj-c++.dg/torture/strings/const-cfstring-1.mm b/gcc/testsuite/obj-c++.dg/torture/strings/const-cfstring-1.mm
new file mode 100644
index 000000000..2983c43c4
--- /dev/null
+++ b/gcc/testsuite/obj-c++.dg/torture/strings/const-cfstring-1.mm
@@ -0,0 +1,62 @@
+/* Test the -fconstant-cfstrings option for constructing
+ compile-time immutable CFStrings, and their interoperation
+ with both Cocoa and CoreFoundation. This will only work
+ on MacOS X 10.1.2 and later. */
+/* Developed by Ziemowit Laski <zlaski@apple.com>. */
+
+/* So far, CFString is darwin-only. */
+/* { dg-do run { target *-*-darwin* } } */
+/* { dg-skip-if "NeXT only" { *-*-* } { "-fgnu-runtime" } { "" } } */
+/* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { ! objc2 } } } { "-fnext-runtime" } { "" } } */
+/* { dg-options "-mconstant-cfstrings -framework Cocoa" } */
+/* Darwin10's linker emits a warning that the constant strings are incompatible with writable ones.
+ well, we don't implement writable ones at this juncture. */
+/* { dg-options "-mconstant-cfstrings -framework Cocoa -Wl,-w" { target *-*-darwin[123]* } } */
+
+#import <Foundation/NSString.h>
+#import <CoreFoundation/CFString.h>
+#include <stdlib.h>
+
+void printOut(NSString *str) {
+ NSLog(@"The value of str is: %@", str);
+}
+
+CFStringRef s0a = CFSTR("Compile-time string literal");
+CFStringRef s0b = CFSTR("Compile-time string literal");
+
+void checkNSRange(NSRange r) {
+ if (r.location != 6 || r.length != 5) {
+ printOut(@"Range check failed");
+ abort();
+ }
+}
+
+void checkCFRange(CFRange r) {
+ if (r.location != 6 || r.length != 5) {
+ printOut(@"Range check failed");
+ abort();
+ }
+}
+
+int main(void) {
+ const NSString *s1 = @"Compile-time string literal";
+ CFStringRef s2 = CFSTR("Compile-time string literal");
+
+ checkNSRange([@"Hello World" rangeOfString:@"World"]);
+ checkNSRange([(id)CFSTR("Hello World") rangeOfString:@"World"]);
+ checkNSRange([@"Hello World" rangeOfString:(id)CFSTR("World")]);
+ checkNSRange([(id)CFSTR("Hello World") rangeOfString:(id)CFSTR("World")]);
+
+ checkCFRange(CFStringFind((CFStringRef)@"Hello World", (CFStringRef)@"World", 0));
+ checkCFRange(CFStringFind(CFSTR("Hello World"), (CFStringRef)@"World", 0));
+ checkCFRange(CFStringFind((CFStringRef)@"Hello World", CFSTR("World"), 0));
+ checkCFRange(CFStringFind(CFSTR("Hello World"), CFSTR("World"), 0));
+
+ /* Check for string uniquing. */
+ if (s0a != s0b || s0a != s2 || s1 != (id)s2) {
+ NSLog(@"String uniquing failed");
+ abort ();
+ }
+
+ return 0;
+}
diff --git a/gcc/testsuite/obj-c++.dg/torture/strings/const-cfstring-3.mm b/gcc/testsuite/obj-c++.dg/torture/strings/const-cfstring-3.mm
new file mode 100644
index 000000000..4a6142988
--- /dev/null
+++ b/gcc/testsuite/obj-c++.dg/torture/strings/const-cfstring-3.mm
@@ -0,0 +1,27 @@
+/* Test for assigning compile-time constant-string objects to static variables. */
+/* Contributed by Ziemowit Laski <zlaski@apple.com> */
+
+/* So far, CFString is darwin-only. */
+/* { dg-do run { target *-*-darwin* } } */
+/* { dg-skip-if "NeXT only" { *-*-* } { "-fgnu-runtime" } { "" } } */
+/* { dg-options "-mconstant-cfstrings -framework Foundation" } */
+
+#include <stdlib.h>
+
+typedef const struct __CFString * CFStringRef;
+static CFStringRef appKey = (CFStringRef) @"com.apple.soundpref";
+
+static int CFPreferencesSynchronize (CFStringRef ref) {
+ return ref == appKey;
+}
+
+static void PrefsSynchronize()
+{
+ if(!CFPreferencesSynchronize(appKey))
+ abort();
+}
+
+int main(void) {
+ PrefsSynchronize();
+ return 0;
+}
diff --git a/gcc/testsuite/obj-c++.dg/torture/strings/const-cfstring-4.mm b/gcc/testsuite/obj-c++.dg/torture/strings/const-cfstring-4.mm
new file mode 100644
index 000000000..1155db5f8
--- /dev/null
+++ b/gcc/testsuite/obj-c++.dg/torture/strings/const-cfstring-4.mm
@@ -0,0 +1,21 @@
+/* Test if constant CFStrings get placed in the correct section and that the
+ layout of the object is correct for both m32 and m64. */
+/* Contributed by Ziemowit Laski <zlaski@apple.com> */
+
+/* So far, CFString is darwin-only. */
+/* { dg-do compile { target *-*-darwin* } } */
+/* { dg-skip-if "NeXT only" { *-*-* } { "-fgnu-runtime" } { "" } } */
+/* { dg-options "-mconstant-cfstrings" } */
+
+typedef const struct __CFString * CFStringRef;
+static CFStringRef appKey = (CFStringRef) @"com.apple.soundpref";
+
+void *foo (void)
+{
+ void *a = (void *)appKey;
+ return a;
+}
+
+/* { dg-final { scan-assembler ".section __DATA, __cfstring" } } */
+/* { dg-final { scan-assembler ".long\t___CFConstantStringClassReference\n\t.long\t1992\n\t.long\t.*\n\t.long\t19\n" { target { *-*-darwin* && { ! lp64 } } } } } */
+/* { dg-final { scan-assembler ".quad\t___CFConstantStringClassReference\n\t.long\t1992\n\t.space 4\n\t.quad\t.*\n\t.quad\t19\n" { target { *-*-darwin* && { lp64 } } } } } */
diff --git a/gcc/testsuite/obj-c++.dg/torture/strings/const-str-10.mm b/gcc/testsuite/obj-c++.dg/torture/strings/const-str-10.mm
new file mode 100644
index 000000000..3cb3acfae
--- /dev/null
+++ b/gcc/testsuite/obj-c++.dg/torture/strings/const-str-10.mm
@@ -0,0 +1,35 @@
+/* Test if ObjC constant string layout is checked properly, regardless of how
+ constant string classes get derived. */
+/* Contributed by Ziemowit Laski <zlaski@apple.com> */
+
+/* { dg-do compile } */
+/* { dg-skip-if "" { *-*-* } { "-fgnu-runtime" } { "" } } */
+/* { dg-options "-mno-constant-cfstrings" { target *-*-darwin* } } */
+
+#include "../../../objc-obj-c++-shared/Object1.h"
+
+@interface NSString: Object
+@end
+
+@interface NSSimpleCString : NSString {
+@protected
+ char *bytes;
+ unsigned int numBytes;
+}
+@end
+
+@interface NSConstantString : NSSimpleCString
+@end
+
+#ifdef NEXT_OBJC_USE_NEW_INTERFACE
+Class _NSConstantStringClassReference;
+#else
+extern struct objc_class _NSConstantStringClassReference;
+#endif
+
+const NSConstantString *appKey = @"MyApp";
+
+/* { dg-final { scan-assembler ".section __OBJC, __cstring_object" { target { *-*-darwin* && { ! lp64 } } } } } */
+/* { dg-final { scan-assembler ".section __DATA, __objc_stringobj" { target { *-*-darwin* && { lp64 } } } } } */
+/* { 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_OBJC_CLASS_._NSConstantString\n\t.quad\t.*\n\t.long\t5\n\t.space" { target { *-*-darwin* && { lp64 } } } } } */
diff --git a/gcc/testsuite/obj-c++.dg/torture/strings/const-str-11.mm b/gcc/testsuite/obj-c++.dg/torture/strings/const-str-11.mm
new file mode 100644
index 000000000..8674646d8
--- /dev/null
+++ b/gcc/testsuite/obj-c++.dg/torture/strings/const-str-11.mm
@@ -0,0 +1,35 @@
+/* Test if ObjC constant string layout is checked properly, regardless of how
+ constant string classes get derived. */
+/* Contributed by Ziemowit Laski <zlaski@apple.com> */
+
+/* { dg-do compile } */
+/* { dg-skip-if "" { *-*-* } { "-fgnu-runtime" } { "" } } */
+/* { dg-options "-fconstant-string-class=XStr" } */
+/* { dg-options "-mno-constant-cfstrings -fconstant-string-class=XStr" { target *-*-darwin* } } */
+
+#include "../../../objc-obj-c++-shared/Object1.h"
+
+@interface XString: Object {
+@protected
+ char *bytes;
+}
+@end
+
+@interface XStr : XString {
+@public
+ unsigned int len;
+}
+@end
+
+#ifdef NEXT_OBJC_USE_NEW_INTERFACE
+extern Class _XStrClassReference;
+#else
+extern struct objc_class _XStrClassReference;
+#endif
+
+const XStr *appKey = @"MyApp";
+
+/* { dg-final { scan-assembler ".section __OBJC, __cstring_object" { target { *-*-darwin* && { ! lp64 } } } } } */
+/* { dg-final { scan-assembler ".section __DATA, __objc_stringobj" { target { *-*-darwin* && { lp64 } } } } } */
+/* { dg-final { scan-assembler ".long\t__XStrClassReference\n\t.long\t.*\n\t.long\t5\n\t.data" { target { *-*-darwin* && { ! lp64 } } } } } */
+/* { dg-final { scan-assembler ".quad\t_OBJC_CLASS_._XStr\n\t.quad\t.*\n\t.long\t5\n\t.space" { target { *-*-darwin* && { lp64 } } } } } */
diff --git a/gcc/testsuite/obj-c++.dg/torture/strings/const-str-3.mm b/gcc/testsuite/obj-c++.dg/torture/strings/const-str-3.mm
new file mode 100644
index 000000000..461d97b19
--- /dev/null
+++ b/gcc/testsuite/obj-c++.dg/torture/strings/const-str-3.mm
@@ -0,0 +1,57 @@
+/* Test the -fconstant-string-class=Foo option under the NeXT
+ runtime. */
+/* Developed by Markus Hitter <mah@jump-ing.de>. */
+
+/* { dg-do run { target *-*-darwin* } } */
+/* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { ! objc2 } } } { "-fnext-runtime" } { "" } } */
+/* { dg-options "-fconstant-string-class=Foo" } */
+/* { dg-options "-mno-constant-cfstrings -fconstant-string-class=Foo" { target *-*-darwin* } } */
+
+#include "../../../objc-obj-c++-shared/objc-test-suite-types.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+@interface Foo {
+ void *dummy_class_ref;
+ char *cString;
+ unsigned int len;
+}
++ initialize;
+- (char *)customString;
+@end
+
+TNS_STRING_REF_T _FooClassReference; /* Only used by NeXT. */
+
+@implementation Foo
++ initialize {return self;}
+- (char *)customString {
+ return cString;
+}
+@end
+
+int main () {
+ Foo *string = @"bla";
+ Foo *string2 = @"bla";
+
+ if(string != string2)
+ abort();
+ printf("Strings are being uniqued properly\n");
+
+#ifdef __NEXT_RUNTIME__
+ /* This memcpy has to be done before the first message is sent to a
+ constant string object. Can't be moved to +initialize since _that_
+ is already a message. */
+
+ memcpy(&_FooClassReference, objc_getClass("Foo"), sizeof(_FooClassReference));
+#endif
+
+ if (strcmp ([string customString], "bla")) {
+ abort ();
+ }
+
+ printf([@"This is a working constant string object\n" customString]);
+ return 0;
+}
+
diff --git a/gcc/testsuite/obj-c++.dg/torture/strings/const-str-4.mm b/gcc/testsuite/obj-c++.dg/torture/strings/const-str-4.mm
new file mode 100644
index 000000000..c2cadd3df
--- /dev/null
+++ b/gcc/testsuite/obj-c++.dg/torture/strings/const-str-4.mm
@@ -0,0 +1,33 @@
+/* Ensure that the preprocessor handles ObjC string constants gracefully. */
+/* Author: Ziemowit Laski <zlaski@apple.com> */
+
+/* { dg-do run { target *-*-darwin* } } */
+/* { dg-options "-fconstant-string-class=MyString" } */
+/* { dg-options "-mno-constant-cfstrings -fconstant-string-class=MyString" { target *-*-darwin* } } */
+
+#include <stdlib.h>
+
+@interface MyString
+{
+ void *isa;
+ char *str;
+ int len;
+}
+@end
+
+#define kMyStringMacro1 "My String"
+#define kMyStringMacro2 @"My String"
+
+void *_MyStringClassReference;
+
+@implementation MyString
+@end
+
+int main(void) {
+ MyString* aString1 = @kMyStringMacro1;
+ MyString* aString2 = kMyStringMacro2;
+ if(aString1 != aString2) {
+ abort();
+ }
+ return 0;
+}
diff --git a/gcc/testsuite/obj-c++.dg/torture/strings/const-str-7.mm b/gcc/testsuite/obj-c++.dg/torture/strings/const-str-7.mm
new file mode 100644
index 000000000..d58cb91a7
--- /dev/null
+++ b/gcc/testsuite/obj-c++.dg/torture/strings/const-str-7.mm
@@ -0,0 +1,46 @@
+/* Test to make sure that the const objc strings are the same across
+ scopes. */
+/* Developed by Andrew Pinski <pinskia@physics.uc.edu> */
+
+/* { dg-do run } */
+/* { dg-options "-fconstant-string-class=Foo" } */
+/* { dg-options "-mno-constant-cfstrings -fconstant-string-class=Foo" { target *-*-darwin* } } */
+/* { dg-additional-sources "../../../objc-obj-c++-shared/Object1.mm" } */
+
+#include "../../../objc-obj-c++-shared/Object1.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <objc/objc.h>
+
+@interface Foo: Object {
+ char *cString;
+ unsigned int len;
+}
+- (char *)customString;
+@end
+
+#ifdef NEXT_OBJC_USE_NEW_INTERFACE
+Class _FooClassReference;
+#else
+struct objc_class _FooClassReference;
+#endif
+
+@implementation Foo : Object
+- (char *)customString {
+ return cString;
+}
+@end
+
+
+int main () {
+ Foo *string = @"bla";
+ {
+ Foo *string2 = @"bla";
+
+ if(string != string2)
+ abort();
+ printf("Strings are being uniqued properly\n");
+ }
+ return 0;
+}
diff --git a/gcc/testsuite/obj-c++.dg/torture/strings/const-str-8.mm b/gcc/testsuite/obj-c++.dg/torture/strings/const-str-8.mm
new file mode 100644
index 000000000..17997b628
--- /dev/null
+++ b/gcc/testsuite/obj-c++.dg/torture/strings/const-str-8.mm
@@ -0,0 +1,44 @@
+/* Test for assigning compile-time constant-string objects to static variables. */
+/* Contributed by Ziemowit Laski <zlaski@apple.com> */
+
+/* { dg-do run { target *-*-darwin* } } */
+/* { dg-options "-fconstant-string-class=Foo" } */
+/* { dg-options "-mno-constant-cfstrings -fconstant-string-class=Foo" { target *-*-darwin* } } */
+/* { dg-additional-sources "../../../objc-obj-c++-shared/Object1.mm" } */
+
+#include "../../../objc-obj-c++-shared/Object1.h"
+#include <stdlib.h>
+
+@interface Foo: Object {
+ char *cString;
+ unsigned int len;
+}
+@end
+
+#ifdef NEXT_OBJC_USE_NEW_INTERFACE
+Class _FooClassReference;
+#else
+struct objc_class _FooClassReference;
+#endif
+
+@implementation Foo : Object
+- (char *)customString {
+ return cString;
+}
+@end
+
+static const Foo *appKey = @"MyApp";
+static int CFPreferencesSynchronize (const Foo *ref) {
+ return ref == appKey;
+}
+
+static void PrefsSynchronize(void)
+{
+ if(!CFPreferencesSynchronize(appKey))
+ abort();
+}
+
+int main () {
+ PrefsSynchronize();
+ return 0;
+}
diff --git a/gcc/testsuite/obj-c++.dg/torture/strings/const-str-9.mm b/gcc/testsuite/obj-c++.dg/torture/strings/const-str-9.mm
new file mode 100644
index 000000000..e05c62b88
--- /dev/null
+++ b/gcc/testsuite/obj-c++.dg/torture/strings/const-str-9.mm
@@ -0,0 +1,27 @@
+/* Test if ObjC constant strings get placed in the correct section. */
+/* Contributed by Ziemowit Laski <zlaski@apple.com> */
+
+/* { dg-do compile } */
+/* { dg-skip-if "" { *-*-* } { "-fgnu-runtime" } { "" } } */
+/* { dg-options "-mno-constant-cfstrings" { target *-*-darwin* } } */
+
+#include "../../../objc-obj-c++-shared/Object1.h"
+
+@interface NSConstantString: Object {
+ char *cString;
+ unsigned int len;
+}
+@end
+
+#ifdef NEXT_OBJC_USE_NEW_INTERFACE
+Class _NSConstantStringClassReference;
+#else
+extern struct objc_class _NSConstantStringClassReference;
+#endif
+
+const NSConstantString *appKey = @"MyApp";
+
+/* { dg-final { scan-assembler ".section __OBJC, __cstring_object" { target { *-*-darwin* && { ! lp64 } } } } } */
+/* { dg-final { scan-assembler ".section __DATA, __objc_stringobj" { target { *-*-darwin* && { lp64 } } } } } */
+/* { 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_OBJC_CLASS_._NSConstantString\n\t.quad\t.*\n\t.long\t5\n\t.space" { target { *-*-darwin* && { lp64 } } } } } */
diff --git a/gcc/testsuite/obj-c++.dg/torture/strings/string1.mm b/gcc/testsuite/obj-c++.dg/torture/strings/string1.mm
new file mode 100644
index 000000000..deacf43b3
--- /dev/null
+++ b/gcc/testsuite/obj-c++.dg/torture/strings/string1.mm
@@ -0,0 +1,25 @@
+/* Based on a test case contributed by Nicola Pero. */
+
+/* { dg-do run } */
+/* { dg-options "-mno-constant-cfstrings" { target *-*-darwin* } } */
+/* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { ! objc2 } } } { "-fnext-runtime" } { "" } } */
+/* { dg-additional-sources "../../../objc-obj-c++-shared/Object1.mm ../../../objc-obj-c++-shared/nsconstantstring-class-impl.mm" } */
+
+#include "../../../objc-obj-c++-shared/Object1.h"
+#include "../../../objc-obj-c++-shared/next-mapping.h"
+
+#include <string.h>
+#include <stdlib.h>
+
+#ifndef __NEXT_RUNTIME__
+#include <objc/NXConstStr.h>
+#else
+#include "../../../objc-obj-c++-shared/nsconstantstring-class.h"
+#endif
+
+int main(int argc, char **args)
+{
+ if (strcmp ([@"this is a string" cString], "this is a string"))
+ abort ();
+ return 0;
+}
diff --git a/gcc/testsuite/obj-c++.dg/torture/strings/strings.exp b/gcc/testsuite/obj-c++.dg/torture/strings/strings.exp
new file mode 100644
index 000000000..180401c3b
--- /dev/null
+++ b/gcc/testsuite/obj-c++.dg/torture/strings/strings.exp
@@ -0,0 +1,34 @@
+# String tests that should be run at all optimization levels.
+
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# This file is part of GCC.
+#
+# GCC is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GCC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GCC; see the file COPYING3. If not see
+# <http://www.gnu.org/licenses/>.
+
+load_lib obj-c++-dg.exp
+
+dg-init
+# Gather a list of all tests.
+set tests [lsort [glob -nocomplain $srcdir/$subdir/*.mm]]
+
+obj-c++-dg-runtest $tests "-fgnu-runtime"
+
+# Darwin targets can also run code with the NeXT runtime.
+if [istarget "*-*-darwin*" ] {
+ obj-c++-dg-runtest $tests "-fnext-runtime"
+}
+
+dg-finish
diff --git a/gcc/testsuite/obj-c++.dg/torture/tls/diag-1.mm b/gcc/testsuite/obj-c++.dg/torture/tls/diag-1.mm
new file mode 100644
index 000000000..7c3245d9f
--- /dev/null
+++ b/gcc/testsuite/obj-c++.dg/torture/tls/diag-1.mm
@@ -0,0 +1,12 @@
+// Valid __thread specifiers.
+// { dg-require-effective-target tls }
+
+__thread int g1;
+extern __thread int g2;
+static __thread int g3;
+
+void foo()
+{
+ extern __thread int l1;
+ static __thread int l2;
+}
diff --git a/gcc/testsuite/obj-c++.dg/torture/tls/thr-init-1.mm b/gcc/testsuite/obj-c++.dg/torture/tls/thr-init-1.mm
new file mode 100644
index 000000000..62e322ed1
--- /dev/null
+++ b/gcc/testsuite/obj-c++.dg/torture/tls/thr-init-1.mm
@@ -0,0 +1,25 @@
+// { dg-do run }
+// { dg-require-effective-target tls }
+// { dg-add-options tls }
+
+extern "C" {
+extern void abort ();
+}
+
+static __thread int fstat = 1;
+
+int test_code(int b)
+{
+ fstat += b ;
+ return fstat;
+}
+
+int main (int ac, char *av[])
+{
+ int a = test_code(1);
+
+ if ( a != 2 || fstat != 2 )
+ abort ();
+
+ return 0;
+}
diff --git a/gcc/testsuite/obj-c++.dg/torture/tls/thr-init-2.mm b/gcc/testsuite/obj-c++.dg/torture/tls/thr-init-2.mm
new file mode 100644
index 000000000..4e3f8e6e3
--- /dev/null
+++ b/gcc/testsuite/obj-c++.dg/torture/tls/thr-init-2.mm
@@ -0,0 +1,45 @@
+// { dg-do run }
+// { dg-require-effective-target tls }
+// { dg-add-options tls }
+
+extern "C" {
+extern void abort ();
+}
+
+__thread int glb =1 ;
+
+static __thread int fstat = 2;
+
+int fa(int a)
+{
+static __thread int as = 3;
+ as += a ;
+ return as;
+}
+
+int fb(int b)
+{
+static __thread int bs = 4;
+ bs += b ;
+ glb = bs;
+ return bs;
+}
+
+int main (int ac, char *av[])
+{
+ int a = 1;
+
+ a = fa(fstat);
+ if ( a != 5 )
+ abort () ;
+
+ a = fa(glb);
+ if ( a != 6 )
+ abort () ;
+
+ a = fb(a);
+ if ( a != 10 || glb != 10 )
+ abort () ;
+
+ return 0;
+}
diff --git a/gcc/testsuite/obj-c++.dg/torture/tls/thr-init-3.mm b/gcc/testsuite/obj-c++.dg/torture/tls/thr-init-3.mm
new file mode 100644
index 000000000..29768886a
--- /dev/null
+++ b/gcc/testsuite/obj-c++.dg/torture/tls/thr-init-3.mm
@@ -0,0 +1,41 @@
+/* { dg-do run } */
+/* { dg-require-effective-target tls } */
+/* { dg-add-options tls } */
+/* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { ! objc2 } } } { "-fnext-runtime" } { "" } } */
+/* { dg-additional-sources "../../../objc-obj-c++-shared/Object1.mm" } */
+
+#include "../../../objc-obj-c++-shared/Object1.h"
+extern "C" {
+extern void abort ();
+}
+
+@interface tsObj: Object {
+ int ai ;
+}
+
+- (int) fa:(int) n;
+
+@end
+
+@implementation tsObj
+
+- (int) fa:(int) n
+{
+static __thread int as = 3;
+ as += n ;
+ return as ;
+}
+
+@end
+
+int main (int ac, char *av[])
+{
+ int a ;
+ tsObj *to = [tsObj new];
+
+ a = [to fa:5];
+ if ( a != 8 )
+ abort () ;
+
+ return 0;
+}
diff --git a/gcc/testsuite/obj-c++.dg/torture/tls/tls.exp b/gcc/testsuite/obj-c++.dg/torture/tls/tls.exp
new file mode 100644
index 000000000..6d0668045
--- /dev/null
+++ b/gcc/testsuite/obj-c++.dg/torture/tls/tls.exp
@@ -0,0 +1,16 @@
+# This harness is for tests that should be run at all optimisation levels.
+
+load_lib obj-c++-dg.exp
+
+dg-init
+# Gather a list of all tests.
+set tests [lsort [glob -nocomplain $srcdir/$subdir/*.mm]]
+
+obj-c++-dg-runtest $tests "-fgnu-runtime"
+
+# darwin targets can also run code with the NeXT runtime.
+if [istarget "*-*-darwin*" ] {
+ obj-c++-dg-runtest $tests "-fnext-runtime"
+}
+
+dg-finish
diff --git a/gcc/testsuite/obj-c++.dg/torture/tls/trivial.mm b/gcc/testsuite/obj-c++.dg/torture/tls/trivial.mm
new file mode 100644
index 000000000..e2b8f45b8
--- /dev/null
+++ b/gcc/testsuite/obj-c++.dg/torture/tls/trivial.mm
@@ -0,0 +1,3 @@
+// { dg-require-effective-target tls }
+
+__thread int i;
diff --git a/gcc/testsuite/obj-c++.dg/torture/trivial.mm b/gcc/testsuite/obj-c++.dg/torture/trivial.mm
new file mode 100644
index 000000000..e627343a8
--- /dev/null
+++ b/gcc/testsuite/obj-c++.dg/torture/trivial.mm
@@ -0,0 +1,12 @@
+// { dg-do run }
+
+// { dg-xfail-run-if "OBJC2 runtime" { *-*-darwin* && { lp64 && { ! objc2 } } } { "-fnext-runtime" } { "-fgnu-runtime" } }
+// { dg-additional-sources "../../objc-obj-c++-shared/Object1.mm" }
+
+#import "../../objc-obj-c++-shared/Object1.h"
+
+int main(void)
+{
+ [Object class];
+ return 0;
+}