Skip to content

Commit 1e9e0b1

Browse files
sstricklCommit Queue
authored andcommitted
[vm] Don't generate gen_snapshot targeting ARM/RISCV64 for ARM64C/X64C.
Currently, DART_COMPRESSED_POINTERS is used both for the host and the target, and the ARM assembler treats it being defined as an error and the RISCV assembler does not appropriately define certain methods when compressed pointers are used. TEST=manual build of create_sdk for arm64c/x64c, since there are no pkg/sdk trybots for compressed architectures. Issue: #28617 Change-Id: Iac31b23b59c0d5cfe2bef007c553f56e5144d782 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/438500 Commit-Queue: Tess Strickland <[email protected]> Reviewed-by: Martin Kustermann <[email protected]> Reviewed-by: Ivan Inozemtsev <[email protected]>
1 parent bb1e9f0 commit 1e9e0b1

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

sdk/BUILD.gn

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -880,13 +880,18 @@ group("create_full_sdk") {
880880
# SDK, but add them as a dependency, so that they are built.
881881
public_deps += [
882882
"../runtime/bin:gen_snapshot_product_linux_arm64",
883-
"../runtime/bin:gen_snapshot_product_linux_riscv64",
884883
"../runtime/bin:gen_snapshot_product_linux_x64",
885884
]
886885

887-
# assembler_arm.cc disallows ARM cross-compilation on Windows.
888-
if (!is_win) {
889-
public_deps += [ "../runtime/bin:gen_snapshot_product_linux_arm" ]
886+
# Don't add cross compilers for architectures that do not support
887+
# compressed pointers in SDKs built for compressed pointers.
888+
if (!dart_use_compressed_pointers) {
889+
public_deps += [ "../runtime/bin:gen_snapshot_product_linux_riscv64" ]
890+
891+
# assembler_arm.cc disallows ARM cross-compilation on Windows.
892+
if (!is_win) {
893+
public_deps += [ "../runtime/bin:gen_snapshot_product_linux_arm" ]
894+
}
890895
}
891896
}
892897
}

0 commit comments

Comments
 (0)