<div dir="ltr">This broke asan on PowerPC linux, where the page size (sysconf(_SC_PAGESIZE)) is 64K, but for some reason EXEC_PAGESIZE is 4K<div><br></div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Mon, May 20, 2013 at 9:05 PM, Peter Collingbourne <span dir="ltr"><<a href="mailto:peter@pcc.me.uk" target="_blank">peter@pcc.me.uk</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: pcc<br>
Date: Mon May 20 12:05:29 2013<br>
New Revision: 182303<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=182303&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=182303&view=rev</a><br>
Log:<br>
[nolibc] Move GetPageSize to the individual platforms.<br>
<br>
GetPageSize wraps sysconf(_SC_PAGESIZE) on POSIX platforms, but<br>
sysconf resides in libc.  To make this libc-independent on Linux,<br>
move the wrapper to sanitizer_mac.cc and return the Linux-specific<br>
constant EXEC_PAGESIZE in the sanitizer_linux.cc implementation.<br>
<br>
Modified:<br>
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc<br>
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_mac.cc<br>
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_posix.cc<br>
<br>
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc?rev=182303&r1=182302&r2=182303&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc?rev=182303&r1=182302&r2=182303&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc Mon May 20 12:05:29 2013<br>
@@ -613,6 +613,10 @@ bool ThreadLister::GetDirectoryEntries()<br>
   return true;<br>
 }<br>
<br>
+uptr GetPageSize() {<br>
+  return EXEC_PAGESIZE;<br>
+}<br>
+<br>
 // Match full names of the form /path/to/base_name{-,.}*<br>
 bool LibraryNameIs(const char *full_name, const char *base_name) {<br>
   const char *name = full_name;<br>
<br>
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_mac.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_mac.cc?rev=182303&r1=182302&r2=182303&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_mac.cc?rev=182303&r1=182302&r2=182303&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_mac.cc (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_mac.cc Mon May 20 12:05:29 2013<br>
@@ -170,6 +170,10 @@ void PrepareForSandboxing() {<br>
   // Nothing here for now.<br>
 }<br>
<br>
+uptr GetPageSize() {<br>
+  return sysconf(_SC_PAGESIZE);<br>
+}<br>
+<br>
 // ----------------- sanitizer_procmaps.h<br>
<br>
 MemoryMappingLayout::MemoryMappingLayout(bool cache_enabled) {<br>
<br>
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_posix.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_posix.cc?rev=182303&r1=182302&r2=182303&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_posix.cc?rev=182303&r1=182302&r2=182303&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_posix.cc (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_posix.cc Mon May 20 12:05:29 2013<br>
@@ -35,10 +35,6 @@<br>
 namespace __sanitizer {<br>
<br>
 // ------------- sanitizer_common.h<br>
-uptr GetPageSize() {<br>
-  return sysconf(_SC_PAGESIZE);<br>
-}<br>
-<br>
 uptr GetMmapGranularity() {<br>
   return GetPageSize();<br>
 }<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>