[PATCH 4/7] Eliminate kernel_address

[Pavel Roskin]

ChangeLog:

        * boot/i386/pc/boot.S: Eliminate kernel_address.  Add .bss
        section corresponding to the loader.  Use relative jump to the
        loader.
---
 boot/i386/pc/boot.S |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/boot/i386/pc/boot.S b/boot/i386/pc/boot.S
index 15d02e5..9323cb9 100644
--- a/boot/i386/pc/boot.S
+++ b/boot/i386/pc/boot.S
@@ -92,9 +92,6 @@ cylinder_start:
         * End of BIOS parameter block.
         */
 
-kernel_address:
-       .word   GRUB_BOOT_MACHINE_KERNEL_ADDR
-
        . = _start + GRUB_BOOT_MACHINE_KERNEL_SECTOR
 kernel_sector:
        .long   1, 0
@@ -392,12 +389,7 @@ copy_buffer:
        popa
 
        /* boot kernel */
-#ifdef APPLE_CC
-       kernel_address_abs = ABS (kernel_address)
-       jmp     *(kernel_address_abs)
-#else
-       jmp     *(kernel_address)
-#endif
+       jmp     kernel_entry
 
 /* END OF MAIN LOOP */
 
@@ -532,3 +524,7 @@ fd_probe_error_string:      .asciz "Floppy"
 
 /* the last 2 bytes in the sector 0 contain the signature */
        .word   GRUB_BOOT_MACHINE_SIGNATURE
+
+       .bss
+       . = . + 0x200
+kernel_entry: