From: Daniel Verkamp Date: Fri, 15 Aug 2008 17:56:11 +0000 (-0400) Subject: [librm] Make rm_sp and rm_ss globals again X-Git-Tag: v0.9.4~33 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2539f5fa4a2d9da5ee803fd99fd655b5d9abb3e7;p=thirdparty%2Fipxe.git [librm] Make rm_sp and rm_ss globals again --- diff --git a/src/arch/i386/include/librm.h b/src/arch/i386/include/librm.h old mode 100644 new mode 100755 index 413f0362e..e9827de8a --- a/src/arch/i386/include/librm.h +++ b/src/arch/i386/include/librm.h @@ -60,6 +60,8 @@ extern char *text16; ( ( ( void * ) (pointer) ) - ( ( void * ) text16 ) ) ) /* Variables in librm.S, present in the normal data segment */ +extern uint16_t rm_sp; +extern uint16_t rm_ss; extern uint16_t __data16 ( rm_cs ); #define rm_cs __use_data16 ( rm_cs ) extern uint16_t __text16 ( rm_ds ); diff --git a/src/arch/i386/transitions/librm.S b/src/arch/i386/transitions/librm.S old mode 100644 new mode 100755 index 45e0d0ff8..ff4b1d978 --- a/src/arch/i386/transitions/librm.S +++ b/src/arch/i386/transitions/librm.S @@ -552,7 +552,9 @@ rc_function: .word 0, 0 **************************************************************************** */ .section ".data" + .globl rm_sp rm_sp: .word 0 + .globl rm_ss rm_ss: .word 0 pm_esp: .long _estack