summaryrefslogtreecommitdiff
path: root/lib/cfi
diff options
context:
space:
mode:
authorAlexey Samsonov <vonosmas@gmail.com>2016-02-02 18:36:28 +0000
committerAlexey Samsonov <vonosmas@gmail.com>2016-02-02 18:36:28 +0000
commite738979fb247b22ac2dc3dfc9afc96f80666c44d (patch)
tree39a857d75784797bd0b0d3d66a0bf69bee16bf7d /lib/cfi
parent71c88e15a70a564186f73c15efcdde0d0df32dca (diff)
downloadcompiler-rt-e738979fb247b22ac2dc3dfc9afc96f80666c44d.tar.gz
Cast the fifth arg to mremap to void *
Summary: Since the prototype of mremap is ``` void *mremap(void *old_address, size_t old_size, size_t new_size, int flags, ... /* void *new_address*/); ``` we need to cast new_address to void * when calling mremap. Otherwise, the wrong value will be passed to mremap on x32. Patch by H.J Lu! Reviewers: kcc, eugenis, samsonov Subscribers: samsonov, llvm-commits Differential Revision: http://reviews.llvm.org/D16805 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@259540 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/cfi')
-rw-r--r--lib/cfi/cfi.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/cfi/cfi.cc b/lib/cfi/cfi.cc
index 524730f81..55b2327e3 100644
--- a/lib/cfi/cfi.cc
+++ b/lib/cfi/cfi.cc
@@ -155,7 +155,7 @@ void ShadowBuilder::Install() {
if (main_shadow) {
// Update.
void *res = mremap((void *)shadow_, GetShadowSize(), GetShadowSize(),
- MREMAP_MAYMOVE | MREMAP_FIXED, main_shadow);
+ MREMAP_MAYMOVE | MREMAP_FIXED, (void *)main_shadow);
CHECK(res != MAP_FAILED);
} else {
// Initial setup.