For PR797:
Final removal of exceptions from lib/System and adjustment of users to
accommodate.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29846 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/System/Unix/Memory.inc b/lib/System/Unix/Memory.inc
index 7faa220..d040416 100644
--- a/lib/System/Unix/Memory.inc
+++ b/lib/System/Unix/Memory.inc
@@ -35,7 +35,7 @@
#ifdef NEED_DEV_ZERO_FOR_MMAP
static int zero_fd = open("/dev/zero", O_RDWR);
if (zero_fd == -1) {
- GetErrno("Can't open /dev/zero device", ErrMsg);
+ MakeErrMsg(ErrMsg, "Can't open /dev/zero device");
return MemoryBlock();
}
fd = zero_fd;
@@ -58,7 +58,7 @@
if (NearBlock) //Try again without a near hint
return AllocateRWX(NumBytes, 0);
- GetErrno("Can't allocate RWX Memory", ErrMsg);
+ MakeErrMsg(ErrMsg, "Can't allocate RWX Memory");
return MemoryBlock();
}
MemoryBlock result;
@@ -70,7 +70,7 @@
bool llvm::sys::Memory::ReleaseRWX(MemoryBlock &M, std::string *ErrMsg) {
if (M.Address == 0 || M.Size == 0) return false;
if (0 != ::munmap(M.Address, M.Size))
- return GetErrno("Can't release RWX Memory", ErrMsg);
+ return MakeErrMsg(ErrMsg, "Can't release RWX Memory");
return false;
}