Merge pull request #519 from AntelopeIO/gh_517

Disable `NEON` on arm in boost `unordered`.
AntelopeIO · Aug 12, 2024 · 10295c4 · 10295c4
2 parents c428a75 + 8804792
commit 10295c4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -179,6 +179,10 @@ set(CMAKE_DISABLE_FIND_PACKAGE_OpenSSL On)
 # is effectively --catch_system_errors=no broadly across all tests
 add_compile_definitions(BOOST_TEST_DEFAULTS_TO_CORE_DUMP)
 
+# Unless this is set, some boost unordered headers include `arm_neon.h` when building on ARM processors,
+# which includes a definition for `float16_t` conflicting with the one in `libraries/softfloat`.
+add_compile_definitions(BOOST_UNORDERED_DISABLE_NEON)
+
 add_subdirectory( libraries )
 add_subdirectory( plugins )
 add_subdirectory( programs )

diff --git a/unittests/savanna_cluster.hpp b/unittests/savanna_cluster.hpp
@@ -5,6 +5,7 @@
 
 #include <eosio/testing/tester.hpp>
 #include <ranges>
+
 #include <boost/unordered/unordered_flat_map.hpp>
 
 #include "snapshot_suites.hpp"