Sun Mar 14 22:58:11 2021 UTC ()
Specify the emulation explicitly (n32) so this builds when the default
emulation changes.


(christos)
diff -r1.3 -r1.4 src/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs
diff -r1.1.1.1 -r1.2 src/sys/arch/evbmips/stand/sbmips/Makefile.bootxx
diff -r1.1.1.1 -r1.2 src/sys/arch/evbmips/stand/sbmips/boot/Makefile
diff -r1.1.1.1 -r1.2 src/sys/arch/evbmips/stand/sbmips/netboot/Makefile
cvs diff -r1.3 -r1.4 src/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs (expand / switch to unified diff)

--- src/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs 2017/08/21 16:36:00 1.3
+++ src/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs 2021/03/14 22:58:10 1.4
@@ -1,46 +1,55 @@ @@ -1,46 +1,55 @@
1# $NetBSD: Makefile.bootprogs,v 1.3 2017/08/21 16:36:00 christos Exp $ 1# $NetBSD: Makefile.bootprogs,v 1.4 2021/03/14 22:58:10 christos Exp $
2 2
3NOSSP=yes 3NOSSP=yes
4NOPIE=yes 4NOPIE=yes
5 5
6.include <bsd.own.mk> 6.include <bsd.own.mk>
7.include <bsd.klinks.mk> 7.include <bsd.klinks.mk>
8 8
9S= ${.CURDIR}/../../../../.. 9S= ${.CURDIR}/../../../../..
10COMMON= ${.CURDIR}/../common 10COMMON= ${.CURDIR}/../common
11 11
12.PATH: ${COMMON} 12.PATH: ${COMMON}
13 13
 14.if ${MACHINE_ARCH:M*64*}
 15. if ${MACHINE_ARCH:M*eb}
 16LDABI= -melf32btsmipn32
 17. else
 18LDABI= -melf32ltsmipn32
 19. endif
 20.endif
 21
14STRIPFLAG= 22STRIPFLAG=
15BINMODE= 444 23BINMODE= 444
16 24
17# XXX SHOULD NOT NEED TO DEFINE THESE! 25# XXX SHOULD NOT NEED TO DEFINE THESE!
18LIBCRT0= 26LIBCRT0=
19LIBCRTI= 27LIBCRTI=
20LIBC= 28LIBC=
21LIBCRTBEGIN= 29LIBCRTBEGIN=
22LIBCRTEND= 30LIBCRTEND=
23 31
24STRIP?= strip 32STRIP?= strip
25 33
26CHECKSIZE_CMD= SIZE=${SIZE} ${HOST_SH} ${COMMON}/checksize.sh 34CHECKSIZE_CMD= SIZE=${SIZE} ${HOST_SH} ${COMMON}/checksize.sh
27 35
28AFLAGS+= -DASSEMBLER -D_LOCORE -mno-abicalls -mips64 36AFLAGS+= -DASSEMBLER -D_LOCORE -mno-abicalls -mips64
29# -I${.CURDIR}/../.. done by Makefile.inc 37# -I${.CURDIR}/../.. done by Makefile.inc
30CPPFLAGS+= -nostdinc -I${.OBJDIR} -D_STANDALONE -I${S} 38CPPFLAGS+= -nostdinc -I${.OBJDIR} -D_STANDALONE -I${S}
31CFLAGS= -Os -g -ffreestanding -mno-abicalls -msoft-float -G 0 39CFLAGS= -Os -g -ffreestanding -mno-abicalls -msoft-float -G 0
32CFLAGS+= -mips64 40CFLAGS+= -mips64
33CFLAGS+= -Werror ${CWARNFLAGS} 41CFLAGS+= -Werror ${CWARNFLAGS}
 42CPUFLAGS+= -mabi=n32
