From ddd63049716ff1321b5ef8c974e2c5ec57935733 Mon Sep 17 00:00:00 2001 From: Chris Kitching Date: Thu, 19 Oct 2017 14:11:15 +0100 Subject: [PATCH 1/2] Allow user-provided -std=* argument to override the default This means any user-provided -std=* argument overrides this one, allowing use of newer standards. [ROCm/clr commit: 90b04f696b47ca32a24d0598089ad07206b9b0a5] --- projects/clr/hipamd/hipify-clang/src/Cuda2Hip.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/clr/hipamd/hipify-clang/src/Cuda2Hip.cpp b/projects/clr/hipamd/hipify-clang/src/Cuda2Hip.cpp index f34cc77928..e31a7c4480 100644 --- a/projects/clr/hipamd/hipify-clang/src/Cuda2Hip.cpp +++ b/projects/clr/hipamd/hipify-clang/src/Cuda2Hip.cpp @@ -4281,7 +4281,9 @@ int main(int argc, const char **argv) { compilationStages.push_back("--cuda-host-only"); Tool.appendArgumentsAdjuster(getInsertArgumentAdjuster(compilationStages[0], ArgumentInsertPosition::BEGIN)); - Tool.appendArgumentsAdjuster(getInsertArgumentAdjuster("-std=c++11")); + + // Ensure at least c++11 is used. + Tool.appendArgumentsAdjuster(getInsertArgumentAdjuster("-std=c++11", ArgumentInsertPosition::BEGIN)); #if defined(HIPIFY_CLANG_RES) Tool.appendArgumentsAdjuster(getInsertArgumentAdjuster("-resource-dir=" HIPIFY_CLANG_RES)); #endif From 5cbaf0686772873e324af35a5055e2ed94e28e3c Mon Sep 17 00:00:00 2001 From: Chris Kitching Date: Thu, 19 Oct 2017 13:04:00 +0100 Subject: [PATCH 2/2] Inline a redundant std::vector Looks like a partial refactor..? [ROCm/clr commit: 6165b65d2179e004898359fbc7f19924e05e9839] --- projects/clr/hipamd/hipify-clang/src/Cuda2Hip.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/projects/clr/hipamd/hipify-clang/src/Cuda2Hip.cpp b/projects/clr/hipamd/hipify-clang/src/Cuda2Hip.cpp index e31a7c4480..907e78e54f 100644 --- a/projects/clr/hipamd/hipify-clang/src/Cuda2Hip.cpp +++ b/projects/clr/hipamd/hipify-clang/src/Cuda2Hip.cpp @@ -4277,10 +4277,8 @@ int main(int argc, const char **argv) { addAllMatchers(Finder, &Callback); auto action = newFrontendActionFactory(&Finder, &PPCallbacks); - std::vector compilationStages; - compilationStages.push_back("--cuda-host-only"); - Tool.appendArgumentsAdjuster(getInsertArgumentAdjuster(compilationStages[0], ArgumentInsertPosition::BEGIN)); + Tool.appendArgumentsAdjuster(getInsertArgumentAdjuster("--cuda-host-only", ArgumentInsertPosition::BEGIN)); // Ensure at least c++11 is used. Tool.appendArgumentsAdjuster(getInsertArgumentAdjuster("-std=c++11", ArgumentInsertPosition::BEGIN));