[PATCH] ARM: fix $(CROSS_COMPILE) prefix missing from size invocation

[Janusz Krzysztofik]

On Friday 25 of November 2011 at 02:58:58, Janusz Krzysztofik wrote:
> Otherwise, cross compilation may fail with error messages like:
> 
> ...
> size: arch/arm/boot/compressed/../../../../vmlinux: File format is ambiguous
> size: Matching formats: elf32-littlearm elf32-littlearm-symbian elf32-littlearm-vxworks
>   LD      arch/arm/boot/compressed/vmlinux
>   arm-angstrom-linux-uclibcgnueabi-ld:--defsym _kernel_bss_size=: syntax error
> 
> Signed-off-by: Janusz Krzysztofik <jkrzyszt at tis.icnet.pl>

Trying to guess why this patch is still sitting in the Incoming queue in 
the Russell's patch system (7184/1) while others have found their way to 
the Applied queue meanwhile, I wonder if this is because I didn't 
mention explicitly that it is a fix to a regression introduced into 
3.2-rc with the following commit:

$ git log v3.1..v3.2-rc1 -Ssize -p arch/arm/boot/compressed/Makefile
commit 5ffb04f6690d71fab241b3562ebf52b893ac4ff1
Author: Nicolas Pitre <nicolas.pitre at linaro.org>
Date:   Sun Jun 12 01:07:33 2011 -0400

    ARM: zImage: make sure appended DTB doesn't get overwritten by kernel .bss
    
    The appended DTB gets relocated with the decompressor code to get out
    of the way of the decompressed kernel.  However the kernel's .bss section
    may be larger than the relocated code and data, and then the DTB gets
    overwritten.  Let's make sure the relocation takes care of moving zImage
    far enough so no such conflict with .bss occurs.
    
    Thanks to Tony Lindgren <tony at atomide.com> for figuring out this issue.
    
    While at it, let's clean up the code a bit so that the wont_overwrite
    symbol is used while determining if a conflict exists, making the above
    change more precise as well as eliminating some ARM/THUMB alternates.
    
    Signed-off-by: Nicolas Pitre <nicolas.pitre at linaro.org>
    Acked-by: Tony Lindgren <tony at atomide.com>
    Tested-by: Shawn Guo <shawn.guo at linaro.org>
    Tested-by: Dave Martin <dave.martin at linaro.org>
    Tested-by: Thomas Abraham <thomas.abraham at linaro.org>

diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 0c74a6f..4867647 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -104,6 +104,9 @@ endif
 ccflags-y := -fpic -fno-builtin
 asflags-y := -Wa,-march=all
 
+# Supply kernel BSS size to the decompressor via a linker symbol.
+KBSS_SZ = $(shell size $(obj)/../../../../vmlinux | awk 'END{print $$3}')
+LDFLAGS_vmlinux = --defsym _kernel_bss_size=$(KBSS_SZ)
 # Supply ZRELADDR to the decompressor via a linker symbol.
 ifneq ($(CONFIG_AUTO_ZRELADDR),y)
 LDFLAGS_vmlinux += --defsym zreladdr=$(ZRELADDR)

Thanks,
Janusz

> ---
>  arch/arm/boot/compressed/Makefile |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
> index 21f56ff..cf0a64c 100644
> --- a/arch/arm/boot/compressed/Makefile
> +++ b/arch/arm/boot/compressed/Makefile
> @@ -126,7 +126,8 @@ ccflags-y := -fpic -fno-builtin -I$(obj)
>  asflags-y := -Wa,-march=all
>  
>  # Supply kernel BSS size to the decompressor via a linker symbol.
> -KBSS_SZ = $(shell size $(obj)/../../../../vmlinux | awk 'END{print $$3}')
> +KBSS_SZ = $(shell $(CROSS_COMPILE)size $(obj)/../../../../vmlinux | \
> +		awk 'END{print $$3}')
>  LDFLAGS_vmlinux = --defsym _kernel_bss_size=$(KBSS_SZ)
>  # Supply ZRELADDR to the decompressor via a linker symbol.
>  ifneq ($(CONFIG_AUTO_ZRELADDR),y)
>