diff options
| author | isaacs <i@izs.me> | 2012-10-23 11:59:19 -0700 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2012-10-23 11:59:19 -0700 |
| commit | c3ca783525c3de368572a12e627e56090e49f594 (patch) | |
| tree | 505a6903fb30d0381bf3654e938bada90e728a63 /deps/v8/src | |
| parent | a0ee291566511a7fd959384381e3a7981bd43e60 (diff) | |
| parent | 76a6c4bf2e30f4c4a342b0acde2927cfd5bcd61d (diff) | |
| download | node-c3ca783525c3de368572a12e627e56090e49f594.tar.gz | |
Merge remote-tracking branch 'ry/v0.8'
Conflicts:
deps/v8/src/arm/code-stubs-arm.cc
deps/v8/src/version.cc
Diffstat (limited to 'deps/v8/src')
| -rw-r--r-- | deps/v8/src/arm/code-stubs-arm.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/deps/v8/src/arm/code-stubs-arm.cc b/deps/v8/src/arm/code-stubs-arm.cc index d9e3a3da9..5bb211626 100644 --- a/deps/v8/src/arm/code-stubs-arm.cc +++ b/deps/v8/src/arm/code-stubs-arm.cc @@ -3444,8 +3444,8 @@ void TranscendentalCacheStub::Generate(MacroAssembler* masm) { ExternalReference(RuntimeFunction(), masm->isolate()); __ TailCallExternalReference(runtime_function, 1, 1); } else { - ASSERT(CpuFeatures::IsSupported(VFP2)); - CpuFeatures::Scope scope(VFP2); + ASSERT(CpuFeatures::IsSupported(VFP3)); + CpuFeatures::Scope scope(VFP3); Label no_update; Label skip_cache; |