From 84e1569ee47c41788c95691a2b9901894def0359 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Tue, 29 May 2012 13:54:33 +0200 Subject: [PATCH] * grub-core/kern/i386/pc/startup.S [__APPLE__]: Add a workaround for objconv bug. --- ChangeLog | 5 +++++ grub-core/kern/i386/pc/startup.S | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 93a4da5d6..9f724e568 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-05-29 Vladimir Serbinenko + + * grub-core/kern/i386/pc/startup.S [__APPLE__]: Add a workaround for + objconv bug. + 2012-05-29 Vladimir Serbinenko * grub-core/gdb/i386/machdep.S: Make usable with Apple assembler. diff --git a/grub-core/kern/i386/pc/startup.S b/grub-core/kern/i386/pc/startup.S index c05b27e96..6bb36c603 100644 --- a/grub-core/kern/i386/pc/startup.S +++ b/grub-core/kern/i386/pc/startup.S @@ -202,6 +202,10 @@ VARIABLE(grub_realidt) .long 0 #ifdef __APPLE__ + /* Older versions of objconv assume that there is the same number + of text and data sections. Hence this dummy. */ + .section __TEXT, __zz_dummy + .byte 0 .globl EXT_C(_edata) .globl EXT_C(grub_boot_device) .zerofill __DATA, __aa_before_bss, EXT_C(_edata), 1, 0