From 1f4650288b8cae852c93b0da319512a5d6f5866b Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:13:40 +0200 Subject: [PATCH] --- yaml --- r: 65428 b: refs/heads/master c: e2ec98525d815d6e68dd509e5a4c9b93e55d622d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/boot/compressed/Makefile | 2 +- trunk/arch/i386/boot/compressed/{vmlinux.lds => vmlinux_32.lds} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/i386/boot/compressed/{vmlinux.lds => vmlinux_32.lds} (100%) diff --git a/[refs] b/[refs] index 4ca9cea19e31..13f3f26d8932 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c1c85a52c755c86840f83669bbab63962ab231ff +refs/heads/master: e2ec98525d815d6e68dd509e5a4c9b93e55d622d diff --git a/trunk/arch/i386/boot/compressed/Makefile b/trunk/arch/i386/boot/compressed/Makefile index c4533eadc7a5..aa7f87318349 100644 --- a/trunk/arch/i386/boot/compressed/Makefile +++ b/trunk/arch/i386/boot/compressed/Makefile @@ -17,7 +17,7 @@ CFLAGS := -m32 -D__KERNEL__ $(LINUX_INCLUDE) -O2 \ $(call cc-option,-fno-stack-protector) LDFLAGS := -m elf_i386 -$(obj)/vmlinux: $(src)/vmlinux.lds $(obj)/head.o $(obj)/misc_32.o $(obj)/piggy.o FORCE +$(obj)/vmlinux: $(src)/vmlinux_32.lds $(obj)/head.o $(obj)/misc_32.o $(obj)/piggy.o FORCE $(call if_changed,ld) @: diff --git a/trunk/arch/i386/boot/compressed/vmlinux.lds b/trunk/arch/i386/boot/compressed/vmlinux_32.lds similarity index 100% rename from trunk/arch/i386/boot/compressed/vmlinux.lds rename to trunk/arch/i386/boot/compressed/vmlinux_32.lds