FreeBSD fixes (#3430)

* fix missing include

* fix VisitModule under FreeBSD

I guess it got lost/reverted in the move

diff --git a/src/shared/dbgutil/elfreader.h b/src/shared/dbgutil/elfreader.h
index a30d880cc7ade8fc7a6ce42a25488cf1293d2874..483fb36ea1fe4f13978f3e9df6df6bf12681b25d 100644 (file)
--- a/src/shared/dbgutil/elfreader.h
+++ b/src/shared/dbgutil/elfreader.h
@@ -67,7 +67,11 @@ private:
     bool EnumerateLinkMapEntries(ElfW(Dyn)* dynamicAddr);
 #endif
     bool EnumerateProgramHeaders(ElfW(Phdr)* phdrAddr, int phnum, uint64_t baseAddress, uint64_t* ploadbias, ElfW(Dyn)** pdynamicAddr);
+#ifdef __FreeBSD__
+    virtual void VisitModule(caddr_t baseAddress, std::string& moduleName) { };
+#else
     virtual void VisitModule(uint64_t baseAddress, std::string& moduleName) { };
+#endif
     virtual void VisitProgramHeader(uint64_t loadbias, uint64_t baseAddress, ElfW(Phdr)* phdr) { };
     virtual bool ReadMemory(void* address, void* buffer, size_t size) = 0;
     virtual void Trace(const char* format, ...) { };

diff --git a/src/shared/pal/src/init/pal.cpp b/src/shared/pal/src/init/pal.cpp
index 7f1127027faacfbb63018ea60cec592473a6f7ec..2aeb8e5f9020f18ee80984358442df65b47ede74 100644 (file)
--- a/src/shared/pal/src/init/pal.cpp
+++ b/src/shared/pal/src/init/pal.cpp
@@ -81,6 +81,7 @@ int CacheLineSize;
 
 #ifdef __FreeBSD__
 #include <sys/user.h>
+#include <sys/sysctl.h>
 #endif
 
 #include <algorithm>