Merge branch 'release_0.84.00' into privatestaging

Conflicts:
	include/hcc_detail/hip_runtime.h
	src/hip_hcc.cpp

bin/hipcc

@@ -64,6 +64,9 @@ if ($HIP_PLATFORM eq "hcc") {
     $HCC_HOME=$ENV{'HCC_HOME'};
     $HCC_HOME="/opt/rocm/hcc" unless defined $HCC_HOME;
 
+    $ROCM_PATH=$ENV{'ROCM_PATH'};
+    $ROCM_PATH="/opt/rocm" unless defined $ROCM_PATH;
+
     # HCC* may be used to compile src/hip_hcc.o (and also feed the HIPCXXFLAGS below)
     $HCC = "$HCC_HOME/bin/hcc";
     $HCCFLAGS = "-hc -I$HCC_HOME/include ";
@@ -77,7 +80,7 @@ if ($HIP_PLATFORM eq "hcc") {
     $HIPLDFLAGS .= " -Wl,--defsym=_binary_kernel_spir_end=0 -Wl,--defsym=_binary_kernel_spir_start=0 -Wl,--defsym=_binary_kernel_cl_start=0 -Wl,--defsym=_binary_kernel_cl_end=0";
     # Satisfy HCC dependencies
     $HIPLDFLAGS .= " -lc++abi";
-	$HIPLDFLAGS .= " -L$HSA_PATH/lib -lhsa-runtime64 -lhc_am";
+	$HIPLDFLAGS .= " -L$HSA_PATH/lib -L$ROCM_PATH/lib -lhsa-runtime64 -lhc_am";
 
     # Add trace marker library:
     # TODO - once we cleanly separate the HIP API headers from HIP library headers this logic should move to CMakebuild option - apps do not need to see the marker library.

bin/hipify

@@ -228,8 +228,8 @@ while (@ARGV) {
 
         #--------
         #Includes:
-        $countIncludes += s/(\s*#\s*include\s+)[<"]cuda_runtime\.h[>"]/$1<hip_runtime.h>/;
-        $countIncludes += s/(\s*#\s*include\s+)[<"]cuda_runtime_api\.h[>"]/$1<hip_runtime_api.h>/;
+        $countIncludes += s/(\s*#\s*include\s+)[<"]cuda_runtime\.h[>"]/$1<hip\/hip_runtime.h>/;
+        $countIncludes += s/(\s*#\s*include\s+)[<"]cuda_runtime_api\.h[>"]/$1<hip\/hip_runtime_api.h>/;
 
 
         #--------
@@ -559,7 +559,7 @@ while (@ARGV) {
                 # If this file makes kernel builtin calls, and does not include the cuda_runtime.h,
                 # then add an #include to match "magic" includes provided by NVCC.
 				# This logic can miss cases where cuda_runtime.h is included by another include file.
-                print $OUTFILE '#include "hip_runtime.h"' . ($is_dos ? "\r\n" : "\n");
+                print $OUTFILE '#include "hip/hip_runtime.h"' . ($is_dos ? "\r\n" : "\n");
             }
             print $OUTFILE  "$_";
         }