languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-11-02 08:44:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

[vm] Give a better error if one tries to build simia32 or simx64.

Browse source 
TEST=build
Bug: https://github.com/flutter/flutter/issues/90769
Change-Id: Ib613538efab60f3c688824e939a8f0bc41b83c58
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/214681
Reviewed-by: Siva Annamalai <asiva@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
This commit is contained in:
Ryan Macnak 2021-09-27 23:45:45 +00:00 committed by commit-bot@chromium.org
parent 9826867fd0
commit 67c1f75d2b
5 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
runtime/platform/globals.h
View file

@ -356,9 +356,13 @@ typedef simd128_value_t fpu_register_t;
// Determine whether we will be using the simulator.
#if defined(TARGET_ARCH_IA32)
// No simulator used.
#if !defined(HOST_ARCH_IA32)
#define USING_SIMULATOR 1
#endif
#elif defined(TARGET_ARCH_X64)
// No simulator used.
#if !defined(HOST_ARCH_X64)
#define USING_SIMULATOR 1
#endif
#elif defined(TARGET_ARCH_ARM)
#if !defined(HOST_ARCH_ARM)
#define TARGET_HOST_MISMATCH 1

2
runtime/vm/cpu_arm64.cc
View file

@ -64,7 +64,7 @@ const char* CPU::Id() {
return
#if defined(USING_SIMULATOR)
"sim"
#endif // !defined(HOST_ARCH_ARM64)
#endif // !defined(USING_SIMULATOR)
"arm64";
}

6
runtime/vm/cpu_ia32.cc
View file

@ -24,7 +24,11 @@ void CPU::FlushICache(uword start, uword size) {
}
const char* CPU::Id() {
return "ia32";
return
#if defined(USING_SIMULATOR)
"sim"
#endif // !defined(USING_SIMULATOR)
"ia32";
}
const char* HostCPUFeatures::hardware_ = nullptr;

6
runtime/vm/cpu_x64.cc
View file

@ -23,7 +23,11 @@ void CPU::FlushICache(uword start, uword size) {
}
const char* CPU::Id() {
return "x64";
return
#if defined(USING_SIMULATOR)
"sim"
#endif // !defined(USING_SIMULATOR)
"x64";
}
const char* HostCPUFeatures::hardware_ = nullptr;

3
runtime/vm/simulator.h
View file

@ -9,8 +9,7 @@
#if defined(USING_SIMULATOR)
#if defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64)
// No simulator used.
#error Simulator not supported.
#error Simulator not implemented.
#elif defined(TARGET_ARCH_ARM)
#include "vm/simulator_arm.h"
#elif defined(TARGET_ARCH_ARM64)