From b9fe6ce1c0dd85b57f3e350b566c389d16681254 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:16:06 +0200 Subject: [PATCH] x86_64: prepare shared boot/compressed/Makefile Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar --- arch/x86_64/boot/compressed/Makefile | 35 ++++------------------ .../boot/compressed/{Makefile => Makefile_64} | 0 2 files changed, 5 insertions(+), 30 deletions(-) rewrite arch/x86_64/boot/compressed/Makefile (100%) copy arch/x86_64/boot/compressed/{Makefile => Makefile_64} (100%) diff --git a/arch/x86_64/boot/compressed/Makefile b/arch/x86_64/boot/compressed/Makefile dissimilarity index 100% index 5bfd108f29d..78514f3f626 100644 --- a/arch/x86_64/boot/compressed/Makefile +++ b/arch/x86_64/boot/compressed/Makefile @@ -1,30 +1,5 @@ -# -# linux/arch/x86_64/boot/compressed/Makefile -# -# create a compressed vmlinux image from the original vmlinux -# - -targets := vmlinux vmlinux.bin vmlinux.bin.gz head_64.o misc_64.o piggy.o - -CFLAGS := -m64 -D__KERNEL__ $(LINUXINCLUDE) -O2 \ - -fno-strict-aliasing -fPIC -mcmodel=small \ - $(call cc-option, -ffreestanding) \ - $(call cc-option, -fno-stack-protector) -AFLAGS := $(CFLAGS) -D__ASSEMBLY__ -LDFLAGS := -m elf_x86_64 - -LDFLAGS_vmlinux := -T -$(obj)/vmlinux: $(src)/vmlinux_64.lds $(obj)/head_64.o $(obj)/misc_64.o $(obj)/piggy.o FORCE - $(call if_changed,ld) - @: - -$(obj)/vmlinux.bin: vmlinux FORCE - $(call if_changed,objcopy) - -$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE - $(call if_changed,gzip) - -LDFLAGS_piggy.o := -r --format binary --oformat elf64-x86-64 -T - -$(obj)/piggy.o: $(obj)/vmlinux_64.scr $(obj)/vmlinux.bin.gz FORCE - $(call if_changed,ld) +ifeq ($(CONFIG_X86_32),y) +include ${srctree}/arch/i386/boot/compressed/Makefile_32 +else +include ${srctree}/arch/x86_64/boot/compressed/Makefile_64 +endif diff --git a/arch/x86_64/boot/compressed/Makefile b/arch/x86_64/boot/compressed/Makefile_64 similarity index 100% copy from arch/x86_64/boot/compressed/Makefile copy to arch/x86_64/boot/compressed/Makefile_64 -- 2.11.4.GIT