Messages in this thread Patch in this message | | | From | Ian Campbell <> | Date | Sat, 26 Jan 2008 11:54:08 +0000 | Subject | [PATCH 4/9] x86_64: Unify arch/x86/boot/compressed/vmlinux_??.scr |
| |
The files are now identical so merge them.
size reports no change in arch/x86/boot/compressed/vmlinux.
Signed-off-by: Ian Campbell <ijc@hellion.org.uk> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> --- arch/x86/boot/compressed/Makefile | 2 +- .../compressed/{vmlinux_32.scr => vmlinux.scr} | 0 arch/x86/boot/compressed/vmlinux_64.scr | 10 ---------- 3 files changed, 1 insertions(+), 11 deletions(-) rename arch/x86/boot/compressed/{vmlinux_32.scr => vmlinux.scr} (100%) delete mode 100644 arch/x86/boot/compressed/vmlinux_64.scr
diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile index d6ae347..baffeaf 100644 --- a/arch/x86/boot/compressed/Makefile +++ b/arch/x86/boot/compressed/Makefile @@ -59,5 +59,5 @@ LDFLAGS_piggy.o := -r --format binary --oformat elf64-x86-64 -T endif -$(obj)/piggy.o: $(obj)/vmlinux_$(BITS).scr $(obj)/vmlinux.bin.gz FORCE +$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE $(call if_changed,ld) diff --git a/arch/x86/boot/compressed/vmlinux_32.scr b/arch/x86/boot/compressed/vmlinux.scr similarity index 100% rename from arch/x86/boot/compressed/vmlinux_32.scr rename to arch/x86/boot/compressed/vmlinux.scr diff --git a/arch/x86/boot/compressed/vmlinux_64.scr b/arch/x86/boot/compressed/vmlinux_64.scr deleted file mode 100644 index a549526..0000000 --- a/arch/x86/boot/compressed/vmlinux_64.scr +++ /dev/null @@ -1,10 +0,0 @@ -SECTIONS -{ - .data.compressed : { - input_len = .; - LONG(input_data_end - input_data) input_data = .; - *(.data) - output_len = . - 4; - input_data_end = .; - } -} -- 1.5.3.8
| |