Module Name: src Committed By: matt Date: Thu Jul 18 22:06:09 UTC 2013
Modified Files: src/share/mk: bsd.endian.mk bsd.own.mk bsd.sys.mk sys.mk Log Message: Test BSD makefile about coldfire. XXX still hate m68k--netbsdelf-coldfire To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/share/mk/bsd.endian.mk cvs rdiff -u -r1.737 -r1.738 src/share/mk/bsd.own.mk cvs rdiff -u -r1.225 -r1.226 src/share/mk/bsd.sys.mk cvs rdiff -u -r1.116 -r1.117 src/share/mk/sys.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/share/mk/bsd.endian.mk diff -u src/share/mk/bsd.endian.mk:1.17 src/share/mk/bsd.endian.mk:1.18 --- src/share/mk/bsd.endian.mk:1.17 Sun Feb 3 05:35:25 2013 +++ src/share/mk/bsd.endian.mk Thu Jul 18 22:06:09 2013 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.endian.mk,v 1.17 2013/02/03 05:35:25 matt Exp $ +# $NetBSD: bsd.endian.mk,v 1.18 2013/07/18 22:06:09 matt Exp $ .if !defined(_BSD_ENDIAN_MK_) _BSD_ENDIAN_MK_=1 @@ -15,7 +15,8 @@ _BSD_ENDIAN_MK_=1 ${MACHINE_ARCH} == "x86_64" || \ ${MACHINE_ARCH:C/^.*el$/el/} == "el" TARGET_ENDIANNESS= 1234 -.elif ${MACHINE_ARCH} == "hppa" || \ +.elif ${MACHINE_ARCH} == "coldfire" || \ + ${MACHINE_ARCH} == "hppa" || \ ${MACHINE_ARCH} == "m68000" || \ ${MACHINE_ARCH} == "m68k" || \ ${MACHINE_ARCH} == "powerpc" || \ Index: src/share/mk/bsd.own.mk diff -u src/share/mk/bsd.own.mk:1.737 src/share/mk/bsd.own.mk:1.738 --- src/share/mk/bsd.own.mk:1.737 Thu Jul 11 06:58:30 2013 +++ src/share/mk/bsd.own.mk Thu Jul 18 22:06:09 2013 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.737 2013/07/11 06:58:30 martin Exp $ +# $NetBSD: bsd.own.mk,v 1.738 2013/07/18 22:06:09 matt Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -14,7 +14,7 @@ MAKECONF?= /etc/mk.conf # # CPU model, derived from MACHINE_ARCH # -MACHINE_CPU= ${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/m68000/m68k/:S/armeb/arm/:C/earm.*/arm/:S/earm/arm/:S/powerpc64/powerpc/} +MACHINE_CPU= ${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/coldfire/m68k/:S/m68000/m68k/:S/armeb/arm/:C/earm.*/arm/:S/earm/arm/:S/powerpc64/powerpc/} # # Subdirectory used below ${RELEASEDIR} when building a release @@ -61,6 +61,7 @@ HAVE_GCC?= 45 .if \ ${MACHINE_CPU} == "arm" || \ ${MACHINE_ARCH} == "i386" || \ + ${MACHINE_CPU} == "m68k" || \ ${MACHINE_CPU} == "mips" || \ ${MACHINE_ARCH} == "powerpc" || \ ${MACHINE_CPU} == "sh3" || \ @@ -707,6 +708,8 @@ MACHINE_GNU_ARCH=${GNU_ARCH.${MACHINE_AR # .if (!empty(MACHINE_ARCH:Mearm*)) MACHINE_GNU_PLATFORM?=${MACHINE_GNU_ARCH}--netbsdelf-${MACHINE_ARCH:C/eb//:S/earm/eabi/} +.elif ${MACHINE_ARCH} == "coldfire" +MACHINE_GNU_PLATFORM?=${MACHINE_GNU_ARCH}--netbsdelf-coldfire .elif (${MACHINE_GNU_ARCH} == "arm" || \ ${MACHINE_GNU_ARCH} == "armeb" || \ ${MACHINE_ARCH} == "i386" || \ @@ -815,11 +818,13 @@ MKCOMPATMODULES:= no # # Default mips64 to softfloat now. -# arm is always softfloat +# arm is always softfloat unless it isn't # emips is always softfloat. +# coldfire is always softfloat # .if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" || \ (${MACHINE_CPU} == "arm" && ${MACHINE_ARCH:M*hf*} == "") || \ + ${MACHINE_ARCH} == "coldfire" || \ ${MACHINE} == "emips" MKSOFTFLOAT?= yes .endif Index: src/share/mk/bsd.sys.mk diff -u src/share/mk/bsd.sys.mk:1.225 src/share/mk/bsd.sys.mk:1.226 --- src/share/mk/bsd.sys.mk:1.225 Wed Jul 17 19:24:56 2013 +++ src/share/mk/bsd.sys.mk Thu Jul 18 22:06:09 2013 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.sys.mk,v 1.225 2013/07/17 19:24:56 martin Exp $ +# $NetBSD: bsd.sys.mk,v 1.226 2013/07/18 22:06:09 matt Exp $ # # Build definitions used for NetBSD source tree builds. @@ -75,7 +75,8 @@ CFLAGS+= ${${ACTIVE_CC} == "gcc":? -Wno- CFLAGS+= ${${ACTIVE_CC} == "clang":? -Wpointer-sign -Wmissing-noreturn :} .endif .if (defined(HAVE_GCC) && ${HAVE_GCC} == 45 \ - && (${MACHINE_ARCH} == "sh3eb" || \ + && (${MACHINE_ARCH} == "coldfire" || \ + ${MACHINE_ARCH} == "sh3eb" || \ ${MACHINE_ARCH} == "sh3el" || \ ${MACHINE_ARCH} == "m68k" || \ ${MACHINE_ARCH} == "m68000")) @@ -104,6 +105,9 @@ COPTS+= ${${ACTIVE_CC} == "gcc":? --para .if ${MKSOFTFLOAT:Uno} != "no" COPTS+= -msoft-float FOPTS+= -msoft-float +.elif ${MACHINE_ARCH} == "coldfire" +COPTS+= -mhard-float +FOPTS+= -mhard-float .endif .if ${MKIEEEFP:Uno} != "no" Index: src/share/mk/sys.mk diff -u src/share/mk/sys.mk:1.116 src/share/mk/sys.mk:1.117 --- src/share/mk/sys.mk:1.116 Wed Mar 6 11:19:08 2013 +++ src/share/mk/sys.mk Thu Jul 18 22:06:09 2013 @@ -1,4 +1,4 @@ -# $NetBSD: sys.mk,v 1.116 2013/03/06 11:19:08 yamt Exp $ +# $NetBSD: sys.mk,v 1.117 2013/07/18 22:06:09 matt Exp $ # @(#)sys.mk 8.2 (Berkeley) 3/21/94 # # This file contains the basic rules for make(1) and is read first @@ -30,6 +30,8 @@ DBG?= -Os -freorder-blocks .elif ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "m68000" # see src/doc/HACKS for details DBG?= -Os +.elif ${MACHINE_ARCH} == "coldfire" +DBG?= -O1 .elif ${MACHINE_ARCH} == "vax" DBG?= -O1 -fgcse -fstrength-reduce -fgcse-after-reload .else