diff --git a/rocclr/compiler/lib/utils/options.cpp b/rocclr/compiler/lib/utils/options.cpp
index fa67675cdc..490b29f1c8 100644
--- a/rocclr/compiler/lib/utils/options.cpp
+++ b/rocclr/compiler/lib/utils/options.cpp
@@ -896,6 +896,13 @@ processOption(int OptDescTableIx, Options& Opts, const std::string& Value,
         }
         break;
 
+#if defined(WITH_LIGHTNING_COMPILER)
+    case OID_OptUseNative:
+        Opts.llvmOptions.append(" -mllvm -amdgpu-use-native=");
+        Opts.llvmOptions.append(sval);
+        break;
+#endif
+
     case OID_WFComma:
     case OID_WBComma:
     case OID_WHComma:
diff --git a/rocclr/runtime/device/pal/palcompiler.cpp b/rocclr/runtime/device/pal/palcompiler.cpp
index ddeb6045e5..17de21fdd5 100644
--- a/rocclr/runtime/device/pal/palcompiler.cpp
+++ b/rocclr/runtime/device/pal/palcompiler.cpp
@@ -260,7 +260,7 @@ bool LightningProgram::compileImpl(const std::string& sourceCode,
   driverOptions.append(hsailOptions(options));
 
   // Set whole program mode
-  driverOptions.append(" -mllvm -amdgpu-early-inline-all");
+  driverOptions.append(" -mllvm -amdgpu-early-inline-all -mllvm -amdgpu-prelink");
 
   // Find the temp folder for the OS
   std::string tempFolder = amd::Os::getEnvironment("TEMP");
diff --git a/rocclr/runtime/device/rocm/roccompiler.cpp b/rocclr/runtime/device/rocm/roccompiler.cpp
index e70bc6f640..da821ae1ab 100644
--- a/rocclr/runtime/device/rocm/roccompiler.cpp
+++ b/rocclr/runtime/device/rocm/roccompiler.cpp
@@ -100,7 +100,7 @@ bool HSAILProgram::compileImpl_LC(const std::string& sourceCode,
   driverOptions.append(options->llvmOptions);
 
   // Set whole program mode
-  driverOptions.append(" -mllvm -amdgpu-early-inline-all");
+  driverOptions.append(" -mllvm -amdgpu-early-inline-all -mllvm -amdgpu-prelink");
 
   driverOptions.append(preprocessorOptions(options));