Module Name: src
Committed By: martin
Date: Wed Jul 2 12:44:15 UTC 2014
Modified Files:
src/sys/arch/playstation2/conf: Makefile.playstation2.inc
build.playstation2.sh
Log Message:
The correct toolchain tuple is mipsel--netbsd (not netbsdelf)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/sys/arch/playstation2/conf/Makefile.playstation2.inc \
src/sys/arch/playstation2/conf/build.playstation2.sh
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/playstation2/conf/Makefile.playstation2.inc
diff -u src/sys/arch/playstation2/conf/Makefile.playstation2.inc:1.6 src/sys/arch/playstation2/conf/Makefile.playstation2.inc:1.7
--- src/sys/arch/playstation2/conf/Makefile.playstation2.inc:1.6 Sat Apr 5 11:15:57 2014
+++ src/sys/arch/playstation2/conf/Makefile.playstation2.inc Wed Jul 2 12:44:15 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.playstation2.inc,v 1.6 2014/04/05 11:15:57 martin Exp $
+# $NetBSD: Makefile.playstation2.inc,v 1.7 2014/07/02 12:44:15 martin Exp $
.if !defined(EXTERNAL_TOOLCHAIN) || ${EXTERNAL_TOOLCHAIN}==""
.error please do not run "make" directly, use sh ../../conf/build.playstation2.sh instead
@@ -8,7 +8,7 @@
# not properly get picked up by mkdep in sub-makes for "make depend" of
# libkern and friends - XXX fix this
PREFIX=${EXTERNAL_TOOLCHAIN}
-PLATFORM=mipsel--netbsdelf
+PLATFORM=mipsel--netbsd
CC=${PREFIX}/bin/${PLATFORM}-gcc
CPP=${PREFIX}/bin/${PLATFORM}-cpp
@@ -21,5 +21,5 @@ SIZE=${PREFIX}/bin/${PLATFORM}-size
STRIP=${PREFIX}/bin/${PLATFORM}-strip
# Playstation2 uses 128 bit access, which currently requires n32 ABI
-CFLAGS+= -mabi=n32 -march=r5900 -fno-pic
+CFLAGS+= -mabi=n32 -march=r5900 -fno-pic -msoft-float
AFLAGS+= -mabi=n32 -march=r5900 -fno-pic
Index: src/sys/arch/playstation2/conf/build.playstation2.sh
diff -u src/sys/arch/playstation2/conf/build.playstation2.sh:1.6 src/sys/arch/playstation2/conf/build.playstation2.sh:1.7
--- src/sys/arch/playstation2/conf/build.playstation2.sh:1.6 Sat Apr 5 11:15:57 2014
+++ src/sys/arch/playstation2/conf/build.playstation2.sh Wed Jul 2 12:44:15 2014
@@ -3,7 +3,7 @@
# This assumes the compiler comes from pkgsrc/cross/gcc-mips-current
# (as R5900 support is not available on other branches of gcc yet)
root=/usr/pkg
-target=mipsel--netbsdelf
+target=mipsel--netbsd
EXTERNAL_TOOLCHAIN=${root}; export EXTERNAL_TOOLCHAIN
LD=${root}/bin/${target}-ld; export LD
@@ -19,5 +19,4 @@ STRIP=${root}/bin/${target}-strip; expor
MAKE="make"; export MAKE
-set -x
exec $MAKE "$@"
