* grub-core/kern/arm/uboot/startup.S: Use .org rather than assigning

	".".

diff --git a/ChangeLog b/ChangeLog
index 35e498487bbe1c12b65679a9a6537cb87c7a8e64..48b5d6f940136675317cc4be316fa0d2f7c06454 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2013-11-12  Vladimir Serbinenko  <phcoder@gmail.com>
+2013-11-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/arm/uboot/startup.S: Use .org rather than assigning
+       ".".
+
+2013-11-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * include/grub/symbol.h (ADDR): New macro. Replace all occurences of
        =x with ADDR(x) in arm assembly.

diff --git a/grub-core/kern/arm/uboot/startup.S b/grub-core/kern/arm/uboot/startup.S
index 8920c2addfbcc0d67846a29edb4801199ec8d7a3..4b710a119a90eb951a6535de7670b4ef7bc9cce2 100644 (file)
--- a/grub-core/kern/arm/uboot/startup.S
+++ b/grub-core/kern/arm/uboot/startup.S
@@ -51,7 +51,7 @@ FUNCTION(_start)
        b       codestart
        
        @ Size of final image integrated module blob - set by grub-mkimage
-       . = _start + GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE
+       .org _start + GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE
 VARIABLE(grub_total_module_size)
        .long   0