diff options
| author | Bob Wilson <bob.wilson@apple.com> | 2013-03-12 20:00:34 +0000 |
|---|---|---|
| committer | Bob Wilson <bob.wilson@apple.com> | 2013-03-12 20:00:34 +0000 |
| commit | 897ce8c8bb7816eab9a082df7bf391525f6588f8 (patch) | |
| tree | ee02b13685a3c8e65db09e38c4b76ba4fc82e0db | |
| parent | 9deb9d9d42829a5892585e6b6af1a87f072fe8f3 (diff) | |
| download | bcm5719-llvm-897ce8c8bb7816eab9a082df7bf391525f6588f8.tar.gz bcm5719-llvm-897ce8c8bb7816eab9a082df7bf391525f6588f8.zip | |
Revert "Revert r166370 and r166540 now that Xcode 4.6 has been available for a while."
This reverts commit 176887. Nico asked for more time to move to Xcode 4.6.
llvm-svn: 176892
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticGroups.td | 2 | ||||
| -rw-r--r-- | clang/test/Driver/warning-options.cpp | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/clang/include/clang/Basic/DiagnosticGroups.td b/clang/include/clang/Basic/DiagnosticGroups.td index a610f62c513..0f127bf2e2f 100644 --- a/clang/include/clang/Basic/DiagnosticGroups.td +++ b/clang/include/clang/Basic/DiagnosticGroups.td @@ -303,6 +303,8 @@ def ImplicitAtomic : DiagGroup<"implicit-atomic-properties">; def CustomAtomic : DiagGroup<"custom-atomic-properties">; def AtomicProperties : DiagGroup<"atomic-properties", [ImplicitAtomic, CustomAtomic]>; +// FIXME: Remove arc-abi once an Xcode is released that doesn't pass this flag. +def : DiagGroup<"arc-abi">; def ARCUnsafeRetainedAssign : DiagGroup<"arc-unsafe-retained-assign">; def ARCRetainCycles : DiagGroup<"arc-retain-cycles">; def ARCNonPodMemAccess : DiagGroup<"arc-non-pod-memaccess">; diff --git a/clang/test/Driver/warning-options.cpp b/clang/test/Driver/warning-options.cpp index 4d9e1f7466d..f1a335d2139 100644 --- a/clang/test/Driver/warning-options.cpp +++ b/clang/test/Driver/warning-options.cpp @@ -3,6 +3,11 @@ // RUN: %clang -### -Wlarge-by-value-copy=128 %s 2>&1 | FileCheck -check-prefix=LARGE_VALUE_COPY_JOINED %s // LARGE_VALUE_COPY_JOINED: -Wlarge-by-value-copy=128 +// FIXME: Remove this together with -Warc-abi once an Xcode is released that doesn't pass this flag. +// RUN: %clang -### -Warc-abi -Wno-arc-abi %s 2>&1 | FileCheck -check-prefix=ARCABI %s +// ARCABI-NOT: unknown warning option '-Warc-abi' +// ARCABI-NOT: unknown warning option '-Wno-arc-abi' + // Check that -isysroot warns on nonexistent paths. // RUN: %clang -### -c -target i386-apple-darwin10 -isysroot /FOO %s 2>&1 | FileCheck --check-prefix=CHECK-ISYSROOT %s // CHECK-ISYSROOT: warning: no such sysroot directory: '{{([A-Za-z]:.*)?}}/FOO' |
