CVS commit: src/sys/arch/acorn26/stand
Module Name:src
Committed By: matt
Date: Wed Aug 21 06:07:26 UTC 2013
Modified Files:
src/sys/arch/acorn26/stand: Makefile.buildboot
src/sys/arch/acorn26/stand/lib: riscoscalls.S
Log Message:
Unified syntax
bsd.klinks.mk (remove uneeded lines)
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/acorn26/stand/Makefile.buildboot
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/acorn26/stand/lib/riscoscalls.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/acorn26/stand/Makefile.buildboot
diff -u src/sys/arch/acorn26/stand/Makefile.buildboot:1.16 src/sys/arch/acorn26/stand/Makefile.buildboot:1.17
--- src/sys/arch/acorn26/stand/Makefile.buildboot:1.16 Thu Aug 15 21:41:08 2013
+++ src/sys/arch/acorn26/stand/Makefile.buildboot Wed Aug 21 06:07:26 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.buildboot,v 1.16 2013/08/15 21:41:08 matt Exp $
+# $NetBSD: Makefile.buildboot,v 1.17 2013/08/21 06:07:26 matt Exp $
S?= ${.CURDIR}/../../../..
@@ -39,15 +39,6 @@ CFLAGS= -O2
CFLAGS+= -ffreestanding -fno-unwind-tables
CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes
-.if !make(obj) !make(clean) !make(cleandir)
-.BEGIN:
- -rm -f machine ${MACHINE_ARCH}
- ln -s $S/arch/${MACHINE}/include machine
- ln -s $S/arch/${MACHINE_ARCH}/include ${MACHINE_ARCH}
-.endif
-
-CLEANFILES+= machine ${MACHINE_ARCH}
-
### find out what to use for libkern
KERN_AS= library
.include ${S}/lib/libkern/Makefile.inc
Index: src/sys/arch/acorn26/stand/lib/riscoscalls.S
diff -u src/sys/arch/acorn26/stand/lib/riscoscalls.S:1.4 src/sys/arch/acorn26/stand/lib/riscoscalls.S:1.5
--- src/sys/arch/acorn26/stand/lib/riscoscalls.S:1.4 Thu Jul 20 23:35:20 2006
+++ src/sys/arch/acorn26/stand/lib/riscoscalls.S Wed Aug 21 06:07:26 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: riscoscalls.S,v 1.4 2006/07/20 23:35:20 bjh21 Exp $ */
+/* $NetBSD: riscoscalls.S,v 1.5 2013/08/21 06:07:26 matt Exp $ */
/*-
* Copyright (c) 2001 Ben Harris
@@ -92,7 +92,7 @@ ENTRY(xosargs_read)
sub fp, ip, #4
mov r3, r2
swi OS_Args
- ldmvsdb fp, {fp, sp, pc}
+ ldmdbvs fp, {fp, sp, pc}
teq r3, #0
strne r2, [r3]
mov r0, #0
@@ -151,7 +151,7 @@ ENTRY(xosfind_open)
stmfd sp!, {fp, ip, lr, pc}
sub fp, ip, #4
swi XOS_Find
- ldmvsdb fp, {fp, sp, pc}
+ ldmdbvs fp, {fp, sp, pc}
teq r3, #0
strne r0, [r3]
mov r0, #0
@@ -226,7 +226,7 @@ ENTRY(xos_swi_number_from_string)
mov r2, r1
mov r1, r0
swi XOS_SWINumberFromString
- ldmvsdb fp, {fp, sp, pc}
+ ldmdbvs fp, {fp, sp, pc}
str r0, [r2]
mov r0, #0
ldmdb fp, {fp, sp, pc}
@@ -311,7 +311,7 @@ ENTRY(xcache_control)
stmfd sp!, {fp, ip, lr, pc}
sub fp, ip, #4
swi XCache_Control
- ldmvsdb fp, {fp, sp, pc}
+ ldmdbvs fp, {fp, sp, pc}
teq r2, #0
strne r0, [r2]
mov r0, #0
CVS commit: src/sys/arch/vax/boot
Module Name:src
Committed By: matt
Date: Wed Aug 21 06:15:41 UTC 2013
Modified Files:
src/sys/arch/vax/boot: Makefile.inc
src/sys/arch/vax/boot/boot: Makefile
Log Message:
Use bsd.klinks.mk
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/vax/boot/Makefile.inc
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/vax/boot/boot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/vax/boot/Makefile.inc
diff -u src/sys/arch/vax/boot/Makefile.inc:1.15 src/sys/arch/vax/boot/Makefile.inc:1.16
--- src/sys/arch/vax/boot/Makefile.inc:1.15 Thu Jul 18 12:15:16 2013
+++ src/sys/arch/vax/boot/Makefile.inc Wed Aug 21 06:15:41 2013
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.15 2013/07/18 12:15:16 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.16 2013/08/21 06:15:41 matt Exp $
+
+.include bsd.klinks.mk
RELOC=0x3f
.PATH: ${.CURDIR}/../../vax ${.CURDIR}/../common
@@ -9,6 +11,7 @@ CPPFLAGS+=-I${.CURDIR}/../../
CPPFLAGS+=-I${.CURDIR}/../common
CPPFLAGS+=-I${.CURDIR}/../../include
CPPFLAGS+=-DRELOC=${RELOC}
+CPPFLAGS+=-D_STANDALONE
WARNS?= 1
CFLAGS+=-ffreestanding -fno-pic -fno-unwind-tables
@@ -18,13 +21,3 @@ MKMAN=no
LIBCRTBEGIN=
LIBCRTEND=
-
-.if ${MACHINE} == vax
-.PHONY: machine-links
-beforedepend: machine-links
-machine-links:
- @rm -f machine ln -s ${S}/arch/${MACHINE}/include machine
- @rm -f ${MACHINE_ARCH} ln -s ${S}/arch/${MACHINE_ARCH}/include ${MACHINE_ARCH}
-.NOPATH: machine ${MACHINE_ARCH}
-CLEANFILES+= machine ${MACHINE_ARCH}
-.endif
Index: src/sys/arch/vax/boot/boot/Makefile
diff -u src/sys/arch/vax/boot/boot/Makefile:1.40 src/sys/arch/vax/boot/boot/Makefile:1.41
--- src/sys/arch/vax/boot/boot/Makefile:1.40 Mon May 14 10:05:50 2012
+++ src/sys/arch/vax/boot/boot/Makefile Wed Aug 21 06:15:41 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2012/05/14 10:05:50 abs Exp $
+# $NetBSD: Makefile,v 1.41 2013/08/21 06:15:41 matt Exp $
S= ${.CURDIR}/../../../..
@@ -36,7 +36,7 @@ vers.c: ${.CURDIR}/version
${HOST_SH} ${S}/conf/newvers_stand.sh -N ${${MKREPRO} == yes :?:-D} \
${.CURDIR}/version ${MACHINE}
-${PROG}: machine-links ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
+${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
${_MKTARGET_LINK}
${LD} -N -Ttext ${RELOC} -e nisse -o ${PROG}.sym ${OBJS} \
${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN}
CVS commit: src/sys/arch/rs6000/stand
Module Name:src
Committed By: matt
Date: Wed Aug 21 06:20:49 UTC 2013
Modified Files:
src/sys/arch/rs6000/stand/boot: Makefile
src/sys/arch/rs6000/stand/common: Makefile
Log Message:
Use bsd.klinks.mk
Add a missing ${_MKTARGET_LINK}
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/rs6000/stand/boot/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/rs6000/stand/common/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/rs6000/stand/boot/Makefile
diff -u src/sys/arch/rs6000/stand/boot/Makefile:1.4 src/sys/arch/rs6000/stand/boot/Makefile:1.5
--- src/sys/arch/rs6000/stand/boot/Makefile:1.4 Sat Jan 22 19:19:22 2011
+++ src/sys/arch/rs6000/stand/boot/Makefile Wed Aug 21 06:20:49 2013
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2011/01/22 19:19:22 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2013/08/21 06:20:49 matt Exp $
NOMAN= # defined
.include bsd.own.mk
+.include bsd.klinks.mk
COMMON= ${.CURDIR}/../common
COMMONOBJ!= cd ${COMMON} ${PRINTOBJDIR}
@@ -46,28 +47,16 @@ LIBCRTEND=
RELOC= 0x80
#RELOC= 0x0
-CLEANFILES+= vers.c machine powerpc
+CLEANFILES+= vers.c
LIBS= ${L}/sa/libsa.a ${L}/kern/libkern.a ${L}/z/libz.a
-.if !make(obj) !make(clean) !make(cleandir)
-.BEGIN: machine powerpc
-.NOPATH: machine powerpc
-
-machine::
- -rm -f $@
- ln -s ${S}/arch/${MACHINE}/include $@
-
-powerpc::
- -rm -f $@
- ln -s ${S}/arch/powerpc/include $@
-.endif
-
vers.c: ${.CURDIR}/../boot/version
${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == yes :?:-D} \
${.CURDIR}/../boot/version rs6000 ${NEWVERSWHAT}
${PROG}: ${OBJS} ${LIBS}
+ ${_MKTARGET_LINK}
${LD} -o ${PROG} -s -N -T ${.CURDIR}/../boot/ld.script \
-Ttext ${RELOC} ${OBJS} ${LIBS}
Index: src/sys/arch/rs6000/stand/common/Makefile
diff -u src/sys/arch/rs6000/stand/common/Makefile:1.2 src/sys/arch/rs6000/stand/common/Makefile:1.3
--- src/sys/arch/rs6000/stand/common/Makefile:1.2 Thu May 27 06:58:15 2010
+++ src/sys/arch/rs6000/stand/common/Makefile Wed Aug 21 06:20:49 2013
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2010/05/27 06:58:15 dholland Exp $
+# $NetBSD: Makefile,v 1.3 2013/08/21 06:20:49 matt Exp $
S= ${.CURDIR}/../../../..
+.include bsd.klinks.mk
+
NOMAN= # defined
CPPFLAGS+= -D_STANDALONE
@@ -11,19 +13,6 @@ CPPFLAGS+= -Werror -Wall -Wstrict-protot
CFLAGS= -Os -mmultiple -ffreestanding
-CLEANFILES+= machine powerpc
-
-.if !make(obj) !make(clean) !make(cleandir)
-.PHONY: machine-links
-beforedepend: machine-links
-
-machine-links:
- -rm -f machine
- ln -s ${S}/arch/${MACHINE}/include machine
- -rm -f ${MACHINE_ARCH}
- ln -s ${S}/arch/${MACHINE_ARCH}/include ${MACHINE_ARCH}
-.endif
-
.include bsd.prog.mk
### find out what to use for libkern
@@ -44,9 +33,4 @@ LIBSA= ${SALIB}
LIBS= ${LIBSA} ${LIBZ} ${LIBKERN}
-realall: machine-links ${LIBS}
-
-cleandir distclean: .WAIT cleanlibdir
-
-cleanlibdir:
- -rm -rf lib
+realall: ${LIBS}
CVS commit: src/sys/arch/shark/stand/ofwboot
Module Name:src
Committed By: matt
Date: Wed Aug 21 06:24:42 UTC 2013
Modified Files:
src/sys/arch/shark/stand/ofwboot: Makefile
Log Message:
Use bsd.klinks.mk
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/shark/stand/ofwboot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/shark/stand/ofwboot/Makefile
diff -u src/sys/arch/shark/stand/ofwboot/Makefile:1.13 src/sys/arch/shark/stand/ofwboot/Makefile:1.14
--- src/sys/arch/shark/stand/ofwboot/Makefile:1.13 Sun Jun 30 21:54:26 2013
+++ src/sys/arch/shark/stand/ofwboot/Makefile Wed Aug 21 06:24:42 2013
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2013/06/30 21:54:26 matt Exp $
+# $NetBSD: Makefile,v 1.14 2013/08/21 06:24:42 matt Exp $
NOMAN= # defined
.include bsd.own.mk
+.include bsd.klinks.mk
S= ${.CURDIR}/../../../..
@@ -40,15 +41,6 @@ CPPFLAGS+= -DRELOC=0x${RELOC}
CFLAGS+= -fno-unwind-tables
CPUFLAGS= -mcpu=strongarm
-.if !make(obj) !make(clean) !make(cleandir)
-.BEGIN:
- @[ -h machine ] || ln -s ${S}/arch/${MACHINE}/include machine
- @[ -h arm ] || ln -s ${S}/arch/arm/include arm
-.endif
-
-.NOPATH: machine arm
-CLEANFILES+= machine arm
-
CLEANFILES+= ${PROG}.aout
### find out what to use for libkern
CVS commit: src/sys/arch/sbmips/stand
Module Name:src
Committed By: matt
Date: Wed Aug 21 06:27:54 UTC 2013
Modified Files:
src/sys/arch/sbmips/stand: Makefile.bootprogs
Log Message:
Use bsd.klinks.mk
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sbmips/stand/Makefile.bootprogs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sbmips/stand/Makefile.bootprogs
diff -u src/sys/arch/sbmips/stand/Makefile.bootprogs:1.10 src/sys/arch/sbmips/stand/Makefile.bootprogs:1.11
--- src/sys/arch/sbmips/stand/Makefile.bootprogs:1.10 Thu Jan 19 19:58:16 2012
+++ src/sys/arch/sbmips/stand/Makefile.bootprogs Wed Aug 21 06:27:54 2013
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.bootprogs,v 1.10 2012/01/19 19:58:16 matt Exp $
+# $NetBSD: Makefile.bootprogs,v 1.11 2013/08/21 06:27:54 matt Exp $
.include bsd.own.mk
+.include bsd.klinks.mk
.include bsd.sys.mk # for HOST_SH
S= ${.CURDIR}/../../../..
@@ -20,18 +21,6 @@ STRIP?= strip
CHECKSIZE_CMD= SIZE=${SIZE} ${HOST_SH} ${.CURDIR}/../common/checksize.sh
-.PHONY: machine-links
-beforedepend: machine-links .WAIT
-# ${MACHINE} then ${MACHINE_ARCH}
-machine-links:
- -rm -f machine \
- ln -s $S/arch/sbmips/include machine
- -rm -f mips \
- ln -s $S/arch/mips/include mips
-CLEANFILES+=machine mips
-
-realall: machine-links ${PROG}
-
AFLAGS+= -DASSEMBLER -D_LOCORE -mno-abicalls -mips64
# -I${.CURDIR}/../.. done by Makefile.inc
CPPFLAGS+= -nostdinc -I${.OBJDIR} -D_STANDALONE -I${S}
CVS commit: src/sys/arch/sparc/stand
Module Name:src
Committed By: matt
Date: Wed Aug 21 06:41:52 UTC 2013
Modified Files:
src/sys/arch/sparc/stand/bootblk: Makefile
src/sys/arch/sparc/stand/ofwboot: Makefile
Log Message:
Use bsd.klinks.mk
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sparc/stand/bootblk/Makefile
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/sparc/stand/ofwboot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/stand/bootblk/Makefile
diff -u src/sys/arch/sparc/stand/bootblk/Makefile:1.13 src/sys/arch/sparc/stand/bootblk/Makefile:1.14
--- src/sys/arch/sparc/stand/bootblk/Makefile:1.13 Sat Feb 13 23:38:17 2010
+++ src/sys/arch/sparc/stand/bootblk/Makefile Wed Aug 21 06:41:52 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2010/02/13 23:38:17 eeh Exp $
+# $NetBSD: Makefile,v 1.14 2013/08/21 06:41:52 matt Exp $
CURDIR= ${.CURDIR}
S= ${CURDIR}/../../../..
@@ -10,7 +10,7 @@ S= ${CURDIR}/../../../..
PROG= bootblk
SRCS= bootblk.fth
OBJS=
-CLEANFILES= ffs.fth.h lfs.fth.h assym.fth.h.tmp machine sparc \
+CLEANFILES= ffs.fth.h lfs.fth.h assym.fth.h.tmp \
bootblk bootblk.text bootblk.text.tmp
NOMAN= # defined
@@ -21,17 +21,6 @@ USE_GENASSYM?= no
INCLUDES= -I. -I$S/arch -I$S -I${S}/../common/include -nostdinc
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_LKM -D_KERNEL
-#all:: bootblk.text bootblk
-
-#clean::
-# rm assym.fth.h bootblk.text machine bootblk
-
-sparc:
- ln -s ${.CURDIR}/../../../sparc/include sparc
-
-machine:
- ln -s ${.CURDIR}/../../../${MACHINE}/include machine
-
ffs.fth.h: genfth.cf machine sparc
${TOOL_GENASSYM} -f -- ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
${.CURDIR}/genfth.cf ffs.fth.h.tmp \
@@ -61,4 +50,5 @@ fake: bootblk bootblk.text
../fakeboot/fakeboot -elf32 bootblk /bootblk
../fakeboot/fakeboot -elf32 bootblk.text /bootblk.text
+.include bsd.klinks.mk
.include bsd.prog.mk
Index: src/sys/arch/sparc/stand/ofwboot/Makefile
diff -u src/sys/arch/sparc/stand/ofwboot/Makefile:1.29 src/sys/arch/sparc/stand/ofwboot/Makefile:1.30
--- src/sys/arch/sparc/stand/ofwboot/Makefile:1.29 Sat May 21 15:50:42 2011
+++ src/sys/arch/sparc/stand/ofwboot/Makefile Wed Aug 21 06:41:52 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2011/05/21 15:50:42 tsutsui Exp $
+# $NetBSD: Makefile,v 1.30 2013/08/21 06:41:52 matt Exp $
CURDIR= ${.CURDIR}
S= ${CURDIR}/../../../..
@@ -8,6 +8,7 @@ S= ${CURDIR}/../../../..
#
WARNS?= 2
+KLINK_MACHINE= sparc64
PROG?= ofwboot
SRCS= srt0.s Locore.c boot.c ofdev.c alloc.c net.c netif_of.c vers.c
@@ -78,21 +79,8 @@ SAMISCCPPFLAGS+= -DCOMPAT_SOLARIS_UFS
.include ${S}/lib/libsa/Makefile.inc
LIBSA= ${SALIB}
-.if !make(obj) !make(clean) !make(cleandir)
-.BEGIN:
- @([ -h machine ] || ln -s ${S}/arch/sparc64/include machine)
- @([ -h sparc64 ] || ln -s ${S}/arch/sparc64/include sparc64)
- @([ -h sparc ] || ln -s ${S}/arch/sparc/include sparc)
-.NOPATH: machine sparc64 sparc
-.endif
-CLEANFILES+= machine sparc64 sparc
-
-cleandir distclean: .WAIT cleanlibdir
-
-cleanlibdir:
- -rm -rf lib
-
.include bsd.own.mk
+.include bsd.klinks.mk
vers.c: version
${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == yes :?:-D} \
@@ -102,10 +90,12 @@ CLEANFILES+= vers.c
.if CROSS
${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
+ ${_MKTARGET_LINK}
${LD} -N -p -Ttext ${RELOC} -e ${ENTRY} lderr -o ${PROG} \
${OBJS} -L${SADST} -lsa -L${ZDST} -lz -L${KERNDST} -lkern # solaris linker
.else
${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
+ ${_MKTARGET_LINK}
${LD} -X -N -Ttext ${RELOC} -e ${ENTRY} -o ${PROG} \
${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} # native linker
.endif
CVS commit: src/sys/arch/sandpoint/stand/altboot
Module Name:src
Committed By: matt
Date: Wed Aug 21 06:44:02 UTC 2013
Modified Files:
src/sys/arch/sandpoint/stand/altboot: Makefile
Log Message:
Use bsd.klinks.mk
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sandpoint/stand/altboot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sandpoint/stand/altboot/Makefile
diff -u src/sys/arch/sandpoint/stand/altboot/Makefile:1.12 src/sys/arch/sandpoint/stand/altboot/Makefile:1.13
--- src/sys/arch/sandpoint/stand/altboot/Makefile:1.12 Sun Oct 30 20:42:09 2011
+++ src/sys/arch/sandpoint/stand/altboot/Makefile Wed Aug 21 06:44:02 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2011/10/30 20:42:09 phx Exp $
+# $NetBSD: Makefile,v 1.13 2013/08/21 06:44:02 matt Exp $
S= ${.CURDIR}/../../../..
@@ -19,6 +19,7 @@ CPPFLAGS+= -nostdinc -I. -I${.OBJDIR} -I
DBG= -Os
.include bsd.own.mk
+.include bsd.klinks.mk
# XXX SHOULD NOT NEED TO DEFINE THESE!
LIBCRT0=
@@ -32,14 +33,6 @@ BINMODE= 444
RELOC= 100
ENTRY= _start
-.if !make(obj) !make(clean) !make(cleandir)
-.BEGIN:
- @[ -h machine ] || ln -s ${S}/arch/${MACHINE}/include machine
- @[ -h powerpc ] || ln -s ${S}/arch/powerpc/include powerpc
-.NOPATH: machine powerpc
-.endif
-CLEANFILES+= machine powerpc
-
### find out what to use for libkern
KERN_AS= library
.include ${S}/lib/libkern/Makefile.inc
@@ -62,6 +55,7 @@ vers.c: version
${${MKREPRO} == yes :?:-D} ${.CURDIR}/version sandpoint
${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
+ ${_MKTARGET_LINK}
${LD} -N -Ttext ${RELOC} -Bstatic -e ${ENTRY} -o ${PROG} \
${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
${OBJCOPY} -S -O binary ${PROG} ${PROG}.bin
CVS commit: src/sys/arch/ofppc/stand/ofwboot
Module Name:src
Committed By: matt
Date: Wed Aug 21 06:46:26 UTC 2013
Modified Files:
src/sys/arch/ofppc/stand/ofwboot: Makefile
Log Message:
Use bsd.klinks.mk
Add ${_MKTARGET_LINK}
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/ofppc/stand/ofwboot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/ofppc/stand/ofwboot/Makefile
diff -u src/sys/arch/ofppc/stand/ofwboot/Makefile:1.27 src/sys/arch/ofppc/stand/ofwboot/Makefile:1.28
--- src/sys/arch/ofppc/stand/ofwboot/Makefile:1.27 Mon Jan 24 19:27:18 2011
+++ src/sys/arch/ofppc/stand/ofwboot/Makefile Wed Aug 21 06:46:26 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2011/01/24 19:27:18 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2013/08/21 06:46:26 matt Exp $
S!= cd ${.CURDIR}/../../../.. ; pwd
@@ -14,6 +14,7 @@ CPPFLAGS+= -D_STANDALONE -DSUPPORT_DHCP
CPPFLAGS+= -DHEAP_VARIABLE
.include bsd.own.mk
+.include bsd.klinks.mk
DBG= -Os -mmultiple
@@ -46,14 +47,6 @@ CPPFLAGS+= -DRELOC=0x${RELOC}
CPPFLAGS+= -DFIRMWORKSBUGS
CPPFLAGS+= -DCOMPAT_386BSD_MBRPART
-.if !make(obj) !make(clean) !make(cleandir)
-.BEGIN:
- @[ -h machine ] || ln -s ${S}/arch/${MACHINE}/include machine
- @[ -h powerpc ] || ln -s ${S}/arch/powerpc/include powerpc
-.endif
-.NOPATH: machine powerpc
-CLEANFILES+= machine powerpc
-
### find out what to use for libkern
KERN_AS= library
.include ${S}/lib/libkern/Makefile.inc
@@ -76,6 +69,7 @@ vers.c: version
${.CURDIR}/version ofppc ${NEWVERSWHAT}
${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
+ ${_MKTARGET_LINK}
${LD} -s -N -T ${.CURDIR}/ldscript -Ttext ${RELOC} -Bstatic \
-e ${ENTRY} -o ${PROG}.X ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
mv -f ${PROG}.X ${PROG}
CVS commit: src/sys/arch/prep/stand
Module Name:src
Committed By: matt
Date: Wed Aug 21 06:49:45 UTC 2013
Modified Files:
src/sys/arch/prep/stand/boot: Makefile
src/sys/arch/prep/stand/common: Makefile
Log Message:
Use bsd.klinks.mk
Use ${_MKTARGET_LINK}
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/prep/stand/boot/Makefile
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/prep/stand/common/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/prep/stand/boot/Makefile
diff -u src/sys/arch/prep/stand/boot/Makefile:1.26 src/sys/arch/prep/stand/boot/Makefile:1.27
--- src/sys/arch/prep/stand/boot/Makefile:1.26 Sat May 19 14:40:13 2012
+++ src/sys/arch/prep/stand/boot/Makefile Wed Aug 21 06:49:44 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2012/05/19 14:40:13 kiyohara Exp $
+# $NetBSD: Makefile,v 1.27 2013/08/21 06:49:44 matt Exp $
NOMAN= # defined
@@ -56,26 +56,15 @@ CLEANFILES+= vers.c machine powerpc ${PR
LIBS= ${L}/sa/libsa.a ${L}/kern/libkern.a ${L}/z/libz.a
-.if !make(obj) !make(clean) !make(cleandir)
-.BEGIN: machine powerpc
-.NOPATH: machine powerpc
-
-machine::
- -rm -f $@
- ln -s ${S}/arch/${MACHINE}/include $@
-
-powerpc::
- -rm -f $@
- ln -s ${S}/arch/powerpc/include $@
-.endif
-
vers.c: ${.CURDIR}/../boot/version
${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == yes :?:-D} \
${.CURDIR}/../boot/version prep ${NEWVERSWHAT}
${PROG}: ${OBJS} ${LIBS}
+ ${_MKTARGET_LINK}
${LD} -o ${PROG}.elf -N -T ${.CURDIR}/../boot/ld.script \
-Ttext ${RELOC} ${OBJS} ${LIBS}
${STRIP} -o ${PROG} ${PROG}.elf
.include bsd.prog.mk
+.include bsd.klinks.mk
Index: src/sys/arch/prep/stand/common/Makefile
diff -u src/sys/arch/prep/stand/common/Makefile:1.10 src/sys/arch/prep/stand/common/Makefile:1.11
--- src/sys/arch/prep/stand/common/Makefile:1.10 Thu May 27 06:58:15 2010
+++ src/sys/arch/prep/stand/common/Makefile Wed Aug 21 06:49:45 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/05/27 06:58:15 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2013/08/21 06:49:45 matt Exp $
S= ${.CURDIR}/../../../..
@@ -11,20 +11,8 @@ CPPFLAGS+= -Werror -Wall -Wstrict-protot
CFLAGS= -Os -mmultiple -ffreestanding
-CLEANFILES+= machine powerpc
-
-.if !make(obj) !make(clean) !make(cleandir)
-.PHONY: machine-links
-beforedepend: machine-links
-
-machine-links:
- -rm -f machine
- ln -s ${S}/arch/${MACHINE}/include machine
- -rm -f ${MACHINE_ARCH}
- ln -s ${S}/arch/${MACHINE_ARCH}/include ${MACHINE_ARCH}
-.endif
-
.include bsd.prog.mk
+.include bsd.klinks.mk
### find out what to use for libkern
KERN_AS= library
@@ -44,7 +32,7 @@ LIBSA= ${SALIB}
LIBS= ${LIBSA} ${LIBZ} ${LIBKERN}
-realall: machine-links ${LIBS}
+realall: ${LIBS}
cleandir distclean: .WAIT cleanlibdir
CVS commit: src/sys/arch/bebox/stand
Module Name:src
Committed By: matt
Date: Wed Aug 21 06:53:10 UTC 2013
Modified Files:
src/sys/arch/bebox/stand/boot: Makefile
src/sys/arch/bebox/stand/common: Makefile
Log Message:
Use bsd.klinks.mk
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/bebox/stand/boot/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/bebox/stand/common/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/bebox/stand/boot/Makefile
diff -u src/sys/arch/bebox/stand/boot/Makefile:1.32 src/sys/arch/bebox/stand/boot/Makefile:1.33
--- src/sys/arch/bebox/stand/boot/Makefile:1.32 Sat Sep 1 00:29:00 2012
+++ src/sys/arch/bebox/stand/boot/Makefile Wed Aug 21 06:53:10 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2012/09/01 00:29:00 matt Exp $
+# $NetBSD: Makefile,v 1.33 2013/08/21 06:53:10 matt Exp $
NOMAN= # defined
@@ -56,23 +56,10 @@ LIBCRTEND=
RELOC= 0x70
-CLEANFILES+= vers.c machine powerpc ${PROG}.elf
+CLEANFILES+= vers.c ${PROG}.elf
LIBS= ${L}/sa/libsa.a ${L}/kern/libkern.a ${L}/z/libz.a
-.if !make(obj) !make(clean) !make(cleandir)
-.BEGIN: machine powerpc
-.NOPATH: machine powerpc
-
-machine::
- -rm -f $@
- ln -s ${S}/arch/${MACHINE}/include $@
-
-powerpc::
- -rm -f $@
- ln -s ${S}/arch/powerpc/include $@
-.endif
-
vers.c: ${.CURDIR}/../boot/version
${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == yes :?:-D} \
${.CURDIR}/../boot/version bebox ${NEWVERSWHAT}
@@ -84,3 +71,4 @@ ${PROG}: ${OBJS} ${LIBS}
${STRIP} -o ${PROG} ${PROG}.elf
.include bsd.prog.mk
+.include bsd.klinks.mk
Index: src/sys/arch/bebox/stand/common/Makefile
diff -u src/sys/arch/bebox/stand/common/Makefile:1.2 src/sys/arch/bebox/stand/common/Makefile:1.3
--- src/sys/arch/bebox/stand/common/Makefile:1.2 Thu May 27 06:58:13 2010
+++ src/sys/arch/bebox/stand/common/Makefile Wed Aug 21 06:53:10 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/05/27 06:58:13 dholland Exp $
+# $NetBSD: Makefile,v 1.3 2013/08/21 06:53:10 matt Exp $
S= ${.CURDIR}/../../../..
@@ -11,20 +11,8 @@ CPPFLAGS+= -Werror -Wall -Wstrict-protot
CFLAGS= -Os -mmultiple -ffreestanding
-CLEANFILES+= machine powerpc
-
-.if !make(obj) !make(clean) !make(cleandir)
-.PHONY: machine-links
-beforedepend: machine-links
-
-machine-links:
- -rm -f machine
- ln -s ${S}/arch/${MACHINE}/include machine
- -rm -f ${MACHINE_ARCH}
- ln -s ${S}/arch/${MACHINE_ARCH}/include ${MACHINE_ARCH}
-.endif
-
.include bsd.prog.mk
+.include bsd.klinks.mk
### find out what to use for libkern
KERN_AS= library
@@ -44,7 +32,7 @@ LIBSA= ${SALIB}
LIBS= ${LIBSA} ${LIBZ} ${LIBKERN}
-realall: machine-links ${LIBS}
+realall: ${LIBS}
cleandir distclean: .WAIT cleanlibdir
CVS commit: src/sys/arch/next68k/stand/boot
Module Name:src
Committed By: matt
Date: Wed Aug 21 06:56:14 UTC 2013
Modified Files:
src/sys/arch/next68k/stand/boot: Makefile
Log Message:
Use bsd.klinks.mk
Add ${_MKTARGET_LINK}
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/next68k/stand/boot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/next68k/stand/boot/Makefile
diff -u src/sys/arch/next68k/stand/boot/Makefile:1.26 src/sys/arch/next68k/stand/boot/Makefile:1.27
--- src/sys/arch/next68k/stand/boot/Makefile:1.26 Mon Nov 5 16:53:25 2012
+++ src/sys/arch/next68k/stand/boot/Makefile Wed Aug 21 06:56:14 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2012/11/05 16:53:25 apb Exp $
+# $NetBSD: Makefile,v 1.27 2013/08/21 06:56:14 matt Exp $
NOMAN= # defined
@@ -44,7 +44,7 @@ SRCS= boot.c machdep.c conf.c devopen.
.PATH: ${S}/lib/libsa
SRCS+= dev_net.c
-CLEANFILES+= srt0.o boot.elf boot.raw machine ${MACHINE_ARCH} limits.h
+CLEANFILES+= srt0.o boot.elf boot.raw limits.h
CLEANFILES+= vers.c build.c build # generated dynamically
BINDIR= /usr/mdec
@@ -65,6 +65,7 @@ function x(v) { printf \\0\\%o\\%o\\%o
}'
${PROG}: srt0.o ${OBJS} ${LIBS}
+ ${_MKTARGET_LINK}
${LD} -N -Ttext ${RELOC} -e start srt0.o ${OBJS} ${LIBS} -o $@.elf
${SIZE} $@.elf
${OBJCOPY} -O binary $@.elf $@.raw
@@ -89,17 +90,5 @@ vers.c: version
# utilities
-.if !make(obj) !make(clean) !make(cleandir)
-.NOPATH: machine ${MACHINE_ARCH}
-.BEGIN: machine ${MACHINE_ARCH}
-
-machine:
- -rm -f machine
- ln -s ${S}/arch/${MACHINE}/include machine
-
-${MACHINE_ARCH}:
- -rm -f ${MACHINE_ARCH}
- ln -s ${S}/arch/${MACHINE_ARCH}/include ${MACHINE_ARCH}
-.endif
-
.include bsd.prog.mk
+.include bsd.klinks.mk
CVS commit: src/sys/arch/mvme68k/stand/installboot
Module Name:src
Committed By: matt
Date: Wed Aug 21 06:58:58 UTC 2013
Modified Files:
src/sys/arch/mvme68k/stand/installboot: Makefile
Log Message:
Use bsd.klinks.mk
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/mvme68k/stand/installboot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mvme68k/stand/installboot/Makefile
diff -u src/sys/arch/mvme68k/stand/installboot/Makefile:1.16 src/sys/arch/mvme68k/stand/installboot/Makefile:1.17
--- src/sys/arch/mvme68k/stand/installboot/Makefile:1.16 Wed Dec 28 08:08:00 2005
+++ src/sys/arch/mvme68k/stand/installboot/Makefile Wed Aug 21 06:58:58 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/12/28 08:08:00 skrll Exp $
+# $NetBSD: Makefile,v 1.17 2013/08/21 06:58:58 matt Exp $
NOMAN= # defined
@@ -12,19 +12,9 @@ CPPFLAGS+= -I${LIBSA} -I. -D__daddr_t=in
# Need this to work in the miniroot
LDSTATIC= -static
-.if !make(obj) !make(clean) !make(cleandir)
-.BEGIN: machine
-.NOPATH: machine
-
-machine::
- -rm -f $@
- ln -s ${.CURDIR}/../../include $@
-.endif
-
-CLEANFILES+= machine
-
.PATH.c: ${LIBSA}
SRCS= installboot.c byteorder.c loadfile.c loadfile_aout.c loadfile_elf32.c
.include bsd.prog.mk
+.include bsd.klinks.mk
CVS commit: src/sys/arch/mmeye/stand/bootelf
Module Name:src
Committed By: matt
Date: Wed Aug 21 07:04:38 UTC 2013
Modified Files:
src/sys/arch/mmeye/stand/bootelf: Makefile
Log Message:
Use bsd.klinks.mk
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mmeye/stand/bootelf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mmeye/stand/bootelf/Makefile
diff -u src/sys/arch/mmeye/stand/bootelf/Makefile:1.14 src/sys/arch/mmeye/stand/bootelf/Makefile:1.15
--- src/sys/arch/mmeye/stand/bootelf/Makefile:1.14 Mon Apr 3 09:08:03 2006
+++ src/sys/arch/mmeye/stand/bootelf/Makefile Wed Aug 21 07:04:38 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/04/03 09:08:03 uebayasi Exp $
+# $NetBSD: Makefile,v 1.15 2013/08/21 07:04:38 matt Exp $
#
# NOTE: This program is *not* standalone, but a userlevel program -- this
# program was run from within boot-only, NetBSD-as-bootloader as a
@@ -18,14 +18,7 @@ CFLAGS+= -ffreestanding
CPPFLAGS+= -I${.CURDIR}/../../../.. -I${.OBJDIR}
LDSTATIC= -static
-CLEANFILES+= machine
-
-realdepend realall: machine
-
-machine::
- -rm -f $@
- ln -s ${.CURDIR}/../../../../arch/${MACHINE}/include $@
-
-${PROG}: ${OBJS} machine
+${PROG}: ${OBJS}
.include bsd.prog.mk
+.include bsd.klinks.mk
CVS commit: src/sys/arch/landisk/stand
Module Name:src
Committed By: matt
Date: Wed Aug 21 07:08:30 UTC 2013
Modified Files:
src/sys/arch/landisk/stand: Makefile.bootprogs
src/sys/arch/landisk/stand/boot: Makefile.boot
src/sys/arch/landisk/stand/bootxx: Makefile.bootxx
Log Message:
Use bsd.klinks.mk
Add missing ${_MKTARGET_LINK}
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/landisk/stand/Makefile.bootprogs
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/landisk/stand/boot/Makefile.boot
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/landisk/stand/bootxx/Makefile.bootxx
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/landisk/stand/Makefile.bootprogs
diff -u src/sys/arch/landisk/stand/Makefile.bootprogs:1.4 src/sys/arch/landisk/stand/Makefile.bootprogs:1.5
--- src/sys/arch/landisk/stand/Makefile.bootprogs:1.4 Thu May 27 06:58:14 2010
+++ src/sys/arch/landisk/stand/Makefile.bootprogs Wed Aug 21 07:08:30 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootprogs,v 1.4 2010/05/27 06:58:14 dholland Exp $
+# $NetBSD: Makefile.bootprogs,v 1.5 2013/08/21 07:08:30 matt Exp $
S= ${.CURDIR}/../../../../..
@@ -11,6 +11,7 @@ PRIMARY_LOAD_ADDRESS?=0x8c201000
SECONDARY_LOAD_ADDRESS?=0x8ff0
.include bsd.own.mk
+.include bsd.klinks.mk
STRIPFLAG= # override
@@ -29,18 +30,6 @@ CPPFLAGS+= -nostdinc -D_STANDALONE
CPPFLAGS+= -DSH4
CPPFLAGS+= -I${.OBJDIR} -I${.CURDIR}/.. -I${.CURDIR}/../../boot -I${S}
-.if !make(obj) !make(clean) !make(cleandir)
-.BEGIN:
- -rm -f machine \
- ln -s ${S}/arch/${MACHINE}/include machine
- -rm -f ${MACHINE_CPU} \
- ln -s ${S}/arch/${MACHINE_CPU}/include ${MACHINE_CPU}
-.ifdef LIBOBJ
- -rm -f lib ln -s ${LIBOBJ}/lib lib
- mkdir -p ${LIBOBJ}/lib
-.endif
-.endif
-
### find out what to use for libsa
SA_AS= library
.include ${S}/lib/libsa/Makefile.inc
Index: src/sys/arch/landisk/stand/boot/Makefile.boot
diff -u src/sys/arch/landisk/stand/boot/Makefile.boot:1.5 src/sys/arch/landisk/stand/boot/Makefile.boot:1.6
--- src/sys/arch/landisk/stand/boot/Makefile.boot:1.5 Sun Dec 25 06:09:09 2011
+++ src/sys/arch/landisk/stand/boot/Makefile.boot Wed Aug 21 07:08:30 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.5 2011/12/25 06:09:09 tsutsui Exp $
+# $NetBSD: Makefile.boot,v 1.6 2013/08/21 07:08:30 matt Exp $
PROG?= boot
@@ -40,6 +40,7 @@ vers.c: ${VERSIONFILE} ${SOURCES} ${.CUR
${VERSIONFILE} ${MACHINE} ${NEWVERSWHAT}
${PROG}: ${OBJS} ${LIBLIST}
+ ${_MKTARGET_LINK}
${LD} -o ${PROG}.sym ${LDFLAGS} -Ttext ${SECONDARY_LOAD_ADDRESS} \
-Map ${PROG}.map -cref ${OBJS} ${LIBLIST}
${OBJCOPY} -O binary ${PROG}.sym ${PROG}
Index: src/sys/arch/landisk/stand/bootxx/Makefile.bootxx
diff -u src/sys/arch/landisk/stand/bootxx/Makefile.bootxx:1.3 src/sys/arch/landisk/stand/bootxx/Makefile.bootxx:1.4
--- src/sys/arch/landisk/stand/bootxx/Makefile.bootxx:1.3 Wed Apr 22 17:13:36 2009
+++ src/sys/arch/landisk/stand/bootxx/Makefile.bootxx Wed Aug 21 07:08:30 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootxx,v 1.3 2009/04/22 17:13:36 tsutsui Exp $
+# $NetBSD: Makefile.bootxx,v 1.4 2013/08/21 07:08:30 matt Exp $
PROG?= bootxx_${FS}
@@ -46,6 +46,7 @@ LIBLIST= ${LIBSA} ${LIBKERN}
CLEANFILES+= ${PROG}.sym ${PROG}.map
${PROG}: ${OBJS} ${LIBLIST}
+ ${_MKTARGET_LINK}
${LD} -o ${PROG}.sym ${LDFLAGS} -Ttext ${PRIMARY_LOAD_ADDRESS} \
-Map ${PROG}.map -cref ${OBJS} ${LIBLIST}
${OBJCOPY} -O binary ${PROG}.sym ${PROG}
CVS commit: src/sys/arch/mipsco/stand
Module Name:src
Committed By: matt
Date: Wed Aug 21 07:13:51 UTC 2013
Modified Files:
src/sys/arch/mipsco/stand: Makefile.booters
Log Message:
Use bsd.klinks.mk
Add missing ${_MKTARGET_LINK}
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/mipsco/stand/Makefile.booters
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mipsco/stand/Makefile.booters
diff -u src/sys/arch/mipsco/stand/Makefile.booters:1.17 src/sys/arch/mipsco/stand/Makefile.booters:1.18
--- src/sys/arch/mipsco/stand/Makefile.booters:1.17 Sat Jan 22 19:19:19 2011
+++ src/sys/arch/mipsco/stand/Makefile.booters Wed Aug 21 07:13:51 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.17 2011/01/22 19:19:19 joerg Exp $
+# $NetBSD: Makefile.booters,v 1.18 2013/08/21 07:13:51 matt Exp $
.include bsd.sys.mk # for HOST_SH
@@ -17,21 +17,7 @@ LIBC=
LIBCRTBEGIN=
LIBCRTEND=
-.PHONY: machine-links
-beforedepend: machine-links
-
-machine-links: machine mipsco mips
-machine mipsco:
- -rm -f ${.TARGET}
- ln -s ${MIPSCO}/include ${.TARGET}
-
-mips:
- -rm -f ${.TARGET}
- ln -s ${MIPS}/include ${.TARGET}
-
-CLEANFILES+= machine mipsco mips
-
-realall: machine-links ${PROG}
+realall: ${PROG}
AFLAGS+= -D_LOCORE -D_KERNEL -DASSEMBLER -mno-abicalls
# -I${.CURDIR}/../.. done by Makefile.inc
@@ -124,7 +110,8 @@ vers.c: ${.CURDIR}/version
${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == yes :?:-D} \
-N ${.CURDIR}/version mipsco
-${PROG}: machine-links ${LDSCRIPT} ${OBJS} ${LIBS}
+${PROG}: ${LDSCRIPT} ${OBJS} ${LIBS}
+ ${_MKTARGET_LINK}
${LD} ${OFORMAT} -Map ${PROG}.map -N -x -Ttext ${LOAD_ADDRESS} \
-T ${LDSCRIPT} -e start -o ${PROG} ${OBJS} ${LIBS}
@${SIZE} ${PROG}
@@ -146,3 +133,4 @@ cleanlibdir:
-rm -rf lib
.include bsd.prog.mk
+.include bsd.klinks.mk
CVS commit: src/sys/arch/ia64/stand/ia64
Module Name:src
Committed By: matt
Date: Wed Aug 21 07:17:08 UTC 2013
Modified Files:
src/sys/arch/ia64/stand/ia64: Makefile.booters
Log Message:
Use bsd.klinks.mk
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/stand/ia64/Makefile.booters
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/ia64/stand/ia64/Makefile.booters
diff -u src/sys/arch/ia64/stand/ia64/Makefile.booters:1.4 src/sys/arch/ia64/stand/ia64/Makefile.booters:1.5
--- src/sys/arch/ia64/stand/ia64/Makefile.booters:1.4 Thu May 27 06:58:14 2010
+++ src/sys/arch/ia64/stand/ia64/Makefile.booters Wed Aug 21 07:17:08 2013
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.booters,v 1.4 2010/05/27 06:58:14 dholland Exp $
+# $NetBSD: Makefile.booters,v 1.5 2013/08/21 07:17:08 matt Exp $
.include bsd.own.mk
+.include bsd.klinks.mk
STRIPFLAG=
BINMODE=444
@@ -23,29 +24,6 @@ CFLAGS+= -ffreestanding -fshort-wchar -W
LDFLAGS+= #-nostdlib
CPPFLAGS+= -D_STANDALONE
-.if !make(obj) !make(clean) !make(cleandir)
-.BEGIN: machine
-.NOPATH: machine
-.endif
-
-realdepend realall: machine lib
-CLEANFILES= machine
-
-machine:
- -rm -f $@
- ln -s $S/arch/${MACHINE_ARCH}/include $@
-
-${OBJS}: machine lib
-
-lib:
-.ifdef LIBOBJ
- -rm -f $@
- ln -s ${LIBOBJ}/lib .
- [ -d ${LIBOBJ}/lib ] || mkdir ${LIBOBJ}/lib
-.else
- mkdir lib
-.endif
-
### find out what to use for libkern
KERN_AS= library
.include ${S}/lib/libkern/Makefile.inc
CVS commit: src/sys/arch/emips/stand
Module Name:src
Committed By: matt
Date: Wed Aug 21 07:22:27 UTC 2013
Modified Files:
src/sys/arch/emips/stand: Makefile.booters
Log Message:
Use bsd.klinks.mk
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/emips/stand/Makefile.booters
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/emips/stand/Makefile.booters
diff -u src/sys/arch/emips/stand/Makefile.booters:1.1 src/sys/arch/emips/stand/Makefile.booters:1.2
--- src/sys/arch/emips/stand/Makefile.booters:1.1 Wed Jan 26 01:18:53 2011
+++ src/sys/arch/emips/stand/Makefile.booters Wed Aug 21 07:22:26 2013
@@ -1,19 +1,10 @@
-# $NetBSD: Makefile.booters,v 1.1 2011/01/26 01:18:53 pooka Exp $
+# $NetBSD: Makefile.booters,v 1.2 2013/08/21 07:22:26 matt Exp $
.include bsd.sys.mk # for HOST_SH
# $S must correspond to the top of the 'sys' tree
S= ${.CURDIR}/../../../..
-.if !make(obj) !make(clean) !make(cleandir)
-.BEGIN:
- @[ -h machine ] || ln -s $S/arch/${MACHINE}/include machine
- @[ -h emips ] || ln -s $S/arch/${MACHINE}/include emips
- @[ -h mips ] || ln -s $S/arch/mips/include mips
-.NOPATH: machine emips mips
-.endif
-CLEANFILES+= machine emips mips
-
BINMODE?= 444
# XXX SHOULD NOT NEED TO DEFINE THESE!
@@ -109,7 +100,8 @@ vers.c: ${.CURDIR}/version
${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == yes :?:-D} \
-N ${.CURDIR}/version emips
-${PROG}: machine mips emips ${OBJS} ${LIBS}
+${PROG}: ${OBJS} ${LIBS}
+ ${_MKTARGET_LINK}
${LD} -Map ${PROG}.map -N -x -Ttext ${LOAD_ADDRESS} \
${LDBUG} -e start -o ${PROG}.elf ${OBJS} ${LIBS}
@${SIZE} ${PROG}.elf
@@ -121,6 +113,7 @@ ${PROG}: machine mips emips ${OBJS} ${LI
dd if=${PROG}.bin of=${PROG} bs=512 conv=sync
.include bsd.prog.mk
+.include bsd.klinks.mk
CLEANFILES+= ${PROG}.map
CVS commit: src/sys/arch/hpcmips/stand/lcboot
Module Name:src
Committed By: matt
Date: Wed Aug 21 07:27:01 UTC 2013
Modified Files:
src/sys/arch/hpcmips/stand/lcboot: Makefile
Log Message:
Use bsd.klinks.mk
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hpcmips/stand/lcboot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/stand/lcboot/Makefile
diff -u src/sys/arch/hpcmips/stand/lcboot/Makefile:1.11 src/sys/arch/hpcmips/stand/lcboot/Makefile:1.12
--- src/sys/arch/hpcmips/stand/lcboot/Makefile:1.11 Sat Jan 22 19:19:18 2011
+++ src/sys/arch/hpcmips/stand/lcboot/Makefile Wed Aug 21 07:27:01 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2011/01/22 19:19:18 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2013/08/21 07:27:01 matt Exp $
.include bsd.own.mk
ROMICE?= no
@@ -37,16 +37,6 @@ LD_SCRIPT= lcboot.ldscript
CPPFLAGS+= -DROMICE
.endif
-.if !make(obj) !make(clean) !make(cleandir)
-.BEGIN:
- @([ -h machine ] || ln -s ${S}/arch/${MACHINE}/include machine)
- @[ -h mips ] || ln -s ${S}/arch/mips/include mips
-.NOPATH: machine
-.endif
-CLEANFILES+= machine mips
-
-${OBJS}: machine mips
-
### find out what to use for libkern
.include ${S}/lib/libkern/Makefile.inc
LIBKERN= ${KERNLIB}
@@ -76,6 +66,7 @@ vers.c: ${VERSIONFILE}
CLEANFILES+= ${PROG}
${PROG}: ${OBJS} ${LIBKERN} ${LIBSA} ${LIBZ}
+ ${_MKTARGET_LINK}
${LD} -o ${PROG} -T ${LD_SCRIPT} ${OBJS} ${LIBLIST}
CLEANFILES+= ${SREC}
@@ -84,3 +75,4 @@ ${SREC}: ${PROG}
${OBJCOPY} -S -O srec ${PROG} ${SREC}
.include bsd.prog.mk
+.include bsd.klinks.mk
CVS commit: src/sys/arch/amiga/stand/bootblock
Module Name:src
Committed By: matt
Date: Wed Aug 21 08:04:50 UTC 2013
Modified Files:
src/sys/arch/amiga/stand/bootblock/boot: Makefile
src/sys/arch/amiga/stand/bootblock/bootxx_ffs: Makefile
Log Message:
Use bsd.klinks.mk
Use ${_MKTARGET_*}
Use correct arguments to ${AR}
Fix entry symbol.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/amiga/stand/bootblock/boot/Makefile
cvs rdiff -u -r1.19 -r1.20 \
src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/stand/bootblock/boot/Makefile
diff -u src/sys/arch/amiga/stand/bootblock/boot/Makefile:1.48 src/sys/arch/amiga/stand/bootblock/boot/Makefile:1.49
--- src/sys/arch/amiga/stand/bootblock/boot/Makefile:1.48 Thu Jul 18 12:15:15 2013
+++ src/sys/arch/amiga/stand/bootblock/boot/Makefile Wed Aug 21 08:04:50 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2013/07/18 12:15:15 joerg Exp $
+# $NetBSD: Makefile,v 1.49 2013/08/21 08:04:50 matt Exp $
.include bsd.own.mk
.include bsd.sys.mk # for HOST_SH
@@ -66,11 +66,12 @@ DEFS+= -DNETBSD_VERS='${NETBSD_VERS}'
### main target: ###
-realall: machine m68k ${FILES}
+realall: ${FILES}
-CLEANFILES += boot.amiga x.out xxstart.o libboot.a vers.c machine m68k
+CLEANFILES += boot.amiga x.out xxstart.o libboot.a vers.c
.include bsd.prog.mk
+.include bsd.klinks.mk
### special rules for bootblocks ###
@@ -93,47 +94,44 @@ CFLAGS+= -Wall -Wmissing-prototypes -Wst
COPTS.cread.c = -O1
.c.o:
+ ${_MKTARGET_COMPILE}
${CC} ${CFLAGS} ${COPTS.${.IMPSRC:T}} -S $ -o $*.s
${TXLT} $*.s | ${AS} ${AFLAGS} -o $@
rm $*.s
-.s.o: ; ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $
-
-.S.o: ; ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $
+.s.o:
+ ${_MKTARGET_COMPILE}
+ ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $
+
+.S.o:
+ ${_MKTARGET_COMPILE}
+ ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $
boot.amiga: x.out
+ ${_MKTARGET_CREATE}
${RELOC2BB} -S x.out $@ || (${NM} -u x.out false)
x.out: xxstart.o libboot.a ${LIBZ}
+ ${_MKTARGET_LINK}
${LD} ${LDFLAGS} -r -dc -e start -o $@ $
${SIZE} $@
${NM} -u $@
xxstart.o: ${.CURDIR}/bbstart.s
+ ${_MKTARGET_COMPILE}
${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp \
-o $@ -c $
libboot.a: ${OBJS}
- ${AR} r $@ $ ${RANLIB} $@
+ ${_MKTARGET_BUILD}
+ ${AR} crs $@ $ ${RANLIB} $@
vers.o: vers.c
vers.c: ${.CURDIR}/version
+ ${_MKTARGET_CREATE}
${HOST_SH} ${DIR_TOP}/conf/newvers_stand.sh \
${${MKREPRO} == yes :?:-D} -N ${.CURDIR}/version amiga
-.if !make(obj) !make(clean) !make(cleandir)
-.NOPATH: machine m68k
-.BEGIN: machine m68k
-
-machine:
- -rm -f $@
- ln -s ${DIR_TOP}/arch/amiga/include $@
-
-m68k:
- -rm -f $@
- ln -s ${DIR_TOP}/arch/m68k/include $@
-.endif
-
# make sure these are built:
${COBJS}: ${TXLT}
Index: src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile
diff -u src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile:1.19 src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile:1.20
--- src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile:1.19 Thu Jul 18 12:15:15 2013
+++ src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile Wed Aug 21 08:04:50 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2013/07/18 12:15:15 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2013/08/21 08:04:50 matt Exp $
### what we need:
@@ -39,11 +39,12 @@ DEFS = -D_STANDALONE -DSA_EXEC_ANYOWNER
### main target: ###
-realall: machine m68k ${FILES}
+realall: ${FILES}
-CLEANFILES += bootxx_ffs bootxx_fd x.out f.out xxstart.o fdstart.o libboot.a vers.c machine m68k
+CLEANFILES += bootxx_ffs bootxx_fd x.out f.out xxstart.o fdstart.o libboot.a vers.c
.include bsd.prog.mk
+.include bsd.klinks.mk
### special rules for bootblocks ###
@@ -65,58 +66,58 @@ DEFS+= -DNETBSD_VERS='${NETBSD_VERS}'
DEFS+= -D__daddr_t=int32_t
.c.o:
+ ${_MKTARGET_COMPILE}
${CC} ${CFLAGS} -S $ -o $*.s
${TXLT} $*.s | ${AS} ${AFLAGS} -o $*.o
rm $*.s
-.s.o: ; ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $
-
-.S.o: ; ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $
+.s.o:
+ ${_MKTARGET_COMPILE}
+ ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $
+
+.S.o:
+ ${_MKTARGET_COMPILE}
+ ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $
bootxx_ffs: x.out
+ ${_MKTARGET_CREATE}
${RELOC2BB} x.out $@ || (${NM} -u x.out false)
bootxx_fd: f.out
+ ${_MKTARGET_CREATE}
${RELOC2BB} -F f.out $@ || (${NM} -u f.out false)
x.out: xxstart.o libboot.a
- ${LD} ${LDFLAGS} -r -dc -e _start -o $@ $
+ ${_MKTARGET_LINK}
+ ${LD} ${LDFLAGS} -r -dc -e start -o $@ $
${SIZE} $@
${NM} -u $@
f.out: fdstart.o libboot.a
- ${LD} ${LDFLAGS} -r -dc -e _start -o $@ $
+ ${_MKTARGET_LINK}
+ ${LD} ${LDFLAGS} -r -dc -e start -o $@ $
${SIZE} $@
${NM} -u $@
xxstart.o:
CVS commit: src/sys/arch/i386/stand
Module Name:src
Committed By: matt
Date: Wed Aug 21 08:15:19 UTC 2013
Modified Files:
src/sys/arch/i386/stand: Makefile.booters
src/sys/arch/i386/stand/boot: Makefile.boot
src/sys/arch/i386/stand/bootxx: Makefile.bootxx
Log Message:
Use bsd.klinks.mk
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/i386/stand/Makefile.booters
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/i386/stand/boot/Makefile.boot
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/i386/stand/bootxx/Makefile.bootxx
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/Makefile.booters
diff -u src/sys/arch/i386/stand/Makefile.booters:1.86 src/sys/arch/i386/stand/Makefile.booters:1.87
--- src/sys/arch/i386/stand/Makefile.booters:1.86 Fri Aug 10 12:18:14 2012
+++ src/sys/arch/i386/stand/Makefile.booters Wed Aug 21 08:15:19 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.86 2012/08/10 12:18:14 joerg Exp $
+# $NetBSD: Makefile.booters,v 1.87 2013/08/21 08:15:19 matt Exp $
.include bsd.own.mk
@@ -49,18 +49,6 @@ KERNMISCMAKEFLAGS=LIBKERN_ARCH=i386
CLEANFILES+= ${STARTFILE} vers.c ${BASE}.list
SRCS+= vers.c
-CLEANFILES+= machine x86
-
-.if !make(obj) !make(clean) !make(cleandir)
-.BEGIN:
- -rm -f machine ln -s $S/arch/i386/include machine
- -rm -f x86 ln -s $S/arch/x86/include x86
-.ifdef LIBOBJ
- -rm -f lib ln -s ${LIBOBJ}/lib lib
- mkdir -p ${LIBOBJ}/lib
-.endif
-.endif
-
### find out what to use for libkern
KERN_AS= library
.include ${S}/lib/libkern/Makefile.inc
@@ -125,3 +113,4 @@ ${BASE}.bin: ${STARTFILE} ${OBJS} ${LIBS
${OBJCOPY} -O binary ${BASE}.sym ${BASE}.bin
.include bsd.prog.mk
+.include bsd.klinks.mk
Index: src/sys/arch/i386/stand/boot/Makefile.boot
diff -u src/sys/arch/i386/stand/boot/Makefile.boot:1.58 src/sys/arch/i386/stand/boot/Makefile.boot:1.59
--- src/sys/arch/i386/stand/boot/Makefile.boot:1.58 Fri Aug 10 12:18:15 2012
+++ src/sys/arch/i386/stand/boot/Makefile.boot Wed Aug 21 08:15:19 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.58 2012/08/10 12:18:15 joerg Exp $
+# $NetBSD: Makefile.boot,v 1.59 2013/08/21 08:15:19 matt Exp $
S= ${.CURDIR}/../../../../..
@@ -91,18 +91,6 @@ CPPFLAGS+= -Wno-pointer-sign
I386_STAND_DIR?= $S/arch/i386/stand
-CLEANFILES+= machine x86
-
-.if !make(obj) !make(clean) !make(cleandir)
-.BEGIN:
- -rm -f machine ln -s $S/arch/i386/include machine
- -rm -f x86 ln -s $S/arch/x86/include x86
-.ifdef LIBOBJ
- -rm -f lib ln -s ${LIBOBJ}/lib lib
- mkdir -p ${LIBOBJ}/lib
-.endif
-.endif
-
### find out what to use for libi386
I386DIR= ${I386_STAND_DIR}/lib
.include ${I386DIR}/Makefile.inc
@@ -165,3 +153,4 @@ ${PROG}: ${OBJS} ${LIBLIST} ${.CURDIR}/.
${OBJCOPY} -O binary ${PROG}.syms ${PROG}
.include bsd.prog.mk
+.include bsd.klinks.mk
Index: src/sys/arch/i386/stand/bootxx/Makefile.bootxx
diff -u src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.43 src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.44
--- src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.43 Fri Aug 10 12:18:15 2012
+++ src/sys/arch/i386/stand/bootxx/Makefile.bootxx Wed Aug 21 08:15:19 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootxx,v 1.43 2012/08/10 12:18:15 joerg Exp $
+# $NetBSD: Makefile.bootxx,v 1.44 2013/08/21 08:15:19 matt Exp $
S= ${.CURDIR}/../../../../..
@@ -93,18 +93,6 @@ CPPFLAGS+= -DLIBSA_SINGLE_FILESYSTEM=xxf
I386_STAND_DIR?= $S/arch/i386/stand
-CLEANFILES+= machine x86
-
-.if !make(obj) !make(clean) !make(cleandir)
-.BEGIN:
- -rm -f machine ln -s $S/arch/i386/include machine
- -rm -f x86 ln -s $S/arch/x86/include x86
-.ifdef LIBOBJ
- -rm -f lib ln -s ${LIBOBJ}/lib lib
- mkdir -p ${LIBOBJ}/lib
-.endif
-.endif
-
### find out what to use for libi386
I386DIR= ${I386_STAND_DIR}/lib
.include ${I386DIR}/Makefile.inc
@@ -150,3 +138,4 @@ ${PROG}: ${OBJS} ${LIBLIST}
fi
.include bsd.prog.mk
+.include bsd.klinks.mk
CVS commit: src/sys/arch/x68k/stand/loadbsd
Module Name:src
Committed By: matt
Date: Wed Aug 21 08:17:34 UTC 2013
Modified Files:
src/sys/arch/x68k/stand/loadbsd: Makefile
Log Message:
Use bsd.klinks.mk
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/x68k/stand/loadbsd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x68k/stand/loadbsd/Makefile
diff -u src/sys/arch/x68k/stand/loadbsd/Makefile:1.15 src/sys/arch/x68k/stand/loadbsd/Makefile:1.16
--- src/sys/arch/x68k/stand/loadbsd/Makefile:1.15 Mon Aug 12 16:34:05 2013
+++ src/sys/arch/x68k/stand/loadbsd/Makefile Wed Aug 21 08:17:34 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2013/08/12 16:34:05 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2013/08/21 08:17:34 matt Exp $
S= ${.CURDIR}/../../../..
@@ -14,6 +14,7 @@ BINDIR= /usr/mdec
.PATH: ${.CURDIR}/../common
.include bsd.own.mk
+.include bsd.klinks.mk
AOUT2HUXDIR!= cd ${.CURDIR}/../aout2hux ${PRINTOBJDIR}
AOUT2HUX= ${AOUT2HUXDIR}/aout2hux
@@ -31,13 +32,6 @@ LDLIBS= -L${LIBDOS} -ldos -L${LIBIOCS}
DPADD+= ${AOUT2HUX}
CLEANFILES+= ${BASE}1 ${BASE}2
-CLEANFILES+= machine m68k
-
-.if !make(obj) !make(clean) !make(cleandir)
-.BEGIN:
- rm -f machine ln -s $S/arch/x68k/include machine
- rm -f m68k ln -s $S/arch/m68k/include m68k
-.endif
${PROG}: ${BASE}1 ${BASE}2
${_MKTARGET_LINK}
CVS commit: src/sys/lib/libkern/arch/arm
Module Name:src Committed By: matt Date: Wed Aug 21 08:30:18 UTC 2013 Modified Files: src/sys/lib/libkern/arch/arm: clzsi2.S Log Message: Thumbify To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/lib/libkern/arch/arm/clzsi2.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/lib/libkern/arch/arm/clzsi2.S diff -u src/sys/lib/libkern/arch/arm/clzsi2.S:1.5 src/sys/lib/libkern/arch/arm/clzsi2.S:1.6 --- src/sys/lib/libkern/arch/arm/clzsi2.S:1.5 Sun Aug 11 04:58:01 2013 +++ src/sys/lib/libkern/arch/arm/clzsi2.S Wed Aug 21 08:30:18 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: clzsi2.S,v 1.5 2013/08/11 04:58:01 matt Exp $ */ +/* $NetBSD: clzsi2.S,v 1.6 2013/08/21 08:30:18 matt Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. * All rights reserved. @@ -30,7 +30,6 @@ #include machine/asm.h .text -ENTRY(__clzdi2) #ifdef __ARMEB__ #define HI r0 #define LO r1 @@ -39,22 +38,26 @@ ENTRY(__clzdi2) #define LO r0 #endif #if defined(_ARM_ARCH_5) -#ifdef __thumb__ - cmp HI, #0 - beq 1f +#if defined(__thumb__) defined(_ARM_ARCH_T2) +ENTRY(__clzdi2) + cbz HI, 1f clz r0, HI /* count leading zeros in high word */ RET 1: clz r0, LO /* yes, count in low word */ - add r0, r0, #32 /* and add the bits in the high word */ + adds r0, r0, #32 /* and add the bits in the high word */ RET +END(__clzdi2) #else +ARM_ENTRY(__clzdi2) teq HI, #0 /* high word all zero? */ clzne r0, HI /* count leading zeros in high word */ clzeq r0, LO /* yes, count in low word */ addeq r0, r0, #32 /* and add the bits in the high word */ RET +END(__clzdi2) #endif #else +ARM_ENTRY(__clzdi2) movs r3, HI movne r0, #31 bne .L_clz @@ -63,14 +66,20 @@ ENTRY(__clzdi2) bne .L_clz mov r0, #64 RET -#endif END(__clzdi2) +#endif -ENTRY(__clzsi2) #if defined(_ARM_ARCH_5) +#if defined(_ARM_ARCH_7) +ENTRY(__clzsi2) +#else +ARM_ENTRY(__clzsi2) +#endif clz r0, r0 RET +END(__clzsi2) #else +ARM_ENTRY(__clzsi2) movs r3, r0 moveq r0, #32 RETc(eq) @@ -115,5 +124,5 @@ ENTRY(__clzsi2) #endif #endif /* __OPTIMIZE_SIZE__ */ RET -#endif /* _ARM_ARCH_5 */ END(__clzsi2) +#endif /* _ARM_ARCH_5 */
CVS commit: src/sys/lib/libsa
Module Name:src
Committed By: matt
Date: Wed Aug 21 08:30:50 UTC 2013
Modified Files:
src/sys/lib/libsa: Makefile
Log Message:
Use LIBISPRIVATE?= yes
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/lib/libsa/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libsa/Makefile
diff -u src/sys/lib/libsa/Makefile:1.78 src/sys/lib/libsa/Makefile:1.79
--- src/sys/lib/libsa/Makefile:1.78 Fri Aug 10 16:05:27 2012
+++ src/sys/lib/libsa/Makefile Wed Aug 21 08:30:50 2013
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.78 2012/08/10 16:05:27 joerg Exp $
+# $NetBSD: Makefile,v 1.79 2013/08/21 08:30:50 matt Exp $
LIB= sa
-NOPIC= # defined
-NOPROFILE=# defined
+LIBISPRIVATE?= yes
SA_USE_CREAD?= no # Read compressed kernels
SA_INCLUDE_NET?= yes # Netboot via TFTP, NFS
@@ -80,10 +79,6 @@ SRCS+= fnmatch.c
# for historic compatibility ufs == ffsv1
SRCS+= ufs.c
-# only needed during build
-libinstall::
-
-.undef DESTDIR
.include bsd.lib.mk
lib${LIB}.o:: ${OBJS}
CVS commit: src/lib/libm/src
Module Name:src Committed By: martin Date: Wed Aug 21 13:03:56 UTC 2013 Modified Files: src/lib/libm/src: s_nexttoward.c Log Message: Add support for archs with LDBL_IMPLICIT_NBIT To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libm/src/s_nexttoward.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libm/src/s_nexttoward.c diff -u src/lib/libm/src/s_nexttoward.c:1.1 src/lib/libm/src/s_nexttoward.c:1.2 --- src/lib/libm/src/s_nexttoward.c:1.1 Wed Sep 15 16:12:05 2010 +++ src/lib/libm/src/s_nexttoward.c Wed Aug 21 13:03:56 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: s_nexttoward.c,v 1.1 2010/09/15 16:12:05 christos Exp $ */ +/* $NetBSD: s_nexttoward.c,v 1.2 2013/08/21 13:03:56 martin Exp $ */ /* @(#)s_nextafter.c 5.1 93/09/24 */ /* @@ -13,7 +13,7 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: s_nexttoward.c,v 1.1 2010/09/15 16:12:05 christos Exp $); +__RCSID($NetBSD: s_nexttoward.c,v 1.2 2013/08/21 13:03:56 martin Exp $); /* * We assume that a long double has a 15-bit exponent. On systems @@ -30,6 +30,10 @@ __RCSID($NetBSD: s_nexttoward.c,v 1.1 2 #error Unsupported long double format #endif +#ifdef LDBL_IMPLICIT_NBIT +#define LDBL_NBIT 0 +#endif + /* * The nexttoward() function is equivalent to nextafter() function, * except that the second parameter shall have type long double and
CVS commit: src/lib/libm
Module Name:src
Committed By: martin
Date: Wed Aug 21 13:06:01 UTC 2013
Modified Files:
src/lib/libm: Makefile
Log Message:
Add nexttoward, nearbyint and rintl for sparc64
To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 src/lib/libm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.139 src/lib/libm/Makefile:1.140
--- src/lib/libm/Makefile:1.139 Thu Jun 20 19:49:47 2013
+++ src/lib/libm/Makefile Wed Aug 21 13:06:00 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.139 2013/06/20 19:49:47 christos Exp $
+# $NetBSD: Makefile,v 1.140 2013/08/21 13:06:00 martin Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -66,7 +66,8 @@ COMMON_SRCS+= fenv.c
COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
.elif (${MACHINE_ARCH} == sparc64)
.PATH: ${.CURDIR}/arch/sparc64
-COMMON_SRCS+= fenv.c
+COMMON_SRCS+= fenv.c s_nexttoward.c s_nexttowardf.c \
+ s_nearbyint.c s_rintl.c
COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
.elif ((${MACHINE_ARCH} == i386) || (${MACHINE_ARCH} == x86_64))
CVS commit: src/lib/libm/src
Module Name:src
Committed By: martin
Date: Wed Aug 21 13:04:44 UTC 2013
Modified Files:
src/lib/libm/src: s_rintl.c
Log Message:
Add support for the long double format used on sparc64
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libm/src/s_rintl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/src/s_rintl.c
diff -u src/lib/libm/src/s_rintl.c:1.4 src/lib/libm/src/s_rintl.c:1.5
--- src/lib/libm/src/s_rintl.c:1.4 Mon Feb 11 02:45:27 2013
+++ src/lib/libm/src/s_rintl.c Wed Aug 21 13:04:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: s_rintl.c,v 1.4 2013/02/11 02:45:27 christos Exp $ */
+/* $NetBSD: s_rintl.c,v 1.5 2013/08/21 13:04:44 martin Exp $ */
/*-
* Copyright (c) 2008 David Schultz d...@freebsd.org
@@ -30,7 +30,7 @@
#if 0
__FBSDID($FreeBSD: src/lib/msun/src/s_rintl.c,v 1.5 2008/02/22 11:59:05 bde Exp $);
#else
-__RCSID($NetBSD: s_rintl.c,v 1.4 2013/02/11 02:45:27 christos Exp $);
+__RCSID($NetBSD: s_rintl.c,v 1.5 2013/08/21 13:04:44 martin Exp $);
#endif
#include float.h
@@ -46,6 +46,8 @@ shift[2] = {
0x1.0p63, -0x1.0p63
#elif EXT_FRACBITS == 113
0x1.0p112, -0x1.0p112
+#elif EXT_FRACBITS == 112
+ 0x1.0p111, -0x1.0p111
#else
#error Unsupported long double format
#endif
CVS commit: src/sys/arch/i386/stand
Module Name:src
Committed By: matt
Date: Wed Aug 21 15:24:27 UTC 2013
Modified Files:
src/sys/arch/i386/stand: Makefile.booters
Log Message:
Set KLINK_MACHINE
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/i386/stand/Makefile.booters
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/Makefile.booters
diff -u src/sys/arch/i386/stand/Makefile.booters:1.87 src/sys/arch/i386/stand/Makefile.booters:1.88
--- src/sys/arch/i386/stand/Makefile.booters:1.87 Wed Aug 21 08:15:19 2013
+++ src/sys/arch/i386/stand/Makefile.booters Wed Aug 21 15:24:27 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.87 2013/08/21 08:15:19 matt Exp $
+# $NetBSD: Makefile.booters,v 1.88 2013/08/21 15:24:27 matt Exp $
.include bsd.own.mk
@@ -113,4 +113,5 @@ ${BASE}.bin: ${STARTFILE} ${OBJS} ${LIBS
${OBJCOPY} -O binary ${BASE}.sym ${BASE}.bin
.include bsd.prog.mk
+KLINK_MACHINE= i386
.include bsd.klinks.mk
CVS commit: src/share/mk
Module Name:src
Committed By: matt
Date: Wed Aug 21 15:26:44 UTC 2013
Modified Files:
src/share/mk: bsd.klinks.mk
Log Message:
Change rule for x86 link to not be x86 dependent
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/share/mk/bsd.klinks.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.klinks.mk
diff -u src/share/mk/bsd.klinks.mk:1.10 src/share/mk/bsd.klinks.mk:1.11
--- src/share/mk/bsd.klinks.mk:1.10 Thu May 2 04:14:28 2013
+++ src/share/mk/bsd.klinks.mk Wed Aug 21 15:26:44 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.klinks.mk,v 1.10 2013/05/02 04:14:28 matt Exp $
+# $NetBSD: bsd.klinks.mk,v 1.11 2013/08/21 15:26:44 matt Exp $
#
.include bsd.own.mk
@@ -59,12 +59,10 @@ CLEANFILES+= x86
ln -s $S/arch/sparc/include sparc
.endif
.if ${KLINK_MACHINE} == amd64
- @rm -f x86 \
- ln -s $S/arch/x86/include x86
@rm -f i386 \
ln -s $S/arch/i386/include i386
.endif
-.if ${MACHINE_CPU} == i386
+.if ${MACHINE_CPU} == i386 || ${MACHINE_CPU} == x86_64
@rm -f x86 \
ln -s $S/arch/x86/include x86
.endif
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: christos
Date: Wed Aug 21 16:37:31 UTC 2013
Modified Files:
src/sys/arch/x86/x86: mpbios.c
Log Message:
Use the default mp definition tables for ancient machines. From Felix
Deichmann.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/x86/x86/mpbios.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/mpbios.c
diff -u src/sys/arch/x86/x86/mpbios.c:1.60 src/sys/arch/x86/x86/mpbios.c:1.61
--- src/sys/arch/x86/x86/mpbios.c:1.60 Tue Nov 27 15:32:58 2012
+++ src/sys/arch/x86/x86/mpbios.c Wed Aug 21 12:37:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mpbios.c,v 1.60 2012/11/27 20:32:58 jakllsch Exp $ */
+/* $NetBSD: mpbios.c,v 1.61 2013/08/21 16:37:31 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mpbios.c,v 1.60 2012/11/27 20:32:58 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: mpbios.c,v 1.61 2013/08/21 16:37:31 christos Exp $);
#include acpica.h
#include lapic.h
@@ -147,10 +147,6 @@ int mpbios_nioapic;
#include locators.h
-static struct mpbios_ioapic default_ioapic = {
-2,0,1,IOAPICENTRY_FLAG_EN,(uint32_t)IOAPIC_BASE_DEFAULT
-};
-
/* descriptions of MP basetable entries */
struct mpbios_baseentry {
uint8_t type;
@@ -174,6 +170,11 @@ struct mp_map
int psize;
};
+struct dflt_conf_entry {
+ const char *bus_type[2];
+ int flags;
+};
+
int mp_cpuprint(void *, const char *);
int mp_ioapicprint(void *, const char *);
static const void *mpbios_search(device_t, paddr_t, int,
@@ -194,7 +195,12 @@ static void mp_cfg_eisa_intr(const struc
static void mp_cfg_isa_intr(const struct mpbios_int *, uint32_t *);
static void mp_print_isa_intr(int intr);
-static void mpbios_cpus(device_t);
+static void mpbios_dflt_conf_cpu(device_t);
+static void mpbios_dflt_conf_bus(device_t, const struct dflt_conf_entry *);
+static void mpbios_dflt_conf_ioapic(device_t);
+static void mpbios_dflt_conf_int(device_t, const struct dflt_conf_entry *,
+ const int *);
+
static void mpbios_cpu(const uint8_t *, device_t);
static void mpbios_bus(const uint8_t *, device_t);
static void mpbios_ioapic(const uint8_t *, device_t);
@@ -342,8 +348,6 @@ mpbios_probe(device_t self)
goto err;
}
- aprint_normal_dev(self, MP default configuration %d\n,
- mp_fps-mpfb1);
return 10;
}
@@ -476,6 +480,55 @@ static struct mp_bus nmi_bus = {
NULL, 0, 0, NULL, 0
};
+/*
+ * MP default configuration tables (acc. MP Specification Version 1.4)
+ */
+
+/*
+ * Default configurations always feature two processors and the local APIC IDs
+ * are assigned consecutively by hardware starting from zero (sec. 5). We set
+ * I/O APIC ID to 2.
+ */
+#define DFLT_IOAPIC_ID 2
+
+#define ELCR_INV 0x1
+#define MCA_INV 0x2
+#define IRQ_VAR 0x4
+#define INTIN0_NC 0x8
+
+static const struct dflt_conf_entry dflt_conf_tab[7] = {
+ /*
+ * Assume all systems with EISA and (modern) PCI chipsets have ELCRs
+ * (to control external interrupt-level inverters). MCA systems must
+ * use fixed inverters for INTIN1-INTIN15 (table 5-1; sec. 5.3.2).
+ */
+ {{ISA , NULL}, 0 }, /* default config 1 */
+ {{EISA , NULL}, ELCR_INV | IRQ_VAR }, /* default config 2 */
+ {{EISA , NULL}, ELCR_INV }, /* default config 3 */
+ {{MCA , NULL}, MCA_INV}, /* default config 4 */
+ {{ISA , PCI }, ELCR_INV }, /* default config 5 */
+ {{EISA , PCI }, ELCR_INV }, /* default config 6 */
+ {{MCA , PCI }, MCA_INV | INTIN0_NC} /* default config 7 */
+};
+
+#define _ (-1) /* INTINx not connected (to a bus interrupt) */
+
+static const int dflt_bus_irq_tab[2][16] = {
+ /* Default configs 1,3-7 connect INTIN1-INTIN15 to bus interrupts. */
+ {_, 1, 0, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15},
+ /*
+ * Default config 2 connects neither timer IRQ0 nor DMA chaining to
+ * INTIN2 and INTIN13 (sec. 5.3).
+ */
+ {_, 1, _, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, _, 14, 15}
+};
+
+#undef _
+
+static const uint8_t dflt_lint_tab[2] = {
+ MPS_INTTYPE_ExtINT, MPS_INTTYPE_NMI
+};
+
/*
* 1st pass on BIOS's Intel MP specification table.
@@ -495,10 +548,13 @@ void
mpbios_scan(device_t self, int *ncpup)
{
const uint8_t *position, *end;
+ size_t i;
int count;
int type;
int intr_cnt, cur_intr;
paddr_t lapic_base;
+ const struct dflt_conf_entry *dflt_conf;
+ const int *dflt_bus_irq;
const struct mpbios_int *iep;
struct mpbios_int ie;
@@ -538,30 +594,65 @@ mpbios_scan(device_t self, int *ncpup)
/* check for use of 'default' configuration */
if (mp_fps-mpfb1 != 0) {
+ if (mp_fps-mpfb1 __arraycount(dflt_conf_tab))
+ panic(Unsupported MP default configuration %d\n,
+ mp_fps-mpfb1);
+
aprint_normal(\n);
aprint_normal_dev(self, MP
CVS commit: src/sys/arch/i386/stand/boot
Module Name:src
Committed By: matt
Date: Wed Aug 21 17:15:26 UTC 2013
Modified Files:
src/sys/arch/i386/stand/boot: Makefile.boot
Log Message:
Add KLINK_MACHINE= i386
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/i386/stand/boot/Makefile.boot
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/boot/Makefile.boot
diff -u src/sys/arch/i386/stand/boot/Makefile.boot:1.59 src/sys/arch/i386/stand/boot/Makefile.boot:1.60
--- src/sys/arch/i386/stand/boot/Makefile.boot:1.59 Wed Aug 21 08:15:19 2013
+++ src/sys/arch/i386/stand/boot/Makefile.boot Wed Aug 21 17:15:26 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.59 2013/08/21 08:15:19 matt Exp $
+# $NetBSD: Makefile.boot,v 1.60 2013/08/21 17:15:26 matt Exp $
S= ${.CURDIR}/../../../../..
@@ -153,4 +153,5 @@ ${PROG}: ${OBJS} ${LIBLIST} ${.CURDIR}/.
${OBJCOPY} -O binary ${PROG}.syms ${PROG}
.include bsd.prog.mk
+KLINK_MACHINE= i386
.include bsd.klinks.mk
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jakllsch
Date: Wed Aug 21 17:25:58 UTC 2013
Modified Files:
src/sys/dev/usb: usb.h
Log Message:
Add UDESC_SSHUB and UDPROTO_SSHUB constants from USB 3.0.
To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/sys/dev/usb/usb.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usb.h
diff -u src/sys/dev/usb/usb.h:1.103 src/sys/dev/usb/usb.h:1.104
--- src/sys/dev/usb/usb.h:1.103 Fri Apr 5 09:20:51 2013
+++ src/sys/dev/usb/usb.h Wed Aug 21 17:25:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.h,v 1.103 2013/04/05 09:20:51 skrll Exp $ */
+/* $NetBSD: usb.h,v 1.104 2013/08/21 17:25:58 jakllsch Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb.h,v 1.14 1999/11/17 22:33:46 n_hibma Exp $ */
/*
@@ -245,6 +245,7 @@ typedef struct {
#define UDESC_CS_INTERFACE 0x24
#define UDESC_CS_ENDPOINT 0x25
#define UDESC_HUB 0x29
+#define UDESC_SSHUB 0x2a
#define UR_SET_DESCRIPTOR 0x07
#define UR_GET_CONFIG 0x08
#define UR_SET_CONFIG 0x09
@@ -513,6 +514,7 @@ typedef struct {
#define UDPROTO_FSHUB 0x00
#define UDPROTO_HSHUBSTT 0x01
#define UDPROTO_HSHUBMTT 0x02
+#define UDPROTO_SSHUB 0x03
#define UDCLASS_DIAGNOSTIC 0xdc
#define UDCLASS_WIRELESS 0xe0
#define UDSUBCLASS_RF 0x01
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jakllsch
Date: Wed Aug 21 17:52:10 UTC 2013
Modified Files:
src/sys/dev/usb: ehci.c
Log Message:
swap positions of ehci_root_ctrl_done and ehci_root_intr_done so that they
are grouped with their respective transfer types
To generate a diff of this commit:
cvs rdiff -u -r1.207 -r1.208 src/sys/dev/usb/ehci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.207 src/sys/dev/usb/ehci.c:1.208
--- src/sys/dev/usb/ehci.c:1.207 Tue Jun 25 15:32:23 2013
+++ src/sys/dev/usb/ehci.c Wed Aug 21 17:52:10 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.207 2013/06/25 15:32:23 jakllsch Exp $ */
+/* $NetBSD: ehci.c,v 1.208 2013/08/21 17:52:10 jakllsch Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.207 2013/06/25 15:32:23 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.208 2013/08/21 17:52:10 jakllsch Exp $);
#include ohci.h
#include uhci.h
@@ -2544,7 +2544,7 @@ ehci_root_ctrl_close(usbd_pipe_handle pi
}
Static void
-ehci_root_intr_done(usbd_xfer_handle xfer)
+ehci_root_ctrl_done(usbd_xfer_handle xfer)
{
xfer-hcpriv = NULL;
}
@@ -2613,7 +2613,7 @@ ehci_root_intr_close(usbd_pipe_handle pi
}
Static void
-ehci_root_ctrl_done(usbd_xfer_handle xfer)
+ehci_root_intr_done(usbd_xfer_handle xfer)
{
xfer-hcpriv = NULL;
}
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jakllsch
Date: Wed Aug 21 17:59:40 UTC 2013
Modified Files:
src/sys/dev/usb: usb.c usb_subr.c
Log Message:
Use NULL instead of 0 as appropriate.
To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.190 -r1.191 src/sys/dev/usb/usb_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.140 src/sys/dev/usb/usb.c:1.141
--- src/sys/dev/usb/usb.c:1.140 Tue Jan 22 12:40:43 2013
+++ src/sys/dev/usb/usb.c Wed Aug 21 17:59:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.140 2013/01/22 12:40:43 jmcneill Exp $ */
+/* $NetBSD: usb.c,v 1.141 2013/08/21 17:59:40 jakllsch Exp $ */
/*
* Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: usb.c,v 1.140 2013/01/22 12:40:43 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: usb.c,v 1.141 2013/08/21 17:59:40 jakllsch Exp $);
#ifdef _KERNEL_OPT
#include opt_compat_netbsd.h
@@ -660,7 +660,7 @@ usbioctl(dev_t devt, u_long cmd, void *d
if (len 0 || len 32768)
return (EINVAL);
if (addr 0 || addr = USB_MAX_DEVICES ||
- sc-sc_bus-devices[addr] == 0)
+ sc-sc_bus-devices[addr] == NULL)
return (EINVAL);
if (len != 0) {
iov.iov_base = (void *)ur-ucr_data;
Index: src/sys/dev/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.190 src/sys/dev/usb/usb_subr.c:1.191
--- src/sys/dev/usb/usb_subr.c:1.190 Wed Mar 20 11:14:51 2013
+++ src/sys/dev/usb/usb_subr.c Wed Aug 21 17:59:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_subr.c,v 1.190 2013/03/20 11:14:51 skrll Exp $ */
+/* $NetBSD: usb_subr.c,v 1.191 2013/08/21 17:59:40 jakllsch Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: usb_subr.c,v 1.190 2013/03/20 11:14:51 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: usb_subr.c,v 1.191 2013/08/21 17:59:40 jakllsch Exp $);
#ifdef _KERNEL_OPT
#include opt_compat_netbsd.h
@@ -801,7 +801,7 @@ usbd_getnewaddr(usbd_bus_handle bus)
int addr;
for (addr = 1; addr USB_MAX_DEVICES; addr++)
- if (bus-devices[addr] == 0)
+ if (bus-devices[addr] == NULL)
return (addr);
return (-1);
}
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jakllsch Date: Wed Aug 21 18:08:29 UTC 2013 Modified Files: src/sys/dev/pci: files.pci Log Message: We already have a config rule for the eventual core of xhci(4); may as well have the PCI attachment rule as well. To generate a diff of this commit: cvs rdiff -u -r1.365 -r1.366 src/sys/dev/pci/files.pci Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/files.pci diff -u src/sys/dev/pci/files.pci:1.365 src/sys/dev/pci/files.pci:1.366 --- src/sys/dev/pci/files.pci:1.365 Mon Jul 22 13:44:59 2013 +++ src/sys/dev/pci/files.pci Wed Aug 21 18:08:29 2013 @@ -1,4 +1,4 @@ -# $NetBSD: files.pci,v 1.365 2013/07/22 13:44:59 soren Exp $ +# $NetBSD: files.pci,v 1.366 2013/08/21 18:08:29 jakllsch Exp $ # # Config file and device description for machine-independent PCI code. # Included by ports that need it. Requires that the SCSI files be @@ -630,6 +630,10 @@ file dev/pci/ehci_pci.c ehci_pci file dev/pci/usb_pci.c ehci_pci | ehci_cardbus +# xHCI USB controller +attach xhci at pci with xhci_pci +file dev/pci/xhci_pci.c xhci_pci + # OHCI IEEE 1394 controller attach fwohci at pci with fwohci_pci file dev/pci/fwohci_pci.c fwohci_pci
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jakllsch
Date: Wed Aug 21 18:11:31 UTC 2013
Modified Files:
src/sys/dev/usb: usb.c
Log Message:
Use usbd_errstr instead of printing non-errno(2) error code.
To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 src/sys/dev/usb/usb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.141 src/sys/dev/usb/usb.c:1.142
--- src/sys/dev/usb/usb.c:1.141 Wed Aug 21 17:59:40 2013
+++ src/sys/dev/usb/usb.c Wed Aug 21 18:11:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.141 2013/08/21 17:59:40 jakllsch Exp $ */
+/* $NetBSD: usb.c,v 1.142 2013/08/21 18:11:31 jakllsch Exp $ */
/*
* Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: usb.c,v 1.141 2013/08/21 17:59:40 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: usb.c,v 1.142 2013/08/21 18:11:31 jakllsch Exp $);
#ifdef _KERNEL_OPT
#include opt_compat_netbsd.h
@@ -312,8 +312,8 @@ usb_doattach(device_t self)
dev-hub-explore(sc-sc_bus-root_hub);
#endif
} else {
- aprint_error(%s: root hub problem, error=%d\n,
- device_xname(self), err);
+ aprint_error(%s: root hub problem, error=%s\n,
+ device_xname(self), usbd_errstr(err));
sc-sc_dying = 1;
}
CVS commit: src/doc
Module Name:src Committed By: tron Date: Wed Aug 21 19:48:35 UTC 2013 Modified Files: src/doc: 3RDPARTY Log Message: Postfix 2.9.7 and 2.10.1 are out. To generate a diff of this commit: cvs rdiff -u -r1.1049 -r1.1050 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1049 src/doc/3RDPARTY:1.1050 --- src/doc/3RDPARTY:1.1049 Fri Aug 9 23:38:54 2013 +++ src/doc/3RDPARTY Wed Aug 21 19:48:35 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1049 2013/08/09 23:38:54 lukem Exp $ +# $NetBSD: 3RDPARTY,v 1.1050 2013/08/21 19:48:35 tron Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1052,7 +1052,7 @@ now to do a new import. Package: Postfix Version: 2.9.5 -Current Vers: 2.10.0/2.9.5 +Current Vers: 2.10.1/2.9.7 Maintainer: Wietse Venema wie...@porcupine.org Archive Site: ftp://postfix.cloud9.net/official/ Home Page: http://www.postfix.org/
CVS commit: src/external/ibm-public/postfix/dist
Module Name:src Committed By: tron Date: Wed Aug 21 20:12:31 UTC 2013 Modified Files: src/external/ibm-public/postfix/dist/README_FILES: TLS_README src/external/ibm-public/postfix/dist/html: TLS_README.html postconf.5.html src/external/ibm-public/postfix/dist/man/man5: postconf.5 src/external/ibm-public/postfix/dist/proto: TLS_README.html postconf.proto src/external/ibm-public/postfix/dist/src/global: mail_params.h src/external/ibm-public/postfix/dist/src/tls: tls_client.c Log Message: esolve conflicts from last import. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/external/ibm-public/postfix/dist/README_FILES/TLS_README cvs rdiff -u -r1.7 -r1.8 \ src/external/ibm-public/postfix/dist/html/TLS_README.html cvs rdiff -u -r1.10 -r1.11 \ src/external/ibm-public/postfix/dist/html/postconf.5.html cvs rdiff -u -r1.10 -r1.11 \ src/external/ibm-public/postfix/dist/man/man5/postconf.5 cvs rdiff -u -r1.6 -r1.7 \ src/external/ibm-public/postfix/dist/proto/TLS_README.html cvs rdiff -u -r1.10 -r1.11 \ src/external/ibm-public/postfix/dist/proto/postconf.proto cvs rdiff -u -r1.9 -r1.10 \ src/external/ibm-public/postfix/dist/src/global/mail_params.h cvs rdiff -u -r1.6 -r1.7 \ src/external/ibm-public/postfix/dist/src/tls/tls_client.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/ibm-public/postfix/dist/README_FILES/TLS_README diff -u src/external/ibm-public/postfix/dist/README_FILES/TLS_README:1.6 src/external/ibm-public/postfix/dist/README_FILES/TLS_README:1.7 --- src/external/ibm-public/postfix/dist/README_FILES/TLS_README:1.6 Wed Jan 2 19:18:30 2013 +++ src/external/ibm-public/postfix/dist/README_FILES/TLS_README Wed Aug 21 20:12:30 2013 @@ -462,6 +462,34 @@ host: /etc/postfix/relay_clientcerts: D7:04:2F:A7:0B:8C:A5:21:FA:31:77:E1:41:8A:EE:80 lutzpc.at.home +To extract the public key fingerprint from an X.509 certificate, you need to +extract the public key from the certificate and compute the appropriate digest +of its DER (ASN.1) encoding. With OpenSSL the -pubkey option of the x509 +command extracts the public key always in PEM format. We pipe the result to +another OpenSSL command that converts the key to DER and then to the dgst +command to compute the fingerprint. + +The actual command to transform the key to DER format depends on the version of +OpenSSL used. With OpenSSL 1.0.0 and later, the pkey command supports all key +types. With OpenSSL 0.9.8 and earlier, the key type is always RSA (nobody uses +DSA, and EC keys are not fully supported by 0.9.8), so the rsa command is +used. + +# OpenSSL 1.0 with all certificates and SHA-1 fingerprints. +$ openssl x509 -in cert.pem -noout -pubkey | +openssl pkey -pubin -outform DER | +openssl dgst -sha1 -c +(stdin)= 64:3f:1f:f6:e5:1e:d4:2a:56:8b:fc:09:1a:61:98:b5:bc:7c:60:58 + +# OpenSSL 0.9.8 with RSA certificates and MD5 fingerprints. +$ openssl x509 -in cert.pem -noout -pubkey | +openssl rsa -pubin -outform DER | +openssl dgst -md5 -c +(stdin)= f4:62:60:f6:12:8f:d5:8d:28:4d:13:a7:db:b2:ff:50 + +Note: Postfix 2.9.0-2.9.5 computed the public key fingerprint incorrectly. To +use public-key fingerprints, upgrade to Postfix 2.9.6 or later. + SSeerrvveerr--ssiiddee cciipphheerr ccoonnttrroollss The Postfix SMTP server supports 5 distinct cipher security levels as specified @@ -823,6 +851,34 @@ the example above, we show two matching match=3D:95:34:51:24:66:33:B9:D2:40:99:C0:C1:17:0B:D1 match=EC:3B:2D:B0:5B:B1:FB:6D:20:A3:9D:72:F6:8D:12:35 +To extract the public key fingerprint from an X.509 certificate, you need to +extract the public key from the certificate and compute the appropriate digest +of its DER (ASN.1) encoding. With OpenSSL the -pubkey option of the x509 +command extracts the public key always in PEM format. We pipe the result to +another OpenSSL command that converts the key to DER and then to the dgst +command to compute the fingerprint. + +The actual command to transform the key to DER format depends on the version of +OpenSSL used. With OpenSSL 1.0.0 and later, the pkey command supports all key +types. With OpenSSL 0.9.8 and earlier, the key type is always RSA (nobody uses +DSA, and EC keys are not fully supported by 0.9.8), so the rsa command is +used. + +# OpenSSL 1.0 with all certificates and SHA-1 fingerprints. +$ openssl x509 -in cert.pem -noout -pubkey | +openssl pkey -pubin -outform DER | +openssl dgst -sha1 -c +(stdin)= 64:3f:1f:f6:e5:1e:d4:2a:56:8b:fc:09:1a:61:98:b5:bc:7c:60:58 + +# OpenSSL 0.9.8 with RSA certificates and MD5 fingerprints. +$ openssl x509 -in cert.pem -noout -pubkey | +openssl rsa -pubin -outform DER | +openssl
CVS commit: src/etc/mtree
Module Name:src Committed By: tron Date: Wed Aug 21 20:22:35 UTC 2013 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: Remove obsolete directories /usr/share/locale/no_NO.ISO8859-15 and /usr/share/locale/no_NO.ISO8859-15/LC_MESSAGES. To generate a diff of this commit: cvs rdiff -u -r1.121 -r1.122 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.121 src/etc/mtree/NetBSD.dist.base:1.122 --- src/etc/mtree/NetBSD.dist.base:1.121 Sun Aug 11 22:09:40 2013 +++ src/etc/mtree/NetBSD.dist.base Wed Aug 21 20:22:35 2013 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.121 2013/08/11 22:09:40 joerg Exp $ +# $NetBSD: NetBSD.dist.base,v 1.122 2013/08/21 20:22:35 tron Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -715,8 +715,6 @@ ./usr/share/locale/no@nynorsk/LC_MESSAGES ./usr/share/locale/no_NO.ISO8859-1 ./usr/share/locale/no_NO.ISO8859-1/LC_MESSAGES -./usr/share/locale/no_NO.ISO8859-15 -./usr/share/locale/no_NO.ISO8859-15/LC_MESSAGES ./usr/share/locale/pl ./usr/share/locale/pl/LC_MESSAGES ./usr/share/locale/pl_PL.ISO8859-2
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: tron Date: Wed Aug 21 20:51:57 UTC 2013 Modified Files: src/distrib/sets/lists/base: mi Log Message: /usr/share/locale/ko_KR.UTF-8/LC_CTYPE is not obsolete. It gets built and installed. Correct the set entry to reflect that. To generate a diff of this commit: cvs rdiff -u -r1.1039 -r1.1040 src/distrib/sets/lists/base/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1039 src/distrib/sets/lists/base/mi:1.1040 --- src/distrib/sets/lists/base/mi:1.1039 Sun Aug 11 22:29:02 2013 +++ src/distrib/sets/lists/base/mi Wed Aug 21 20:51:57 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1039 2013/08/11 22:29:02 joerg Exp $ +# $NetBSD: mi,v 1.1040 2013/08/21 20:51:57 tron Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -3300,8 +3300,8 @@ ./usr/share/locale/ko/LC_MESSAGES base-locale-ko ./usr/share/locale/ko/LC_MESSAGES/grep.mo base-locale-ko nls,!bsdgrep ./usr/share/locale/ko/LC_MESSAGES/tar.mo base-obsolete obsolete -./usr/share/locale/ko_KR.UTF-8 base-locale-ko -./usr/share/locale/ko_KR.UTF-8/LC_CTYPE base-obsolete obsolete +./usr/share/locale/ko_KR.UTF-8 base-locale-ko nls +./usr/share/locale/ko_KR.UTF-8/LC_CTYPE base-locale-ko nls ./usr/share/locale/ko_KR.UTF-8/LC_MESSAGES base-locale-ko nls ./usr/share/locale/ko_KR.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES base-locale-ko nls ./usr/share/locale/ko_KR.UTF-8/LC_MONETARY base-locale-ko nls
CVS commit: src/etc/mtree
Module Name:src Committed By: tron Date: Wed Aug 21 20:52:45 UTC 2013 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: Remove more obsolete directories: - /usr/include/gcc-4.1 - /usr/share/locale/no_NO.ISO8859-1 - /usr/share/locale/no_NO.ISO8859-1/LC_MESSAGES To generate a diff of this commit: cvs rdiff -u -r1.122 -r1.123 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.122 src/etc/mtree/NetBSD.dist.base:1.123 --- src/etc/mtree/NetBSD.dist.base:1.122 Wed Aug 21 20:22:35 2013 +++ src/etc/mtree/NetBSD.dist.base Wed Aug 21 20:52:45 2013 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.122 2013/08/21 20:22:35 tron Exp $ +# $NetBSD: NetBSD.dist.base,v 1.123 2013/08/21 20:52:45 tron Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -140,7 +140,6 @@ ./usr/include/g++/parallel ./usr/include/g++/tr1 ./usr/include/g++/tr1_impl -./usr/include/gcc-4.1 ./usr/include/gcc-4.5 ./usr/include/gssapi ./usr/include/isofs @@ -713,8 +712,6 @@ ./usr/share/locale/no/LC_MESSAGES ./usr/share/locale/no@nynorsk ./usr/share/locale/no@nynorsk/LC_MESSAGES -./usr/share/locale/no_NO.ISO8859-1 -./usr/share/locale/no_NO.ISO8859-1/LC_MESSAGES ./usr/share/locale/pl ./usr/share/locale/pl/LC_MESSAGES ./usr/share/locale/pl_PL.ISO8859-2
CVS commit: src/usr.bin/rpcinfo
Module Name:src Committed By: dholland Date: Wed Aug 21 21:05:29 UTC 2013 Modified Files: src/usr.bin/rpcinfo: Makefile Log Message: passes WARNS=5, don't set it to 4. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/usr.bin/rpcinfo/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/rpcinfo/Makefile diff -u src/usr.bin/rpcinfo/Makefile:1.14 src/usr.bin/rpcinfo/Makefile:1.15 --- src/usr.bin/rpcinfo/Makefile:1.14 Tue Feb 8 22:16:58 2011 +++ src/usr.bin/rpcinfo/Makefile Wed Aug 21 21:05:29 2013 @@ -1,8 +1,6 @@ -# $NetBSD: Makefile,v 1.14 2011/02/08 22:16:58 christos Exp $ +# $NetBSD: Makefile,v 1.15 2013/08/21 21:05:29 dholland Exp $ # from: @(#)Makefile 5.2 (Berkeley) 5/11/90 -WARNS ?= 4 - .include bsd.own.mk USE_FORT?= yes # network client
CVS commit: src/external/gpl3/gcc/dist/gcc/config/m68k
Module Name:src Committed By: matt Date: Wed Aug 21 21:11:30 UTC 2013 Modified Files: src/external/gpl3/gcc/dist/gcc/config/m68k: lb1sf68.asm Log Message: When compiling use @PLTPC to generate PLT relocs for NetBSD. When building libgcc_s.so for m68k, this gets rid of m68k--netbsdelf/4.5.4/../../../../m68k--netbsdelf/bin/ld: warning: creating a DT_TEXTREL in a shared object. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/dist/gcc/config/m68k/lb1sf68.asm Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/gcc/config/m68k/lb1sf68.asm diff -u src/external/gpl3/gcc/dist/gcc/config/m68k/lb1sf68.asm:1.2 src/external/gpl3/gcc/dist/gcc/config/m68k/lb1sf68.asm:1.3 --- src/external/gpl3/gcc/dist/gcc/config/m68k/lb1sf68.asm:1.2 Sun Sep 25 13:33:11 2011 +++ src/external/gpl3/gcc/dist/gcc/config/m68k/lb1sf68.asm Wed Aug 21 21:11:30 2013 @@ -202,6 +202,8 @@ see the files COPYING3 and COPYING.RUNTI #if defined (__mcoldfire__) !defined (__mcfisab__) !defined (__mcfisac__) lea \addr-.-8,a0 jsr pc@(a0) +#elif defined(__NetBSD__) + jbsr \addr@PLTPC #else jbsr \addr #endif @@ -211,9 +213,11 @@ see the files COPYING3 and COPYING.RUNTI /* ISA C has no bra.l instruction, and since this assembly file gets assembled into multiple object files, we avoid the bra instruction entirely. */ -#if (defined (__mcoldfire__) !defined (__mcfisab__)) || defined(__NetBSD__) +#if (defined (__mcoldfire__) !defined (__mcfisab__)) lea \addr-.-8,a0 jmp pc@(a0) +#elif defined(__NetBSD__) + bra \addr@PLTPC #else bra \addr #endif
CVS commit: src/doc
Module Name:src Committed By: tron Date: Wed Aug 21 21:17:37 UTC 2013 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Postfix 2.9.7 was imported. To generate a diff of this commit: cvs rdiff -u -r1.1050 -r1.1051 src/doc/3RDPARTY cvs rdiff -u -r1.1844 -r1.1845 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1050 src/doc/3RDPARTY:1.1051 --- src/doc/3RDPARTY:1.1050 Wed Aug 21 19:48:35 2013 +++ src/doc/3RDPARTY Wed Aug 21 21:17:37 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1050 2013/08/21 19:48:35 tron Exp $ +# $NetBSD: 3RDPARTY,v 1.1051 2013/08/21 21:17:37 tron Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1051,7 +1051,7 @@ and more. Vern's ping is gone. We are to now to do a new import. Package: Postfix -Version: 2.9.5 +Version: 2.9.7 Current Vers: 2.10.1/2.9.7 Maintainer: Wietse Venema wie...@porcupine.org Archive Site: ftp://postfix.cloud9.net/official/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1844 src/doc/CHANGES:1.1845 --- src/doc/CHANGES:1.1844 Thu Aug 8 21:27:50 2013 +++ src/doc/CHANGES Wed Aug 21 21:17:37 2013 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1844 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1845 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -277,3 +277,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: [reinoud 20130805] xsh(4): Add driver for Individual Computers X-Surf 100 network interface card. [rkujawa 20130808] + postfix(1): Import version 2.9.7 [tron 20130821]
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Wed Aug 21 22:52:28 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: beagleboard.conf
Log Message:
4th time's a charm (I hope). Make sure that we pick up the kernel path passed to
mkimage command line, and not the default.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/utils/embedded/conf/beagleboard.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/conf/beagleboard.conf
diff -u src/distrib/utils/embedded/conf/beagleboard.conf:1.14 src/distrib/utils/embedded/conf/beagleboard.conf:1.15
--- src/distrib/utils/embedded/conf/beagleboard.conf:1.14 Mon Aug 19 04:27:22 2013
+++ src/distrib/utils/embedded/conf/beagleboard.conf Wed Aug 21 22:52:28 2013
@@ -1,13 +1,8 @@
-# $NetBSD: beagleboard.conf,v 1.14 2013/08/19 04:27:22 jmcneill Exp $
+# $NetBSD: beagleboard.conf,v 1.15 2013/08/21 22:52:28 jmcneill Exp $
# BeagleBoard customization script used by mkimage
#
board=beagleboard
-kernel=$src/sys/arch/evbarm/compile/obj/BEAGLEBOARD/netbsd.ub
-
-bboard_kernel=$kernel
-bbone_kernel=$(echo $bboard_kernel | sed 's/BEAGLEBOARD/BEAGLEBONE/g')
-
. ${DIR}/conf/evbarm.conf
bboard_kernelimg=bboard.ub
@@ -35,6 +30,9 @@ EOF
}
populate() {
+ bboard_kernel=$kernel
+ bbone_kernel=$(echo $bboard_kernel | sed 's/BEAGLEBOARD/BEAGLEBONE/g')
+
cat ${mnt}/boot/uEnv.txt EOF
loaduimage=if test $board = am335x; then fatload mmc 0 ${bbone_loadaddr} ${bbone_kernelimg}; bootm ${bbone_loadaddr} root=ld0a; else fatload mmc 0 ${bboard_loadaddr} ${bboard_kernelimg}; bootm ${bboard_loadaddr} root=ld0a; fi
EOF
@@ -47,7 +45,7 @@ EOF
exit 1
fi
- echo ${bar} installing BEAGLEBOARD kernel to /boot ${bar}
+ echo ${bar} installing ${bboard_kernel} to /boot/${bboard_kernelimg} ${bar}
case ${bboard_kernel} in
*.gz)
gzip -dc ${bboard_kernel} ${mnt}/boot/${bboard_kernelimg}
@@ -57,7 +55,7 @@ EOF
;;
esac
- echo ${bar} installing BEAGLEBONE kernel to /boot ${bar}
+ echo ${bar} installing ${bbone_kernel} to /boot/${bbone_kernelimg} ${bar}
case ${bbone_kernel} in
*.gz)
gzip -dc ${bbone_kernel} ${mnt}/boot/${bbone_kernelimg}
CVS commit: src/sys/arch/i386/stand/bootxx
Module Name:src
Committed By: matt
Date: Thu Aug 22 00:13:00 UTC 2013
Modified Files:
src/sys/arch/i386/stand/bootxx: Makefile.bootxx
Log Message:
Add a missing KLINK_MACHINE= i386
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/i386/stand/bootxx/Makefile.bootxx
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/bootxx/Makefile.bootxx
diff -u src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.44 src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.45
--- src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.44 Wed Aug 21 08:15:19 2013
+++ src/sys/arch/i386/stand/bootxx/Makefile.bootxx Thu Aug 22 00:13:00 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootxx,v 1.44 2013/08/21 08:15:19 matt Exp $
+# $NetBSD: Makefile.bootxx,v 1.45 2013/08/22 00:13:00 matt Exp $
S= ${.CURDIR}/../../../../..
@@ -138,4 +138,5 @@ ${PROG}: ${OBJS} ${LIBLIST}
fi
.include bsd.prog.mk
+KLINK_MACHINE= i386
.include bsd.klinks.mk
CVS commit: src/external/gpl3/gcc/lib
Module Name:src
Committed By: matt
Date: Thu Aug 22 00:16:54 UTC 2013
Modified Files:
src/external/gpl3/gcc/lib/libgcc: Makefile Makefile.inc Makefile.srcs
src/external/gpl3/gcc/lib/libgcc/libgcc: Makefile
src/external/gpl3/gcc/lib/libgcc/libgcov: Makefile
src/external/gpl3/gcc/lib/libgomp: Makefile
src/external/gpl3/gcc/lib/libiberty: Makefile
src/external/gpl3/gcc/lib/libobjc: Makefile
Log Message:
Add MACHINE_ARCH's evbearmv5-e[bl] to work
Don't build _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 on earm and coldfire
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/libgcc/Makefile \
src/external/gpl3/gcc/lib/libgcc/Makefile.srcs
cvs rdiff -u -r1.20 -r1.21 src/external/gpl3/gcc/lib/libgcc/Makefile.inc
cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/lib/libgcc/libgcov/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/lib/libgomp/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/lib/libiberty/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/lib/libobjc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libgcc/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/Makefile:1.1 src/external/gpl3/gcc/lib/libgcc/Makefile:1.2
--- src/external/gpl3/gcc/lib/libgcc/Makefile:1.1 Tue Jun 21 06:02:25 2011
+++ src/external/gpl3/gcc/lib/libgcc/Makefile Thu Aug 22 00:16:54 2013
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2011/06/21 06:02:25 mrg Exp $
-
-SUBDIR+= libgcc
+# $NetBSD: Makefile,v 1.2 2013/08/22 00:16:54 matt Exp $
.include bsd.own.mk
+SUBDIR+= libgcc
+
.if ${MKPIC} != no
SUBDIR+= libgcc_eh libgcc_s
.endif
Index: src/external/gpl3/gcc/lib/libgcc/Makefile.srcs
diff -u src/external/gpl3/gcc/lib/libgcc/Makefile.srcs:1.1 src/external/gpl3/gcc/lib/libgcc/Makefile.srcs:1.2
--- src/external/gpl3/gcc/lib/libgcc/Makefile.srcs:1.1 Tue Jun 21 06:02:25 2011
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.srcs Thu Aug 22 00:16:54 2013
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.srcs,v 1.1 2011/06/21 06:02:25 mrg Exp $
+# $NetBSD: Makefile.srcs,v 1.2 2013/08/22 00:16:54 matt Exp $
#
# Generated makefiles.
#
-.include ${.CURDIR}/../arch/${MACHINE_ARCH}/srcs.tmplsrcs.mk
-.include ${.CURDIR}/../arch/${MACHINE_ARCH}/srcs.cppflags.mk
-.include ${.CURDIR}/../arch/${MACHINE_ARCH}/srcs.copts.mk
-.include ${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.srcs.mk
-.include ${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplsrcs.mk
-.include ${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplfpsrcs.mk
-.include ${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplasmsrcs.mk
+.include ${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/srcs.tmplsrcs.mk
+.include ${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/srcs.cppflags.mk
+.include ${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/srcs.copts.mk
+.include ${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/libs.lib${LIB}.srcs.mk
+.include ${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplsrcs.mk
+.include ${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplfpsrcs.mk
+.include ${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplasmsrcs.mk
Index: src/external/gpl3/gcc/lib/libgcc/Makefile.inc
diff -u src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.20 src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.21
--- src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.20 Thu Jul 18 22:39:57 2013
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.inc Thu Aug 22 00:16:54 2013
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.20 2013/07/18 22:39:57 matt Exp $
+# $NetBSD: Makefile.inc,v 1.21 2013/08/22 00:16:54 matt Exp $
.if ${MKGCC} != no
-LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH}
-#.info LIBGCC_MACHINE_ARCH=${LIBGCC_MACHINE_ARCH}
+LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
.if exists(${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}.mk)
.include ${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}.mk
.endif
@@ -46,7 +45,14 @@ LIB2FUNCS_ALL= \
_mulsc3 _muldc3 _mulxc3 _multc3 _divsc3 _divdc3 _divxc3\
_divtc3 _bswapsi2 _bswapdi2
-.if ${MACHINE_ARCH} != coldfire
+.if ${LIBGCC_MACHINE_ARCH} != coldfire empty(LIBGCC_MACHINE_ARCH:Mearm*)
+
+LIB2FUNCS_ALL+= \
+ _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3
+
+.endif
+
+.if ${LIBGCC_MACHINE_ARCH} != coldfire empty(LIBGCC_MACHINE_ARCH:Mearm*)
# non swfloat versions
.for _p in _fix _fixuns
@@ -163,7 +169,7 @@ DPSRCS+= ${FAKEHEADERS}
CLEANFILES+= ${FAKEHEADERS}
# XXX arm hack
-.if ${MACHINE_CPU} == arm
+.if !empty(LIBGCC_MACHINE_ARCH:M*arm*)
${SRCS}: insn-modes.h
# XXX XXX
${__DPSRCS.d}: insn-modes.h
Index: src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.13 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.14
---
CVS commit: src/external/gpl3/gcc/usr.bin
Module Name:src
Committed By: matt
Date: Thu Aug 22 00:17:48 UTC 2013
Modified Files:
src/external/gpl3/gcc/usr.bin: Makefile Makefile.inc
src/external/gpl3/gcc/usr.bin/backend: Makefile
src/external/gpl3/gcc/usr.bin/cpp: Makefile
src/external/gpl3/gcc/usr.bin/frontend: Makefile
src/external/gpl3/gcc/usr.bin/include: Makefile
src/external/gpl3/gcc/usr.bin/libcpp: Makefile
src/external/gpl3/gcc/usr.bin/libdecnumber: Makefile
Log Message:
Add MACHINE_ARCH's evbearmv5-e[bl] to work
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/usr.bin/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/usr.bin/Makefile.inc
cvs rdiff -u -r1.17 -r1.18 src/external/gpl3/gcc/usr.bin/backend/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/usr.bin/cpp/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/usr.bin/frontend/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/usr.bin/include/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/usr.bin/libcpp/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/usr.bin/Makefile
diff -u src/external/gpl3/gcc/usr.bin/Makefile:1.3 src/external/gpl3/gcc/usr.bin/Makefile:1.4
--- src/external/gpl3/gcc/usr.bin/Makefile:1.3 Wed Jun 29 01:57:59 2011
+++ src/external/gpl3/gcc/usr.bin/Makefile Thu Aug 22 00:17:48 2013
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2011/06/29 01:57:59 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2013/08/22 00:17:48 matt Exp $
NOOBJ=# defined
.include bsd.own.mk
-.if ${MKGCC} != no exists(${.CURDIR}/gcc/arch/${MACHINE_ARCH}/defs.mk)
+GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5/earm/}
+
+.if ${MKGCC} != no exists(${.CURDIR}/gcc/arch/${GCC_MACHINE_ARCH}/defs.mk)
# We keep libcpp here since it depends upon frontend.
Index: src/external/gpl3/gcc/usr.bin/Makefile.inc
diff -u src/external/gpl3/gcc/usr.bin/Makefile.inc:1.14 src/external/gpl3/gcc/usr.bin/Makefile.inc:1.15
--- src/external/gpl3/gcc/usr.bin/Makefile.inc:1.14 Tue Aug 6 05:36:42 2013
+++ src/external/gpl3/gcc/usr.bin/Makefile.inc Thu Aug 22 00:17:48 2013
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile.inc,v 1.14 2013/08/06 05:36:42 matt Exp $
+# $NetBSD: Makefile.inc,v 1.15 2013/08/22 00:17:48 matt Exp $
.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_
_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_=1
.include bsd.own.mk
+GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5/earm/}
GMP_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/}
TOP= ${NETBSDSRCDIR}
DIST= ${TOP}/external/gpl3/gcc/dist
-GCCARCH= ${.CURDIR}/../gcc/arch/${MACHINE_ARCH}
+GCCARCH= ${.CURDIR}/../gcc/arch/${GCC_MACHINE_ARCH}
CPPFLAGS+= -DLOCALEDIR=\/usr/share/locale\ -DNETBSD_NATIVE
HOST_CPPFLAGS+= -I${.CURDIR}/..
Index: src/external/gpl3/gcc/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.17 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.18
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.17 Fri May 24 16:37:32 2013
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile Thu Aug 22 00:17:48 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2013/05/24 16:37:32 christos Exp $
+# $NetBSD: Makefile,v 1.18 2013/08/22 00:17:48 matt Exp $
LIBISPRIVATE= yes
@@ -97,10 +97,10 @@ gtype-desc.c: gtype-desc.h
gtype-desc.h: gengtype gtyp-input.list.tmp
${_MKTARGET_CREATE}
rm -f auto-host.h
- ln -s ${.CURDIR}/../gcc/arch/${MACHINE_ARCH}/auto-host.h .
- if [ -f ${.CURDIR}/../gcc/arch/${MACHINE_ARCH}/sysroot-suffix.h ]; then \
+ ln -s ${.CURDIR}/../gcc/arch/${GCC_MACHINE_ARCH}/auto-host.h .
+ if [ -f ${.CURDIR}/../gcc/arch/${GCC_MACHINE_ARCH}/sysroot-suffix.h ]; then \
rm -f sysroot-suffix.h; \
- ln -s ${.CURDIR}/../gcc/arch/${MACHINE_ARCH}/sysroot-suffix.h ; \
+ ln -s ${.CURDIR}/../gcc/arch/${GCC_MACHINE_ARCH}/sysroot-suffix.h ; \
fi
./gengtype ${DIST}/gcc gtyp-input.list.tmp
# gengtype is the real need for options.h
@@ -307,7 +307,7 @@ vec.lo: gtype-desc.h
gtype-desc.d gtype-desc.o: insn-constants.h
insn-emit.d insn-emit.o: tm-constrs.h
-.if ${MACHINE_ARCH} == alpha
+.if ${GCC_MACHINE_ARCH} == alpha
alpha.d alpha.o: tm-constrs.h tm_p.h
.endif
@@ -315,13 +315,13 @@ alpha.d alpha.o: tm-constrs.h tm_p.h
arm.d arm.o: insn-constants.h tm_p.h
.endif
-.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
+.if ${GCC_MACHINE_ARCH} == i386 || ${GCC_MACHINE_ARCH} == x86_64
i386.d i386.o: tm-constrs.h
.endif
CFLAGS+= -Wno-stack-protector
-.if ${MACHINE_ARCH} == m68000 || ${MACHINE_ARCH} == m68k
+.if ${GCC_MACHINE_ARCH} == m68000 || ${GCC_MACHINE_ARCH} == m68k
COPTS.lambda-code.c= -O0
COPTS.tree-loop-linear.c= -O0
.endif
Index: src/external/gpl3/gcc/usr.bin/cpp/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.4 src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.5
---
CVS commit: src/sys/arch/evbcf/include
Module Name:src Committed By: matt Date: Thu Aug 22 00:25:35 UTC 2013 Modified Files: src/sys/arch/evbcf/include: disklabel.h Log Message: Use MBR compatible partitioning To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbcf/include/disklabel.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbcf/include/disklabel.h diff -u src/sys/arch/evbcf/include/disklabel.h:1.1 src/sys/arch/evbcf/include/disklabel.h:1.2 --- src/sys/arch/evbcf/include/disklabel.h:1.1 Thu Jul 18 22:08:59 2013 +++ src/sys/arch/evbcf/include/disklabel.h Thu Aug 22 00:25:35 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: disklabel.h,v 1.1 2013/07/18 22:08:59 matt Exp $ */ +/* $NetBSD: disklabel.h,v 1.2 2013/08/22 00:25:35 matt Exp $ */ /* * Copyright (c) 1995 Dale Rahn. @@ -33,10 +33,10 @@ /* number of boot pieces , ie xxboot bootxx */ #define NUMBOOT 0 -#define LABELUSESMBR 0 /* no MBR partitionning */ -#define LABELSECTOR 0 /* sector containing label */ +#define LABELUSESMBR 1 /* no MBR partitionning */ +#define LABELSECTOR 1 /* sector containing label */ #define LABELOFFSET 0 /* offset of label in sector */ -#define MAXPARTITIONS 8 /* number of partitions */ +#define MAXPARTITIONS 16 /* number of partitions */ #define RAW_PART 2 /* raw partition: xx?c */ /*
CVS commit: src/sbin/disklabel
Module Name:src
Committed By: matt
Date: Thu Aug 22 00:26:23 UTC 2013
Modified Files:
src/sbin/disklabel: main.c
Log Message:
Add m68000/coldfire.
Add evbcf.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sbin/disklabel/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/disklabel/main.c
diff -u src/sbin/disklabel/main.c:1.36 src/sbin/disklabel/main.c:1.37
--- src/sbin/disklabel/main.c:1.36 Sun Aug 11 17:15:15 2013
+++ src/sbin/disklabel/main.c Thu Aug 22 00:26:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.36 2013/08/11 17:15:15 riz Exp $ */
+/* $NetBSD: main.c,v 1.37 2013/08/22 00:26:23 matt Exp $ */
/*
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@ __COPYRIGHT(@(#) Copyright (c) 1987, 19
static char sccsid[] = @(#)disklabel.c 8.4 (Berkeley) 5/4/95;
/* from static char sccsid[] = @(#)disklabel.c 1.2 (Symmetric) 11/28/85; */
#else
-__RCSID($NetBSD: main.c,v 1.36 2013/08/11 17:15:15 riz Exp $);
+__RCSID($NetBSD: main.c,v 1.37 2013/08/22 00:26:23 matt Exp $);
#endif
#endif /* not lint */
@@ -260,8 +260,9 @@ static const struct disklabel_params {
{ dreadmcast, 1, 1, 0, 16, 2, 0, LITTLE_ENDIAN }, /* sh3 */
{ evbsh3, 1, 1, 0, 16, 2, 0, 0 }, /* sh3 */
- { hpcsh, 1, 1, 0, 16, 2, 0, LITTLE_ENDIAN }, /* sh3 */
+ { evbcf, 1, 1, 0, 16, 2, 0, BIG_ENDIAN }, /* coldfire */
{ evbppc-mbr, 1, 1, 0, 16, 2, 0, BIG_ENDIAN }, /* powerpc */
+ { hpcsh, 1, 1, 0, 16, 2, 0, LITTLE_ENDIAN }, /* sh3 */
{ mmeye, 1, 1, 0, 16, 2, 0, 0 }, /* sh3 */
{ acorn26, 1, 1, 0, 16, 2, 8, LITTLE_ENDIAN }, /* arm */
@@ -314,6 +315,7 @@ static const struct arch_endian {
{ LITTLE_ENDIAN, x86_64 },
{ BIG_ENDIAN, armeb },
+ { BIG_ENDIAN, coldfire },
{ BIG_ENDIAN, earmeb },
{ BIG_ENDIAN, earmhfeb },
{ BIG_ENDIAN, earmv4eb },
@@ -323,6 +325,7 @@ static const struct arch_endian {
{ BIG_ENDIAN, earmv7eb },
{ BIG_ENDIAN, earmv7hfeb },
{ BIG_ENDIAN, hppa },
+ { BIG_ENDIAN, m68000 },
{ BIG_ENDIAN, m68k },
{ BIG_ENDIAN, mipseb },
{ BIG_ENDIAN, mips64eb },
CVS commit: othersrc/external/bsd/multigest/dist
Module Name:othersrc
Committed By: agc
Date: Thu Aug 22 01:08:10 UTC 2013
Modified Files:
othersrc/external/bsd/multigest/dist: multigest.c multigest.h
Log Message:
First pass at isolating userland-only code.
Also, only expose a regular expression if we're not in kernel code
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 othersrc/external/bsd/multigest/dist/multigest.c \
othersrc/external/bsd/multigest/dist/multigest.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/multigest/dist/multigest.c
diff -u othersrc/external/bsd/multigest/dist/multigest.c:1.5 othersrc/external/bsd/multigest/dist/multigest.c:1.6
--- othersrc/external/bsd/multigest/dist/multigest.c:1.5 Sun Aug 18 06:03:14 2013
+++ othersrc/external/bsd/multigest/dist/multigest.c Thu Aug 22 01:08:10 2013
@@ -26,6 +26,10 @@
#include sys/stat.h
#include sys/mman.h
+#ifdef _KERNEL
+#include inttypes.h
+#include string.h
+#else
#include ctype.h
#include inttypes.h
#include regex.h
@@ -33,6 +37,7 @@
#include stdlib.h
#include string.h
#include unistd.h
+#endif
/* digests */
#include md5.h
@@ -376,19 +381,36 @@ findalg(const char *algname)
return NULL;
}
-/* percent encode (pseudo-RFC1738) a string */
-static void
-pcstring(FILE *fp, const char *s)
+/* normalise through regexp substitution */
+static int
+normalise(multigest_t *multigest, const char *data, size_t len, int64_t *from)
{
- static const char *pcencodes = %$\r\n\t ;
+#ifndef _KERNEL
+ multigest_dig_t *d;
+ regmatch_t match[2];
+ uint32_t i;
- for ( ; *s ; s++) {
- if (strchr(pcencodes, *s) == NULL) {
- fprintf(fp, %c, *s);
- } else {
- fprintf(fp, %%%02hhx, *s);
+ *from = 0;
+ while (multigest-r len 0) {
+ match[0].rm_so = *from;
+ match[0].rm_eo = len;
+ if (regexec(multigest-r, data, 2, match, REG_STARTEND) != 0) {
+ break;
}
+ for (d = multigest-digs, i = 0 ; i multigest-digc ; i++, d++) {
+ (*d-update)(multigest-ctx[d-ctxoff], data[*from],
+(unsigned)(match[0].rm_so - *from));
+ if (multigest-repllen) {
+(*d-update)(multigest-ctx[d-ctxoff], multigest-repl,
+ multigest-repllen);
+ }
+ }
+ *from = match[0].rm_eo;
}
+#else
+ *from = 0;
+#endif
+ return 1;
}
/***/
@@ -449,7 +471,8 @@ int
multigest_add_subst(multigest_t *multigest, const char *from, const char *to)
{
if (multigest from from[0]) {
- if (regcomp(multigest-r, from, REG_EXTENDED) != 0) {
+ if ((multigest-r = calloc(1, sizeof(regex_t))) == NULL ||
+ regcomp(multigest-r, from, REG_EXTENDED) != 0) {
return 0;
}
multigest-pat = strdup(from);
@@ -467,27 +490,11 @@ void
multigest_update(multigest_t *multigest, const char *data, size_t len)
{
multigest_dig_t *d;
- regmatch_t match[2];
- regoff_t from;
uint32_t i;
+ int64_t from;
if (multigest data) {
- for (from = 0; len 0 ; ) {
- match[0].rm_so = from;
- match[0].rm_eo = len;
- if (regexec(multigest-r, data, 2, match, REG_STARTEND) != 0) {
-break;
- }
- for (d = multigest-digs, i = 0 ; i multigest-digc ; i++, d++) {
-(*d-update)(multigest-ctx[d-ctxoff], data[from],
- (unsigned)(match[0].rm_so - from));
-if (multigest-repllen) {
- (*d-update)(multigest-ctx[d-ctxoff], multigest-repl,
- multigest-repllen);
-}
- }
- from = match[0].rm_eo;
- }
+ normalise(multigest, data, len, from);
for (d = multigest-digs, i = 0 ; i multigest-digc ; i++, d++) {
(*d-update)(multigest-ctx[d-ctxoff], data[from], (unsigned)(len - from));
}
@@ -529,67 +536,6 @@ multigest_data(const char *alg, const ch
return NULL;
}
-/* run sed, then digest on a file */
-uint8_t *
-multigest_file(const char *alg, const char *f, uint8_t *raw, const char *pat, const char *repl)
-{
- struct stat st;
- ssize_t rc;
- size_t size;
- size_t cc;
- char *mapped;
- FILE *fp;
-
- if (f alg raw) {
- if ((fp = fopen(f, r)) == NULL) {
- fprintf(stderr, can't open '%s'\n, f);
- return 0;
- }
- fstat(fileno(fp), st);
- size = st.st_size;
- mapped = mmap(NULL, size, PROT_READ, MAP_SHARED, fileno(fp), 0);
- if (mapped == MAP_FAILED) {
- mapped = calloc(1, MB(1));
- for (cc = 0 ; cc size ; cc += rc) {
-if ((rc = read(fileno(fp), mapped, MB(1))) = 0) {
- break;
-}
-multigest_data(alg, mapped, (size_t)rc, raw, pat, repl);
- }
- free(mapped);
- } else {
- multigest_data(alg, mapped, size, raw, pat, repl);
- munmap(mapped, size);
- }
- fclose(fp);
- return raw;
- }
- return NULL;
-}
-
-/* free resources used in a sedded digest */
-void
-multigest_free(multigest_t *s)
-{
- uint32_t i;
-
- if (s) {
- if (s-ctx) {
- free(s-ctx);
- }
- if (s-pat) {
- free(s-pat);
- regfree(s-r);
- }
- if (s-repl) {
- free(s-repl);
- }
- for (i = 0 ; i s-digc ; i++) {
- free(s-digs[i].alg);
- }
- }
-}
-
/*
