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

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

@@ -87,13 +87,14 @@ SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/

suffix_$(CONFIG_KERNEL_GZIP) = gzip

suffix_$(CONFIG_KERNEL_LZO) = lzo

suffix_$(CONFIG_KERNEL_LZMA) = lzma

+suffix_$(CONFIG_KERNEL_XZ) = xzkern

targets := vmlinux vmlinux.lds \

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

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

# Make sure files are removed during clean

-extra-y += piggy.gzip piggy.lzo piggy.lzma lib1funcs.S

+extra-y += piggy.gzip piggy.lzo piggy.lzma piggy.xzkern lib1funcs.S ashldi3.S

ifeq ($(CONFIG_FUNCTION_TRACER),y)

ORIG_CFLAGS := $(KBUILD_CFLAGS)

@@ -125,6 +126,12 @@ lib1funcs = $(obj)/lib1funcs.o

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

$(call cmd,shipped)

+# For __aeabi_llsl

+ashldi3 = $(obj)/ashldi3.o

+

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

+ $(call cmd,shipped)

+

# We need to prevent any GOTOFF relocs being used with references

# to symbols in the .bss section since we cannot relocate them

# independently from the rest at run time. This can be achieved by

@@ -139,7 +146,7 @@ bad_syms=$$($(CROSS_COMPILE)nm $@ | sed

echo "$$bad_syms" >&2; rm -f $@; false )

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

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

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

$(call if_changed,ld)

@$(check_for_bad_syms)