Module Name:    src
Committed By:   christos
Date:           Mon Mar 15 18:13:54 UTC 2021

Modified Files:
        src/sys/arch/evbmips/stand/sbmips: Makefile.bootprogs

Log Message:
- 32 bit mips uses oabi, don't force it to n32.
- compile assembly code with soft-float to kill linker warnings


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs
diff -u src/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs:1.4 src/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs:1.5
--- src/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs:1.4	Sun Mar 14 18:58:10 2021
+++ src/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs	Mon Mar 15 14:13:54 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootprogs,v 1.4 2021/03/14 22:58:10 christos Exp $
+# $NetBSD: Makefile.bootprogs,v 1.5 2021/03/15 18:13:54 christos Exp $
 
 NOSSP=yes
 NOPIE=yes
@@ -17,6 +17,7 @@ LDABI=	-melf32btsmipn32
 .	else
 LDABI=	-melf32ltsmipn32
 .	endif
+CPUFLAGS+=	-mabi=n32
 .endif
 
 STRIPFLAG=
@@ -33,13 +34,12 @@ STRIP?=	strip
 
 CHECKSIZE_CMD=	SIZE=${SIZE} ${HOST_SH} ${COMMON}/checksize.sh
 
-AFLAGS+=	-DASSEMBLER -D_LOCORE -mno-abicalls -mips64
+AFLAGS+=	-DASSEMBLER -D_LOCORE -mno-abicalls -mips64 -msoft-float
 # -I${.CURDIR}/../.. done by Makefile.inc
 CPPFLAGS+=	-nostdinc -I${.OBJDIR} -D_STANDALONE -I${S}
 CFLAGS=		-Os -g -ffreestanding -mno-abicalls -msoft-float -G 0
 CFLAGS+=	-mips64
 CFLAGS+=	-Werror ${CWARNFLAGS}
-CPUFLAGS+=	-mabi=n32
 
 NETBSD_VERS!=${HOST_SH} ${S}/conf/osrelease.sh
 CPPFLAGS+= -DNETBSD_VERS='"${NETBSD_VERS}"'

Reply via email to