sparc64: Switch to more portable .org.

Binaries are unchanged.

diff --git a/grub-core/boot/sparc64/ieee1275/boot.S b/grub-core/boot/sparc64/ieee1275/boot.S
index 5073677499e67df05a98eacd68d21537e4c47059..586efb4014e8648e560fb43eee8eea8b09da669b 100644 (file)
--- a/grub-core/boot/sparc64/ieee1275/boot.S
+++ b/grub-core/boot/sparc64/ieee1275/boot.S
@@ -41,9 +41,9 @@ pic_base:
         * After loading in that block we will execute it by jumping to the
         * load address plus the size of the prepended A.OUT header (32 bytes).
         */
-       . = _start + GRUB_BOOT_MACHINE_BOOT_DEVPATH
+       .org GRUB_BOOT_MACHINE_BOOT_DEVPATH
 boot_path:
-       . = _start + GRUB_BOOT_MACHINE_KERNEL_BYTE
+       .org GRUB_BOOT_MACHINE_KERNEL_BYTE
 boot_path_end:
 kernel_byte:           .xword (2 << 9)
 kernel_address:                .word  GRUB_BOOT_MACHINE_KERNEL_ADDR
@@ -52,7 +52,7 @@ kernel_address:               .word  GRUB_BOOT_MACHINE_KERNEL_ADDR
 #define boot_path_end (_start + 1024)
 #include <grub/offsets.h>
 
-       . = _start + 8
+       .org 8
 kernel_byte:           .xword (2 << 9)
 kernel_size:           .word  512
 kernel_address:                .word  GRUB_BOOT_SPARC64_IEEE1275_IMAGE_ADDRESS
@@ -224,7 +224,7 @@ bootpath_known:
 #else
         nop
 #endif
-       . = _start + GRUB_BOOT_MACHINE_CODE_END
+       .org GRUB_BOOT_MACHINE_CODE_END
 
 /* the last 4 bytes in the sector 0 contain the signature */
        .word   GRUB_BOOT_MACHINE_SIGNATURE

diff --git a/grub-core/boot/sparc64/ieee1275/diskboot.S b/grub-core/boot/sparc64/ieee1275/diskboot.S
index e020f622181ef18de98c8e9814eb64f0d159b1d6..35e02c1b6d23a845f9a122242ec64a9072ab09ff 100644 (file)
--- a/grub-core/boot/sparc64/ieee1275/diskboot.S
+++ b/grub-core/boot/sparc64/ieee1275/diskboot.S
@@ -136,7 +136,7 @@ lastlist:
        .word   0
        .word   0
 
-       . = _start + (0x200 - GRUB_BOOT_SPARC64_IEEE1275_LIST_SIZE)
+       .org (0x200 - GRUB_BOOT_SPARC64_IEEE1275_LIST_SIZE)
 blocklist_default_start:
        .word   0
        .word   2

diff --git a/grub-core/kern/sparc64/ieee1275/crt0.S b/grub-core/kern/sparc64/ieee1275/crt0.S
index 79b6bb325dd6a420b2f639c50d1fc465a04d42a7..03b916f053436467f2f8c8ec7f9810f63df9eda9 100644 (file)
--- a/grub-core/kern/sparc64/ieee1275/crt0.S
+++ b/grub-core/kern/sparc64/ieee1275/crt0.S
@@ -27,7 +27,7 @@ _start:
        ba      codestart
         mov  %o4, %o0
 
-       . = EXT_C(_start) + GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE
+       .org GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE
 
 VARIABLE(grub_total_module_size)
        .word   0