diff options
| author | Elliott Hughes <enh@google.com> | 2014-11-17 12:02:05 -0800 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-11-19 11:53:07 -0800 |
| commit | 8366ca0d7ba3b80a2d5be65ba436446cc32440bd (patch) | |
| tree | b21c1656af3ec5c9f775373c9d78cb832bee2ca9 /runtime/arch/arm/instruction_set_features_arm.cc | |
| parent | 8542ff31bfa778a06316511672dc113a3f19ae5b (diff) | |
| download | art-8366ca0d7ba3b80a2d5be65ba436446cc32440bd.zip art-8366ca0d7ba3b80a2d5be65ba436446cc32440bd.tar.gz art-8366ca0d7ba3b80a2d5be65ba436446cc32440bd.tar.bz2 | |
Fix the last users of TARGET_CPU_SMP.
Everyone else assumes SMP.
Change-Id: I7ff7faef46fbec6c67d6e446812d599e473cba39
Diffstat (limited to 'runtime/arch/arm/instruction_set_features_arm.cc')
| -rw-r--r-- | runtime/arch/arm/instruction_set_features_arm.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/runtime/arch/arm/instruction_set_features_arm.cc b/runtime/arch/arm/instruction_set_features_arm.cc index f49c037..f8590d3 100644 --- a/runtime/arch/arm/instruction_set_features_arm.cc +++ b/runtime/arch/arm/instruction_set_features_arm.cc @@ -108,12 +108,7 @@ const ArmInstructionSetFeatures* ArmInstructionSetFeatures::FromBitmap(uint32_t } const ArmInstructionSetFeatures* ArmInstructionSetFeatures::FromCppDefines() { -#if defined(HAVE_ANDROID_OS) && (ANDROID_SMP == 0) - const bool smp = false; -#else const bool smp = true; -#endif - #if defined(__ARM_ARCH_EXT_IDIV__) const bool has_div = true; #else @@ -204,11 +199,8 @@ static void bad_divide_inst_handle(int signo ATTRIBUTE_UNUSED, siginfo_t* si ATT } const ArmInstructionSetFeatures* ArmInstructionSetFeatures::FromAssembly() { -#if defined(HAVE_ANDROID_OS) && (ANDROID_SMP == 0) - const bool smp = false; -#else const bool smp = true; -#endif + // See if have a sdiv instruction. Register a signal handler and try to execute an sdiv // instruction. If we get a SIGILL then it's not supported. struct sigaction sa, osa; |