From dc904abd8ac26d525bb455eeabe877f1b72df778 Mon Sep 17 00:00:00 2001
From: Rahul Garg <rahul.garg@amd.com>
Date: Wed, 17 Jun 2020 20:37:46 +0000
Subject: [PATCH] Remove libhip_hcc symlinks to libamdhip64

Change-Id: I7b5b47fc7ca9760316c2424c16b454d7919c665c
---
 bin/hipcc                    | 6 +++---
 packaging/hip-rocclr.txt     | 2 --
 rocclr/CMakeLists.txt        | 8 --------
 tests/src/g++/hipMalloc.cpp  | 2 +-
 tests/src/gcc/LaunchKernel.c | 2 +-
 tests/src/gcc/hipMalloc.c    | 2 +-
 6 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/bin/hipcc b/bin/hipcc
index ddf67242cf..5f1445cc6a 100755
--- a/bin/hipcc
+++ b/bin/hipcc
@@ -798,9 +798,9 @@ if ($setStdLib eq 0 and $HIP_PLATFORM eq 'hcc' and $HIP_COMPILER eq 'hcc')
 
 if ($needHipHcc) {
     if ($linkType eq 0) {
-        substr($HIPLDFLAGS,0,0) = "  $HIP_LIB_PATH/libhip_hcc_static.a " ;
+        substr($HIPLDFLAGS,0,0) = "  $HIP_LIB_PATH/libamdhip64.a " ;
     } else {
-        substr($HIPLDFLAGS,0,0) = "  -Wl,--enable-new-dtags -Wl,--rpath=$HIP_LIB_PATH:$ROCM_PATH/lib $HIP_LIB_PATH/libhip_hcc.so ";
+        substr($HIPLDFLAGS,0,0) = "  -Wl,--enable-new-dtags -Wl,--rpath=$HIP_LIB_PATH:$ROCM_PATH/lib $HIP_LIB_PATH/libamdhip64.so ";
     }
 }
 
