diff options
| author | Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de> | 2002-09-17 08:38:51 -0500 |
|---|---|---|
| committer | Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de> | 2002-09-17 08:38:51 -0500 |
| commit | 761de242cc7e2457aaede2cb3a6016e8646b84a0 (patch) | |
| tree | e33d7d9b73e1d9b2f484835a978a59f209f93045 | |
| parent | 6c5216e2a01cbc7b3428ce3e5d5a783407c7440b (diff) | |
kbuild: Fix up MIPS vmlinux.lds.S
Untested, but at least it should show how to adapt the mips arch.
| -rw-r--r-- | arch/mips/Makefile | 8 | ||||
| -rw-r--r-- | arch/mips/vmlinux.lds.S (renamed from arch/mips/ld.script.in) | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index de853833c0d6..a32f877910a4 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -266,11 +266,11 @@ endif # error messages during linking. Select a default linkscript if # none has been choosen above. # -vmlinux: arch/$(ARCH)/ld.script +vmlinux: arch/$(ARCH)/vmlinux.lds.s -arch/$(ARCH)/ld.script: arch/$(ARCH)/ld.script.in arch/$(ARCH)/Makefile - sed -e 's/@@LOADADDR@@/$(LOADADDR)/' <$< >$@ -LDFLAGS_vmlinux += -T arch/$(ARCH)/ld.script +LDFLAGS_vmlinux += -T arch/$(ARCH)/vmlinux.lds.s + +AFLAGS_vmlinux.lds.o := -DLOADADDR=$(LOADADDR) HEAD := arch/mips/kernel/head.o arch/mips/kernel/init_task.o diff --git a/arch/mips/ld.script.in b/arch/mips/vmlinux.lds.S index 72151b12408c..83563f969f6b 100644 --- a/arch/mips/ld.script.in +++ b/arch/mips/vmlinux.lds.S @@ -3,7 +3,7 @@ ENTRY(kernel_entry) SECTIONS { /* Read-only sections, merged into text segment: */ - . = @@LOADADDR@@; + . = LOADADDR; .init : { *(.init) } =0 .text : { |