Skip to content

Commit 0623511

Browse files
alexmarkovCommit Queue
authored andcommitted
[vm,dyn_modules] Fix cross-architecture x64->arm64 build
TEST=ci Change-Id: I87e441cb1d0f96c3fbf6e9bb0367257fb3c422cc Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/447401 Reviewed-by: Alexander Aprelev <[email protected]> Commit-Queue: Alexander Markov <[email protected]>
1 parent 3c95647 commit 0623511

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

runtime/vm/runtime_entry.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
#include <memory>
88

9+
#include "platform/globals.h"
910
#include "platform/memory_sanitizer.h"
1011
#include "platform/thread_sanitizer.h"
1112
#include "vm/bootstrap.h"
@@ -1201,7 +1202,7 @@ struct FfiCallArguments {
12011202
uword target;
12021203
};
12031204

1204-
#if defined(TARGET_ARCH_ARM64)
1205+
#if defined(HOST_ARCH_ARM64)
12051206
extern "C" void FfiCallTrampoline(FfiCallArguments* args);
12061207
#else
12071208
extern "C" typedef void (*ffiCallTrampoline)(FfiCallArguments* args);
@@ -1445,9 +1446,9 @@ DEFINE_RUNTIME_ENTRY(FfiCall, 2) {
14451446

14461447
{
14471448
TransitionVMToNative transition(thread);
1448-
#if defined(TARGET_ARCH_ARM64)
1449+
#if defined(HOST_ARCH_ARM64)
14491450
FfiCallTrampoline(&args);
1450-
#elif defined(TARGET_ARCH_X64)
1451+
#elif defined(HOST_ARCH_X64)
14511452
reinterpret_cast<ffiCallTrampoline>(
14521453
StubCode::FfiCallTrampoline().EntryPoint())(&args);
14531454
#else

0 commit comments

Comments
 (0)