34 43
35NETBSD_VERS!=${HOST_SH} ${S}/conf/osrelease.sh 44NETBSD_VERS!=${HOST_SH} ${S}/conf/osrelease.sh
36CPPFLAGS+= -DNETBSD_VERS='"${NETBSD_VERS}"' 45CPPFLAGS+= -DNETBSD_VERS='"${NETBSD_VERS}"'
37 46
38CWARNFLAGS+= -Wno-main  47CWARNFLAGS+= -Wno-main
39CWARNFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith 48CWARNFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
40CWARNFLAGS+= -Wno-pointer-sign 49CWARNFLAGS+= -Wno-pointer-sign
41 50
42VERSIONFLAGS+=-n 51VERSIONFLAGS+=-n
43.include "${S}/conf/newvers_stand.mk" 52.include "${S}/conf/newvers_stand.mk"
44 53
45#  54#
46# Refer to CFE documentation for a description of these regions. 55# Refer to CFE documentation for a description of these regions.
cvs diff -r1.1.1.1 -r1.2 src/sys/arch/evbmips/stand/sbmips/Makefile.bootxx (expand / switch to unified diff)

--- src/sys/arch/evbmips/stand/sbmips/Makefile.bootxx 2017/07/24 08:56:29 1.1.1.1
+++ src/sys/arch/evbmips/stand/sbmips/Makefile.bootxx 2021/03/14 22:58:10 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.bootxx,v 1.1.1.1 2017/07/24 08:56:29 mrg Exp $ 1# $NetBSD: Makefile.bootxx,v 1.2 2021/03/14 22:58:10 christos Exp $
2 2
3SRCS = start.S bootxx.c booted_dev.c blkdev.c cfe.c cfe_api.c \ 3SRCS = start.S bootxx.c booted_dev.c blkdev.c cfe.c cfe_api.c \
4 putstr.c panic_putstr.c  4 putstr.c panic_putstr.c
5 5
6BOOT_RELOC = ${PRIMARY_LOAD_ADDRESS} 6BOOT_RELOC = ${PRIMARY_LOAD_ADDRESS}
7 7
8CPPFLAGS += ${PRIMARY_CPPFLAGS} \ 8CPPFLAGS += ${PRIMARY_CPPFLAGS} \
9 -DLIBSA_FS_SINGLECOMPONENT -DLIBSA_NO_FS_WRITE \ 9 -DLIBSA_FS_SINGLECOMPONENT -DLIBSA_NO_FS_WRITE \
10 -DLIBSA_NO_FS_CLOSE -DLIBSA_NO_FS_SEEK \ 10 -DLIBSA_NO_FS_CLOSE -DLIBSA_NO_FS_SEEK \
11 -DLIBSA_SINGLE_DEVICE=blkdev \ 11 -DLIBSA_SINGLE_DEVICE=blkdev \
12 -D"blkdevioctl(x,y,z)=EINVAL" -D"blkdevclose(f)=0" \ 12 -D"blkdevioctl(x,y,z)=EINVAL" -D"blkdevclose(f)=0" \
13 -DLIBSA_NO_TWIDDLE \ 13 -DLIBSA_NO_TWIDDLE \
14 -DLIBSA_NO_FD_CHECKING \ 14 -DLIBSA_NO_FD_CHECKING \
@@ -21,17 +21,17 @@ ${PROG}: ${PROG}.sym @@ -21,17 +21,17 @@ ${PROG}: ${PROG}.sym
21 @echo creating ${PROG} from ${PROG}.sym... 21 @echo creating ${PROG} from ${PROG}.sym...
22 @${OBJCOPY} --output-target=binary -R .reginfo -R .MIPS.abiflags \ 22 @${OBJCOPY} --output-target=binary -R .reginfo -R .MIPS.abiflags \
23 ${PROG}.sym ${PROG} 23 ${PROG}.sym ${PROG}
24 @chmod 644 ${PROG} 24 @chmod 644 ${PROG}
25 @ls -l ${PROG} 25 @ls -l ${PROG}
26 @${CHECKSIZE_CMD} ${PROG}.sym ${PROG} ${PRIMARY_MAX_LOAD} \ 26 @${CHECKSIZE_CMD} ${PROG}.sym ${PROG} ${PRIMARY_MAX_LOAD} \
27 ${PRIMARY_MAX_TOTAL} || (rm -f ${PROG} ; false) 27 ${PRIMARY_MAX_TOTAL} || (rm -f ${PROG} ; false)
28 28
29SAMISCMAKEFLAGS= SA_INCLUDE_NET=no SA_USE_CREAD=no 29SAMISCMAKEFLAGS= SA_INCLUDE_NET=no SA_USE_CREAD=no
30.include "../Makefile.bootprogs" 30.include "../Makefile.bootprogs"
31 31
32${PROG}.sym: ${OBJS} ${LIBSA} ${LIBKERN} 32${PROG}.sym: ${OBJS} ${LIBSA} ${LIBKERN}
33 ${_MKTARGET_LINK} 33 ${_MKTARGET_LINK}
34 ${LD} -Ttext ${BOOT_RELOC} -N -e start -o ${PROG}.sym \ 34 ${LD} ${LDABI} -Ttext ${BOOT_RELOC} -N -e start -o ${PROG}.sym \
35 ${OBJS} ${LIBSA} ${LIBKERN} 35 ${OBJS} ${LIBSA} ${LIBKERN}
36 @chmod 644 ${PROG}.sym 36 @chmod 644 ${PROG}.sym
37 @${SIZE} ${PROG}.sym 37 @${SIZE} ${PROG}.sym
cvs diff -r1.1.1.1 -r1.2 src/sys/arch/evbmips/stand/sbmips/boot/Makefile (expand / switch to unified diff)

