Revert "Bring loader in sync with stg/sc"

This reverts commit c798c60343.

Change-Id: If99e8cc9e2afb525f690e49eb6538d8e950a5615

runtime/hsa-runtime/libamdhsacode/amd_elf_image.cpp

@@ -41,7 +41,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "amd_elf_image.hpp"
-#include "amd_hsa_code_util.hpp"
 #include <gelf.h>
 #include <errno.h>
 #include <cstring>
@@ -51,6 +50,7 @@
 #include <cassert>
 #include <cstdlib>
 #include <algorithm>
+#include "amd_hsa_code_util.hpp"
 #ifdef _WIN32
 #include <Windows.h>
 #define alignof __alignof
@@ -60,38 +60,17 @@
 #ifndef _WIN32
 #define _open open
 #define _close close
-#define _tempnam tempnam
-#include <fcntl.h>
-#include <unistd.h>
-#endif
-
-#if defined(USE_MEMFILE)
-
-#include "memfile.h"
-#define OpenTemp(f)           mem_open(NULL, 0, 0)
-#define CloseTemp(f)          mem_close(f)
-#define _read(f, b, l)        mem_read((f), (b), (l))
-#define _write(f, b, l)       mem_write((f), (b), (l))
-#define _lseek(f, l, w)       mem_lseek((f), (l), (w))
-#define _ftruncate(f, l)      mem_ftruncate((f), (size_t)(l))
-#define sendfile(o, i, p, s)  mem_sendfile((o), (i), (p), (s))
-
-#else // USE_MEMFILE
-
-#define OpenTemp(f) amd::hsa::OpenTempFile(f);
-#define CloseTemp(f) amd::hsa::CloseTempFile(f);
-
-#ifndef _WIN32
 #define _read read
 #define _write write
 #define _lseek lseek
 #define _ftruncate ftruncate
+#define _tempnam tempnam
 #include <sys/sendfile.h>
+#include <fcntl.h>
+#include <unistd.h>
 #else
 #define _ftruncate _chsize
-#endif // !_WIN32
-
-#endif // !USE_MEMFILE
+#endif
 
 #if !defined(BSD_LIBELF)
   #define elf_setshstrndx elfx_update_shstrndx
@@ -136,7 +115,7 @@ namespace amd {
 
     FileImage::~FileImage()
     {
-      if (d != -1) { CloseTemp(d); }
+      if (d >= 0) { amd::hsa::CloseTempFile(d); }
     }
 
     bool FileImage::error(const char* msg)
@@ -174,8 +153,8 @@ namespace amd {
 
     bool FileImage::create()
     {
-      d = OpenTemp("amdelf");
-      if (d == -1) { return error("Failed to open temporary file for elf image"); }
+      d = amd::hsa::OpenTempFile("amdelf");
+      if (d < 0) { return error("Failed to open temporary file for elf image"); }
       return true;
     }