Messages in this thread Patch in this message | | | Date | Wed, 2 Mar 2011 10:55:30 -0500 (EST) | From | Nicolas Pitre <> | Subject | Re: linux-next: build failure after merge of the arm tree |
| |
On Thu, 3 Mar 2011, Stephen Rothwell wrote:
> Hi Russell, > > After merging the final tree, the linux-next 20110228 build (lots of arm > configs) failed like this: > > stat: cannot stat `arch/arm/boot/compressed/../Image': No such file or directory > gcc-4.4.0-nolibc/arm-linux/bin/arm-linux-ld:--defsym _image_size=: syntax error > > Presumably caused by commit d239b1dc093d551046a909920b5310c1d1e308c1 > ("ARM: 6746/1: remove the 4x expansion presumption while decompressing > the kernel").
The fix would be this:
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index 9d328be..3c0c68f 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -84,7 +84,7 @@ EXTRA_CFLAGS := -fpic -fno-builtin EXTRA_AFLAGS := -Wa,-march=all # Provide size of uncompressed kernel to the decompressor via a linker symbol. -LDFLAGS_vmlinux := --defsym _image_size=$(shell stat -c "%s" $(obj)/../Image) +LDFLAGS_vmlinux = --defsym _image_size=$(shell stat -c "%s" $(obj)/../Image) # Supply ZRELADDR to the decompressor via a linker symbol. ifneq ($(CONFIG_AUTO_ZRELADDR),y) LDFLAGS_vmlinux += --defsym zreladdr=$(ZRELADDR) Russell: can you fold this fix in the original patch, or do you prefer I send you this fix separately?
Nicolas
| |