From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759107AbYA1Irw (ORCPT ); Mon, 28 Jan 2008 03:47:52 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757053AbYA1Iqj (ORCPT ); Mon, 28 Jan 2008 03:46:39 -0500 Received: from mtaout03-winn.ispmail.ntl.com ([81.103.221.49]:42051 "EHLO mtaout03-winn.ispmail.ntl.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756819AbYA1Iqh (ORCPT ); Mon, 28 Jan 2008 03:46:37 -0500 From: Ian Campbell To: linux-kernel@vger.kernel.org Cc: Ian Campbell , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" Date: Mon, 28 Jan 2008 08:45:44 +0000 Message-Id: <1201509949-3285-5-git-send-email-ijc@hellion.org.uk> X-Mailer: git-send-email 1.5.3.8 In-Reply-To: <1201509949-3285-4-git-send-email-ijc@hellion.org.uk> References: <1201509949-3285-1-git-send-email-ijc@hellion.org.uk> <1201509949-3285-2-git-send-email-ijc@hellion.org.uk> <1201509949-3285-3-git-send-email-ijc@hellion.org.uk> <1201509949-3285-4-git-send-email-ijc@hellion.org.uk> X-SA-Exim-Connect-IP: 192.168.1.223 X-SA-Exim-Mail-From: ijc@hellion.org.uk Subject: [PATCHv2 4/9] x86_64: Unify arch/x86/boot/compressed/vmlinux_??.scr X-SA-Exim-Version: 4.2.1 (built Tue, 09 Jan 2007 17:23:22 +0000) X-SA-Exim-Scanned: Yes (on hopkins.hellion.org.uk) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The files are now identical so merge them. size reports no change in arch/x86/boot/compressed/vmlinux. Signed-off-by: Ian Campbell Cc: Thomas Gleixner Cc: Ingo Molnar Cc: H. Peter Anvin --- 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 f02382a..0000000 --- a/arch/x86/boot/compressed/vmlinux_64.scr +++ /dev/null @@ -1,10 +0,0 @@ -SECTIONS -{ - .rodata.compressed : { - input_len = .; - LONG(input_data_end - input_data) input_data = .; - *(.data) - output_len = . - 4; - input_data_end = .; - } -} -- 1.5.3.8