summaryrefslogtreecommitdiffstats
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
commitf54e67dcc9876c8a0259e45e5c6823535d8ac384 (patch)
tree43af2a351b520c9462107ddf991aec09121085da
parentecefe5a81fd01922185afdd4f47e8ff231e34a81 (diff)
downloadbcm5719-llvm-f54e67dcc9876c8a0259e45e5c6823535d8ac384.tar.gz
bcm5719-llvm-f54e67dcc9876c8a0259e45e5c6823535d8ac384.zip
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 llvm-svn: 259540
-rw-r--r--compiler-rt/lib/cfi/cfi.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler-rt/lib/cfi/cfi.cc b/compiler-rt/lib/cfi/cfi.cc
index 524730f8132..55b2327e357 100644
--- a/compiler-rt/lib/cfi/cfi.cc
+++ b/compiler-rt/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.
OpenPOWER on IntegriCloud