--- src/sys/arch/evbmips/stand/sbmips/boot/Makefile 2017/07/24 08:56:29 1.1.1.1
+++ src/sys/arch/evbmips/stand/sbmips/boot/Makefile 2021/03/14 22:58:11 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1.1.1 2017/07/24 08:56:29 mrg Exp $ 1# $NetBSD: Makefile,v 1.2 2021/03/14 22:58:11 christos Exp $
2 2
3PROG = boot 3PROG = boot
4 4
5SRCS = start.S boot.c blkdev.c cfe.c cfe_api.c  5SRCS = start.S boot.c blkdev.c cfe.c cfe_api.c
6SRCS+= filesystem.c booted_dev.c 6SRCS+= filesystem.c booted_dev.c
7 7
8BOOT_RELOC = ${SECONDARY_LOAD_ADDRESS} 8BOOT_RELOC = ${SECONDARY_LOAD_ADDRESS}
9 9
10CPPFLAGS += ${SECONDARY_CPPFLAGS} \ 10CPPFLAGS += ${SECONDARY_CPPFLAGS} \
11 -DBOOT_TYPE_NAME='"Secondary"' \ 11 -DBOOT_TYPE_NAME='"Secondary"' \
12 -DLIBSA_SINGLE_DEVICE=blkdev \ 12 -DLIBSA_SINGLE_DEVICE=blkdev \
13 -D"blkdevioctl(x,y,z)=EINVAL" 13 -D"blkdevioctl(x,y,z)=EINVAL"
14 14
@@ -17,16 +17,16 @@ CLEANFILES+= ${PROG}.sym @@ -17,16 +17,16 @@ CLEANFILES+= ${PROG}.sym
17${PROG}: ${PROG}.sym 17${PROG}: ${PROG}.sym
18 @echo creating ${PROG} from ${PROG}.sym... 18 @echo creating ${PROG} from ${PROG}.sym...
19 @${OBJCOPY} --output-target=binary -R .reginfo ${PROG}.sym ${PROG} 19 @${OBJCOPY} --output-target=binary -R .reginfo ${PROG}.sym ${PROG}
20 @chmod 644 ${PROG} 20 @chmod 644 ${PROG}
21 @ls -l ${PROG} 21 @ls -l ${PROG}
22 @${CHECKSIZE_CMD} ${PROG}.sym ${PROG} ${SECONDARY_MAX_LOAD} \ 22 @${CHECKSIZE_CMD} ${PROG}.sym ${PROG} ${SECONDARY_MAX_LOAD} \
23 ${SECONDARY_MAX_TOTAL} || (rm -f ${PROG} ; false) 23 ${SECONDARY_MAX_TOTAL} || (rm -f ${PROG} ; false)
24 24
25SAMISCMAKEFLAGS= SA_INCLUDE_NET=no SA_USE_CREAD=yes 25SAMISCMAKEFLAGS= SA_INCLUDE_NET=no SA_USE_CREAD=yes
26.include "../Makefile.bootprogs" 26.include "../Makefile.bootprogs"
27 27
28${PROG}.sym: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} ${LDSCRIPT} 28${PROG}.sym: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} ${LDSCRIPT}
29 ${_MKTARGET_LINK} 29 ${_MKTARGET_LINK}
30 ${LD} -T ${LDSCRIPT} -N -e start -o ${PROG}.sym \ 30 ${LD} ${LDABI} -T ${LDSCRIPT} -N -e start -o ${PROG}.sym \
31 ${OBJS} ${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN} 31 ${OBJS} ${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN}
32 ${SIZE} ${PROG}.sym 32 ${SIZE} ${PROG}.sym
cvs diff -r1.1.1.1 -r1.2 src/sys/arch/evbmips/stand/sbmips/netboot/Makefile (expand / switch to unified diff)

