summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDuncan P. N. Exon Smith <dexonsmith@apple.com>2017-06-18 16:50:23 +0000
committerDuncan P. N. Exon Smith <dexonsmith@apple.com>2017-06-18 16:50:23 +0000
commit878cf8fbd418c86396e8aef0636f3347905059ac (patch)
tree14a9144455203df17e18bdde4ff87e76f10d3e8e
parente203359c45f59ef2d0234ac1960a6a17637d7ab2 (diff)
downloadbcm5719-llvm-878cf8fbd418c86396e8aef0636f3347905059ac.tar.gz
bcm5719-llvm-878cf8fbd418c86396e8aef0636f3347905059ac.zip
iostreams: Fix deployment target for streams dylib support
Fix an off-by-one in r302172, which triggered building local versions of the iostreams when deploying to `<= macOS 10.9`, when it should have been `< macOS 10.9`. 10.9 had the dylib support. This defines `_LIBCPP_AVAILABILITY_NO_STREAMS_EXTERN_TEMPLATE` less often, reducing code size for users with deployment targets of exactly macOS 10.9 or iOS 7.0. rdar://problem/32233981 llvm-svn: 305649
-rw-r--r--libcxx/include/__config4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/__config b/libcxx/include/__config
index 7358e52ec3b..003e1ea60c6 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
@@ -1207,9 +1207,9 @@ _LIBCPP_FUNC_VIS extern "C" void __sanitizer_annotate_contiguous_container(
// availability(ios,introduced=7.0)
#if defined(_LIBCPP_USE_AVAILABILITY_APPLE) && \
((defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && \
- __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ <= 1090) || \
+ __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1090) || \
(defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && \
- __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ <= 70000))
+ __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ < 70000))
#define _LIBCPP_AVAILABILITY_NO_STREAMS_EXTERN_TEMPLATE
#endif
OpenPOWER on IntegriCloud