CVS commit: src/sys/arch/evbmips/stand/sbmips

2021-03-15 Thread Christos Zoulas 
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}"'

CVS commit: src/sys/arch/evbmips/stand/sbmips

2021-03-14 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Mar 14 22:58:11 UTC 2021

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

Log Message:
Specify the emulation explicitly (n32) so this builds when the default
emulation changes.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/arch/evbmips/stand/sbmips/Makefile.bootxx
cvs rdiff -u -r1.1.1.1 -r1.2 src/sys/arch/evbmips/stand/sbmips/boot/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/arch/evbmips/stand/sbmips/netboot/Makefile

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.3 src/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs:1.4
--- src/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs:1.3	Mon Aug 21 12:36:00 2017
+++ src/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs	Sun Mar 14 18:58:10 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootprogs,v 1.3 2017/08/21 16:36:00 christos Exp $
+# $NetBSD: Makefile.bootprogs,v 1.4 2021/03/14 22:58:10 christos Exp $
 
 NOSSP=yes
 NOPIE=yes
@@ -11,6 +11,14 @@ COMMON=	${.CURDIR}/../common
 
 .PATH:	${COMMON}
 
+.if ${MACHINE_ARCH:M*64*}
+.	if ${MACHINE_ARCH:M*eb}
+LDABI=	-melf32btsmipn32
+.	else
+LDABI=	-melf32ltsmipn32
+.	endif
+.endif
+
 STRIPFLAG=
 BINMODE= 444
 
@@ -31,6 +39,7 @@ CPPFLAGS+=	-nostdinc -I${.OBJDIR} -D_STA
 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}"'

Index: src/sys/arch/evbmips/stand/sbmips/Makefile.bootxx
diff -u src/sys/arch/evbmips/stand/sbmips/Makefile.bootxx:1.1.1.1 src/sys/arch/evbmips/stand/sbmips/Makefile.bootxx:1.2
--- src/sys/arch/evbmips/stand/sbmips/Makefile.bootxx:1.1.1.1	Mon Jul 24 04:56:29 2017
+++ src/sys/arch/evbmips/stand/sbmips/Makefile.bootxx	Sun Mar 14 18:58:10 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootxx,v 1.1.1.1 2017/07/24 08:56:29 mrg Exp $
+# $NetBSD: Makefile.bootxx,v 1.2 2021/03/14 22:58:10 christos Exp $
 
 SRCS = start.S bootxx.c booted_dev.c blkdev.c cfe.c cfe_api.c \
putstr.c panic_putstr.c 
@@ -31,7 +31,7 @@ SAMISCMAKEFLAGS= SA_INCLUDE_NET=no SA_US
 
 ${PROG}.sym: ${OBJS} ${LIBSA} ${LIBKERN}
 	${_MKTARGET_LINK}
-	${LD} -Ttext ${BOOT_RELOC} -N -e start -o ${PROG}.sym \
+	${LD} ${LDABI} -Ttext ${BOOT_RELOC} -N -e start -o ${PROG}.sym \
 	${OBJS} ${LIBSA} ${LIBKERN}
 	@chmod 644 ${PROG}.sym
 	@${SIZE} ${PROG}.sym

Index: src/sys/arch/evbmips/stand/sbmips/boot/Makefile
diff -u src/sys/arch/evbmips/stand/sbmips/boot/Makefile:1.1.1.1 src/sys/arch/evbmips/stand/sbmips/boot/Makefile:1.2
--- src/sys/arch/evbmips/stand/sbmips/boot/Makefile:1.1.1.1	Mon Jul 24 04:56:29 2017
+++ src/sys/arch/evbmips/stand/sbmips/boot/Makefile	Sun Mar 14 18:58:11 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2017/07/24 08:56:29 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2021/03/14 22:58:11 christos Exp $
 
 PROG = boot
 
@@ -27,6 +27,6 @@ SAMISCMAKEFLAGS= SA_INCLUDE_NET=no SA_US
 
 ${PROG}.sym: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} ${LDSCRIPT}
 	${_MKTARGET_LINK}
-	${LD} -T ${LDSCRIPT} -N -e start -o ${PROG}.sym \
+	${LD} ${LDABI} -T ${LDSCRIPT} -N -e start -o ${PROG}.sym \
 	${OBJS} ${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN}
 	${SIZE} ${PROG}.sym

