diff options
| author | Reid Kleckner <reid@kleckner.net> | 2009-07-23 01:40:54 +0000 |
|---|---|---|
| committer | Reid Kleckner <reid@kleckner.net> | 2009-07-23 01:40:54 +0000 |
| commit | 4bf370698a456bcc96d26184785eb4f5fab396f2 (patch) | |
| tree | 30f156c6f9fbe2faa7faf0dbbf047dd053dd1d23 /lib/System | |
| parent | 54e650f2c7bfcaec159ae41b2d79ce4a9a45edf8 (diff) | |
| download | llvm-4bf370698a456bcc96d26184785eb4f5fab396f2.tar.gz llvm-4bf370698a456bcc96d26184785eb4f5fab396f2.tar.bz2 llvm-4bf370698a456bcc96d26184785eb4f5fab396f2.tar.xz | |
Reverting r76825 and r76828, since they caused clang runtime errors and some build failure involving memset.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@76838 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/System')
| -rw-r--r-- | lib/System/Unix/Memory.inc | 7 | ||||
| -rw-r--r-- | lib/System/Win32/Memory.inc | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/lib/System/Unix/Memory.inc b/lib/System/Unix/Memory.inc index a80f56fbc1..b7a70135bc 100644 --- a/lib/System/Unix/Memory.inc +++ b/lib/System/Unix/Memory.inc @@ -12,7 +12,6 @@ //===----------------------------------------------------------------------===// #include "Unix.h" -#include "llvm/Support/DataTypes.h" #include "llvm/System/Process.h" #ifdef HAVE_SYS_MMAN_H @@ -29,12 +28,12 @@ /// is very OS specific. /// llvm::sys::MemoryBlock -llvm::sys::Memory::AllocateRWX(size_t NumBytes, const MemoryBlock* NearBlock, +llvm::sys::Memory::AllocateRWX(unsigned NumBytes, const MemoryBlock* NearBlock, std::string *ErrMsg) { if (NumBytes == 0) return MemoryBlock(); - size_t pageSize = Process::GetPageSize(); - size_t NumPages = (NumBytes+pageSize-1)/pageSize; + unsigned pageSize = Process::GetPageSize(); + unsigned NumPages = (NumBytes+pageSize-1)/pageSize; int fd = -1; #ifdef NEED_DEV_ZERO_FOR_MMAP diff --git a/lib/System/Win32/Memory.inc b/lib/System/Win32/Memory.inc index 7611ecdb92..5e5cf7a676 100644 --- a/lib/System/Win32/Memory.inc +++ b/lib/System/Win32/Memory.inc @@ -13,7 +13,6 @@ //===----------------------------------------------------------------------===// #include "Win32.h" -#include "llvm/Support/DataTypes.h" #include "llvm/System/Process.h" namespace llvm { @@ -24,13 +23,13 @@ using namespace sys; //=== and must not be UNIX code //===----------------------------------------------------------------------===// -MemoryBlock Memory::AllocateRWX(size_t NumBytes, +MemoryBlock Memory::AllocateRWX(unsigned NumBytes, const MemoryBlock *NearBlock, std::string *ErrMsg) { if (NumBytes == 0) return MemoryBlock(); - static const size_t pageSize = Process::GetPageSize(); - size_t NumPages = (NumBytes+pageSize-1)/pageSize; + static const long pageSize = Process::GetPageSize(); + unsigned NumPages = (NumBytes+pageSize-1)/pageSize; //FIXME: support NearBlock if ever needed on Win64. |