8c6b1ac71e
Also include some minor fixes for gcc 5.1.1 Signed-off-by: Peter Jones <pjones@redhat.com>
79 lines
2.6 KiB
Diff
79 lines
2.6 KiB
Diff
From da9f30b455a3d1b9e52ae6875b4724c0784c9e8a Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
Date: Sat, 21 Feb 2015 20:43:57 +0100
|
|
Subject: [PATCH 320/506] mips: Switch to more portable .org
|
|
|
|
Binary is unchanged.
|
|
---
|
|
grub-core/boot/mips/loongson/fwstart.S | 6 +++---
|
|
grub-core/boot/mips/startup_raw.S | 6 +++---
|
|
grub-core/kern/mips/startup.S | 2 +-
|
|
3 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/grub-core/boot/mips/loongson/fwstart.S b/grub-core/boot/mips/loongson/fwstart.S
|
|
index 6ae3269..71bab6d 100644
|
|
--- 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 c169ca3..ca3413b 100644
|
|
--- 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 709a91a..339ab33 100644
|
|
--- 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
|
|
|
|
--
|
|
2.4.3
|
|
|