[src/trunk]: src/sys/arch/hpcmips/conf Start using the common mips/conf/Makef...

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

details:   https://anonhg.NetBSD.org/src/rev/4bdfc0945938
branches:  trunk
changeset: 500895:4bdfc0945938
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Dec 20 04:12:42 2000 +0000

description:
Start using the common mips/conf/Makefile.mips

diffstat:

 sys/arch/hpcmips/conf/Makefile.hpcmips     |  237 -----------------------------
 sys/arch/hpcmips/conf/Makefile.hpcmips.inc |    4 +
 sys/arch/hpcmips/conf/std.hpcmips          |    4 +-
 3 files changed, 7 insertions(+), 238 deletions(-)

diffs (264 lines):

diff -r 6be0957c0529 -r 4bdfc0945938 sys/arch/hpcmips/conf/Makefile.hpcmips
--- a/sys/arch/hpcmips/conf/Makefile.hpcmips    Wed Dec 20 03:23:55 2000 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,237 +0,0 @@
-#      $NetBSD: Makefile.hpcmips,v 1.19 2000/12/17 15:52:41 jdolecek 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/hpcmips/conf/``machineid''
-# after which you should do
-#      config machineid
-# Machine generic makefile changes should be made in
-#      /sys/arch/hpcmips/conf/Makefile.hpcmips
-# after which config should be rerun for all machines of that type.
-
-# DEBUG is set to -g if debugging.
-# PROF is set to -pg if profiling.
-
-#BINDIR=       /usr/pkg/mipsel-netbsd/bin/mipsel-netbsd-
-MACHINE=hpcmips
-MACHINE_ARCH=mipsel
-
-AR?=   ${BINDIR}ar
-AS?=   ${BINDIR}as
-CC?=   ${BINDIR}gcc
-CPP?=  cpp
-LD?=   ${BINDIR}ld
-LORDER?=lorder
-MKDEP?=        mkdep
-NM?=   ${BINDIR}nm
-RANLIB?=       ${BINDIR}ranlib
-SIZE?= ${BINDIR}size
-STRIP?=        ${BINDIR}strip
-TSORT?=        tsort -q
-
-COPTS?=        -Os -mmemcpy
-
-# source tree is located via $S relative to the compilation directory
-.ifndef S
-#S!=   cd ../../../..; pwd
-S=     ../../../..
-.endif
-HPCMIPS=       $S/arch/hpcmips
-MIPS=  $S/arch/mips
-
-HAVE_EGCS!=    ${CC} --version | egrep "^(2\.[89]|egcs)" ; echo 
-INCLUDES=      -I. -I$S/arch -I$S -nostdinc
-CPPFLAGS=      ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -Dhpcmips -D__hpcmips__
-CWARNFLAGS?=   -Werror -Wall  -Wstrict-prototypes -Wmissing-prototypes \
-               -Wno-uninitialized -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
-GP?=           -G 20
-CFLAGS=                ${DEBUG} ${COPTS} ${CWARNFLAGS} ${GP} \
-               -mno-abicalls -mno-half-pic
-AFLAGS=                -x assembler-with-cpp -traditional-cpp -D_LOCORE
-LINKFLAGS=     -Ttext 0x80030000 -T ${MIPS}/conf/kern.ldscript.le \
-               -e start ${GP}
-STRIPFLAGS=    -g -X -x
-
-%INCLUDES
-
-### find out what to use for libkern
-.include "$S/lib/libkern/Makefile.inc"
-.ifndef PROF
-LIBKERN=       ${KERNLIB}
-.else
-LIBKERN=       ${KERNLIB_PROF}
-.endif
-
-### find out what to use for libcompat
-.include "$S/compat/common/Makefile.inc"
-.ifndef PROF
-LIBCOMPAT=     ${COMPATLIB}
-.else
-LIBCOMPAT=     ${COMPATLIB_PROF}
-.endif
-
-# 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).
-
-NORMAL_C=      ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-NOPROF_C=      ${CC} ${CFLAGS} ${CPPFLAGS} -c $<
-NORMAL_S=      ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
-
-%OBJS
-
-%CFILES
-
-%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}
-SYSTEM_OBJ=     locore.o locore_machdep.o
-# VR4100/TX3900 core supports pipeline interlock & branch likely instruction
-CFLAGS+= -mips2
-AFLAGS+= -mips2
-.if !empty(IDENT:M-DMIPS1)
-SYSTEM_OBJ+=    locore_mips1.o
-.endif
-.if !empty(IDENT:M-DMIPS3)
-SYSTEM_OBJ+=    locore_mips3.o
-.endif
-SYSTEM_OBJ+=    param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
-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+=    -x
-.endif
-
-%LOAD
-
-assym.h: $S/kern/genassym.sh ${MIPS}/mips/genassym.cf
-       sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
-         < ${MIPS}/mips/genassym.cf > 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
-
-__CLEANDEPEND: .USE
-       rm -f .depend
-
-clean: __CLEANKERNEL
-
-cleandir distclean: __CLEANKERNEL __CLEANDEPEND
-
-lint:
-       @lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
-         ${MIPS}/mips/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
-
-SRCS=  ${MIPS}/mips/locore.S \
-       ${HPCMIPS}/hpcmips/locore_machdep.S \
-       param.c ioconf.c ${CFILES} ${SFILES}
-depend: .depend
-.depend: ${SRCS} assym.h param.c
-       CC="${CC}" ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${MIPS}/mips/locore.S
-       CC="${CC}" ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${HPCMIPS}/hpcmips/locore_machdep.S 
-       CC="${CC}" ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
-.if (${SFILES} != "")
-       CC="${CC}" ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-.endif
-       CC="${CC}" sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \
-         ${CPPFLAGS} < ${MIPS}/mips/genassym.cf
-       @sed -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >> .depend
-       @rm -f assym.dep
-
-dependall: depend all
-
-
-# depend on root or device configuration
-autoconf.o conf.o: Makefile
- 
-# depend on network or filesystem configuration 
-uipc_proto.o vfs_conf.o: Makefile 
-
-# depend on maxusers
-machdep.o: Makefile
-
-# depend on CPU configuration 
-machdep.o mainbus.o trap.o: Makefile
-
-# depend on System V IPC/shmem options
-mips_machdep.o pmap.o: Makefile
-
-locore.o: ${MIPS}/mips/locore.S assym.h
-       ${NORMAL_S}
-
-locore_mips1.o: ${MIPS}/mips/locore_mips1.S assym.h
-       ${NORMAL_S}
-
-locore_mips3.o: ${MIPS}/mips/locore_mips3.S assym.h
-       ${NORMAL_S}
-
-locore_machdep.o: ${HPCMIPS}/hpcmips/locore_machdep.S assym.h
-       ${NORMAL_S}
-
-# 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
-.endif
-
-%RULES
diff -r 6be0957c0529 -r 4bdfc0945938 sys/arch/hpcmips/conf/Makefile.hpcmips.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/hpcmips/conf/Makefile.hpcmips.inc        Wed Dec 20 04:12:42 2000 +0000
@@ -0,0 +1,4 @@
+#      $NetBSD: Makefile.hpcmips.inc,v 1.1 2000/12/20 04:12:42 matt Exp $
+
+CFLAGS+=       -mips2
+AFLAGS+=       -mips2
diff -r 6be0957c0529 -r 4bdfc0945938 sys/arch/hpcmips/conf/std.hpcmips
--- a/sys/arch/hpcmips/conf/std.hpcmips Wed Dec 20 03:23:55 2000 +0000
+++ b/sys/arch/hpcmips/conf/std.hpcmips Wed Dec 20 04:12:42 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: std.hpcmips,v 1.6 2000/12/03 07:05:22 matt Exp $
+#      $NetBSD: std.hpcmips,v 1.7 2000/12/20 04:12:42 matt Exp $
 # standard, required hpcmips info
 
 machine hpcmips mips
@@ -12,3 +12,5 @@
 
 makeoptions    DEFTEXTADDR="0x80003000"
 makeoptions    ENDIAN="-EL"
+makeoptions    DEFGP="-G 20"
+makeoptions    DEFCOPTS="-O2 -mmemcpy"