diff options
| -rw-r--r-- | include/clang/Basic/DiagnosticDriverKinds.td | 4 | ||||
| -rw-r--r-- | lib/Driver/ToolChains.cpp | 3 | ||||
| -rw-r--r-- | test/Driver/arc.c | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/include/clang/Basic/DiagnosticDriverKinds.td b/include/clang/Basic/DiagnosticDriverKinds.td index a2e15395d6..bc961ee557 100644 --- a/include/clang/Basic/DiagnosticDriverKinds.td +++ b/include/clang/Basic/DiagnosticDriverKinds.td @@ -93,8 +93,8 @@ def err_drv_objc_gc_arr : Error< "cannot specify both '-fobjc-arc' and '%0'">; def err_arc_unsupported_on_runtime : Error< "-fobjc-arc is not supported on platforms using the legacy runtime">; -def err_arc_unsupported_on_toolchain : Error< - "-fobjc-arc is not supported on %select{versions of Mac OS prior to 10.6}0">; +def err_arc_unsupported_on_toolchain : Error< // feel free to generalize this + "-fobjc-arc is not supported on versions of OS X prior to 10.6">; def err_drv_mg_requires_m_or_mm : Error< "option '-MG' requires '-M' or '-MM'">; def err_drv_asan_android_requires_pie : Error< diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 46259139cd..b47a0dee2a 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -954,8 +954,7 @@ bool Darwin::SupportsObjCGC() const { void Darwin::CheckObjCARC() const { if (isTargetIPhoneOS() || !isMacosxVersionLT(10, 6)) return; - getDriver().Diag(diag::err_arc_unsupported_on_toolchain) - << 0; // "versions of Mac OS X prior to 10.6" + getDriver().Diag(diag::err_arc_unsupported_on_toolchain); } std::string diff --git a/test/Driver/arc.c b/test/Driver/arc.c index 1072e6b7bb..4c99e5773a 100644 --- a/test/Driver/arc.c +++ b/test/Driver/arc.c @@ -14,4 +14,4 @@ // NOTOBJC-NOT: error: -fobjc-arc is not supported on platforms using the legacy runtime // NOTOBJC: invalid preprocessing directive -// UNSUPPORTED: error: -fobjc-arc is not supported on versions of Mac OS prior to 10.6 +// UNSUPPORTED: error: -fobjc-arc is not supported on versions of OS X prior to 10.6 |