Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk Test BSD makefile about coldfire.



details:   https://anonhg.NetBSD.org/src/rev/164c056076f1
branches:  trunk
changeset: 788740:164c056076f1
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Jul 18 22:06:09 2013 +0000

description:
Test BSD makefile about coldfire.
XXX still hate m68k--netbsdelf-coldfire

diffstat:

 share/mk/bsd.endian.mk |   5 +++--
 share/mk/bsd.own.mk    |  11 ++++++++---
 share/mk/bsd.sys.mk    |   8 ++++++--
 share/mk/sys.mk        |   4 +++-
 4 files changed, 20 insertions(+), 8 deletions(-)

diffs (116 lines):

diff -r ebe1fa9f3355 -r 164c056076f1 share/mk/bsd.endian.mk
--- a/share/mk/bsd.endian.mk    Thu Jul 18 22:00:48 2013 +0000
+++ b/share/mk/bsd.endian.mk    Thu Jul 18 22:06:09 2013 +0000
@@ -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 @@
     ${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" || \
diff -r ebe1fa9f3355 -r 164c056076f1 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Thu Jul 18 22:00:48 2013 +0000
+++ b/share/mk/bsd.own.mk       Thu Jul 18 22:06:09 2013 +0000
@@ -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 @@
 #
 # 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 @@
 .if \
     ${MACHINE_CPU} == "arm" || \
     ${MACHINE_ARCH} == "i386" || \
+    ${MACHINE_CPU} == "m68k" || \
     ${MACHINE_CPU} == "mips" || \
     ${MACHINE_ARCH} == "powerpc" || \
     ${MACHINE_CPU} == "sh3" || \
@@ -707,6 +708,8 @@
 #
 .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 @@
 
 #
 # 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
diff -r ebe1fa9f3355 -r 164c056076f1 share/mk/bsd.sys.mk
--- a/share/mk/bsd.sys.mk       Thu Jul 18 22:00:48 2013 +0000
+++ b/share/mk/bsd.sys.mk       Thu Jul 18 22:06:09 2013 +0000
@@ -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} == "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 @@
 .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"
diff -r ebe1fa9f3355 -r 164c056076f1 share/mk/sys.mk
--- a/share/mk/sys.mk   Thu Jul 18 22:00:48 2013 +0000
+++ b/share/mk/sys.mk   Thu Jul 18 22:06:09 2013 +0000
@@ -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 @@
 .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



Home | Main Index | Thread Index | Old Index