Subject: Re: Small change to hpcmips port
To: Warner Losh <matt@netbsd.org>
From: TAKEMURA Shin <takemura@netbsd.org>
List: port-hpcmips
Date: 07/08/2001 22:41:41
----- Original Message -----
From: "Warner Losh" <imp@harmony.village.org>
To: <port-hpcmips@netbsd.org>; <port-mips@netbsd.org>
Sent: Friday, June 22, 2001 6:13 AM
Subject: Small change to hpcmips port


> Recent hpcmips kernel makefiles give me the following warning:
> make: "/sys/arch/hpcmips/compile/GENERIC/Makefile" line 1417: warning:
duplicate script for target "fp.o" ignored
> make: "/sys/arch/hpcmips/compile/GENERIC/Makefile" line 520: warning:
using previous script for "fp.o" defined here

It seemts that you should fix Makefiles.mips rather than files.hpcmips.
I've reffered changes rev. 1.3->1.4 and 1.5->1.6 on Makefile.mips and I made
a patch. (attached)

http://cvsweb.netbsd.org/cgi-bin/cvsweb.cgi/syssrc/sys/arch/mips/conf/Makefi
le.mips

But if you need fp.S irrecpective of NOFPU and softfloat, you can simply
remove all 'if empty(IDENT:M-DNOFPU)'. How do you think?

Takemura

diff -c -r1.14 Makefile.mips
*** Makefile.mips       2001/05/29 02:20:24     1.14
--- Makefile.mips       2001/07/08 12:51:47
***************
*** 263,270 ****
--- 263,272 ----
  locore_mips3.o: ${MIPS}/mips/locore_mips3.S assym.h
        ${NORMAL_S}

+ .if empty(IDENT:M-DNOFPU)
  fp.o: ${MIPS}/mips/fp.S assym.h
        ${NORMAL_S}
+ .endif

  locore_machdep.o: ${THISMIPS}/${TARGET_MACHINE}/locore_machdep.S assym.h
        ${NORMAL_S}

> Index: files.hpcmips
> ===================================================================
> RCS file:
/home/imp/NetBSD/CVS/syssrc/sys/arch/hpcmips/conf/files.hpcmips,v
> retrieving revision 1.59
> diff -u -r1.59 files.hpcmips
> --- files.hpcmips 2001/06/13 19:09:07 1.59
> +++ files.hpcmips 2001/06/21 21:11:58
> @@ -48,7 +48,7 @@
>  file arch/hpcmips/vr/vr_idle.S vr41xx
>  file arch/hpcmips/tx/tx39.c tx39xx # TOSHIBA TX3900 series
>
> -file arch/mips/mips/fp.S softfloat
> +#file arch/mips/mips/fp.S softfloat
>
>  file arch/hpcmips/hpcmips/autoconf.c
>  file arch/hpcmips/hpcmips/bus_dma.c
>
> Fixes the warning, but I don't think that's the right fix.
>
> What is the right fix here?
>
> Warner