From b2035c98acd3ba4f8a386a43bbbb54a548672892 Mon Sep 17 00:00:00 2001
From: Maneesh Gupta <maneesh.gupta@amd.com>
Date: Wed, 3 Aug 2016 09:07:58 +0530
Subject: [PATCH 1/2] hip_hcc rpm package does not depend on rocm-profiler

Change-Id: I291c046371e704ce395781d5de3f6430c0dcba7b
---
 packaging/hip_hcc.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packaging/hip_hcc.txt b/packaging/hip_hcc.txt
index 661d77e530..556bade072 100644
--- a/packaging/hip_hcc.txt
+++ b/packaging/hip_hcc.txt
@@ -20,12 +20,12 @@ set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}
 set(CPACK_GENERATOR "TGZ;DEB;RPM")
 set(CPACK_BINARY_DEB "ON")
 set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/postinst;${PROJECT_BINARY_DIR}/prerm")
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip_base (= ${CPACK_PACKAGE_VERSION}), hcc_lc (= @HCC_VERSION@), rocm-profiler")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip_base (= ${CPACK_PACKAGE_VERSION}), hcc_lc (= @HCC_VERSION@)")
 set(CPACK_BINARY_RPM "ON")
 set(CPACK_RPM_PACKAGE_ARCHITECTURE "x86_64")
 set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/postinst")
 set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/prerm")
 set(CPACK_RPM_PACKAGE_AUTOREQPROV " no")
-set(CPACK_RPM_PACKAGE_REQUIRES "hip_base = ${CPACK_PACKAGE_VERSION}, hcc_lc = @HCC_VERSION@, rocm-profiler")
+set(CPACK_RPM_PACKAGE_REQUIRES "hip_base = ${CPACK_PACKAGE_VERSION}, hcc_lc = @HCC_VERSION@")
 set(CPACK_SOURCE_GENERATOR "TGZ")
 include(CPack)

From e818f2378d1509c07a8f46019e75781b2c13a44e Mon Sep 17 00:00:00 2001
From: Maneesh Gupta <maneesh.gupta@amd.com>
Date: Wed, 3 Aug 2016 09:08:40 +0530
Subject: [PATCH 2/2] Fix hipcc to work correctly when HIP_ATP_MARKER is not
 defined

Change-Id: I7cc525daccf896704e6ccf6d04ed395fda622031
---
 bin/hipcc | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/bin/hipcc b/bin/hipcc
index ce888fea8f..81d9ec62ec 100755
--- a/bin/hipcc
+++ b/bin/hipcc
@@ -57,9 +57,7 @@ if ($HIP_PLATFORM eq "hcc") {
     $ROCM_PATH="/opt/rocm" unless defined $ROCM_PATH;
 
     $HIP_ATP_MARKER=$ENV{'HIP_ATP_MARKER'};
-    if ($HIP_ATP_MARKER) {
-        $marker_path = "$ROCM_PATH/profiler/CXLActivityLogger";
-    }
+    $marker_path = "$ROCM_PATH/profiler/CXLActivityLogger";
 
     $ROCM_TARGET=$ENV{'ROCM_TARGET'};
     $ROCM_TARGET="fiji" unless defined $ROCM_TARGET;
@@ -103,11 +101,11 @@ if ($HIP_PLATFORM eq "hcc") {
         if (-e $marker_inc_path) {
             $HIPCXXFLAGS .= " -I$marker_inc_path";
         }
+    }
 
-        $marker_lib_path = "$marker_path/bin/x86_64";
-        if (-e $marker_lib_path) {
-            $HIPLDFLAGS .= " -L$marker_lib_path -lCXLActivityLogger -Wl,--rpath=$marker_lib_path";
-        }
+    $marker_lib_path = "$marker_path/bin/x86_64";
+    if (-e $marker_lib_path) {
+        $HIPLDFLAGS .= " -L$marker_lib_path -lCXLActivityLogger -Wl,--rpath=$marker_lib_path";
     }
 
     # Add C++ libs for GCC.