From ab0362087f043ae9ade74c5b3b9d2fde5ffe2303 Mon Sep 17 00:00:00 2001
From: Ben Sander <ben.sander@amd.com>
Date: Mon, 14 Nov 2016 15:25:43 -0700
Subject: [PATCH 1/2] tweak hcc demangler

[ROCm/clr commit: 2ea3f8f68e0c97c810e35b1a91d99677bb68e7bb]
---
 projects/clr/hipamd/bin/hipdemangleatp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/clr/hipamd/bin/hipdemangleatp b/projects/clr/hipamd/bin/hipdemangleatp
index 456ea9ae15..9ea30c4cd8 100755
--- a/projects/clr/hipamd/bin/hipdemangleatp
+++ b/projects/clr/hipamd/bin/hipdemangleatp
@@ -13,7 +13,7 @@ done
 # HC kernels
 kernels=$(grep cxxamp_trampoline $1 | cut -d" " -f1 | sort | uniq)
 for mangled_sym in $kernels; do
-    real_sym=$(echo $mangled_sym |  sed "s/^/_/g; s/_EC_/_$/g" | c++filt -p | cut -d\( -f1 | cut -d" " -f1 --complement | sed 's/ /\\\&nbsp/g')
+    real_sym=$(echo $mangled_sym |  sed "s/^/_/g; s/_EC_/$/g" | c++filt -p | cut -d\( -f1 | cut -d" " -f1 --complement | sed 's/ /\\\&nbsp/g')
     #echo "$mangled_sym => $real_sym" >> $1.log
     sed -i "s/$mangled_sym/$real_sym/g" $1
 done

From 65782bbaeb82b60f890ef3f16b539762221de140 Mon Sep 17 00:00:00 2001
From: Maneesh Gupta <maneesh.gupta@amd.com>
Date: Tue, 15 Nov 2016 10:42:27 +0530
Subject: [PATCH 2/2] Enable USE_COPY_EXT_V2 by default

Change-Id: I2c0dc80f85a0ccb5744715b5418a604e38b249ed


[ROCm/clr commit: 0696d4417fccb5ba519bc93c7f3b33e91e744335]
---
 projects/clr/hipamd/src/hip_hcc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/clr/hipamd/src/hip_hcc.cpp b/projects/clr/hipamd/src/hip_hcc.cpp
index e5619f723e..d066079fc0 100644
--- a/projects/clr/hipamd/src/hip_hcc.cpp
+++ b/projects/clr/hipamd/src/hip_hcc.cpp
@@ -49,7 +49,7 @@ THE SOFTWARE.
 
 
 #ifndef USE_COPY_EXT_V2
-#define USE_COPY_EXT_V2 0
+#define USE_COPY_EXT_V2 1
 #endif
 
 //=================================================================================================