@@ -228,11 +228,6 @@ declare_args() {
228
228
(is_linux || is_chromeos || is_mac )) ||
229
229
(v8_current_cpu == " ppc64" && (is_linux || is_chromeos ))
230
230
231
- # Enable mitigations for executing untrusted code.
232
- # Disabled by default on ia32 due to conflicting requirements with embedded
233
- # builtins.
234
- v8_untrusted_code_mitigations = false
235
-
236
231
# Enable minor mark compact.
237
232
v8_enable_minor_mc = true
238
233
@@ -461,9 +456,6 @@ if (build_with_chromium && v8_current_cpu == "arm64" &&
461
456
assert (! v8_disable_write_barriers || v8_enable_single_generation ,
462
457
" Disabling write barriers works only with single generation" )
463
458
464
- assert (v8_current_cpu != " x86" || ! v8_untrusted_code_mitigations ,
465
- " Untrusted code mitigations are unsupported on ia32" )
466
-
467
459
assert (v8_current_cpu == " arm64" || ! v8_control_flow_integrity ,
468
460
" Control-flow integrity is only supported on arm64" )
469
461
@@ -480,9 +472,6 @@ assert(!v8_enable_map_packing || !v8_enable_pointer_compression,
480
472
assert (! v8_enable_map_packing || v8_current_cpu == " x64" ,
481
473
" Map packing is only supported on x64" )
482
474
483
- assert (! v8_use_multi_snapshots || ! v8_control_flow_integrity ,
484
- " Control-flow integrity does not support multisnapshots" )
485
-
486
475
assert (! v8_enable_heap_sandbox || v8_enable_pointer_compression ,
487
476
" V8 Heap Sandbox requires pointer compression" )
488
477
@@ -872,9 +861,6 @@ config("features") {
872
861
if (v8_enable_lazy_source_positions ) {
873
862
defines += [ " V8_ENABLE_LAZY_SOURCE_POSITIONS" ]
874
863
}
875
- if (v8_use_multi_snapshots ) {
876
- defines += [ " V8_MULTI_SNAPSHOTS" ]
877
- }
878
864
if (v8_use_siphash ) {
879
865
defines += [ " V8_USE_SIPHASH" ]
880
866
}
@@ -1170,10 +1156,6 @@ config("toolchain") {
1170
1156
defines += [ " V8_RUNTIME_CALL_STATS" ]
1171
1157
}
1172
1158
1173
- if (! v8_untrusted_code_mitigations ) {
1174
- defines += [ " DISABLE_UNTRUSTED_CODE_MITIGATIONS" ]
1175
- }
1176
-
1177
1159
if (v8_no_inline ) {
1178
1160
if (is_win ) {
1179
1161
cflags += [ " /Ob0" ]
@@ -1309,8 +1291,6 @@ template("asm_to_inline_asm") {
1309
1291
if (is_android && enable_java_templates ) {
1310
1292
android_assets (" v8_external_startup_data_assets" ) {
1311
1293
if (v8_use_external_startup_data ) {
1312
- # We don't support side-by-side snapshots on Android within Chromium.
1313
- assert (! v8_use_multi_snapshots )
1314
1294
deps = [ " //v8" ]
1315
1295
renaming_sources = [ " $root_out_dir /snapshot_blob.bin" ]
1316
1296
if (current_cpu == " arm" || current_cpu == " x86" ||
@@ -1987,17 +1967,6 @@ if (emit_builtins_as_inline_asm) {
1987
1967
args = []
1988
1968
}
1989
1969
}
1990
- if (v8_use_multi_snapshots ) {
1991
- run_mksnapshot (" trusted" ) {
1992
- args = [ " --no-untrusted-code-mitigations" ]
1993
- embedded_variant = " Trusted"
1994
- }
1995
- if (emit_builtins_as_inline_asm ) {
1996
- asm_to_inline_asm (" trusted" ) {
1997
- args = []
1998
- }
1999
- }
2000
- }
2001
1970
2002
1971
action (" v8_dump_build_config" ) {
2003
1972
script = " tools/testrunner/utils/dump_build_config.py"
@@ -2086,16 +2055,6 @@ v8_source_set("v8_snapshot") {
2086
2055
deps += [ " :v8_base" ]
2087
2056
2088
2057
sources += [ " src/snapshot/snapshot-external.cc" ]
2089
-
2090
- if (v8_use_multi_snapshots ) {
2091
- public_deps += [ " :run_mksnapshot_trusted" ]
2092
- if (emit_builtins_as_inline_asm ) {
2093
- deps += [ " :asm_to_inline_asm_trusted" ]
2094
- sources += [ " $target_gen_dir /embedded_trusted.cc" ]
2095
- } else {
2096
- sources += [ " $target_gen_dir /embedded_trusted.S" ]
2097
- }
2098
- }
2099
2058
} else {
2100
2059
# Also top-level visibility targets can depend on this.
2101
2060
visibility += [ " //:gn_visibility" ]
0 commit comments