8c6b1ac71e
Also include some minor fixes for gcc 5.1.1 Signed-off-by: Peter Jones <pjones@redhat.com>
53 lines
1.5 KiB
Diff
53 lines
1.5 KiB
Diff
From 3c6043245e9618a499766fdb0e51c4953d5d3da9 Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
Date: Sat, 21 Feb 2015 20:13:58 +0100
|
|
Subject: [PATCH 316/506] qemu: Switch to more portable .org
|
|
|
|
Binary is checked identical.
|
|
---
|
|
grub-core/boot/i386/qemu/boot.S | 6 +++---
|
|
grub-core/kern/i386/qemu/startup.S | 2 +-
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/grub-core/boot/i386/qemu/boot.S b/grub-core/boot/i386/qemu/boot.S
|
|
index c5343bf..8c3a1db 100644
|
|
--- 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 17aace9..0d89858 100644
|
|
--- 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
|
|
|
|
--
|
|
2.4.3
|
|
|