Skip to content

Revert "Use default new C++11 ABI for std::string and std::list in libstdc++" #39

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

Merged
merged 2 commits into from
Dec 6, 2021
Merged

Revert "Use default new C++11 ABI for std::string and std::list in libstdc++" #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdcebdf
Revert "Use default new C++11 ABI for std::string and std::list in li…
pcolberg Dec 6, 2021
562565e
Document use of _GLIBCXX_USE_CXX11_ABI
pcolberg Dec 6, 2021
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
6 changes: 6 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,12 @@ set_target_properties(acl_objs PROPERTIES
target_compile_features(acl_objs PRIVATE cxx_std_11)
# These compile_definitions need to be public, since we're building an OBJECT library (?)
target_compile_definitions(acl_objs PUBLIC
# Revert to old pre-C++11 ABI for std::string and std::list in libstdc++.
# This is needed for ABI compatibility with the Intel® FPGA Add-On for
# oneAPI Base Toolkit, particularly the simulation flow, which accesses
# the internal runtime API that exposes C++ structures and functions.
# https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
_GLIBCXX_USE_CXX11_ABI=0
ACL_SUPPORT_DOUBLE=0
ACL_HAS_STDLIB_STDIO
CL_USE_DEPRECATED_OPENCL_1_0_APIS=1
Expand Down
1 change: 1 addition & 0 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ add_executable(acl_test
set_target_properties(acl_test PROPERTIES CXX_EXTENSIONS OFF)
target_compile_features(acl_test PRIVATE cxx_std_11)
target_compile_definitions(acl_test PRIVATE
_GLIBCXX_USE_CXX11_ABI=0
"ACL_TARGET_BIT=${ACL_TARGET_BIT}"
CL_USE_DEPRECATED_OPENCL_1_0_APIS=1
CL_USE_DEPRECATED_OPENCL_1_1_APIS=1
Expand Down