Skip to content

Commit 3dc7ff6

Browse files
committed
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 0605379.
1 parent df4be19 commit 3dc7ff6

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ set_target_properties(acl_objs PROPERTIES
196196
target_compile_features(acl_objs PRIVATE cxx_std_11)
197197
# These compile_definitions need to be public, since we're building an OBJECT library (?)
198198
target_compile_definitions(acl_objs PUBLIC
199+
_GLIBCXX_USE_CXX11_ABI=0
199200
ACL_SUPPORT_DOUBLE=0
200201
ACL_HAS_STDLIB_STDIO
201202
CL_USE_DEPRECATED_OPENCL_1_0_APIS=1

test/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ add_executable(acl_test
3030
set_target_properties(acl_test PROPERTIES CXX_EXTENSIONS OFF)
3131
target_compile_features(acl_test PRIVATE cxx_std_11)
3232
target_compile_definitions(acl_test PRIVATE
33+
_GLIBCXX_USE_CXX11_ABI=0
3334
"ACL_TARGET_BIT=${ACL_TARGET_BIT}"
3435
CL_USE_DEPRECATED_OPENCL_1_0_APIS=1
3536
CL_USE_DEPRECATED_OPENCL_1_1_APIS=1

0 commit comments

Comments
 (0)