summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-05-10 21:01:25 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-05-10 21:01:25 +0000
commit3cffdc0053293314572890f9224e306388f2b95b (patch)
tree52d668be8b46621dec08f529d5bf41288bb09110
parent117e30e741cd28e08528240304772c417db10792 (diff)
Make the kernel build with the recent binutils changes.
-rw-r--r--arch/mips/Makefile5
-rw-r--r--arch/mips/ld.script.in1
2 files changed, 1 insertions, 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