Hi,
There's been some rework on the Makefile for the mips64 target,
however the line for the assembler options was forgotten, causing
assembly source code to be wronly compiled, and crashing the linker
afterwards. This patch fixes it, and also removes a few warnings about
structures declared in parameter list.
regards,
Vivien Chappelier.
diff -Naur linux/arch/mips64/Makefile linux.patch/arch/mips64/Makefile
--- linux/arch/mips64/Makefile Thu Jul 4 10:12:27 2002
+++ linux.patch/arch/mips64/Makefile Thu Jul 4 11:17:54 2002
@@ -71,10 +71,6 @@
endif
endif
-AFLAGS += $(GCCFLAGS)
-CFLAGS += $(GCCFLAGS)
-
-
#
# We unconditionally build the math emulator
#
@@ -163,7 +159,7 @@
# convert to ECOFF using elf2ecoff.
#
ifdef CONFIG_BOOT_ELF32
-CFLAGS += -Wa,-32
+GCCFLAGS += -Wa,-32
LINKFLAGS += -T arch/mips64/ld.script.elf32
endif
#
@@ -171,7 +167,7 @@
# ELF files from 32-bit files by conversion.
#
ifdef CONFIG_BOOT_ELF64
-CFLAGS += -Wa,-32
+GCCFLAGS += -Wa,-32
LINKFLAGS += -T arch/mips64/ld.script.elf32
#AS += -64
#LD += -m elf64bmip
@@ -193,6 +189,9 @@
else
64bit-bfd = elf64-bigmips
endif
+
+AFLAGS += $(GCCFLAGS)
+CFLAGS += $(GCCFLAGS)
vmlinux: arch/mips64/ld.script.elf32
arch/mips64/ld.script.elf32: arch/mips64/ld.script.elf32.S
diff -Naur linux/include/asm-mips64/processor.h linux.patch/include/asm-mips64/processor.h
--- linux/include/asm-mips64/processor.h Mon Jul 1 20:26:41 2002
+++ linux.patch/include/asm-mips64/processor.h Thu Jul 4 11:17:28 2002
@@ -13,6 +13,10 @@
#include <linux/config.h>
+#ifndef _LANGUAGE_ASSEMBLY
+struct task_struct;
+#endif
+
/*
* Return current * instruction pointer ("program counter").
*/
diff -Naur /share/linux-2.5.cvs/include/asm-mips64/system.h linux.patch/include/asm-mips64/system.h
--- linux/include/asm-mips64/system.h Thu Jul 4 10:12:56 2002
+++ linux.patch/include/asm-mips64/system.h Thu Jul 4 11:17:38 2002
@@ -15,6 +15,8 @@
#include <asm/ptrace.h>
#include <linux/kernel.h>
+struct task_struct;
+
__asm__ (
".macro\t__sti\n\t"
".set\tpush\n\t"
--- linux/include/asm-mips64/traps.h Wed Jun 26 15:01:23 2002
+++ linux.patch/include/asm-mips64/traps.h Thu Jul 4 12:26:58 2002
@@ -13,6 +13,8 @@
#ifndef __ASM_MIPS64_TRAPS_H
#define __ASM_MIPS64_TRAPS_H
+struct pt_regs;
+
/*
* Possible status responses for a be_board_handler backend.
*/
