| Index: src/arm/simulator-arm.cc | 
| diff --git a/src/arm/simulator-arm.cc b/src/arm/simulator-arm.cc | 
| index ea79310447cc9d816e927da7bec9517a9e30112d..7033390fa5b2b114fa2e0637c391d8aebdd1b5db 100644 | 
| --- a/src/arm/simulator-arm.cc | 
| +++ b/src/arm/simulator-arm.cc | 
| @@ -26,7 +26,7 @@ | 
| // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 
|  | 
| #include <stdlib.h> | 
| -#include <math.h> | 
| +#include <cmath> | 
| #include <cstdarg> | 
| #include "v8.h" | 
|  | 
| @@ -1297,7 +1297,7 @@ bool Simulator::OverflowFrom(int32_t alu_out, | 
|  | 
| // Support for VFP comparisons. | 
| void Simulator::Compute_FPSCR_Flags(double val1, double val2) { | 
| -  if (isnan(val1) || isnan(val2)) { | 
| +  if (std::isnan(val1) || std::isnan(val2)) { | 
| n_flag_FPSCR_ = false; | 
| z_flag_FPSCR_ = false; | 
| c_flag_FPSCR_ = true; | 
| @@ -1866,7 +1866,7 @@ void Simulator::SoftwareInterrupt(Instruction* instr) { | 
|  | 
|  | 
| double Simulator::canonicalizeNaN(double value) { | 
| -  return (FPSCR_default_NaN_mode_ && isnan(value)) ? | 
| +  return (FPSCR_default_NaN_mode_ && std::isnan(value)) ? | 
| FixedDoubleArray::canonical_not_the_hole_nan_as_double() : value; | 
| } | 
|  | 
| @@ -2947,7 +2947,7 @@ void Simulator::DecodeVCMP(Instruction* instr) { | 
|  | 
| // Raise exceptions for quiet NaNs if necessary. | 
| if (instr->Bit(7) == 1) { | 
| -      if (isnan(dd_value)) { | 
| +      if (std::isnan(dd_value)) { | 
| inv_op_vfp_flag_ = true; | 
| } | 
| } | 
|  |