qemu: Switch to more portable .org

Binary is checked identical.

diff --git a/grub-core/boot/i386/qemu/boot.S b/grub-core/boot/i386/qemu/boot.S
index c5343bfb5e5d82ca054fb99d36dd1278362aa98d..8c3a1db71580bf0295645a91a71b945b8cf3c9a5 100644 (file)
--- a/grub-core/boot/i386/qemu/boot.S
+++ b/grub-core/boot/i386/qemu/boot.S
@@ -31,7 +31,7 @@ _start:
 
        jmp     1f
 
-       . = _start + GRUB_BOOT_I386_QEMU_CORE_ENTRY_ADDR
+       .org GRUB_BOOT_I386_QEMU_CORE_ENTRY_ADDR
 VARIABLE(grub_core_entry_addr)
        .long   0
 1:
@@ -66,9 +66,9 @@ VARIABLE(grub_core_entry_addr)
        /* Intel, in its infinite wisdom, decided to put the i8086 entry point
           *right here* and this is why we need this kludge.  */
 
-       . = GRUB_BOOT_MACHINE_SIZE - 16
+       .org GRUB_BOOT_MACHINE_SIZE - 16
 
        .code16
        
        jmp     _start
-       . = GRUB_BOOT_MACHINE_SIZE
+       .org GRUB_BOOT_MACHINE_SIZE

diff --git a/grub-core/kern/i386/qemu/startup.S b/grub-core/kern/i386/qemu/startup.S
index 17aace9d4c8a1653f612bbb2e25d9c91ccbc8218..0d89858d9b3892eca256bd15a1453702464bd1ec 100644 (file)
--- a/grub-core/kern/i386/qemu/startup.S
+++ b/grub-core/kern/i386/qemu/startup.S
@@ -28,7 +28,7 @@
 _start:
        jmp     codestart
 
-       . = _start + GRUB_KERNEL_I386_QEMU_CORE_ENTRY_ADDR
+       .org GRUB_KERNEL_I386_QEMU_CORE_ENTRY_ADDR
 VARIABLE(grub_core_entry_addr)
        .long   0