8c6b1ac71e
Also include some minor fixes for gcc 5.1.1 Signed-off-by: Peter Jones <pjones@redhat.com>
76 lines
2.5 KiB
Diff
76 lines
2.5 KiB
Diff
From 49e5fcb9fb1efd1c9b9622d1bc0fe5fa23e99b81 Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
Date: Sat, 21 Feb 2015 20:32:03 +0100
|
|
Subject: [PATCH 319/506] sparc64: Switch to more portable .org.
|
|
|
|
Binaries are unchanged.
|
|
---
|
|
grub-core/boot/sparc64/ieee1275/boot.S | 8 ++++----
|
|
grub-core/boot/sparc64/ieee1275/diskboot.S | 2 +-
|
|
grub-core/kern/sparc64/ieee1275/crt0.S | 2 +-
|
|
3 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/grub-core/boot/sparc64/ieee1275/boot.S b/grub-core/boot/sparc64/ieee1275/boot.S
|
|
index 5073677..586efb4 100644
|
|
--- 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 e020f62..35e02c1 100644
|
|
--- 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 79b6bb3..03b916f 100644
|
|
--- 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
|
|
--
|
|
2.4.3
|
|
|