* 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.

diff --git a/ChangeLog b/ChangeLog
index 064ccd54dc5e79ed6ad317c040d524299faf68fb..bc44f7ebf31ec52ef634d366f4b8a2f8437496e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * 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  <phcoder@gmail.com>
 
        * 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 413c0e9446b60b3fbd3c67e011fa8f3d5107a608..2199f3e96b0924cb172bdc4a0f7a7c4d15407999 100644 (file)
--- 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