Windows fix

lief-project · May 9, 2024 · 3c76f67 · 3c76f67
1 parent fc8aa9a
commit 3c76f67
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/cmake/LIEFCompilerFlags.cmake b/cmake/LIEFCompilerFlags.cmake
@@ -119,6 +119,10 @@ if(MSVC AND NOT CLANG_CL)
   endforeach(flag)
 
   if (LIEF_DISABLE_EXCEPTIONS)
+      string(REGEX REPLACE " /EHsc" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+      string(REGEX REPLACE " /EHsc" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+      string(REGEX REPLACE " /EHc" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+      string(REGEX REPLACE " /EHc" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
       target_compile_options(LIB_LIEF PRIVATE /EHsc-)
   endif()
 endif()

diff --git a/include/LIEF/MachO/DyldExportsTrie.hpp b/include/LIEF/MachO/DyldExportsTrie.hpp
@@ -53,7 +53,7 @@ class LIEF_API DyldExportsTrie : public LoadCommand {
   //! Iterator which outputs const ExportInfo&
   using it_const_export_info = const_ref_iterator<const export_info_t&, ExportInfo*>;
 
-  DyldExportsTrie() = default;
+  DyldExportsTrie();
   DyldExportsTrie(const details::linkedit_data_command& cmd);
   std::unique_ptr<LoadCommand> clone() const override {
     return std::unique_ptr<DyldExportsTrie>(new DyldExportsTrie(*this));

diff --git a/src/MachO/Builder.cpp b/src/MachO/Builder.cpp
@@ -26,6 +26,7 @@
 #include "LIEF/MachO/Builder.hpp"
 #include "LIEF/MachO/FatBinary.hpp"
 #include "LIEF/MachO/UUIDCommand.hpp"
+#include "LIEF/MachO/ExportInfo.hpp"
 
 #include "Object.tcc"
 
@@ -140,7 +141,7 @@ ok_error_t Builder::build_fat() {
     std::vector<uint8_t> raw = build_raw(*binaries_[i], config_);
 
     auto alignment = BinaryStream::swap_endian<uint32_t>(arch->align);
-    uint32_t offset = align(raw_.size(), 1 << alignment);
+    uint32_t offset = align(raw_.size(), 1llu << alignment);
 
     arch->offset = BinaryStream::swap_endian<uint32_t>(offset);
     arch->size   = BinaryStream::swap_endian<uint32_t>(raw.size());

diff --git a/src/MachO/DyldExportsTrie.cpp b/src/MachO/DyldExportsTrie.cpp
@@ -27,6 +27,8 @@
 
 namespace LIEF {
 namespace MachO {
+
+DyldExportsTrie::DyldExportsTrie() = default;
 DyldExportsTrie::~DyldExportsTrie() = default;
 DyldExportsTrie::DyldExportsTrie(const DyldExportsTrie& other) :
   LoadCommand::LoadCommand(other),