[src/trunk]: src/sys/arch/macppc/conf Switch to use Makefile.powerpc by defau...

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

details:   https://anonhg.NetBSD.org/src/rev/6c01dcf96e44
branches:  trunk
changeset: 766154:6c01dcf96e44
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Jun 17 05:17:30 2011 +0000

description:
Switch to use Makefile.powerpc by default.  Include the macppc specific
stuff in Makefile.macppc.inc which Makefile.powerpc will include.

diffstat:

 sys/arch/macppc/conf/Makefile.macppc     |  130 -------------------------------
 sys/arch/macppc/conf/Makefile.macppc.inc |    8 +
 2 files changed, 8 insertions(+), 130 deletions(-)

diffs (146 lines):

diff -r c8f3f4dae765 -r 6c01dcf96e44 sys/arch/macppc/conf/Makefile.macppc
--- a/sys/arch/macppc/conf/Makefile.macppc      Fri Jun 17 05:15:22 2011 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-#      $NetBSD: Makefile.macppc,v 1.33 2009/02/15 01:58:01 cube Exp $
-#
-# Makefile for NetBSD
-#
-# This makefile is constructed from a machine description:
-#      config machineid
-# Most changes should be made in the machine description
-#      /sys/arch/powerpc/conf/``machineid''
-# after which you should do
-#      config machineid
-# Machine generic makefile changes should be made in
-#      /sys/arch/powerpc/conf/Makefile.powerpc
-# after which config should be rerun for all machines of that type.
-#
-# To specify debugging, add the config line: makeoptions DEBUG="-g"
-# A better way is to specify -g only for a few files.
-#
-#      makeoptions DEBUGLIST="uvm* trap if_*"
-
-MACHINE_ARCH=powerpc
-USETOOLS?=     no
-NEED_OWN_INSTALL_TARGET?=no
-.include <bsd.own.mk>
-
-##
-## (1) port identification
-##
-THISPPC=       $S/arch/${MACHINE}
-POWERPC=       $S/arch/powerpc
-.if exists(${THISPPC}/${MACHINE}/genassym.cf)
-GENASSYM_CONF= ${THISPPC}/${MACHINE}/genassym.cf
-.else
-GENASSYM_CONF= ${POWERPC}/${PPCDIR}/genassym.cf
-.endif
-.-include "${THISPPC}/conf/Makefile.${MACHINE}.inc"
-
-##
-## (2) compile settings
-##
-CPPFLAGS+=     -D${MACHINE}=${MACHINE}
-CWARNFLAGS+=   -Wreturn-type
-.if ${PPCDIR} == "oea"
-CFLAGS+=       -mno-strict-align
-.endif
-
-.if ${PPC_ARCH_MODE} == "ppc64bridge"
-AOPTS+=        -Wa,-mppc64bridge
-.endif
-
-CFLAGS+=       -msoft-float ${CCPUOPTS} -Wa,-maltivec
-AFLAGS+=       ${AOPTS}
-
-##
-## (3) libkern and compat
-##
-OPT_MODULAR=   %MODULAR%
-.if !empty(OPT_MODULAR)
-KERN_AS=       obj
-.endif
-
-##
-## (4) local objects, compile rules, and dependencies
-##
-.if !defined(SYSTEM_FIRST_OBJ)
-SYSTEM_FIRST_OBJ= locore.o
-.endif
-.if !defined(SYSTEM_FIRST_SFILE)
-SYSTEM_FIRST_SFILE= ${THISPPC}/${MACHINE}/locore.S
-.endif
-MD_OBJS=       ${SYSTEM_FIRST_OBJ}
-MD_CFILES=
-MD_SFILES=     ${SYSTEM_FIRST_SFILE}
-
-${SYSTEM_FIRST_OBJ}: ${SYSTEM_FIRST_SFILE} assym.h
-       ${NORMAL_S}
-
-##
-## (5) link settings
-##
-TEXTADDR?=     0x100000
-LINKFORMAT=    -N
-ENTRYPOINT=    __start
-
-.if defined(NEED_SREC)
-SYSTEM_LD_TAIL_EXTRA+=; \
-               ${OBJCOPY} -v -O srec $@ $@.srec
-.endif
-
-.if defined(NEED_BINARY)
-SYSTEM_LD_TAIL_EXTRA+=; \
-               ${OBJCOPY} -v -O binary $@ $@.bin
-.endif
-
-##
-## (6) port specific target dependencies
-##
-
-# depend on CPU configuration
-locore.o machdep.o: Makefile
-
-lock_stubs.o setfault.o: assym.h
-
-##
-## (7) misc settings
-##
-
-##
-## (8) config(8) generated machinery
-##
-%INCLUDES
-
-%OBJS
-
-%CFILES
-
-%SFILES
-
-%LOAD
-
-%RULES
-
-##
-## (9) port independent kernel machinery
-##
-.include "$S/conf/Makefile.kern.inc"
-
-##
-## (10) Appending make options.
-##
-%MAKEOPTIONSAPPEND
diff -r c8f3f4dae765 -r 6c01dcf96e44 sys/arch/macppc/conf/Makefile.macppc.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/macppc/conf/Makefile.macppc.inc  Fri Jun 17 05:17:30 2011 +0000
@@ -0,0 +1,8 @@
+#      $NetBSD: Makefile.macppc.inc,v 1.1 2011/06/17 05:17:30 matt Exp $
+
+.if ${PPC_ARCH_MODE} == "ppc64bridge"
+AOPTS+=        -Wa,-mppc64bridge
+.endif
+
+CFLAGS+=       -Wa,-maltivec
+AFLAGS+=       ${AOPTS}