| Index: src/arm/assembler-arm.h
|
| diff --git a/src/arm/assembler-arm.h b/src/arm/assembler-arm.h
|
| index 497d0d411abacd91b3fdba10f8d16061726b1bd7..30b4af0beb4d1a260195cb59570797861f83491e 100644
|
| --- a/src/arm/assembler-arm.h
|
| +++ b/src/arm/assembler-arm.h
|
| @@ -510,6 +510,7 @@ class CpuFeatures : public AllStatic {
|
| static bool IsSupported(CpuFeature f) {
|
| ASSERT(initialized_);
|
| if (f == VFP3 && !FLAG_enable_vfp3) return false;
|
| + if (f == VFP2 && !FLAG_enable_vfp2) return false;
|
| return (supported_ & (1u << f)) != 0;
|
| }
|
|
|
| @@ -535,6 +536,8 @@ class CpuFeatures : public AllStatic {
|
| public:
|
| explicit Scope(CpuFeature f) {
|
| unsigned mask = 1u << f;
|
| + // VFP2 and ARMv7 are implied by VFP3.
|
| + if (f == VFP3) mask |= 1u << VFP2 | 1u << ARMv7;
|
| ASSERT(CpuFeatures::IsSupported(f));
|
| ASSERT(!Serializer::enabled() ||
|
| (CpuFeatures::found_by_runtime_probing_ & mask) == 0);
|
|
|