Merge branch 'master' into v2.1

(cherry picked from commit 6a2d8b0)
eugeneia · Jan 17, 2018 · f6c52a3 · f6c52a3
1 parent 97356f9
commit f6c52a3
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/dynasm/dasm_x86.h b/dynasm/dasm_x86.h
@@ -421,7 +421,8 @@ int dasm_encode(Dst_DECL, void *buffer)
 	}
 	case DASM_REL_LG: p++; if (n >= 0) goto rel_pc;
 	  b++; n = (int)(ptrdiff_t)D->globals[-n];
-	case DASM_REL_A: rel_a: n -= (int)(ptrdiff_t)(cp+4); goto wd; /* !x64 */
+	case DASM_REL_A: rel_a:
+	  n -= (unsigned int)(ptrdiff_t)(cp+4); goto wd; /* !x64 */
 	case DASM_REL_PC: rel_pc: {
 	  int shrink = *b++;
 	  int *pb = DASM_POS2PTR(D, n); if (*pb < 0) { n = pb[1]; goto rel_a; }