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/disasm-ppc.cc b/src/ppc/disasm-ppc.cc
index d9450f8..e72658f 100644
--- a/src/ppc/disasm-ppc.cc
+++ b/src/ppc/disasm-ppc.cc
@@ -1073,14 +1073,12 @@
out_buffer_pos_ += SNPrintF(out_buffer_ + out_buffer_pos_, "%08x ",
instr->InstructionBits());
-#if ABI_USES_FUNCTION_DESCRIPTORS
- // The first field will be identified as a jump table entry. We emit the rest
- // of the structure as zero, so just skip past them.
- if (instr->InstructionBits() == 0) {
+ if (ABI_USES_FUNCTION_DESCRIPTORS && instr->InstructionBits() == 0) {
+ // The first field will be identified as a jump table entry. We
+ // emit the rest of the structure as zero, so just skip past them.
Format(instr, "constant");
return Instruction::kInstrSize;
}
-#endif
switch (instr->OpcodeValue() << 26) {
case TWI: {