Module Name: src
Committed By: matt
Date: Sat Feb 26 16:26:58 UTC 2011
Modified Files:
src/sys/arch/sgimips/stand: Makefile.booters
src/sys/arch/sgimips/stand/boot: Makefile
Log Message:
Make sure that sgimips64 can build the O32 bootloaders
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sgimips/stand/Makefile.booters
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sgimips/stand/boot/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/sgimips/stand/Makefile.booters
diff -u src/sys/arch/sgimips/stand/Makefile.booters:1.20 src/sys/arch/sgimips/stand/Makefile.booters:1.21
--- src/sys/arch/sgimips/stand/Makefile.booters:1.20 Sun Feb 20 07:59:51 2011
+++ src/sys/arch/sgimips/stand/Makefile.booters Sat Feb 26 16:26:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.20 2011/02/20 07:59:51 matt Exp $
+# $NetBSD: Makefile.booters,v 1.21 2011/02/26 16:26:58 matt Exp $
# PROG set by parent.
NOMAN= # defined
@@ -26,9 +26,8 @@
# compiler flags for smallest code size
CFLAGS= -ffreestanding -Os -Wall -Werror -mno-abicalls -msoft-float -G 1024
.if ${MACHINE_ARCH} == "mips64eb"
-CPUFLAGS+= -mips3 -mabi=32
-LDFLAGS+= -mips3 -mabi=32
-MACHINE_ARCH= mipseb
+AFLAGS+= -mips3 -mabi=32
+CFLAGS+= -mips3 -mabi=32
.endif
CWARNFLAGS+= -Wall -Werror
CWARNFLAGS+= -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith
Index: src/sys/arch/sgimips/stand/boot/Makefile
diff -u src/sys/arch/sgimips/stand/boot/Makefile:1.18 src/sys/arch/sgimips/stand/boot/Makefile:1.19
--- src/sys/arch/sgimips/stand/boot/Makefile:1.18 Sun Feb 20 07:59:51 2011
+++ src/sys/arch/sgimips/stand/boot/Makefile Sat Feb 26 16:26:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2011/02/20 07:59:51 matt Exp $
+# $NetBSD: Makefile,v 1.19 2011/02/26 16:26:58 matt Exp $
# Don't strip the ECOFF'ed version on install -- strip gets confused by that,
@@ -31,14 +31,14 @@
ip3xboot: ${OBJS} ${LIBS}
${_MKTARGET_LINK}
${LD} -Map ${.TARGET}.map -N -x -Ttext ${LOAD_ADDRESS_IP32} ${LDBUG} \
- -e start -o ${.TARGET}.elf ${OBJS} ${LIBS}
+ -m elf32btsmip -e start -o ${.TARGET}.elf ${OBJS} ${LIBS}
@${STRIP} -s ${.TARGET}.elf -o ${.TARGET}
@${SIZE} ${.TARGET}
ip2xboot: ${OBJS} ${LIBS}
${_MKTARGET_LINK}
${LD} -Map ${.TARGET}.map -N -x -Ttext ${LOAD_ADDRESS} ${LDBUG} \
- -e start -o ${.TARGET}.elf ${OBJS} ${LIBS}
+ -m elf32btsmip -e start -o ${.TARGET}.elf ${OBJS} ${LIBS}
@${STRIP} -s ${.TARGET}.elf -o ${.TARGET}
@${SIZE} ${.TARGET}
