Revert "Revert "Upgrade to 5.0.71.48"" DO NOT MERGE
This reverts commit f2e3994fa5148cc3d9946666f0b0596290192b0e,
and updates the x64 makefile properly so it doesn't break that
build.
FPIIM-449
Change-Id: Ib83e35bfbae6af627451c926a9650ec57c045605
(cherry picked from commit 109988c7ccb6f3fd1a58574fa3dfb88beaef6632)
diff --git a/src/ppc/assembler-ppc.cc b/src/ppc/assembler-ppc.cc
index 147fb59..aed149b 100644
--- a/src/ppc/assembler-ppc.cc
+++ b/src/ppc/assembler-ppc.cc
@@ -55,7 +55,7 @@
void CpuFeatures::ProbeImpl(bool cross_compile) {
supported_ |= CpuFeaturesImpliedByCompiler();
- cache_line_size_ = 128;
+ icache_line_size_ = 128;
// Only use statically determined features for cross compile (snapshot).
if (cross_compile) return;
@@ -85,6 +85,9 @@
// Assume support
supported_ |= (1u << FPU);
}
+ if (cpu.icache_line_size() != base::CPU::UNKNOWN_CACHE_LINE_SIZE) {
+ icache_line_size_ = cpu.icache_line_size();
+ }
#elif V8_OS_AIX
// Assume support FP support and default cache line size
supported_ |= (1u << FPU);
@@ -1504,14 +1507,14 @@
// Code address skips the function descriptor "header".
// TOC and static chain are ignored and set to 0.
void Assembler::function_descriptor() {
-#if ABI_USES_FUNCTION_DESCRIPTORS
- Label instructions;
- DCHECK(pc_offset() == 0);
- emit_label_addr(&instructions);
- dp(0);
- dp(0);
- bind(&instructions);
-#endif
+ if (ABI_USES_FUNCTION_DESCRIPTORS) {
+ Label instructions;
+ DCHECK(pc_offset() == 0);
+ emit_label_addr(&instructions);
+ dp(0);
+ dp(0);
+ bind(&instructions);
+ }
}