From facf22b8b07b9bbd59a078cce25137b297b5eaae Mon Sep 17 00:00:00 2001
From: Vitaly Buka <vitalybuka@google.com>
Date: Thu, 25 May 2023 20:58:52 -0700
Subject: [PATCH] [fuzzer] Platfom specific version of PageSize

---
 compiler-rt/lib/fuzzer/FuzzerUtil.cpp        | 6 ------
 compiler-rt/lib/fuzzer/FuzzerUtilFuchsia.cpp | 5 +++++
 compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp   | 5 +++++
 compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp | 9 +++++++++
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/compiler-rt/lib/fuzzer/FuzzerUtil.cpp b/compiler-rt/lib/fuzzer/FuzzerUtil.cpp
index 71c3dc1..aeab70f 100644
--- a/compiler-rt/lib/fuzzer/FuzzerUtil.cpp
+++ b/compiler-rt/lib/fuzzer/FuzzerUtil.cpp
@@ -21,7 +21,6 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <thread>
-#include <unistd.h>
 
 namespace fuzzer {
 
@@ -235,9 +234,4 @@ uint64_t SimpleFastHash(const void *Data, size_t Size, uint64_t Initial) {
   return Res;
 }
 
-size_t PageSize() {
-  static size_t PageSizeCached = sysconf(_SC_PAGESIZE);
-  return PageSizeCached;
-}
-
 }  // namespace fuzzer
diff --git a/compiler-rt/lib/fuzzer/FuzzerUtilFuchsia.cpp b/compiler-rt/lib/fuzzer/FuzzerUtilFuchsia.cpp
index d80b80c..2a21529 100644
--- a/compiler-rt/lib/fuzzer/FuzzerUtilFuchsia.cpp
+++ b/compiler-rt/lib/fuzzer/FuzzerUtilFuchsia.cpp
@@ -551,6 +551,11 @@ void DiscardOutput(int Fd) {
   dup2(nullfd, Fd);
 }
 
+size_t PageSize() {
+  static size_t PageSizeCached = _zx_system_get_page_size();
+  return PageSizeCached;
+}
+
 } // namespace fuzzer
 
 #endif // LIBFUZZER_FUCHSIA
diff --git a/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp b/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
index 0446d73..392c1e5 100644
--- a/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
+++ b/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
@@ -183,6 +183,11 @@ std::string SearchRegexCmd(const std::string &Regex) {
   return "grep '" + Regex + "'";
 }
 
+size_t PageSize() {
+  static size_t PageSizeCached = sysconf(_SC_PAGESIZE);
+  return PageSizeCached;
+}
+
 }  // namespace fuzzer
 
 #endif // LIBFUZZER_POSIX
diff --git a/compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp b/compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp
index 3598758..6d9bc76 100644
--- a/compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp
+++ b/compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp
@@ -224,6 +224,15 @@ void DiscardOutput(int Fd) {
   fclose(Temp);
 }
 
+size_t PageSize() {
+  static size_t PageSizeCached = []() -> size_t {
+    SYSTEM_INFO si;
+    GetSystemInfo(&si);
+    return si.dwPageSize;
+  }();
+  return PageSizeCached;
+}
+
 } // namespace fuzzer
 
 #endif // LIBFUZZER_WINDOWS
-- 
2.7.4