Index: src/sys/arch/evbmips/stand/sbmips/netboot/Makefile
diff -u src/sys/arch/evbmips/stand/sbmips/netboot/Makefile:1.1.1.1 src/sys/arch/evbmips/stand/sbmips/netboot/Makefile:1.2
--- src/sys/arch/evbmips/stand/sbmips/netboot/Makefile:1.1.1.1	Mon Jul 24 04:56:29 2017
+++ src/sys/arch/evbmips/stand/sbmips/netboot/Makefile	Sun Mar 14 18:58:11 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2017/07/24 08:56:29 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2021/03/14 22:58:11 christos Exp $
 
 PROG = netboot
 
@@ -27,6 +27,6 @@ SAMISCMAKEFLAGS= SA_INCLUDE_NET=yes SA_U
 
 ${PROG}.sym: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} ${LDSCRIPT}
 	${_MKTARGET_LINK}
-	${LD} -T ${LDSCRIPT} -N -e start -o ${PROG}.sym \
+	${LD} ${LDABI} -T ${LDSCRIPT} -N -e start -o ${PROG}.sym \
 	${OBJS} ${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN} 
 	${SIZE} ${PROG}.sym

CVS commit: src/sys/arch/evbmips/stand/sbmips

2017-08-21 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Mon Aug 21 16:36:00 UTC 2017

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

Log Message:
no ssp and pie


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 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.2 src/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs:1.3
--- src/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs:1.2	Mon Jul 24 06:34:54 2017
+++ src/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs	Mon Aug 21 12:36:00 2017
@@ -1,4 +1,7 @@
-# $NetBSD: Makefile.bootprogs,v 1.2 2017/07/24 10:34:54 mrg Exp $
+# $NetBSD: Makefile.bootprogs,v 1.3 2017/08/21 16:36:00 christos Exp $
+
+NOSSP=yes
+NOPIE=yes
 
 .include 
 .include

CVS commit: src/sys/arch/evbmips/stand/sbmips

2017-07-24 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Mon Jul 24 10:34:55 UTC 2017

Modified Files:
src/sys/arch/evbmips/stand/sbmips: Makefile.bootprogs Makefile.inc
src/sys/arch/evbmips/stand/sbmips/common: blkdev.c boot.c booted_dev.c
src/sys/arch/evbmips/stand/sbmips/netboot: getsecs.c if_cfe.c

Log Message:
port this to build under evbmips.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs \
src/sys/arch/evbmips/stand/sbmips/Makefile.inc
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/arch/evbmips/stand/sbmips/common/blkdev.c \
src/sys/arch/evbmips/stand/sbmips/common/boot.c \
src/sys/arch/evbmips/stand/sbmips/common/booted_dev.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/arch/evbmips/stand/sbmips/netboot/getsecs.c \
src/sys/arch/evbmips/stand/sbmips/netboot/if_cfe.c

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.1.1.1 src/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs:1.2
--- src/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs:1.1.1.1	Mon Jul 24 08:56:29 2017
+++ src/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs	Mon Jul 24 10:34:54 2017
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile.bootprogs,v 1.1.1.1 2017/07/24 08:56:29 mrg Exp $
+# $NetBSD: Makefile.bootprogs,v 1.2 2017/07/24 10:34:54 mrg Exp $
 
 .include 
 .include 
 
-S=	${.CURDIR}/../../../..
+S=	${.CURDIR}/../../../../..
+COMMON=	${.CURDIR}/../common
 
-.PATH:	${.CURDIR}/../common
+.PATH:	${COMMON}
 
 STRIPFLAG=
 BINMODE= 444
@@ -19,7 +20,7 @@ LIBCRTEND=
 
 STRIP?=	strip
 
-CHECKSIZE_CMD=	SIZE=${SIZE} ${HOST_SH} ${.CURDIR}/../common/checksize.sh
+CHECKSIZE_CMD=	SIZE=${SIZE} ${HOST_SH} ${COMMON}/checksize.sh
 
 AFLAGS+=	-DASSEMBLER -D_LOCORE -mno-abicalls -mips64
 # -I${.CURDIR}/../.. done by Makefile.inc
@@ -28,7 +29,7 @@ CFLAGS=		-Os -g -ffreestanding -mno-abic
 CFLAGS+=	-mips64
 CFLAGS+=	-Werror ${CWARNFLAGS}
 
