Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Roll the rest of the ports over to the new MI kerne...
details: https://anonhg.NetBSD.org/src/rev/1f15b3272095
branches: trunk
changeset: 519011:1f15b3272095
user: atatat <atatat%NetBSD.org@localhost>
date: Sun Dec 09 05:00:40 2001 +0000
description:
Roll the rest of the ports over to the new MI kernel build machinery.
Any problems reported by testers have been fixed, and massive
cross-compiling of kernels has shown that any problems that remain
with actually building kernels are not related to this.
diffstat:
sys/arch/acorn32/conf/Makefile.acorn32 | 271 ++++--------------
sys/arch/amiga/conf/Makefile.amiga | 243 ++++------------
sys/arch/amigappc/conf/Makefile.amigappc | 232 +++++-----------
sys/arch/arc/conf/Makefile.arc.inc | 13 +-
sys/arch/arm/conf/Makefile.arm | 275 ++++--------------
sys/arch/arm26/conf/Makefile.arm26 | 4 +-
sys/arch/arm32/conf/Makefile.arm32 | 273 ++++--------------
sys/arch/atari/conf/Makefile.atari | 235 +++------------
sys/arch/cesfic/conf/Makefile.cesfic | 201 +++----------
sys/arch/dreamcast/conf/Makefile.dreamcast.inc | 6 +-
sys/arch/evbarm/conf/Makefile.evbarm.inc | 5 +-
sys/arch/hp300/conf/Makefile.hp300 | 240 +++-------------
sys/arch/hpcarm/conf/Makefile.hpcarm | 245 ++++-------------
sys/arch/i386/conf/Makefile.i386 | 4 +-
sys/arch/luna68k/conf/Makefile.luna68k | 238 +++------------
sys/arch/mac68k/conf/Makefile.mac68k | 236 ++++------------
sys/arch/mips/conf/Makefile.mips | 352 +++++++-----------------
sys/arch/mipsco/conf/Makefile.mipsco.inc | 19 +-
sys/arch/mipsco/conf/std.mipsco | 4 +-
sys/arch/mmeye/conf/Makefile.mmeye.inc | 6 +-
sys/arch/mvme68k/conf/Makefile.mvme68k | 244 ++++-------------
sys/arch/netwinder/conf/std.netwinder | 4 +-
sys/arch/news68k/conf/Makefile.news68k | 237 +++------------
sys/arch/newsmips/conf/std.newsmips | 4 +-
sys/arch/next68k/conf/Makefile.next68k | 236 +++------------
sys/arch/pc532/conf/Makefile.pc532 | 232 +++------------
sys/arch/pmax/conf/Makefile.pmax.inc | 4 +-
sys/arch/powerpc/conf/Makefile.powerpc | 243 ++++-------------
sys/arch/sgimips/conf/Makefile.sgimips.inc | 8 +-
sys/arch/sh3/conf/Makefile.sh3 | 258 ++++-------------
sys/arch/sh3/conf/Makefile.sh3.be | 230 ++++-----------
sys/arch/sparc64/conf/Makefile.sparc64 | 244 ++++-------------
sys/arch/sun3/conf/Makefile.sun3 | 262 ++++--------------
sys/arch/x86_64/conf/Makefile.x86_64 | 251 ++++-------------
34 files changed, 1408 insertions(+), 4151 deletions(-)
diffs (truncated from 6503 to 300 lines):
diff -r 432f0468102a -r 1f15b3272095 sys/arch/acorn32/conf/Makefile.acorn32
--- a/sys/arch/acorn32/conf/Makefile.acorn32 Sun Dec 09 03:35:08 2001 +0000
+++ b/sys/arch/acorn32/conf/Makefile.acorn32 Sun Dec 09 05:00:40 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.acorn32,v 1.8 2001/11/27 00:16:00 thorpej Exp $
+# $NetBSD: Makefile.acorn32,v 1.9 2001/12/09 05:00:40 atatat Exp $
# Makefile for NetBSD
#
@@ -11,87 +11,83 @@
# Machine generic makefile changes should be made in
# /sys/arch/acorn32/conf/Makefile.acorn32
# 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=arm32
USETOOLS?= no
-
+NEED_OWN_INSTALL_TARGET?=no
.include <bsd.own.mk>
-# DEBUG is set to -g if debugging.
-# PROF is set to -pg if profiling.
+##
+## (1) port identification
+##
+ACORN32= $S/arch/acorn32
+ARM= $S/arch/arm
+GENASSYM= ${ARM}/arm32/genassym.cf
+GENASSYM_EXTRAS+= ${ACORN32}/acorn32/genassym.cf
-AR?= ar
-AS?= as
-CC?= cc
-CPP?= cpp
-LD?= ld
-LORDER?=lorder
-MKDEP?= mkdep
-NM?= nm
-RANLIB?=ranlib
-SIZE?= size
-STRIP?= strip
-TSORT?= tsort -q
-
-COPTS?= -O2
-
-# source tree is located via $S relative to the compilation directory
-.ifndef S
-S!= cd ../../../..; pwd
-.endif
-ACORN32= $S/arch/acorn32
-ARM= $S/arch/arm
+##
+## (2) compile settings
+##
+CPPFLAGS+= -Darm32
+CWARNFLAGS+= -Wcomment
+LOOSE_PROTOTYPES= yes
+AFLAGS+= -x assembler-with-cpp
-HAVE_EGCS!= ${CC} --version | egrep "^(2\.[89]|egcs)" ; echo
-INCLUDES= -I. -I$S/arch -I$S -nostdinc
-CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D_KERNEL_OPT -Darm32
-CWARNFLAGS?= -Werror -Wall -Wcomment -Wpointer-arith
-# XXX Delete -Wuninitialized for now, since the compiler doesn't
-# XXX always get it right. --thorpej
-CWARNFLAGS+= -Wno-uninitialized
-.if (${HAVE_EGCS} != "")
-CWARNFLAGS+= -Wno-main
-.endif
-CFLAGS= ${DEBUG} ${COPTS} ${CWARNFLAGS}
-AFLAGS= -x assembler-with-cpp -D_LOCORE
+##
+## (3) libkern and compat
+##
+KERN_AS= obj
+
+##
+## (4) local objects, compile rules, and dependencies
+##
+MD_OBJS= locore.o
+MD_CFILES=
+MD_SFILES= ${ARM}/arm32/locore.S
-LOADADDRESS= 0xF0000000
-LINKFLAGS= -Ttext ${LOADADDRESS} -e start
-STRIPFLAGS= -g
-
-GENASSYM_EXTRAS+= ${ACORN32}/acorn32/genassym.cf
-
-%INCLUDES
+locore.o: ${ARM}/arm32/locore.S assym.h
+ ${NORMAL_S}
-HOSTED_CC= ${CC}
-HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//}
-HOSTED_CFLAGS= ${CFLAGS}
+.ifdef MONITOR
+MD_OBJS+= modedefs.o
+MD_CFILES+= modedefs.c
-### find out what to use for libkern
-KERN_AS= obj
-.include "$S/lib/libkern/Makefile.inc"
-.ifndef PROF
-LIBKERN= ${KERNLIB}
-.else
-LIBKERN= ${KERNLIB_PROF}
+modedefs.c: ${ARM}/iomd/makemodes.awk ${ACORN32}/conf/monitors/${MONITOR} Makefile
+ awk -f ${ARM}/iomd/makemodes.awk ${ACORN32}/conf/monitors/${MONITOR} ${MODES} >modedefs.c
+
+modedefs.o: modedefs.c
+ ${NORMAL_C}
.endif
-### find out what to use for libcompat
-.include "$S/compat/common/Makefile.inc"
-.ifndef PROF
-LIBCOMPAT= ${COMPATLIB}
-.else
-LIBCOMPAT= ${COMPATLIB_PROF}
-.endif
+##
+## (5) link settings
+##
+LOADADDRESS?= 0xF0000000
+LINKFLAGS_NORMAL= -x
+
+##
+## (6) port specific target dependencies
+##
-# compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
-# HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
+# depend on CPU configuration
+cpufunc.o cpufunc_asm.o: Makefile
+
+# depend on DIAGNOSTIC etc.
+cpuswitch.o fault.o machdep.o: Makefile
-NORMAL_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-NOPROF_C= ${CC} ${CFLAGS} ${CPPFLAGS} -c $<
-NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
+##
+## (7) misc settings
+##
-HOSTED_C= ${HOSTED_CC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $<
+##
+## (8) config(8) generated machinery
+##
+%INCLUDES
%OBJS
@@ -99,142 +95,11 @@
%SFILES
-# load lines for config "xxx" will be emitted as:
-# xxx: ${SYSTEM_DEP} swapxxx.o
-# ${SYSTEM_LD_HEAD}
-# ${SYSTEM_LD} swapxxx.o
-# ${SYSTEM_LD_TAIL}
-.ifdef MONITOR
-SYSTEM_OBJ= locore.o modedefs.o \
- param.o ioconf.o ${OBJS} ${LIBCOMPAT} ${LIBKERN}
-.else
-SYSTEM_OBJ= locore.o \
- param.o ioconf.o ${OBJS} ${LIBCOMPAT} ${LIBKERN}
-.endif
-SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
-SYSTEM_LD_HEAD= rm -f $@
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
-SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
-
-DEBUG?=
-.if ${DEBUG} == "-g"
-LINKFLAGS+= -X
-SYSTEM_LD_TAIL+=; \
- echo mv -f $@ $@.gdb; mv -f $@ $@.gdb; \
- echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
- ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
-.else
-#LINKFLAGS+= -S
-LINKFLAGS+= -x
-.endif
-
%LOAD
-assym.h: $S/kern/genassym.sh ${ARM}/arm32/genassym.cf
- cat ${ARM}/arm32/genassym.cf ${GENASSYM_EXTRAS} | \
- sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
- > assym.h.tmp && \
- mv -f assym.h.tmp assym.h
-
-param.c: $S/conf/param.c
- rm -f param.c
- cp $S/conf/param.c .
-
-param.o: param.c Makefile
- ${NORMAL_C}
-
-ioconf.o: ioconf.c
- ${NORMAL_C}
-
-newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
- sh $S/conf/newvers.sh
- ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
-
-__CLEANKERNEL: .USE
- @echo "${.TARGET}ing the kernel objects"
- rm -f eddep *netbsd netbsd.gdb tags *.[io] [a-z]*.s \
- [Ee]rrs linterrs makelinks assym.h.tmp assym.h modedefs.c
-
-__CLEANDEPEND: .USE
- rm -f .depend
-
-clean: __CLEANKERNEL
-
-cleandir distclean: __CLEANKERNEL __CLEANDEPEND
-
-lint:
- @lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
- ${ARM}/arm32/Locore.c ${CFILES} \
- ioconf.c param.c | \
- grep -v 'static function .* unused'
-
-tags:
- @echo "see $S/kern/Makefile for tags"
-
-links:
- egrep '#if' ${CFILES} | sed -f $S/conf/defines | \
- sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
- echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
- sort -u | comm -23 - dontlink | \
- sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks
- sh makelinks && rm -f dontlink
+%RULES
-SRCS= ${ARM}/arm32/locore.S param.c ioconf.c ${CFILES} ${SFILES}
-.ifdef MONITOR
-SRCS+= modedefs.c
-.endif
-depend: .depend
-.depend: ${SRCS} assym.h param.c
- ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${ARM}/arm32/locore.S
- ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
- test -z "${SFILES}" || ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
- sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \
- ${CPPFLAGS} < ${ARM}/arm32/genassym.cf
- @sed -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >> .depend
- @rm -f assym.dep
-.ifdef MONITOR
- ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} modedefs.c
-.endif
-
-dependall: depend all
-
-
-# depend on root or device configuration
-autoconf.o conf.o: Makefile
-
-# depend on network
-uipc_proto.o: Makefile
-
-# depend on maxusers
-assym.h: Makefile
-
-# depend on CPU configuration
-cpufunc.o cpufunc_asm.o: Makefile
-
-# depend on DIAGNOSTIC etc.
-cpuswitch.o fault.o machdep.o: Makefile
-
-
-locore.o: ${ARM}/arm32/locore.S assym.h
- ${NORMAL_S}
-
-modedefs.c: ${ARM}/iomd/makemodes.awk ${ACORN32}/conf/monitors/${MONITOR} Makefile
- awk -f ${ARM}/iomd/makemodes.awk ${ACORN32}/conf/monitors/${MONITOR} ${MODES} >modedefs.c
-
-modedefs.o: modedefs.c
- ${NORMAL_C}
-
-# The install target can be redefined by putting a
-# install-kernel-${MACHINE_NAME} target into /etc/mk.conf
-MACHINE_NAME!= uname -n
-install: install-kernel-${MACHINE_NAME}
-.if !target(install-kernel-${MACHINE_NAME}})
-install-kernel-${MACHINE_NAME}:
- rm -f /onetbsd
- ln /netbsd /onetbsd
- cp netbsd /nnetbsd
- mv /nnetbsd /netbsd
Home |
Main Index |
Thread Index |
Old Index