From: Michael Brown <mcb30@etherboot.org>
Date: Mon, 24 Apr 2006 18:29:47 +0000 (+0000)
Subject: (librm_base-1b) is already an offset; no need to apply OFFSET().
X-Git-Tag: v0.9.3~1491
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c4e4de18f94cb6308a3a71d814033608a1b496a;p=thirdparty%2Fipxe.git

(librm_base-1b) is already an offset; no need to apply OFFSET().
Doing so, in fact, seems to expose an assembler bug; (a-b-0) is
apparently not the same as (a-b).  Go figure.
---

diff --git a/src/arch/i386/transitions/librm.S b/src/arch/i386/transitions/librm.S
index 2e6ac47bb..9d55cff76 100644
--- a/src/arch/i386/transitions/librm.S
+++ b/src/arch/i386/transitions/librm.S
@@ -584,7 +584,7 @@ EXPORT(prot_call):
 	 */
 	call	1f
 1:	popl	%ebp
-	movl	OFFSET(librm_base-1b)(%ebp), %ebx
+	movl	(librm_base-1b)(%ebp), %ebx
 	
 	/* Jump to running in installed copy of librm */
 	addl	$OFFSET(1f), %ebx