summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2010-07-22 00:40:31 +0000
committerDaniel Dunbar <daniel@zuster.org>2010-07-22 00:40:31 +0000
commita66a4d10ae6db16ae2585cce963a2d91df9fd175 (patch)
treefcec2b23855584e4aab9f485e7fae12327c30179
parent29dc45b65003d6fd32a54a219108ae9f99fb0cf1 (diff)
downloadbcm5719-llvm-a66a4d10ae6db16ae2585cce963a2d91df9fd175.tar.gz
bcm5719-llvm-a66a4d10ae6db16ae2585cce963a2d91df9fd175.zip
Driver/Darwin: Always allow blocks on Darwin, so that users can conditionally
use blocks even when targetting older systems (using runtime checks and weak linking). llvm-svn: 109072
-rw-r--r--clang/lib/Driver/ToolChains.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/clang/lib/Driver/ToolChains.h b/clang/lib/Driver/ToolChains.h
index 2be88f10bf0..b6c7badf3b3 100644
--- a/clang/lib/Driver/ToolChains.h
+++ b/clang/lib/Driver/ToolChains.h
@@ -153,11 +153,9 @@ public:
virtual Tool &SelectTool(const Compilation &C, const JobAction &JA) const;
virtual bool IsBlocksDefault() const {
- // Blocks default to on for OS X 10.6 and iPhoneOS 3.0 and beyond.
- if (isTargetIPhoneOS())
- return !isIPhoneOSVersionLT(3);
- else
- return !isMacosxVersionLT(10, 6);
+ // Always allow blocks on Darwin; users interested in versioning are
+ // expected to use /usr/include/Blocks.h.
+ return true;
}
virtual bool IsIntegratedAssemblerDefault() const {
#ifdef DISABLE_DEFAULT_INTEGRATED_ASSEMBLER
OpenPOWER on IntegriCloud