[PATCH] CVS HEAD mips64 assembler options

[PATCH] CVS HEAD mips64 assembler options

[Vivien Chappelier]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 343 bytes --]

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.

[-- Attachment #2: Type: TEXT/plain, Size: 2097 bytes --]

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.
  */

Re: [PATCH] CVS HEAD mips64 assembler options

[Ralf Baechle]

On Thu, Jul 04, 2002 at 01:28:19PM +0200, Vivien Chappelier wrote:

> 	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.

I know those warnings and I simply take them as the proof that our
header are too spaghettiish, so I'm not taking the easy way out ...

  Ralf

Re: [PATCH] CVS HEAD mips64 assembler options

[Maciej W. Rozycki]

On Thu, 4 Jul 2002, Ralf Baechle wrote:

> > 	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.
> 
> I know those warnings and I simply take them as the proof that our
> header are too spaghettiish, so I'm not taking the easy way out ...

 But the Makefile part is right -- I am responsible for the breakage, but
since I use non-crippled tools, I haven't got a chance to verify this bit. 
I am checking in the fix, with minor spacing updates (and adjusting 2.4
for consistency). 

-- 
+  Maciej W. Rozycki, Technical University of Gdansk, Poland   +
+--------------------------------------------------------------+
+        e-mail: macro@ds2.pg.gda.pl, PGP key available        +

Re: [PATCH] CVS HEAD mips64 assembler options

[Ralf Baechle]

On Thu, Jul 04, 2002 at 03:23:28PM +0200, Maciej W. Rozycki wrote:

> > > 	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.
> > 
> > I know those warnings and I simply take them as the proof that our
> > header are too spaghettiish, so I'm not taking the easy way out ...
> 
>  But the Makefile part is right -- I am responsible for the breakage, but
> since I use non-crippled tools, I haven't got a chance to verify this bit. 
> I am checking in the fix, with minor spacing updates (and adjusting 2.4
> for consistency). 

Yep, just didn't yet get to sort it.

  Ralf