From 579060fe5105c0cfcb35e5ee35a3f6c921ec0791 Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Wed, 13 Sep 2023 18:51:06 +0200 Subject: [PATCH] Drop cfi support --- build/bromite.gn_args | 2 -- build/bromite_patches_list.txt | 1 - ...xperimental-relative-c---abi-vtables.patch | 28 ------------------- tools/images/bromite-build/build_args.gni | 6 ---- 4 files changed, 37 deletions(-) delete mode 100644 build/patches/00Remove-experimental-relative-c---abi-vtables.patch diff --git a/build/bromite.gn_args b/build/bromite.gn_args index 293db8ebe..40c98e4e7 100644 --- a/build/bromite.gn_args +++ b/build/bromite.gn_args @@ -26,7 +26,6 @@ enable_vr=false exclude_unwind_tables=false ffmpeg_branding="Chrome" icu_use_data_file=true -is_cfi=true is_component_build=false is_debug=false is_official_build=true @@ -36,7 +35,6 @@ symbol_level=1 system_webview_package_name="org.bromite.webview" target_os="android" treat_warnings_as_errors=true -use_cfi_cast=true use_debug_fission=true use_errorprone_java_compiler=false use_gnome_keyring=false diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index 7367e28da..e09dd8ab2 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -204,7 +204,6 @@ Add-kill-switch-for-unsupported-clangd-flags.patch 00WIN-Add-some-prefs-to-secure-preferences.patch 00WIN-Disable-search-for-image.patch -00Remove-experimental-relative-c---abi-vtables.patch AudioBuffer-AnalyserNode-fp-mitigations.patch 00Disable-Component-Updates.patch 00add-browser-policy.patch diff --git a/build/patches/00Remove-experimental-relative-c---abi-vtables.patch b/build/patches/00Remove-experimental-relative-c---abi-vtables.patch deleted file mode 100644 index 1ad068159..000000000 --- a/build/patches/00Remove-experimental-relative-c---abi-vtables.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: uazo -Date: Mon, 30 Jan 2023 15:20:53 +0000 -Subject: Remove experimental-relative-c++-abi-vtables - -although it is really interesting, it breaks execution with CFI active - -License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html ---- - build/config/compiler/BUILD.gn | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn ---- a/build/config/compiler/BUILD.gn -+++ b/build/config/compiler/BUILD.gn -@@ -681,11 +681,6 @@ config("compiler") { - cflags_cc += [ "-Wno-trigraphs" ] - } - -- if (use_relative_vtables_abi) { -- cflags_cc += [ "-fexperimental-relative-c++-abi-vtables" ] -- ldflags += [ "-fexperimental-relative-c++-abi-vtables" ] -- } -- - # Add flags for link-time optimization. These flags enable - # optimizations/transformations that require whole-program visibility at link - # time, so they need to be applied to all translation units, and we may end up --- -2.25.1 diff --git a/tools/images/bromite-build/build_args.gni b/tools/images/bromite-build/build_args.gni index 49be50a7b..b70cc0c18 100644 --- a/tools/images/bromite-build/build_args.gni +++ b/tools/images/bromite-build/build_args.gni @@ -31,14 +31,8 @@ if (target_os == "android") { symbol_level = 1 strip_debug_info = false generate_linker_map = false - - # since is_cfi require use_thin_lto - # but not work in debug mode - is_cfi = false # disable it - use_cfi_cast = false # disable it } else { generate_linker_map = true - use_relative_vtables_abi = false } }