@@ -839,7 +839,7 @@ if ($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "clang") {
       if ($linkType eq 0) {
         $toolArgs .= " -L$HIP_LIB_PATH -lamdhip64 -L$ROCM_PATH/lib -lhsa-runtime64 -ldl -lnuma ";
       } else {
-        $toolArgs .= " -Wl,--enable-new-dtags -Wl,--rpath=$HIP_LIB_PATH:$ROCM_PATH/lib -lhip_hcc ";
+        $toolArgs .= " -Wl,--enable-new-dtags -Wl,--rpath=$HIP_LIB_PATH:$ROCM_PATH/lib -lamdhip64 ";
       }
       # To support __fp16 and _Float16, explicitly link with compiler-rt
       $toolArgs .= " -L$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/linux -lclang_rt.builtins-x86_64 "
diff --git a/packaging/hip-rocclr.txt b/packaging/hip-rocclr.txt
index 9cf89f042b..e284d6fc7f 100644
--- a/packaging/hip-rocclr.txt
+++ b/packaging/hip-rocclr.txt
@@ -5,8 +5,6 @@ if(@BUILD_SHARED_LIBS@)
     install(FILES @PROJECT_BINARY_DIR@/lib/libamdhip64.so DESTINATION lib)
     install(FILES @PROJECT_BINARY_DIR@/lib/libamdhip64.so.@HIP_LIB_VERSION_MAJOR@ DESTINATION lib)
     install(FILES @PROJECT_BINARY_DIR@/lib/libamdhip64.so.@HIP_LIB_VERSION_STRING@ DESTINATION lib)
-    install(FILES @PROJECT_BINARY_DIR@/lib/libhip_hcc.so DESTINATION lib)
-    install(FILES @PROJECT_BINARY_DIR@/lib/libhiprtc.so DESTINATION lib)
 else()
     install(FILES @PROJECT_BINARY_DIR@/lib/libamdhip64.a DESTINATION lib)
 endif()
diff --git a/rocclr/CMakeLists.txt b/rocclr/CMakeLists.txt
index 2687043b42..bef5de347c 100755
--- a/rocclr/CMakeLists.txt
+++ b/rocclr/CMakeLists.txt
@@ -207,17 +207,9 @@ target_link_libraries(device INTERFACE host)
 # FIXME: Linux convention is to create static library with same base
 # filename.
 
-
 if(${BUILD_SHARED_LIBS})
     target_link_libraries(amdhip64 PRIVATE amdrocclr_static Threads::Threads dl hsa-runtime64::hsa-runtime64)
     INSTALL(PROGRAMS $<TARGET_FILE:amdhip64> DESTINATION lib COMPONENT MAIN)
-    INSTALL(CODE "execute_process( COMMAND ${CMAKE_COMMAND} -E create_symlink libamdhip64.so lib/libhip_hcc.so  )" DESTINATION lib COMPONENT MAIN)
-
-    INSTALL(CODE "execute_process( COMMAND ${CMAKE_COMMAND} -E create_symlink libamdhip64.so lib/libhiprtc.so  )" DESTINATION lib COMPONENT MAIN)
-    INSTALL(FILES ${CMAKE_BINARY_DIR}/lib/libhip_hcc.so DESTINATION lib COMPONENT MAIN)
-
-    INSTALL(FILES ${CMAKE_BINARY_DIR}/lib/libhiprtc.so DESTINATION lib COMPONENT MAIN)
-
 else()
 
     target_link_libraries(amdhip64 PRIVATE Threads::Threads dl hsa-runtime64::hsa-runtime64 amd_comgr)
diff --git a/tests/src/g++/hipMalloc.cpp b/tests/src/g++/hipMalloc.cpp
index 3aab48aad5..d527db3570 100644
--- a/tests/src/g++/hipMalloc.cpp
+++ b/tests/src/g++/hipMalloc.cpp
@@ -18,7 +18,7 @@
  * */
 
 /* HIT_START
- * BUILD_CMD: hipMalloc %cxx -D__HIP_PLATFORM_HCC__ -I%hip-path/include -I/opt/rocm/include %S/%s -Wl,--rpath=%hip-path/lib %hip-path/lib/libhip_hcc.so -o %T/%t -std=c++11 EXCLUDE_HIP_PLATFORM nvcc
+ * BUILD_CMD: hipMalloc %cxx -D__HIP_PLATFORM_HCC__ -I%hip-path/include -I/opt/rocm/include %S/%s -Wl,--rpath=%hip-path/lib %hip-path/lib/libamdhip64.so -o %T/%t -std=c++11 EXCLUDE_HIP_PLATFORM nvcc
  * TEST: %t EXCLUDE_HIP_PLATFORM nvcc
  * HIT_END
  */
diff --git a/tests/src/gcc/LaunchKernel.c b/tests/src/gcc/LaunchKernel.c
index 1791d52d25..08aca3e2fe 100644
--- a/tests/src/gcc/LaunchKernel.c
+++ b/tests/src/gcc/LaunchKernel.c
@@ -21,7 +21,7 @@
 /* HIT_START
  * BUILD_CMD: gpu.o %hc -I%hip-path/include -g -c %S/gpu.cpp -o %T/gpu.o EXCLUDE_HIP_PLATFORM nvcc rocclr
  * BUILD_CMD: launchkernel.o %hc -D__HIP_PLATFORM_HCC__ -g -I%hip-path/include -c %S/LaunchKernel.c -o %T/launchkernel.o EXCLUDE_HIP_PLATFORM nvcc rocclr
- * BUILD_CMD: LaunchKernel %hc %T/launchkernel.o %T/gpu.o -g -Wl,--rpath=%hip-path/lib %hip-path/lib/libhip_hcc.so -o %T/%t DEPENDS gpu.o launchkernel.o EXCLUDE_HIP_PLATFORM nvcc rocclr
+ * BUILD_CMD: LaunchKernel %hc %T/launchkernel.o %T/gpu.o -g -Wl,--rpath=%hip-path/lib %hip-path/lib/libamdhip64.so -o %T/%t DEPENDS gpu.o launchkernel.o EXCLUDE_HIP_PLATFORM nvcc rocclr
  * TEST: %t EXCLUDE_HIP_PLATFORM nvcc rocclr
  * HIT_END
  */
diff --git a/tests/src/gcc/hipMalloc.c b/tests/src/gcc/hipMalloc.c
index f54071f907..2e5deb2a16 100644
--- a/tests/src/gcc/hipMalloc.c
+++ b/tests/src/gcc/hipMalloc.c
@@ -19,7 +19,7 @@
 
 /* HIT_START
  * BUILD_CMD: hipMalloc %cc -D__HIP_PLATFORM_NVCC__ -I%hip-path/include -I/usr/local/cuda/include %S/%s -o %T/hipMalloc_nv -L/usr/local/cuda/lib64 -lcudart EXCLUDE_HIP_PLATFORM hcc rocclr
- * BUILD_CMD: hipMalloc %cc -D__HIP_PLATFORM_HCC__ -I%hip-path/include %S/%s -Wl,--rpath=%hip-path/lib %hip-path/lib/libhip_hcc.so -o %T/hipMalloc_hcc EXCLUDE_HIP_PLATFORM nvcc rocclr
+ * BUILD_CMD: hipMalloc %cc -D__HIP_PLATFORM_HCC__ -I%hip-path/include %S/%s -Wl,--rpath=%hip-path/lib %hip-path/lib/libamdhip64.so -o %T/hipMalloc_hcc EXCLUDE_HIP_PLATFORM nvcc rocclr
  * TEST: hipMalloc_nv EXCLUDE_HIP_PLATFORM hcc rocclr
  * TEST: hipMalloc_hcc EXCLUDE_HIP_PLATFORM nvcc rocclr
  * HIT_END