diff options
| author | Daniel Jasper <djasper@google.com> | 2015-03-03 10:02:53 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2015-03-03 10:02:53 +0000 |
| commit | 34d761d893e0126c415d7b17f7474a3bef2beaa2 (patch) | |
| tree | 8fe86a14f14fc5bcdb229f80d83b9be92a944ad5 /clang | |
| parent | cf0805b872a4e18b76bbab6db65ac79ef76302cc (diff) | |
| download | bcm5719-llvm-34d761d893e0126c415d7b17f7474a3bef2beaa2.tar.gz bcm5719-llvm-34d761d893e0126c415d7b17f7474a3bef2beaa2.zip | |
Revert r231008 (and dependent r231019).
As Chandler responded on the initial commit, just directly setting the
triple through -Xclang option to the driver creates havoc on other
platforms. The driver test should specifically go into test/Driver and
test the cc1 commandline itself.
llvm-svn: 231063
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 1 | ||||
| -rw-r--r-- | clang/test/ARCMT/objcmt-property-dot-syntax.m | 2 | ||||
| -rw-r--r-- | clang/test/ARCMT/objcmt-property-dot-syntax.m.result | 2 |
3 files changed, 0 insertions, 5 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 17b430c316c..eff0ca759a4 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -3448,7 +3448,6 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, Args.AddLastArg(CmdArgs, options::OPT_objcmt_migrate_all); Args.AddLastArg(CmdArgs, options::OPT_objcmt_migrate_readonly_property); Args.AddLastArg(CmdArgs, options::OPT_objcmt_migrate_readwrite_property); - Args.AddLastArg(CmdArgs, options::OPT_objcmt_migrate_property_dot_syntax); Args.AddLastArg(CmdArgs, options::OPT_objcmt_migrate_annotation); Args.AddLastArg(CmdArgs, options::OPT_objcmt_migrate_instancetype); Args.AddLastArg(CmdArgs, options::OPT_objcmt_migrate_nsmacros); diff --git a/clang/test/ARCMT/objcmt-property-dot-syntax.m b/clang/test/ARCMT/objcmt-property-dot-syntax.m index 4ebfc246b2e..f1b92555507 100644 --- a/clang/test/ARCMT/objcmt-property-dot-syntax.m +++ b/clang/test/ARCMT/objcmt-property-dot-syntax.m @@ -2,8 +2,6 @@ // RUN: %clang_cc1 -objcmt-migrate-property-dot-syntax -mt-migrate-directory %t %s -x objective-c -fobjc-runtime-has-weak -fobjc-arc -triple x86_64-apple-darwin11 // RUN: c-arcmt-test -mt-migrate-directory %t | arcmt-test -verify-transformed-files %s.result // RUN: %clang_cc1 -fblocks -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c -fobjc-runtime-has-weak -fobjc-arc %s.result -// RUN: rm -rf %t.1 -// RUN: %clang -fsyntax-only -objcmt-migrate-property-dot-syntax -Xclang -mt-migrate-directory -Xclang %t.1 %s -Xclang -triple -Xclang x86_64-apple-darwin11 // rdar://18498572 @interface NSObject @end diff --git a/clang/test/ARCMT/objcmt-property-dot-syntax.m.result b/clang/test/ARCMT/objcmt-property-dot-syntax.m.result index d22f4f353ba..70c7e7ab54e 100644 --- a/clang/test/ARCMT/objcmt-property-dot-syntax.m.result +++ b/clang/test/ARCMT/objcmt-property-dot-syntax.m.result @@ -2,8 +2,6 @@ // RUN: %clang_cc1 -objcmt-migrate-property-dot-syntax -mt-migrate-directory %t %s -x objective-c -fobjc-runtime-has-weak -fobjc-arc -triple x86_64-apple-darwin11 // RUN: c-arcmt-test -mt-migrate-directory %t | arcmt-test -verify-transformed-files %s.result // RUN: %clang_cc1 -fblocks -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c -fobjc-runtime-has-weak -fobjc-arc %s.result -// RUN: rm -rf %t.1 -// RUN: %clang -fsyntax-only -objcmt-migrate-property-dot-syntax -Xclang -mt-migrate-directory -Xclang %t.1 %s -Xclang -triple -Xclang x86_64-apple-darwin11 // rdar://18498572 @interface NSObject @end |
