Skip to content

Commit 0091c24

Browse files
sstricklCommit Queue
authored andcommitted
Revert "Add Linux ARM and Linux RISCV64 cross compilation gen_snapshot binaries."
This reverts commit d257c52. Reason for revert: Attempting to make an Linux ARM cross compiler gen_snapshot breaks Windows build. Issue: #28617 Original change's description: > Add Linux ARM and Linux RISCV64 cross compilation gen_snapshot binaries. > > TEST=ci > > Issue: #28617 > Change-Id: Ia458f167c0e75fe9c7e31684bfaf9967499e9cda > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/437720 > Commit-Queue: Tess Strickland <[email protected]> > Reviewed-by: Ivan Inozemtsev <[email protected]> Issue: #28617 No-Presubmit: true No-Tree-Checks: true No-Try: true Change-Id: I090e4024832c12e7e9f99c30f11a86f961d91aa1 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/438100 Auto-Submit: Tess Strickland <[email protected]> Commit-Queue: Tess Strickland <[email protected]> Reviewed-by: Ivan Inozemtsev <[email protected]>
1 parent d257c52 commit 0091c24

File tree

4 files changed

+0
-103
lines changed

4 files changed

+0
-103
lines changed

runtime/BUILD.gn

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -149,26 +149,6 @@ config("dart_linux_x64_config") {
149149
]
150150
}
151151

152-
# We need to build gen_snapshot targeting Linux ARM during a build
153-
# of the SDK. This configuration is used to unconditionally target
154-
# Linux ARM. It should not be combined with dart_os_config and dart_arch_config.
155-
config("dart_linux_arm_config") {
156-
defines = [
157-
"DART_TARGET_OS_LINUX",
158-
"TARGET_ARCH_ARM",
159-
]
160-
}
161-
162-
# We need to build gen_snapshot targeting Linux RISCV64 during a build
163-
# of the SDK. This configuration is used to unconditionally target
164-
# Linux RISCV64. It should not be combined with dart_os_config and dart_arch_config.
165-
config("dart_linux_riscv64_config") {
166-
defines = [
167-
"DART_TARGET_OS_LINUX",
168-
"TARGET_ARCH_RISCV64",
169-
]
170-
}
171-
172152
config("dart_arch_config") {
173153
defines = []
174154

runtime/bin/BUILD.gn

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -109,20 +109,6 @@ build_libdart_builtin("libdart_builtin_product_linux_arm64") {
109109
]
110110
}
111111

112-
build_libdart_builtin("libdart_builtin_product_linux_arm") {
113-
extra_configs = [
114-
"..:dart_product_config",
115-
"..:dart_linux_arm_config",
116-
]
117-
}
118-
119-
build_libdart_builtin("libdart_builtin_product_linux_riscv64") {
120-
extra_configs = [
121-
"..:dart_product_config",
122-
"..:dart_linux_riscv64_config",
123-
]
124-
}
125-
126112
template("build_native_assets_api") {
127113
extra_configs = []
128114
if (defined(invoker.extra_configs)) {
@@ -380,33 +366,6 @@ build_gen_snapshot("gen_snapshot_product_linux_arm64") {
380366
"../platform:libdart_platform_precompiler_product_linux_arm64",
381367
]
382368
}
383-
384-
build_gen_snapshot("gen_snapshot_product_linux_arm") {
385-
extra_configs = [
386-
"..:dart_product_config",
387-
"..:dart_linux_arm_config",
388-
]
389-
extra_deps = [
390-
":gen_snapshot_dart_io_product_linux_arm",
391-
":libdart_builtin_product_linux_arm",
392-
"..:libdart_precompiler_product_linux_arm",
393-
"../platform:libdart_platform_precompiler_product_linux_arm",
394-
]
395-
}
396-
397-
build_gen_snapshot("gen_snapshot_product_linux_riscv64") {
398-
extra_configs = [
399-
"..:dart_product_config",
400-
"..:dart_linux_riscv64_config",
401-
]
402-
extra_deps = [
403-
":gen_snapshot_dart_io_product_linux_riscv64",
404-
":libdart_builtin_product_linux_riscv64",
405-
"..:libdart_precompiler_product_linux_riscv64",
406-
"../platform:libdart_platform_precompiler_product_linux_riscv64",
407-
]
408-
}
409-
410369
build_gen_snapshot("gen_snapshot_host_targeting_host") {
411370
extra_configs = [ "..:dart_maybe_product_config" ]
412371
extra_deps = [
@@ -509,20 +468,6 @@ build_gen_snapshot_dart_io("gen_snapshot_dart_io_product_linux_arm64") {
509468
]
510469
}
511470

512-
build_gen_snapshot_dart_io("gen_snapshot_dart_io_product_linux_arm") {
513-
extra_configs = [
514-
"..:dart_product_config",
515-
"..:dart_linux_arm_config",
516-
]
517-
}
518-
519-
build_gen_snapshot_dart_io("gen_snapshot_dart_io_product_linux_riscv64") {
520-
extra_configs = [
521-
"..:dart_product_config",
522-
"..:dart_linux_riscv64_config",
523-
]
524-
}
525-
526471
# A source set for the implementation of 'dart:io' library.
527472
template("dart_io") {
528473
extra_configs = []

runtime/configs.gni

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,6 @@ _precompiler_product_linux_arm64_config =
6363
"$_dart_runtime:dart_linux_arm64_config",
6464
] + _product + _precompiler_base
6565

66-
_precompiler_product_linux_arm_config =
67-
[
68-
"$_dart_runtime:dart_config",
69-
"$_dart_runtime:dart_linux_arm_config",
70-
] + _product + _precompiler_base
71-
72-
_precompiler_product_linux_riscv64_config =
73-
[
74-
"$_dart_runtime:dart_config",
75-
"$_dart_runtime:dart_linux_riscv64_config",
76-
] + _product + _precompiler_base
77-
7866
_all_configs = [
7967
{
8068
suffix = "_jit"
@@ -160,20 +148,6 @@ _all_configs = [
160148
compiler = true
161149
is_product = true
162150
},
163-
{
164-
suffix = "_precompiler_product_linux_arm"
165-
configs = _precompiler_product_linux_arm_config
166-
snapshot = false
167-
compiler = true
168-
is_product = true
169-
},
170-
{
171-
suffix = "_precompiler_product_linux_riscv64"
172-
configs = _precompiler_product_linux_riscv64_config
173-
snapshot = false
174-
compiler = true
175-
is_product = true
176-
},
177151
]
178152

179153
# This template creates a target for each of the configurations listed above.

sdk/BUILD.gn

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -879,9 +879,7 @@ group("create_full_sdk") {
879879
# Do not include gen_snapshot binaries for cross-compilation into
880880
# SDK, but add them as a dependency, so that they are built.
881881
public_deps += [
882-
"../runtime/bin:gen_snapshot_product_linux_arm",
883882
"../runtime/bin:gen_snapshot_product_linux_arm64",
884-
"../runtime/bin:gen_snapshot_product_linux_riscv64",
885883
"../runtime/bin:gen_snapshot_product_linux_x64",
886884
]
887885
}

0 commit comments

Comments
 (0)