From eec6c2604b69d1b9b66ac65d069ba24e6bf959a0 Mon Sep 17 00:00:00 2001 From: Thefrank <1910378+Thefrank@users.noreply.github.com> Date: Mon, 3 Oct 2022 13:36:43 -0700 Subject: [PATCH] FreeBSD fixes (#3430) * fix missing include * fix VisitModule under FreeBSD I guess it got lost/reverted in the move --- src/shared/dbgutil/elfreader.h | 4 ++++ src/shared/pal/src/init/pal.cpp | 1 + 2 files changed, 5 insertions(+) diff --git a/src/shared/dbgutil/elfreader.h b/src/shared/dbgutil/elfreader.h index a30d880cc..483fb36ea 100644 --- 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 7f1127027..2aeb8e5f9 100644 --- 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 +#include #endif #include -- 2.34.1