--- src/sys/arch/evbmips/stand/sbmips/netboot/Makefile 2017/07/24 08:56:29 1.1.1.1
+++ src/sys/arch/evbmips/stand/sbmips/netboot/Makefile 2021/03/14 22:58:11 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1.1.1 2017/07/24 08:56:29 mrg Exp $ 1# $NetBSD: Makefile,v 1.2 2021/03/14 22:58:11 christos Exp $
2 2
3PROG = netboot 3PROG = netboot
4 4
5SRCS = start.S boot.c cfe_api.c cfe.c 5SRCS = start.S boot.c cfe_api.c cfe.c
6SRCS+= dev_net.c conf.c devopen.c 6SRCS+= dev_net.c conf.c devopen.c
7SRCS+= if_cfe.c getsecs.c booted_dev.c 7SRCS+= if_cfe.c getsecs.c booted_dev.c
8 8
9BOOT_RELOC = ${UNIFIED_LOAD_ADDRESS} 9BOOT_RELOC = ${UNIFIED_LOAD_ADDRESS}
10 10
11CLEANFILES+= ${PROG}.sym 11CLEANFILES+= ${PROG}.sym
12 12
13CPPFLAGS += ${UNIFIED_CPPFLAGS} -DSUPPORT_DHCP \ 13CPPFLAGS += ${UNIFIED_CPPFLAGS} -DSUPPORT_DHCP \
14 -DBOOT_TYPE_NAME='"Network"' 14 -DBOOT_TYPE_NAME='"Network"'
@@ -17,16 +17,16 @@ ${PROG}: ${PROG}.sym @@ -17,16 +17,16 @@ ${PROG}: ${PROG}.sym
17 @echo creating ${PROG} from ${PROG}.sym... 17 @echo creating ${PROG} from ${PROG}.sym...
18 @${OBJCOPY} --output-target=binary -R .reginfo -R .rel.dyn \ 18 @${OBJCOPY} --output-target=binary -R .reginfo -R .rel.dyn \
19 ${PROG}.sym ${PROG} 19 ${PROG}.sym ${PROG}
20 @chmod 644 ${PROG} 20 @chmod 644 ${PROG}
21 @ls -l ${PROG} 21 @ls -l ${PROG}
22 @${CHECKSIZE_CMD} ${PROG}.sym ${PROG} ${UNIFIED_MAX_LOAD} \ 22 @${CHECKSIZE_CMD} ${PROG}.sym ${PROG} ${UNIFIED_MAX_LOAD} \
23 ${UNIFIED_MAX_TOTAL} || (rm -f ${PROG} ; false) 23 ${UNIFIED_MAX_TOTAL} || (rm -f ${PROG} ; false)
24 24
25SAMISCMAKEFLAGS= SA_INCLUDE_NET=yes SA_USE_CREAD=yes 25SAMISCMAKEFLAGS= SA_INCLUDE_NET=yes SA_USE_CREAD=yes
26.include "../Makefile.bootprogs" 26.include "../Makefile.bootprogs"
27 27
28${PROG}.sym: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} ${LDSCRIPT} 28${PROG}.sym: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} ${LDSCRIPT}
29 ${_MKTARGET_LINK} 29 ${_MKTARGET_LINK}
30 ${LD} -T ${LDSCRIPT} -N -e start -o ${PROG}.sym \ 30 ${LD} ${LDABI} -T ${LDSCRIPT} -N -e start -o ${PROG}.sym \
31 ${OBJS} ${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN}  31 ${OBJS} ${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN}
32 ${SIZE} ${PROG}.sym 32 ${SIZE} ${PROG}.sym