diff options
| -rw-r--r-- | compiler-rt/test/lit.common.cfg | 6 | ||||
| -rw-r--r-- | compiler-rt/test/tsan/Darwin/norace-objcxx-run-time.mm | 2 |
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: |
