From afe4a5cb14f9b9f1274828a90650817e613796a3 Mon Sep 17 00:00:00 2001 From: klzgrad Date: Sat, 30 Nov 2019 21:52:42 +0800 Subject: [PATCH] libc++: Disable exceptions and RTTI Except on Mac, where exceptions are required. And except on Android, where rtti is required. --- src/buildtools/third_party/libc++/BUILD.gn | 4 --- src/buildtools/third_party/libc++abi/BUILD.gn | 30 +++++++++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/buildtools/third_party/libc++/BUILD.gn b/src/buildtools/third_party/libc++/BUILD.gn index dec348e235..5d12685e88 100644 --- a/src/buildtools/third_party/libc++/BUILD.gn +++ b/src/buildtools/third_party/libc++/BUILD.gn @@ -126,8 +126,6 @@ target(_libcxx_target_type, "libc++") { } configs -= [ "//build/config/compiler:chromium_code", - "//build/config/compiler:no_exceptions", - "//build/config/compiler:no_rtti", "//build/config/coverage:default_coverage", ] if ((is_android || is_apple) && libcxx_is_shared) { @@ -141,8 +139,6 @@ target(_libcxx_target_type, "libc++") { configs += [ ":config", "//build/config/compiler:no_chromium_code", - "//build/config/compiler:exceptions", - "//build/config/compiler:rtti", "//build/config/sanitizers:sanitizer_options_link_helper", ] if (libcxx_is_shared && !is_win) { diff --git a/src/buildtools/third_party/libc++abi/BUILD.gn b/src/buildtools/third_party/libc++abi/BUILD.gn index 40f1285f14..39db8748d4 100644 --- a/src/buildtools/third_party/libc++abi/BUILD.gn +++ b/src/buildtools/third_party/libc++abi/BUILD.gn @@ -93,4 +93,34 @@ source_set("libc++abi") { # libc++abi depends on libc++ internals. include_dirs = [ "../libc++/trunk/src" ] + if (!is_mac) { + sources -= [ + "trunk/src/cxa_exception.cpp", + "trunk/src/cxa_personality.cpp", + "trunk/src/private_typeinfo.cpp", + ] + sources += [ + "trunk/src/cxa_noexception.cpp", + ] + defines += [ "_LIBCXXABI_NO_EXCEPTIONS" ] + configs -= [ + "//build/config/compiler:exceptions", + "//build/config/compiler:rtti", + ] + configs += [ + "//build/config/compiler:no_exceptions", + "//build/config/compiler:no_rtti", + ] + } + if (is_android) { + sources += [ + "trunk/src/private_typeinfo.cpp", + ] + configs -= [ + "//build/config/compiler:no_rtti", + ] + configs += [ + "//build/config/compiler:rtti", + ] + } }