From 9c6dbda74b8486f7ed2fcd5300fb4a3b6a02809d Mon Sep 17 00:00:00 2001
From: Tao Sang <tao.sang@amd.com>
Date: Sun, 21 Jun 2020 09:57:24 -0400
Subject: [PATCH] Fix static lib crashing issue

Initialize HIP_ENABLE_DEFERRED_LOADING = 1

Change-Id: I432ccf1926b953c4391fdd086cde7da2380962bb


[ROCm/hip commit: 0eebbb4f87e305a8272849797a452f5682025acb]
---
 projects/hip/rocclr/hip_platform.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/projects/hip/rocclr/hip_platform.cpp b/projects/hip/rocclr/hip_platform.cpp
index 38dac4ad60..00a80fd7bf 100755
--- a/projects/hip/rocclr/hip_platform.cpp
+++ b/projects/hip/rocclr/hip_platform.cpp
@@ -29,6 +29,7 @@
 #include "elfio.hpp"
 
 constexpr unsigned __hipFatMAGIC2 = 0x48495046; // "HIPF"
+int HIP_ENABLE_DEFERRED_LOADING = 1; // Will check later
 
 thread_local std::stack<ihipExec_t> execStack_;
 PlatformState* PlatformState::platform_; // Initiaized as nullptr by default
@@ -130,13 +131,6 @@ bool CL_CALLBACK getSvarInfo(cl_program program, std::string var_name, void** va
                                                     var_addr, var_size);
 }
 
-namespace {
-const int HIP_ENABLE_DEFERRED_LOADING{[] () {
-  char *var = getenv("HIP_ENABLE_DEFERRED_LOADING");
-  return var ? atoi(var) : 1;
-}()};
-} /* namespace */
-
 extern "C" void __hipRegisterFunction(
   hip::FatBinaryInfoType* modules,
   const void*  hostFunction,
@@ -910,6 +904,9 @@ void PlatformState::init()
   }
   initialized_ = true;
 
+  char *var = getenv("HIP_ENABLE_DEFERRED_LOADING");
+  HIP_ENABLE_DEFERRED_LOADING = var ? atoi(var) : 1;
+
   for (auto& it : statCO_.modules_) {
     digestFatBinary(it.first, it.second);
   }