languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-04 16:03:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[vm] Fix cross-build Windows -> android

Browse source 
TEST=ci
Fixes https://github.com/flutter/flutter/issues/141786

Change-Id: I9c6620b8ee25e36631da2b1213002e8bf30b6473
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/347065
Reviewed-by: Alexander Aprelev <aam@google.com>
Commit-Queue: Alexander Markov <alexmarkov@google.com>
This commit is contained in:
Alexander Markov 2024-01-18 21:22:59 +00:00 committed by Commit Queue
parent af07a3f798
commit 71ffaf392f
5 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
runtime/platform/unwinding_records.cc
View file

@ -7,14 +7,14 @@
namespace dart {
#if !defined(DART_TARGET_OS_WINDOWS) || \
#if (!defined(DART_TARGET_OS_WINDOWS) && !defined(DART_HOST_OS_WINDOWS)) || \
(!defined(TARGET_ARCH_X64) && !defined(TARGET_ARCH_ARM64))
intptr_t UnwindingRecordsPlatform::SizeInBytes() {
return 0;
}
#endif // !defined(DART_TARGET_OS_WINDOWS) ...
#endif // (!defined(DART_TARGET_OS_WINDOWS) && !defined(DART_HOST_OS_WINDOWS))
#if !defined(DART_HOST_OS_WINDOWS) || \
(!defined(TARGET_ARCH_X64) && !defined(TARGET_ARCH_ARM64))

8
runtime/platform/unwinding_records.h
View file

@ -26,7 +26,8 @@ class UnwindingRecordsPlatform : public AllStatic {
static void* GetDeleteGrowableFunctionTableFunc();
};
#if defined(DART_TARGET_OS_WINDOWS) && defined(TARGET_ARCH_X64)
#if (defined(DART_TARGET_OS_WINDOWS) || defined(DART_HOST_OS_WINDOWS)) && \
defined(TARGET_ARCH_X64)
#pragma pack(push, 1)
//
@ -104,7 +105,8 @@ struct CodeRangeUnwindingRecord {
#pragma pack(pop)
#elif defined(DART_TARGET_OS_WINDOWS) && defined(TARGET_ARCH_ARM64)
#elif (defined(DART_TARGET_OS_WINDOWS) || defined(DART_HOST_OS_WINDOWS)) && \
defined(TARGET_ARCH_ARM64)
#pragma pack(push, 1)
@ -237,7 +239,7 @@ struct CodeRangeUnwindingRecord {
#pragma pack(pop)
#endif // defined(DART_TARGET_OS_WINDOWS) && defined(TARGET_ARCH_X64)
#endif // (defined(DART_TARGET_OS_WINDOWS) || defined(DART_HOST_OS_WINDOWS))
} // namespace dart

4
runtime/platform/unwinding_records_win.cc
View file

@ -9,7 +9,7 @@
namespace dart {
#if defined(DART_TARGET_OS_WINDOWS) && \
#if (defined(DART_TARGET_OS_WINDOWS) || defined(DART_HOST_OS_WINDOWS)) && \
(defined(TARGET_ARCH_X64) || defined(TARGET_ARCH_ARM64))
#if defined(TARGET_ARCH_X64)
@ -22,7 +22,7 @@ intptr_t UnwindingRecordsPlatform::SizeInBytes() {
return kReservedUnwindingRecordsSizeBytes;
}
#endif // defined(DART_TARGET_OS_WINDOWS)
#endif // defined(DART_TARGET_OS_WINDOWS) || defined(DART_HOST_OS_WINDOWS)
#if defined(DART_HOST_OS_WINDOWS) && \
(defined(TARGET_ARCH_X64) || defined(TARGET_ARCH_ARM64))

2
runtime/vm/unwinding_records.cc
View file

@ -7,7 +7,7 @@
namespace dart {
#if !defined(DART_TARGET_OS_WINDOWS) || \
#if (!defined(DART_TARGET_OS_WINDOWS) && !defined(DART_HOST_OS_WINDOWS)) || \
(!defined(TARGET_ARCH_X64) && !defined(TARGET_ARCH_ARM64))
const void* UnwindingRecords::GenerateRecordsInto(intptr_t offset,

4
runtime/vm/unwinding_records_win.cc
View file

@ -10,7 +10,7 @@
namespace dart {
#if defined(DART_TARGET_OS_WINDOWS) && \
#if (defined(DART_TARGET_OS_WINDOWS) || defined(DART_HOST_OS_WINDOWS)) && \
(defined(TARGET_ARCH_X64) || defined(TARGET_ARCH_ARM64))
static void InitUnwindingRecord(intptr_t offset,
@ -101,7 +101,7 @@ const void* UnwindingRecords::GenerateRecordsInto(intptr_t offset,
return target_buffer;
}
#endif // defined(DART_TARGET_OS_WINDOWS)
#endif // (defined(DART_TARGET_OS_WINDOWS) || defined(DART_HOST_OS_WINDOWS))
#if defined(DART_HOST_OS_WINDOWS) && \
(defined(TARGET_ARCH_X64) || defined(TARGET_ARCH_ARM64))