summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolodymyr Sapsai <vsapsai@apple.com>2018-02-26 23:04:57 +0000
committerVolodymyr Sapsai <vsapsai@apple.com>2018-02-26 23:04:57 +0000
commit9ef00ed487e77d38e6fdca6e9990433cf2ee9332 (patch)
tree125b77b63222779d62681d2a0e97de80e8595d13
parent599990530efd0985bb67d6659db7a2d32ccbb1c3 (diff)
downloadbcm5719-llvm-9ef00ed487e77d38e6fdca6e9990433cf2ee9332.tar.gz
bcm5719-llvm-9ef00ed487e77d38e6fdca6e9990433cf2ee9332.zip
Fix which Darwin versions have ObjC runtime with full subscripting support.
Update min deployment target in some tests so that they don't try to link against libarclite and don't fail when it's not available. rdar://problem/29253617 Reviewers: vsk, kubamracek Reviewed By: vsk Subscribers: jkorous-apple, cfe-commits Differential Revision: https://reviews.llvm.org/D43787 llvm-svn: 326143
-rw-r--r--compiler-rt/test/lit.common.cfg6
-rw-r--r--compiler-rt/test/tsan/Darwin/norace-objcxx-run-time.mm2
2 files changed, 7 insertions, 1 deletions
diff --git a/compiler-rt/test/lit.common.cfg b/compiler-rt/test/lit.common.cfg
index 20280ae6e59..e813a657f23 100644
--- a/compiler-rt/test/lit.common.cfg
+++ b/compiler-rt/test/lit.common.cfg
@@ -201,8 +201,14 @@ if config.host_os == 'Darwin':
pass
config.substitutions.append( ("%macos_min_target_10_11", "-mmacosx-version-min=10.11") )
+
+ isIOS = getattr(config, 'ios', False)
+ # rdar://problem/22207160
+ config.substitutions.append( ("%darwin_min_target_with_full_runtime_arc_support",
+ "-miphoneos-version-min=9.0" if isIOS else "-mmacosx-version-min=10.11") )
else:
config.substitutions.append( ("%macos_min_target_10_11", "") )
+ config.substitutions.append( ("%darwin_min_target_with_full_runtime_arc_support", "") )
if config.android:
adb = os.environ.get('ADB', 'adb')
diff --git a/compiler-rt/test/tsan/Darwin/norace-objcxx-run-time.mm b/compiler-rt/test/tsan/Darwin/norace-objcxx-run-time.mm
index 1de431a076c..ee76ec155cb 100644
--- a/compiler-rt/test/tsan/Darwin/norace-objcxx-run-time.mm
+++ b/compiler-rt/test/tsan/Darwin/norace-objcxx-run-time.mm
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan %s -lc++ -fobjc-arc -lobjc -o %t -framework Foundation
+// RUN: %clang_tsan %s -lc++ -fobjc-arc -lobjc -o %t -framework Foundation %darwin_min_target_with_full_runtime_arc_support
// RUN: %run %t 2>&1 | FileCheck %s
// Check that we do not report races between:
OpenPOWER on IntegriCloud