From 3cffdc0053293314572890f9224e306388f2b95b Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 10 May 2001 21:01:25 +0000 Subject: Make the kernel build with the recent binutils changes. --- arch/mips/Makefile | 5 +---- arch/mips/ld.script.in | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 7c0a63e6c..02dfccd33 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -17,10 +17,8 @@ # ifdef CONFIG_CPU_LITTLE_ENDIAN tool-prefix = mipsel-linux- -output-format = elf32-littlemips else tool-prefix = mips-linux- -output-format = elf32-bigmips endif ifdef CONFIG_CROSSCOMPILE @@ -249,8 +247,7 @@ endif vmlinux: arch/$(ARCH)/ld.script arch/$(ARCH)/ld.script: arch/$(ARCH)/ld.script.in arch/$(ARCH)/Makefile - sed -e 's/@@OUTPUT_FORMAT@@/$(output-format)/' \ - -e 's/@@LOADADDR@@/$(LOADADDR)/' <$< >$@ + sed -e 's/@@LOADADDR@@/$(LOADADDR)/' <$< >$@ LINKFLAGS += -T arch/$(ARCH)/ld.script HEAD := arch/mips/kernel/head.o arch/mips/kernel/init_task.o diff --git a/arch/mips/ld.script.in b/arch/mips/ld.script.in index ca3532669..b8cbfd6e6 100644 --- a/arch/mips/ld.script.in +++ b/arch/mips/ld.script.in @@ -1,4 +1,3 @@ -OUTPUT_FORMAT("@@OUTPUT_FORMAT@@") OUTPUT_ARCH(mips) ENTRY(kernel_entry) SECTIONS -- cgit v1.2.3