Index: src/arm/assembler-arm.cc |
diff --git a/src/arm/assembler-arm.cc b/src/arm/assembler-arm.cc |
index 814bd8b1dcd637eb011bbef108b502d7a4218987..3a02628e76484a6ab48f289f0c7244e7e40c788a 100644 |
--- a/src/arm/assembler-arm.cc |
+++ b/src/arm/assembler-arm.cc |
@@ -93,7 +93,7 @@ void CpuFeatures::ProbeImpl(bool cross_compile) { |
#else // __arm__ |
// Probe for additional features at runtime. |
- CPU cpu; |
+ base::CPU cpu; |
if (FLAG_enable_vfp3 && cpu.has_vfp3()) { |
// This implementation also sets the VFP flags if runtime |
// detection of VFP returns true. VFPv3 implies ARMv7, see ARM DDI |
@@ -109,14 +109,15 @@ void CpuFeatures::ProbeImpl(bool cross_compile) { |
if (FLAG_enable_armv7) supported_ |= 1u << ARMv7; |
if (FLAG_enable_unaligned_accesses) supported_ |= 1u << UNALIGNED_ACCESSES; |
// Use movw/movt for QUALCOMM ARMv7 cores. |
- if (FLAG_enable_movw_movt && cpu.implementer() == CPU::QUALCOMM) { |
+ if (FLAG_enable_movw_movt && cpu.implementer() == base::CPU::QUALCOMM) { |
supported_ |= 1u << MOVW_MOVT_IMMEDIATE_LOADS; |
} |
} |
// ARM Cortex-A9 and Cortex-A5 have 32 byte cachelines. |
- if (cpu.implementer() == CPU::ARM && (cpu.part() == CPU::ARM_CORTEX_A5 || |
- cpu.part() == CPU::ARM_CORTEX_A9)) { |
+ if (cpu.implementer() == base::CPU::ARM && |
+ (cpu.part() == base::CPU::ARM_CORTEX_A5 || |
+ cpu.part() == base::CPU::ARM_CORTEX_A9)) { |
cache_line_size_ = 32; |
} |
@@ -162,7 +163,7 @@ void CpuFeatures::PrintTarget() { |
#endif |
#ifdef __arm__ |
- arm_float_abi = OS::ArmUsingHardFloat() ? "hard" : "softfp"; |
+ arm_float_abi = base::OS::ArmUsingHardFloat() ? "hard" : "softfp"; |
#elif USE_EABI_HARDFLOAT |
arm_float_abi = "hard"; |
#else |
@@ -191,7 +192,7 @@ void CpuFeatures::PrintFeatures() { |
CpuFeatures::IsSupported(UNALIGNED_ACCESSES), |
CpuFeatures::IsSupported(MOVW_MOVT_IMMEDIATE_LOADS)); |
#ifdef __arm__ |
- bool eabi_hardfloat = OS::ArmUsingHardFloat(); |
+ bool eabi_hardfloat = base::OS::ArmUsingHardFloat(); |
#elif USE_EABI_HARDFLOAT |
bool eabi_hardfloat = true; |
#else |
@@ -246,7 +247,7 @@ void RelocInfo::PatchCode(byte* instructions, int instruction_count) { |
} |
// Indicate that code has changed. |
- CPU::FlushICache(pc_, instruction_count * Assembler::kInstrSize); |
+ CpuFeatures::FlushICache(pc_, instruction_count * Assembler::kInstrSize); |
} |