diff options
Diffstat (limited to 'lib/Driver/Types.cpp')
| -rw-r--r-- | lib/Driver/Types.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/Driver/Types.cpp b/lib/Driver/Types.cpp index c29ce9462a07..f8e1e40dc6bf 100644 --- a/lib/Driver/Types.cpp +++ b/lib/Driver/Types.cpp @@ -204,6 +204,7 @@ types::ID types::lookupTypeForExtension(const char *Ext) { .Case("pcm", TY_ModuleFile) .Case("pch", TY_PCH) .Case("gch", TY_PCH) + .Case("rs", TY_RenderScript) .Default(TY_INVALID); } @@ -232,8 +233,7 @@ void types::getCompilationPhases(ID Id, llvm::SmallVectorImpl<phases::ID> &P) { P.push_back(phases::Compile); P.push_back(phases::Backend); } - if (Id != TY_CUDA_DEVICE) - P.push_back(phases::Assemble); + P.push_back(phases::Assemble); } } @@ -242,7 +242,6 @@ void types::getCompilationPhases(ID Id, llvm::SmallVectorImpl<phases::ID> &P) { } assert(0 < P.size() && "Not enough phases in list"); assert(P.size() <= phases::MaxNumberOfPhases && "Too many phases in list"); - return; } ID types::lookupCXXTypeForCType(ID Id) { |