Skip to content

Commit aac709d

Browse files
alexmarkovCommit Queue
authored andcommitted
[vm,dyn_modules] Remove FfiCallTrampoline from AOT runtime
Flutter is not happy about extra exported symbols: https://ci.chromium.org/ui/p/flutter/builders/try/Mac%20mac_ios_engine_ddm/818/overview TEST=ci Change-Id: I7d47e40716927b537ebdacc5e15ca0f2d91014dc Cq-Include-Trybots: luci.dart.try:vm-dyn-mac-debug-arm64-try Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/447624 Commit-Queue: Alexander Markov <[email protected]> Reviewed-by: Alexander Aprelev <[email protected]>
1 parent 9a3349e commit aac709d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

runtime/vm/ffi_trampolines_arm64.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
// This is not written as VM stub because we need it be executable in contexts where we cannot JIT.
77
// (Alternatively, we could start requiring the VM snapshot to be provided in every mode.)
88

9-
#if defined(__aarch64__) && (defined(SIMULATOR_FFI) || defined(DART_DYNAMIC_MODULES))
9+
#if defined(__aarch64__) && (defined(SIMULATOR_FFI) || (defined(DART_DYNAMIC_MODULES) && !defined(DART_PRECOMPILED_RUNTIME)))
1010

1111
.text
1212

13-
#if defined(DART_DYNAMIC_MODULES)
13+
#if defined(DART_DYNAMIC_MODULES) && !defined(DART_PRECOMPILED_RUNTIME)
1414

1515
#if defined(__APPLE__)
1616
.globl _FfiCallTrampoline
@@ -66,7 +66,7 @@ FfiCallTrampoline:
6666
.size FfiCallTrampoline,.-FfiCallTrampoline
6767
#endif
6868

69-
#endif // defined(DART_DYNAMIC_MODULES)
69+
#endif // defined(DART_DYNAMIC_MODULES) && !defined(DART_PRECOMPILED_RUNTIME)
7070

7171
#if defined(SIMULATOR_FFI)
7272

@@ -191,4 +191,4 @@ SimulatorFfiCallbackTrampolineEnd:
191191

192192
#endif // defined(SIMULATOR_FFI)
193193

194-
#endif // defined(__aarch64__) && (defined(SIMULATOR_FFI) || defined(DART_DYNAMIC_MODULES))
194+
#endif // defined(__aarch64__) && (defined(SIMULATOR_FFI) || (defined(DART_DYNAMIC_MODULES) && !defined(DART_PRECOMPILED_RUNTIME)))

0 commit comments

Comments
 (0)