mips: Switch to more portable .org

Binary is unchanged.

diff --git a/grub-core/boot/mips/loongson/fwstart.S b/grub-core/boot/mips/loongson/fwstart.S
index 6ae3269900c48305a62527891b8c910cfd0ebc95..71bab6dc8bd633480108de394d59538ea4d2135b 100644 (file)
--- a/grub-core/boot/mips/loongson/fwstart.S
+++ b/grub-core/boot/mips/loongson/fwstart.S
@@ -162,7 +162,7 @@ retry_cs5536:
 
        b continue
 
-       . = start + GRUB_CPU_LOONGSON_FLASH_TLB_REFILL - GRUB_CPU_LOONGSON_FLASH_START
+       .org GRUB_CPU_LOONGSON_FLASH_TLB_REFILL - GRUB_CPU_LOONGSON_FLASH_START
 tlb_refill:    
        mfc0 $s1, GRUB_CPU_LOONGSON_COP0_EPC
        mfc0 $s2, GRUB_CPU_LOONGSON_COP0_BADVADDR
@@ -196,13 +196,13 @@ tlb_refill:
        b fatal
         addiu $a0, $a0, %lo(unhandled_tlb_refill)
 
-       . = start + GRUB_CPU_LOONGSON_FLASH_CACHE_ERROR - GRUB_CPU_LOONGSON_FLASH_START
+       .org GRUB_CPU_LOONGSON_FLASH_CACHE_ERROR - GRUB_CPU_LOONGSON_FLASH_START
 cache_error:
        lui $a0, %hi(unhandled_cache_error)
        b fatal
         addiu $a0, $a0, %lo(unhandled_cache_error)
 
-       . = start + GRUB_CPU_LOONGSON_FLASH_OTHER_EXCEPTION - GRUB_CPU_LOONGSON_FLASH_START
+       .org GRUB_CPU_LOONGSON_FLASH_OTHER_EXCEPTION - GRUB_CPU_LOONGSON_FLASH_START
 other_exception:
        mfc0 $s0, GRUB_CPU_LOONGSON_COP0_CAUSE
        mfc0 $s1, GRUB_CPU_LOONGSON_COP0_EPC

diff --git a/grub-core/boot/mips/startup_raw.S b/grub-core/boot/mips/startup_raw.S
index c169ca36ab0fed37cff9dc59567801a249617c1e..ca3413bbe09960f5857f330f37b42a7c82105096 100644 (file)
--- a/grub-core/boot/mips/startup_raw.S
+++ b/grub-core/boot/mips/startup_raw.S
@@ -39,13 +39,13 @@ start:
        bal codestart
         nop
 base:  
-       . = _start + GRUB_DECOMPRESSOR_MACHINE_COMPRESSED_SIZE
+       .org GRUB_DECOMPRESSOR_MACHINE_COMPRESSED_SIZE
 compressed_size:
        .long 0
-       . = _start + GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_SIZE
+       .org GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_SIZE
 uncompressed_size:
        .long 0
-       . = _start + GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_ADDR
+       .org GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_ADDR
 uncompressed_addr:
        .long 0
 codestart:

diff --git a/grub-core/kern/mips/startup.S b/grub-core/kern/mips/startup.S
index 709a91afa6840154d43c11fa4de2a8384cfcadb1..339ab337e507837d289e82591b967d9c7157666f 100644 (file)
--- a/grub-core/kern/mips/startup.S
+++ b/grub-core/kern/mips/startup.S
@@ -36,7 +36,7 @@ start:
        bal cont
         nop
 
-       . = _start + GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE
+       .org GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE
 VARIABLE(grub_total_modules_size)
        .long 0