(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 2e6ac47..9d55cff 100644 (file)
--- 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