-NETBSD_VERS!=${HOST_SH} ${.CURDIR}/../../../../conf/osrelease.sh
+NETBSD_VERS!=${HOST_SH} ${S}/conf/osrelease.sh
 CPPFLAGS+= -DNETBSD_VERS='"${NETBSD_VERS}"'
 
 CWARNFLAGS+=	-Wno-main 
@@ -45,7 +46,7 @@ VERSIONFLAGS+=-n
 REGION1_START=		0x2000		# "Region 1 start"
 REGION1_SIZE!=		expr 256 \* 1024	# 256k
 
-LDSCRIPT=		${.CURDIR}/../common/boot.ldscript
+LDSCRIPT=		${COMMON}/boot.ldscript
 
 # our memory lauout:
 
Index: src/sys/arch/evbmips/stand/sbmips/Makefile.inc
diff -u src/sys/arch/evbmips/stand/sbmips/Makefile.inc:1.1.1.1 src/sys/arch/evbmips/stand/sbmips/Makefile.inc:1.2
--- src/sys/arch/evbmips/stand/sbmips/Makefile.inc:1.1.1.1	Mon Jul 24 08:56:29 2017
+++ src/sys/arch/evbmips/stand/sbmips/Makefile.inc	Mon Jul 24 10:34:54 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1.1.1 2017/07/24 08:56:29 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.2 2017/07/24 10:34:54 mrg Exp $
 
 .include 
 
@@ -7,5 +7,5 @@ WARNS?=			1
 
 MKMAN=			no
 
-CPPFLAGS+=		-I${.CURDIR}/../..
+CPPFLAGS+=		-I${.CURDIR}/../../..
 LDSTATIC?=		-static

Index: src/sys/arch/evbmips/stand/sbmips/common/blkdev.c
diff -u src/sys/arch/evbmips/stand/sbmips/common/blkdev.c:1.1.1.1 src/sys/arch/evbmips/stand/sbmips/common/blkdev.c:1.2
--- src/sys/arch/evbmips/stand/sbmips/common/blkdev.c:1.1.1.1	Mon Jul 24 08:56:29 2017
+++ src/sys/arch/evbmips/stand/sbmips/common/blkdev.c	Mon Jul 24 10:34:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: blkdev.c,v 1.1.1.1 2017/07/24 08:56:29 mrg Exp $ */
+/* $NetBSD: blkdev.c,v 1.2 2017/07/24 10:34:54 mrg Exp $ */
 
 /*
  * Copyright (c) 1999 Christopher G. Demetriou.  All rights reserved.
@@ -70,9 +70,9 @@
 #include 
 #include 
 
-#include "stand/common/cfe_api.h"
+#include "stand/sbmips/common/cfe_api.h"
 
-#include "stand/common/common.h"
+#include "stand/sbmips/common/common.h"
 #include "blkdev.h"
 
 /*
Index: src/sys/arch/evbmips/stand/sbmips/common/boot.c
diff -u src/sys/arch/evbmips/stand/sbmips/common/boot.c:1.1.1.1 src/sys/arch/evbmips/stand/sbmips/common/boot.c:1.2
--- src/sys/arch/evbmips/stand/sbmips/common/boot.c:1.1.1.1	Mon Jul 24 08:56:29 2017
+++ src/sys/arch/evbmips/stand/sbmips/common/boot.c	Mon Jul 24 10:34:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.1.1.1 2017/07/24 08:56:29 mrg Exp $ */
+/* $NetBSD: boot.c,v 1.2 2017/07/24 10:34:54 mrg Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -42,10 +42,10 @@
 #include 
 #include 
 
-#include "stand/common/common.h"
-#include "stand/common/cfe_api.h"
+#include "stand/sbmips/common/common.h"
+#include "stand/sbmips/common/cfe_api.h"
 
-#include 
+#include 
 
 #if !defined(UNIFIED_BOOTBLOCK) && !defined(SECONDARY_BOOTBLOCK)
 #error not UNIFIED_BOOTBLOCK and not SECONDARY_BOOTBLOCK
Index: src/sys/arch/evbmips/stand/sbmips/common/booted_dev.c
diff -u src/sys/arch/evbmips/stand/sbmips/common/booted_dev.c:1.1.1.1 src/sys/arch/evbmips/stand/sbmips/common/booted_dev.c:1.2
---