Chromium Code Reviews| Index: src/arm/assembler-arm.cc |
| diff --git a/src/arm/assembler-arm.cc b/src/arm/assembler-arm.cc |
| index a3231e2c89a22013d6b377a79ef79b6303a6f773..a44627f588266edf6fc85c225bdb172d6ee2f83d 100644 |
| --- a/src/arm/assembler-arm.cc |
| +++ b/src/arm/assembler-arm.cc |
| @@ -103,7 +103,8 @@ const char* DwVfpRegister::AllocationIndexToString(int index) { |
| void CpuFeatures::Probe() { |
| uint64_t standard_features = static_cast<unsigned>( |
| OS::CpuFeaturesImpliedByPlatform()) | CpuFeaturesImpliedByCompiler(); |
| - ASSERT(supported_ == 0 || supported_ == standard_features); |
| + ASSERT(supported_ == 0 || |
| + (supported_ & standard_features) == standard_features); |
|
jochen (gone - plz use gerrit)
2014/04/17 13:24:57
unrelated?
Sven Panne
2014/04/22 07:28:36
Alas, no: ARM has to be treated specially, which i
|
| #ifdef DEBUG |
| initialized_ = true; |
| #endif |