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
