Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable NEON on arm in boost unordered. #519

Merged
merged 3 commits into from
Aug 12, 2024
Merged

Disable NEON on arm in boost unordered. #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c908d7
Disable `NEON` on arm in boost `unordered` because of conflicting dec…
greg7mdp Aug 12, 2024
e7890a0
Define `BOOST_UNORDERED_DISABLE_NEON` globally in `CMakeLists.txt`
greg7mdp Aug 12, 2024
8804792
Merge branch 'main' of github.com:AntelopeIO/spring into gh_517
greg7mdp Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
1 change: 1 addition & 0 deletions unittests/savanna_cluster.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#include <eosio/testing/tester.hpp>
#include <ranges>

#include <boost/unordered/unordered_flat_map.hpp>

#include "snapshot_suites.hpp"
Expand Down