diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2019-06-26 10:43:08 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2019-06-26 10:43:08 +0000 |
| commit | 7cfb7260526af8cc8f8d416dcde0f8f8d397eb37 (patch) | |
| tree | 9638495387d16f70b08942e04d2e2956d639898d /libsanitizer | |
| parent | 2bca2d6a7274f4119d36285f386cd8a1e7f72334 (diff) | |
| download | gcc-7cfb7260526af8cc8f8d416dcde0f8f8d397eb37.tar.gz | |
Fix sanitizer_common/sanitizer_posix_libcdep.cc compilation on Solaris 11.5
* sanitizer_common/sanitizer_posix_libcdep.cc: Cherry-pick
compiler-rt revision 363778.
From-SVN: r272685
Diffstat (limited to 'libsanitizer')
| -rw-r--r-- | libsanitizer/ChangeLog | 5 | ||||
| -rw-r--r-- | libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 627d6893798..52c119ff690 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,8 @@ +2019-06-26 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * sanitizer_common/sanitizer_posix_libcdep.cc: Cherry-pick + compiler-rt revision 363778. + 2019-06-18 Iain Sandoe <iain@sandoe.co.uk> PR libsanitizer/87880 diff --git a/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc index a0e96fac223..d2fd76a6d36 100644 --- a/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc +++ b/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc @@ -69,7 +69,7 @@ void ReleaseMemoryPagesToOS(uptr beg, uptr end) { bool NoHugePagesInRegion(uptr addr, uptr size) { #ifdef MADV_NOHUGEPAGE // May not be defined on old systems. - return madvise((void *)addr, size, MADV_NOHUGEPAGE) == 0; + return madvise((char *)addr, size, MADV_NOHUGEPAGE) == 0; #else return true; #endif // MADV_NOHUGEPAGE @@ -77,9 +77,9 @@ bool NoHugePagesInRegion(uptr addr, uptr size) { bool DontDumpShadowMemory(uptr addr, uptr length) { #if defined(MADV_DONTDUMP) - return madvise((void *)addr, length, MADV_DONTDUMP) == 0; + return madvise((char *)addr, length, MADV_DONTDUMP) == 0; #elif defined(MADV_NOCORE) - return madvise((void *)addr, length, MADV_NOCORE) == 0; + return madvise((char *)addr, length, MADV_NOCORE) == 0; #else return true; #endif // MADV_DONTDUMP |