From d6b9d5fbc7f512d6e34bc2fd6cfe30c1d90cc7aa Mon Sep 17 00:00:00 2001
From: dfukalov <daniil.fukalov@amd.com>
Date: Tue, 22 Mar 2016 17:07:37 +0300
Subject: [PATCH] 1. renamed hipMallocHost -> hipHostAlloc, hipFreeHost ->
 hipHostFree 2. added capability to build with llvm/clang 3.8

---
 src/Cuda2Hip.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Cuda2Hip.cpp b/src/Cuda2Hip.cpp
index 46c60bf5be..21f3755d69 100644
--- a/src/Cuda2Hip.cpp
+++ b/src/Cuda2Hip.cpp
@@ -103,9 +103,9 @@ namespace {
 
       // Memory management :
       cuda2hipRename["cudaMalloc"] = "hipMalloc";
-      cuda2hipRename["cudaMallocHost"] = "hipMallocHost";
+      cuda2hipRename["cudaMallocHost"] = "hipHostAlloc";
       cuda2hipRename["cudaFree"] = "hipFree";
-      cuda2hipRename["cudaFreeHost"] = "hipFreeHost";
+      cuda2hipRename["cudaFreeHost"] = "hipHostFree";
 
       // Coordinate Indexing and Dimensions:
       cuda2hipRename["threadIdx.x"] = "hipThreadIdx_x";
@@ -334,7 +334,11 @@ namespace {
           // to workaround the 'const' MacroArgs passed into this hook.
           const Token * start = Args->getUnexpArgument(i);
           size_t len = Args->getArgLength(start) + 1;
+#if (LLVM_VERSION_MAJOR >= 3) && (LLVM_VERSION_MINOR >= 9)
           _pp->EnterTokenStream(ArrayRef<Token>(start,len), false);
+#else
+          _pp->EnterTokenStream(start, len, false, false);
+#endif
           do {
             toks.push_back(Token());
             Token & tk = toks.back();