[src/trunk]: src/sys/arch/evbmips/stand/sbmips Specify the emulation explicit...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1b941ea7b9a5
branches:  trunk
changeset: 960340:1b941ea7b9a5
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Mar 14 22:58:10 2021 +0000

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

diffstat:

 sys/arch/evbmips/stand/sbmips/Makefile.bootprogs |  11 ++++++++++-
 sys/arch/evbmips/stand/sbmips/Makefile.bootxx    |   4 ++--
 sys/arch/evbmips/stand/sbmips/boot/Makefile      |   4 ++--
 sys/arch/evbmips/stand/sbmips/netboot/Makefile   |   4 ++--
 4 files changed, 16 insertions(+), 7 deletions(-)

diffs (84 lines):

diff -r 13d38b382ecb -r 1b941ea7b9a5 sys/arch/evbmips/stand/sbmips/Makefile.bootprogs
--- a/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs  Sun Mar 14 22:56:39 2021 +0000
+++ b/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs  Sun Mar 14 22:58:10 2021 +0000
@@ -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 @@
 
 .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 @@
 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}"'
diff -r 13d38b382ecb -r 1b941ea7b9a5 sys/arch/evbmips/stand/sbmips/Makefile.bootxx
--- a/sys/arch/evbmips/stand/sbmips/Makefile.bootxx     Sun Mar 14 22:56:39 2021 +0000
+++ b/sys/arch/evbmips/stand/sbmips/Makefile.bootxx     Sun Mar 14 22:58:10 2021 +0000
@@ -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 @@
 
 ${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
diff -r 13d38b382ecb -r 1b941ea7b9a5 sys/arch/evbmips/stand/sbmips/boot/Makefile
--- a/sys/arch/evbmips/stand/sbmips/boot/Makefile       Sun Mar 14 22:56:39 2021 +0000
+++ b/sys/arch/evbmips/stand/sbmips/boot/Makefile       Sun Mar 14 22:58:10 2021 +0000
@@ -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 @@
 
 ${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
diff -r 13d38b382ecb -r 1b941ea7b9a5 sys/arch/evbmips/stand/sbmips/netboot/Makefile
--- a/sys/arch/evbmips/stand/sbmips/netboot/Makefile    Sun Mar 14 22:56:39 2021 +0000
+++ b/sys/arch/evbmips/stand/sbmips/netboot/Makefile    Sun Mar 14 22:58:10 2021 +0000
@@ -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 @@
 
 ${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