From ec2580dec0e275c6b962ec95cd9e6567beb0d669 Mon Sep 17 00:00:00 2001 From: Bob Wilson Date: Tue, 2 Dec 2014 05:17:21 +0000 Subject: [PATCH] Re-apply "Revert r166370 and r166540 now that Xcode 4.6 has been available for a while." This reverts commit r176892. I had reverted this a while back to give Chromium more time to update, and Nico says it should be OK now. llvm-svn: 223108 --- clang/include/clang/Basic/DiagnosticGroups.td | 2 -- clang/test/Driver/warning-options.cpp | 5 ----- 2 files changed, 7 deletions(-) diff --git a/clang/include/clang/Basic/DiagnosticGroups.td b/clang/include/clang/Basic/DiagnosticGroups.td index 8184546..af0b948 100644 --- a/clang/include/clang/Basic/DiagnosticGroups.td +++ b/clang/include/clang/Basic/DiagnosticGroups.td @@ -420,8 +420,6 @@ 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 f1a335d..4d9e1f7 100644 --- a/clang/test/Driver/warning-options.cpp +++ b/clang/test/Driver/warning-options.cpp @@ -3,11 +3,6 @@ // 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' -- 2.7.4