diff options
Diffstat (limited to 'clang')
36 files changed, 50 insertions, 69 deletions
diff --git a/clang/test/ARCMT/alloc-with-zone.m b/clang/test/ARCMT/alloc-with-zone.m index b8b78d1ed42..52d278ac949 100644 --- a/clang/test/ARCMT/alloc-with-zone.m +++ b/clang/test/ARCMT/alloc-with-zone.m @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result #include "Common.h" diff --git a/clang/test/ARCMT/alloc-with-zone.m.result b/clang/test/ARCMT/alloc-with-zone.m.result index 52daed619e8..a9977339e51 100644 --- a/clang/test/ARCMT/alloc-with-zone.m.result +++ b/clang/test/ARCMT/alloc-with-zone.m.result @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result #include "Common.h" diff --git a/clang/test/ARCMT/assign-prop-no-arc-runtime.m b/clang/test/ARCMT/assign-prop-no-arc-runtime.m index 07a5b40b6fa..83c0107682d 100644 --- a/clang/test/ARCMT/assign-prop-no-arc-runtime.m +++ b/clang/test/ARCMT/assign-prop-no-arc-runtime.m @@ -1,9 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -fobjc-no-arc-runtime -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s -D__IPHONE_OS_VERSION_MIN_REQUIRED=40300 > %t -// RUN: diff %t %s.result -// RUN: arcmt-test --args -arch x86_64 %s -miphoneos-version-min=4.3 > %t -// RUN: diff %t %s.result -// RUN: arcmt-test --args -arch x86_64 %s -mmacosx-version-min=10.6 > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only %s > %t // RUN: diff %t %s.result #include "Common.h" diff --git a/clang/test/ARCMT/assign-prop-no-arc-runtime.m.result b/clang/test/ARCMT/assign-prop-no-arc-runtime.m.result index 69909f3416f..f5a33c582bd 100644 --- a/clang/test/ARCMT/assign-prop-no-arc-runtime.m.result +++ b/clang/test/ARCMT/assign-prop-no-arc-runtime.m.result @@ -1,9 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -fobjc-no-arc-runtime -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s -D__IPHONE_OS_VERSION_MIN_REQUIRED=40300 > %t -// RUN: diff %t %s.result -// RUN: arcmt-test --args -arch x86_64 %s -miphoneos-version-min=4.3 > %t -// RUN: diff %t %s.result -// RUN: arcmt-test --args -arch x86_64 %s -mmacosx-version-min=10.6 > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only %s > %t // RUN: diff %t %s.result #include "Common.h" diff --git a/clang/test/ARCMT/assign-prop-with-arc-runtime.m b/clang/test/ARCMT/assign-prop-with-arc-runtime.m index 86f5fbb616a..b77b61ba468 100644 --- a/clang/test/ARCMT/assign-prop-with-arc-runtime.m +++ b/clang/test/ARCMT/assign-prop-with-arc-runtime.m @@ -1,9 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s -D__IPHONE_OS_VERSION_MIN_REQUIRED=50000 > %t -// RUN: diff %t %s.result -// RUN: arcmt-test --args -arch x86_64 %s -miphoneos-version-min=5.0 > %t -// RUN: diff %t %s.result -// RUN: arcmt-test --args -arch x86_64 %s -mmacosx-version-min=10.7 > %t +// RUN: arcmt-test --args -triple x86_64-apple-macosx10.8 -fobjc-nonfragile-abi -fsyntax-only %s > %t // RUN: diff %t %s.result #include "Common.h" diff --git a/clang/test/ARCMT/assign-prop-with-arc-runtime.m.result b/clang/test/ARCMT/assign-prop-with-arc-runtime.m.result index 59f7608278d..c5e5854e9af 100644 --- a/clang/test/ARCMT/assign-prop-with-arc-runtime.m.result +++ b/clang/test/ARCMT/assign-prop-with-arc-runtime.m.result @@ -1,9 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s -D__IPHONE_OS_VERSION_MIN_REQUIRED=50000 > %t -// RUN: diff %t %s.result -// RUN: arcmt-test --args -arch x86_64 %s -miphoneos-version-min=5.0 > %t -// RUN: diff %t %s.result -// RUN: arcmt-test --args -arch x86_64 %s -mmacosx-version-min=10.7 > %t +// RUN: arcmt-test --args -triple x86_64-apple-macosx10.8 -fobjc-nonfragile-abi -fsyntax-only %s > %t // RUN: diff %t %s.result #include "Common.h" diff --git a/clang/test/ARCMT/atautorelease-2.m b/clang/test/ARCMT/atautorelease-2.m index 919e10edf23..5d297722778 100644 --- a/clang/test/ARCMT/atautorelease-2.m +++ b/clang/test/ARCMT/atautorelease-2.m @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result @interface NSAutoreleasePool diff --git a/clang/test/ARCMT/atautorelease-2.m.result b/clang/test/ARCMT/atautorelease-2.m.result index 7a55cb43ae0..7bb164723e1 100644 --- a/clang/test/ARCMT/atautorelease-2.m.result +++ b/clang/test/ARCMT/atautorelease-2.m.result @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result @interface NSAutoreleasePool diff --git a/clang/test/ARCMT/atautorelease-3.m b/clang/test/ARCMT/atautorelease-3.m index 4498908472c..5d71c33b6bc 100644 --- a/clang/test/ARCMT/atautorelease-3.m +++ b/clang/test/ARCMT/atautorelease-3.m @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result @interface NSAutoreleasePool diff --git a/clang/test/ARCMT/atautorelease-3.m.result b/clang/test/ARCMT/atautorelease-3.m.result index 51b0e570b63..682118e82f2 100644 --- a/clang/test/ARCMT/atautorelease-3.m.result +++ b/clang/test/ARCMT/atautorelease-3.m.result @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result @interface NSAutoreleasePool diff --git a/clang/test/ARCMT/atautorelease.m b/clang/test/ARCMT/atautorelease.m index fa1a24b9168..bdf77197a8a 100644 --- a/clang/test/ARCMT/atautorelease.m +++ b/clang/test/ARCMT/atautorelease.m @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result #include "Common.h" diff --git a/clang/test/ARCMT/atautorelease.m.result b/clang/test/ARCMT/atautorelease.m.result index 8cd649aba95..ccce1bd8757 100644 --- a/clang/test/ARCMT/atautorelease.m.result +++ b/clang/test/ARCMT/atautorelease.m.result @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result #include "Common.h" diff --git a/clang/test/ARCMT/autoreleases.m b/clang/test/ARCMT/autoreleases.m index 284d92773d4..a12db8178f7 100644 --- a/clang/test/ARCMT/autoreleases.m +++ b/clang/test/ARCMT/autoreleases.m @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result typedef unsigned char BOOL; diff --git a/clang/test/ARCMT/autoreleases.m.result b/clang/test/ARCMT/autoreleases.m.result index fb2959fa90c..796bfbb9d65 100644 --- a/clang/test/ARCMT/autoreleases.m.result +++ b/clang/test/ARCMT/autoreleases.m.result @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result typedef unsigned char BOOL; diff --git a/clang/test/ARCMT/cxx-checking.mm b/clang/test/ARCMT/cxx-checking.mm index cf47bba0c60..667138c9747 100644 --- a/clang/test/ARCMT/cxx-checking.mm +++ b/clang/test/ARCMT/cxx-checking.mm @@ -1,4 +1,4 @@ -// RUN: arcmt-test -check-only -verify --args -Warc-abi %s +// RUN: arcmt-test -check-only -verify --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fblocks -Warc-abi %s // Classes that have an Objective-C object pointer. struct HasObjectMember0 { // expected-warning{{'HasObjectMember0' cannot be shared between ARC and non-ARC code; add a copy constructor, a copy assignment operator, and a destructor to make it ABI-compatible}} diff --git a/clang/test/ARCMT/dealloc.m b/clang/test/ARCMT/dealloc.m index 6166c426fd8..dac964403f2 100644 --- a/clang/test/ARCMT/dealloc.m +++ b/clang/test/ARCMT/dealloc.m @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result @interface A diff --git a/clang/test/ARCMT/dealloc.m.result b/clang/test/ARCMT/dealloc.m.result index 445d91a8b7d..24756d25484 100644 --- a/clang/test/ARCMT/dealloc.m.result +++ b/clang/test/ARCMT/dealloc.m.result @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result @interface A diff --git a/clang/test/ARCMT/init.m b/clang/test/ARCMT/init.m index 419288c3551..f0d24f60e1e 100644 --- a/clang/test/ARCMT/init.m +++ b/clang/test/ARCMT/init.m @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result @interface NSObject diff --git a/clang/test/ARCMT/init.m.result b/clang/test/ARCMT/init.m.result index 9142c37a2fd..4f3b4e724e2 100644 --- a/clang/test/ARCMT/init.m.result +++ b/clang/test/ARCMT/init.m.result @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result @interface NSObject diff --git a/clang/test/ARCMT/nonobjc-to-objc-cast.m b/clang/test/ARCMT/nonobjc-to-objc-cast.m index 1fbe73f3598..4ca47f2259f 100644 --- a/clang/test/ARCMT/nonobjc-to-objc-cast.m +++ b/clang/test/ARCMT/nonobjc-to-objc-cast.m @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result #include "Common.h" diff --git a/clang/test/ARCMT/nonobjc-to-objc-cast.m.result b/clang/test/ARCMT/nonobjc-to-objc-cast.m.result index 856b80f8d9e..f7127b71927 100644 --- a/clang/test/ARCMT/nonobjc-to-objc-cast.m.result +++ b/clang/test/ARCMT/nonobjc-to-objc-cast.m.result @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result #include "Common.h" diff --git a/clang/test/ARCMT/releases.m b/clang/test/ARCMT/releases.m index ddcdf93f323..f49cb7e7b9d 100644 --- a/clang/test/ARCMT/releases.m +++ b/clang/test/ARCMT/releases.m @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -fobjc-nonfragile-abi -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fblocks -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result typedef int BOOL; diff --git a/clang/test/ARCMT/releases.m.result b/clang/test/ARCMT/releases.m.result index b502cbb91df..48b3ba202fc 100644 --- a/clang/test/ARCMT/releases.m.result +++ b/clang/test/ARCMT/releases.m.result @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -fobjc-nonfragile-abi -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fblocks -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result typedef int BOOL; diff --git a/clang/test/ARCMT/remove-dealloc-method.m b/clang/test/ARCMT/remove-dealloc-method.m index 7689bc0a139..5c2d785ba71 100644 --- a/clang/test/ARCMT/remove-dealloc-method.m +++ b/clang/test/ARCMT/remove-dealloc-method.m @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result #define nil ((void*) 0) diff --git a/clang/test/ARCMT/remove-dealloc-method.m.result b/clang/test/ARCMT/remove-dealloc-method.m.result index d423243a8f2..88d94e305e2 100644 --- a/clang/test/ARCMT/remove-dealloc-method.m.result +++ b/clang/test/ARCMT/remove-dealloc-method.m.result @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result #define nil ((void*) 0) diff --git a/clang/test/ARCMT/remove-dealloc-zerouts.m b/clang/test/ARCMT/remove-dealloc-zerouts.m index 7bd00a36182..3ba85f1edca 100644 --- a/clang/test/ARCMT/remove-dealloc-zerouts.m +++ b/clang/test/ARCMT/remove-dealloc-zerouts.m @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result @interface Foo diff --git a/clang/test/ARCMT/remove-dealloc-zerouts.m.result b/clang/test/ARCMT/remove-dealloc-zerouts.m.result index ba93b3f0888..03a426df9b2 100644 --- a/clang/test/ARCMT/remove-dealloc-zerouts.m.result +++ b/clang/test/ARCMT/remove-dealloc-zerouts.m.result @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result @interface Foo diff --git a/clang/test/ARCMT/remove-statements.m b/clang/test/ARCMT/remove-statements.m index 6fb08a7cc2b..c433ec9913c 100644 --- a/clang/test/ARCMT/remove-statements.m +++ b/clang/test/ARCMT/remove-statements.m @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result #include "Common.h" diff --git a/clang/test/ARCMT/remove-statements.m.result b/clang/test/ARCMT/remove-statements.m.result index ab3390f9e83..9a1153e287c 100644 --- a/clang/test/ARCMT/remove-statements.m.result +++ b/clang/test/ARCMT/remove-statements.m.result @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result #include "Common.h" diff --git a/clang/test/ARCMT/retains.m b/clang/test/ARCMT/retains.m index c251f886828..d7938376ab8 100644 --- a/clang/test/ARCMT/retains.m +++ b/clang/test/ARCMT/retains.m @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -fobjc-nonfragile-abi -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fblocks -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result #include "Common.h" diff --git a/clang/test/ARCMT/retains.m.result b/clang/test/ARCMT/retains.m.result index b8f625a91c4..a24b42c8765 100644 --- a/clang/test/ARCMT/retains.m.result +++ b/clang/test/ARCMT/retains.m.result @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -fobjc-nonfragile-abi -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fblocks -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result #include "Common.h" diff --git a/clang/test/ARCMT/rewrite-block-var.m b/clang/test/ARCMT/rewrite-block-var.m index 70da6786c06..76f5d5092b2 100644 --- a/clang/test/ARCMT/rewrite-block-var.m +++ b/clang/test/ARCMT/rewrite-block-var.m @@ -1,5 +1,5 @@ -// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result -D__IPHONE_OS_VERSION_MIN_REQUIRED=50000 -// RUN: arcmt-test --args -arch x86_64 %s -D__IPHONE_OS_VERSION_MIN_REQUIRED=50000 > %t +// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result +// RUN: arcmt-test --args -triple x86_64-apple-macosx10.8 -fobjc-nonfragile-abi -fblocks -fsyntax-only %s > %t // RUN: diff %t %s.result #include "Common.h" diff --git a/clang/test/ARCMT/rewrite-block-var.m.result b/clang/test/ARCMT/rewrite-block-var.m.result index a37e6af5c41..ac220ad2a7c 100644 --- a/clang/test/ARCMT/rewrite-block-var.m.result +++ b/clang/test/ARCMT/rewrite-block-var.m.result @@ -1,5 +1,5 @@ -// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result -D__IPHONE_OS_VERSION_MIN_REQUIRED=50000 -// RUN: arcmt-test --args -arch x86_64 %s -D__IPHONE_OS_VERSION_MIN_REQUIRED=50000 > %t +// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result +// RUN: arcmt-test --args -triple x86_64-apple-macosx10.8 -fobjc-nonfragile-abi -fblocks -fsyntax-only %s > %t // RUN: diff %t %s.result #include "Common.h" diff --git a/clang/test/ARCMT/safe-arc-assign.m b/clang/test/ARCMT/safe-arc-assign.m index 2b8f93e51bd..368c2b6639d 100644 --- a/clang/test/ARCMT/safe-arc-assign.m +++ b/clang/test/ARCMT/safe-arc-assign.m @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result void test12(id collection) { diff --git a/clang/test/ARCMT/safe-arc-assign.m.result b/clang/test/ARCMT/safe-arc-assign.m.result index eac3d62eb11..cacd1093c52 100644 --- a/clang/test/ARCMT/safe-arc-assign.m.result +++ b/clang/test/ARCMT/safe-arc-assign.m.result @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -arch x86_64 %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t // RUN: diff %t %s.result void test12(id collection) { diff --git a/clang/tools/arcmt-test/arcmt-test.cpp b/clang/tools/arcmt-test/arcmt-test.cpp index a5a7125f1ef..baa3f568c01 100644 --- a/clang/tools/arcmt-test/arcmt-test.cpp +++ b/clang/tools/arcmt-test/arcmt-test.cpp @@ -100,22 +100,20 @@ static bool checkForMigration(llvm::StringRef resourcesPath, Diags->setClient(verifyDiag); } - llvm::OwningPtr<CompilerInvocation> CI; - CI.reset(clang::createInvocationFromCommandLine(Args, Diags)); - if (!CI) - return true; + CompilerInvocation CI; + CompilerInvocation::CreateFromArgs(CI, Args.begin(), Args.end(), *Diags); - if (CI->getFrontendOpts().Inputs.empty()) { + if (CI.getFrontendOpts().Inputs.empty()) { llvm::errs() << "error: no input files\n"; return true; } - if (!CI->getLangOpts().ObjC1) + if (!CI.getLangOpts().ObjC1) return false; - return arcmt::checkForManualIssues(*CI, - CI->getFrontendOpts().Inputs[0].second, - CI->getFrontendOpts().Inputs[0].first, + return arcmt::checkForManualIssues(CI, + CI.getFrontendOpts().Inputs[0].second, + CI.getFrontendOpts().Inputs[0].first, Diags->getClient()); } @@ -141,20 +139,19 @@ static bool performTransformations(llvm::StringRef resourcesPath, llvm::IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs()); llvm::IntrusiveRefCntPtr<Diagnostic> TopDiags(new Diagnostic(DiagID, DiagClient)); - llvm::OwningPtr<CompilerInvocation> origCI; - origCI.reset(clang::createInvocationFromCommandLine(Args, TopDiags)); - if (!origCI) - return true; + CompilerInvocation origCI; + CompilerInvocation::CreateFromArgs(origCI, Args.begin(), Args.end(), + *TopDiags); - if (origCI->getFrontendOpts().Inputs.empty()) { + if (origCI.getFrontendOpts().Inputs.empty()) { llvm::errs() << "error: no input files\n"; return true; } - if (!origCI->getLangOpts().ObjC1) + if (!origCI.getLangOpts().ObjC1) return false; - MigrationProcess migration(*origCI, DiagClient); + MigrationProcess migration(origCI, DiagClient); std::vector<TransformFn> transforms = arcmt::getAllTransformations(); assert(!transforms.empty()); |
