From fa6ec5734f55bcecaaa74e988227c25ffb9f3966 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Wed, 29 Feb 2012 19:12:16 +0100 Subject: [PATCH] * grub-core/boot/i386/pc/startup_raw.S: Use separate reed_solomon_size const definition instead of computing it since Apple assembler doesn't support the later. --- ChangeLog | 6 ++++++ grub-core/boot/i386/pc/startup_raw.S | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 064ccd54d..bc44f7ebf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-02-29 Vladimir Serbinenko + + * grub-core/boot/i386/pc/startup_raw.S: Use separate + reed_solomon_size const definition instead of computing it since + Apple assembler doesn't support the later. + 2012-02-29 Vladimir Serbinenko * gentpl.py (kernel): Rewrite Apple part. diff --git a/grub-core/boot/i386/pc/startup_raw.S b/grub-core/boot/i386/pc/startup_raw.S index 413c0e944..2199f3e96 100644 --- a/grub-core/boot/i386/pc/startup_raw.S +++ b/grub-core/boot/i386/pc/startup_raw.S @@ -105,7 +105,8 @@ LOCAL (codestart): call grub_gate_a20 movl LOCAL(compressed_size), %edx - addl $(LOCAL(decompressor_end) - LOCAL(reed_solomon_part)), %edx + LOCAL(reed_solomon_size) = LOCAL(decompressor_end) - LOCAL(reed_solomon_part) + addl $LOCAL(reed_solomon_size), %edx movl reed_solomon_redundancy, %ecx leal LOCAL(reed_solomon_part), %eax cld