Merge branch 'master' into v2.1

diff --cc src/vm_ppc.dasc
index 1cd8eb158ea8f5e211f88207871ba93b5501b756,e2d62e0027d23438a90fb30ca37bdb5223260efe..25898f94c91e94d7c67eccc3d43aa0833f10236e
--- 1/src/vm_ppc.dasc
--- 2/src/vm_ppc.dasc
+++ b/src/vm_ppc.dasc
@@@ -4101,13 -3552,13 +4101,13 @@@ static void build_ins(BuildCtx *ctx, BC
      |.macro addo32., y, a, b
      |  // Need to check overflow for (a<<32) + (b<<32).
      |  rldicr TMP0, a, 32, 31
-     |  rldicr TMP3, b, 32, 31
-     |  addo. TMP0, TMP0, TMP3
+     |  rldicr TMP1, b, 32, 31
+     |  addo. TMP0, TMP0, TMP1
      |  add y, a, b
      |.endmacro
 -    |  ins_arith addo32., fadd
 +    |  ins_arith addo32., fadd, __adddf3
      |.else
 -    |  ins_arith addo., fadd
 +    |  ins_arith addo., fadd, __adddf3
      |.endif
      break;
    case BC_SUBVN: case BC_SUBNV: case BC_SUBVV:
@@@ -4115,13 -3566,13 +4115,13 @@@
      |.macro subo32., y, a, b
      |  // Need to check overflow for (a<<32) - (b<<32).
      |  rldicr TMP0, a, 32, 31
-     |  rldicr TMP3, b, 32, 31
-     |  subo. TMP0, TMP0, TMP3
+     |  rldicr TMP1, b, 32, 31
+     |  subo. TMP0, TMP0, TMP1
      |  sub y, a, b
      |.endmacro
 -    |  ins_arith subo32., fsub
 +    |  ins_arith subo32., fsub, __subdf3
      |.else
 -    |  ins_arith subo., fsub
 +    |  ins_arith subo., fsub, __subdf3
      |.endif
      break;
    case BC_MULVN: case BC_MULNV: case BC_MULVV: