Merge branch 'master' into v2.1

lukego · Oct 2, 2016 · f27b250 · f27b250
2 parents 4ca3909 + fcc8244
commit f27b250
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/lj_emit_arm.h b/src/lj_emit_arm.h
@@ -274,7 +274,7 @@ static void emit_call(ASMState *as, void *target)
   ptrdiff_t delta = ((char *)target - (char *)p) - 8;
   if ((((delta>>2) + 0x00800000) >> 24) == 0) {
     if ((delta & 1))
-      *p = ARMI_BLX | ((uint32_t)(delta>>2) & 0x00ffffffu) | ((delta&2) << 27);
+      *p = ARMI_BLX | ((uint32_t)(delta>>2) & 0x00ffffffu) | ((delta&2) << 23);
     else
       *p = ARMI_BL | ((uint32_t)(delta>>2) & 0x00ffffffu);
   } else {  /* Target out of range: need indirect call. But don't use R0-R3. */