diff --git a/rocclr/device/device.cpp b/rocclr/device/device.cpp
index 5d06068c3d..0e7c24ebdb 100644
--- a/rocclr/device/device.cpp
+++ b/rocclr/device/device.cpp
@@ -749,6 +749,10 @@ bool ClBinary::createElfBinary(bool doencrypt, Program::type_t type) {
     return false;
   }
 
+  if (tempFile_) {
+    std::remove(fname_.c_str());
+  }
+
 #if defined(HAVE_BLOWFISH_H)
   if (doencrypt) {
     // Increase the size by 64 to accomodate extra headers
@@ -863,7 +867,8 @@ void ClBinary::resetElfIn() {
   }
 }
 
-bool ClBinary::setElfOut(unsigned char eclass, const char* outFile) {
+bool ClBinary::setElfOut(unsigned char eclass,
+                         const char* outFile, bool tempFile) {
   elfOut_ = new amd::Elf(eclass, nullptr, 0, outFile, amd::Elf::ELF_C_WRITE);
   if ((elfOut_ == nullptr) || !elfOut_->isSuccessful()) {
     if (elfOut_) {
@@ -874,6 +879,9 @@ bool ClBinary::setElfOut(unsigned char eclass, const char* outFile) {
     return false;
   }
 
+  fname_ = outFile;
+  tempFile_ = tempFile;
+
   return setElfTarget();
 }
 
diff --git a/rocclr/device/device.hpp b/rocclr/device/device.hpp
index 7c125e6531..de9fe4226e 100644
--- a/rocclr/device/device.hpp
+++ b/rocclr/device/device.hpp
@@ -907,7 +907,7 @@ class ClBinary : public amd::HeapObject {
   void resetElfIn();
 
   //! set out elf
-  bool setElfOut(unsigned char eclass, const char* outFile);
+  bool setElfOut(unsigned char eclass, const char* outFile, bool tempFile);
   void resetElfOut();
 
   //! Set elf header information
@@ -1056,6 +1056,9 @@ class ClBinary : public amd::HeapObject {
 
   int encryptCode_;  //!< Encryption Code for input binary (0 for not encrypted)
 
+  std::string fname_; //!< name of elf dump file
+  bool tempFile_;     //!< Is the elf dump file temporary
+
  protected:
   amd::Elf* elfIn_;        //!< ELF object for input ELF binary
   amd::Elf* elfOut_;       //!< ELF object for output ELF binary
diff --git a/rocclr/device/devprogram.cpp b/rocclr/device/devprogram.cpp
index 403c5ec756..d8e7ef3b65 100644
--- a/rocclr/device/devprogram.cpp
+++ b/rocclr/device/devprogram.cpp
@@ -1371,15 +1371,20 @@ bool Program::initBuild(amd::option::Options* options) {
 
   // Elf Binary setup
   std::string outFileName;
+  bool tempFile = false;
 
   // true means hsail required
   clBinary()->init(options, true);
   if (options->isDumpFlagSet(amd::option::DUMP_BIF)) {
     outFileName = options->getDumpFileName(".bin");
+  } else {
+    // elf lib needs a writable temp file
+    outFileName = amd::Os::getTempFileName();
+    tempFile = true;
   }
 
   if (!clBinary()->setElfOut(LP64_SWITCH(ELFCLASS32, ELFCLASS64),
-    (outFileName.size() > 0) ? outFileName.c_str() : nullptr)) {
+    (outFileName.size() > 0) ? outFileName.c_str() : nullptr, tempFile)) {
     LogError("Setup elf out for gpu failed");
     return false;
   }