diff options
| author | Daniel Verkamp | 2008-08-15 19:56:11 +0200 |
|---|---|---|
| committer | Michael Brown | 2008-08-28 23:50:55 +0200 |
| commit | 2539f5fa4a2d9da5ee803fd99fd655b5d9abb3e7 (patch) | |
| tree | 1b4a17278c490ac4d510081a847afe86d0581afc | |
| parent | [libc] Mark setjmp and longjmp as __cdecl (diff) | |
| download | ipxe-2539f5fa4a2d9da5ee803fd99fd655b5d9abb3e7.tar.gz ipxe-2539f5fa4a2d9da5ee803fd99fd655b5d9abb3e7.tar.xz ipxe-2539f5fa4a2d9da5ee803fd99fd655b5d9abb3e7.zip | |
[librm] Make rm_sp and rm_ss globals again
| -rwxr-xr-x[-rw-r--r--] | src/arch/i386/include/librm.h | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/arch/i386/transitions/librm.S | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/arch/i386/include/librm.h b/src/arch/i386/include/librm.h index 413f0362..e9827de8 100644..100755 --- 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 index 45e0d0ff..ff4b1d97 100644..100755 --- 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 |