commit 4486b86368d7 ("[ARM] riscpc: fix decompressor font file handling")
introduced Makefile magic to avoid building a file two times. Using
-Dstatic= does break some assumptions on compiler.h that were introduced
for READ_ONCE.Lets just use sed on the copy instead of using a define. Signed-off-by: Christian Borntraeger <[email protected]> Cc: Russell King <[email protected]> --- arch/arm/boot/compressed/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index 3ea230a..198f12a 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -196,10 +196,11 @@ $(obj)/piggy.$(suffix_y): $(obj)/../Image FORCE $(obj)/piggy.$(suffix_y).o: $(obj)/piggy.$(suffix_y) FORCE -CFLAGS_font.o := -Dstatic= - +# use the font from lib/fonts/. We have to make the font global, +# for the decompressor so lets remove the static declaration $(obj)/font.c: $(FONTC) $(call cmd,shipped) + sed -i s/static//g $@ $(obj)/hyp-stub.S: $(srctree)/arch/$(SRCARCH)/kernel/hyp-stub.S $(call cmd,shipped) -- 1.8.5.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
