From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Wed, 11 Nov 2015 17:58:57 +0000 (+0100)
Subject: asm-tests/i386-pc: Check that near jumps are 2 bytes.
X-Git-Tag: 2.02-beta3~178
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=323ef2bdc358b90f0894223a6424df036c6dfe02;p=thirdparty%2Fgrub.git

asm-tests/i386-pc: Check that near jumps are 2 bytes.

We already check that jump over 300 bytes gap is 3 bytes in code16-mode.
Some clang versions generate 3-byte opcode for short jumps which makes
boot.img blow over 512-byte limit. Enforce -no-integrated-as in such cases
---

diff --git a/asm-tests/i386-pc.S b/asm-tests/i386-pc.S
index 97cd32ae8..f6f9a88be 100644
--- a/asm-tests/i386-pc.S
+++ b/asm-tests/i386-pc.S
@@ -5,6 +5,10 @@
 	.code16
 	jmp far
 	.org 4
-	.space 300
+	jmp nearer
+	.org 6
+	.space 100
+nearer:
+	.space 200
 far:
 	.byte 0