From bdcebdff8cf75342c94ba3eb3de68ddc77167b63 Mon Sep 17 00:00:00 2001 From: Peter Colberg Date: Mon, 6 Dec 2021 15:38:37 -0500 Subject: [PATCH 1/2] Revert "Use default new C++11 ABI for std::string and std::list in libstdc++" This change would require a larger ABI transition beyond the runtime. This reverts commit 0605379d688d51eceb6204f6f0d7ae6a18293b28. --- CMakeLists.txt | 1 + test/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index ea4d4804..3fe7ef85 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -196,6 +196,7 @@ 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 + _GLIBCXX_USE_CXX11_ABI=0 ACL_SUPPORT_DOUBLE=0 ACL_HAS_STDLIB_STDIO CL_USE_DEPRECATED_OPENCL_1_0_APIS=1 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index c9b346bc..d780bea9 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -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 From 562565e2c692f0f760582ceaf82063ea79a10fd9 Mon Sep 17 00:00:00 2001 From: Peter Colberg Date: Mon, 6 Dec 2021 15:55:07 -0500 Subject: [PATCH 2/2] Document use of _GLIBCXX_USE_CXX11_ABI --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3fe7ef85..cb2a8713 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -196,6 +196,11 @@ 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