diff --git a/src/shared/debug/dbgutil/elfreader.cpp b/src/shared/debug/dbgutil/elfreader.cpp index b537b4e283..2346e8e828 100644 --- a/src/shared/debug/dbgutil/elfreader.cpp +++ b/src/shared/debug/dbgutil/elfreader.cpp @@ -97,7 +97,7 @@ class ElfReaderFromFile : public ElfReader } } - virtual bool ReadMemory(void* address, void* buffer, size_t size) + virtual bool ReadMemory(const void* address, void* buffer, size_t size) { if (m_file == NULL) { @@ -163,7 +163,7 @@ TryGetBuildIdFromFile(const WCHAR* modulePath, BYTE* buffer, ULONG bufferSize, P #endif // HOST_UNIX -typedef bool (*ReadMemoryCallback)(void* address, void* buffer, size_t size); +typedef bool (*ReadMemoryCallback)(const void* address, void* buffer, size_t size); class ElfReaderWithCallback : public ElfReader { @@ -181,7 +181,7 @@ class ElfReaderWithCallback : public ElfReader } private: - virtual bool ReadMemory(void* address, void* buffer, size_t size) + virtual bool ReadMemory(const void* address, void* buffer, size_t size) { return m_readMemory(address, buffer, size); } @@ -225,7 +225,7 @@ class ElfReaderExport : public ElfReader } private: - virtual bool ReadMemory(void* address, void* buffer, size_t size) + virtual bool ReadMemory(const void* address, void* buffer, size_t size) { uint32_t read = 0; return SUCCEEDED(m_dataTarget->ReadVirtual(reinterpret_cast(address), reinterpret_cast(buffer), (uint32_t)size, &read)); diff --git a/src/shared/debug/dbgutil/elfreader.h b/src/shared/debug/dbgutil/elfreader.h index 73daa53d05..7235fa6128 100644 --- a/src/shared/debug/dbgutil/elfreader.h +++ b/src/shared/debug/dbgutil/elfreader.h @@ -75,7 +75,7 @@ class ElfReader 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 bool ReadMemory(const void* address, void* buffer, size_t size) = 0; virtual void Trace(const char* format, ...) { }; virtual void TraceVerbose(const char* format, ...) { }; }; diff --git a/src/shared/pal/src/init/pal.cpp b/src/shared/pal/src/init/pal.cpp index f6ea18445d..54e2259223 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