--- arch/arm/boot/compressed/Makefile

+++ arch/arm/boot/compressed/Makefile

@@ -5,7 +5,7 @@

#

HEAD = head.o

-OBJS = misc.o

+OBJS = misc.o decompress.o

FONTC = $(srctree)/drivers/video/console/font_acorn_8x8.c

#

@@ -63,8 +63,13 @@ endif

SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/

-targets := vmlinux vmlinux.lds piggy.gz piggy.o font.o font.c \

- head.o misc.o $(OBJS)

+suffix_$(CONFIG_KERNEL_GZIP) = gzip

+suffix_$(CONFIG_KERNEL_LZO) = lzo

+suffix_$(CONFIG_KERNEL_LZMA) = lzma

+

+targets := vmlinux vmlinux.lds \

+ piggy.$(suffix_y) piggy.$(suffix_y).o \

+ font.o font.c head.o misc.o $(OBJS)

ifeq ($(CONFIG_FUNCTION_TRACER),y)

ORIG_CFLAGS := $(KBUILD_CFLAGS)

@@ -87,22 +92,30 @@ endif

ifneq ($(PARAMS_PHYS),)

LDFLAGS_vmlinux += --defsym params_phys=$(PARAMS_PHYS)

endif

-LDFLAGS_vmlinux += -p --no-undefined -X \

- $(shell $(CC) $(KBUILD_CFLAGS) --print-libgcc-file-name) -T

+# ?

+LDFLAGS_vmlinux += -p

+# Report unresolved symbol references

+LDFLAGS_vmlinux += --no-undefined

+# Delete all temporary local symbols

+LDFLAGS_vmlinux += -X

+# Next argument is a linker script

+LDFLAGS_vmlinux += -T

-# Don't allow any static data in misc.o, which

-# would otherwise mess up our GOT table

-CFLAGS_misc.o := -Dstatic=

+# For __aeabi_uidivmod

+lib1funcs = $(obj)/lib1funcs.o

-$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.o \

- $(addprefix $(obj)/, $(OBJS)) FORCE

+$(obj)/lib1funcs.S: $(srctree)/arch/$(SRCARCH)/lib/lib1funcs.S FORCE

+ $(call cmd,shipped)

+

+$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.$(suffix_y).o \

+ $(addprefix $(obj)/, $(OBJS)) $(lib1funcs) FORCE

$(call if_changed,ld)

@:

-$(obj)/piggy.gz: $(obj)/../Image FORCE

- $(call if_changed,gzip)

+$(obj)/piggy.$(suffix_y): $(obj)/../Image FORCE

+ $(call if_changed,$(suffix_y))

-$(obj)/piggy.o: $(obj)/piggy.gz FORCE

+$(obj)/piggy.$(suffix_y).o: $(obj)/piggy.$(suffix_y) FORCE

CFLAGS_font.o := -Dstatic=