Date: Sat, 6 Jul 2002 20:43:07 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 13849 for review Message-ID: <200207070343.g673h7hC019905@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13849 Change 13849 by rwatson@rwatson_curry on 2002/07/06 20:42:17 Integ trustedbsd_mac forward to just before KSE-III. In particular, pick up a working gdb. Another integ coming to pick up specific post kse-iii changes such as compiler and linker fixes. Affected files ... .. //depot/projects/trustedbsd/mac/bin/cat/cat.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/ln/ln.c#5 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/Makefile.alpha#5 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/Makefile.arm#1 branch .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/Makefile.i386#5 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/Makefile.ia64#1 branch .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/Makefile.powerpc#1 branch .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/Makefile.sparc64#1 branch .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/freebsd-uthread.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/_setjmp.S#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/fixunsdfsi.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/frexp.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/modf.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/setjmp.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/sigsetjmp.S#4 integrate .. //depot/projects/trustedbsd/mac/sys/boot/alpha/boot1/boot1.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/common.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_elf.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sio/sio_ebus.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/intr_machdep.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_ti.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/conf/GENERIC#10 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/profile.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/pmap.c#14 integrate .. //depot/projects/trustedbsd/mac/usr.bin/csplit/csplit.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/mac/bin/cat/cat.c#5 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)cat.c 8.2 (Berkeley) 4/27/95"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/cat/cat.c,v 1.24 2002/06/14 09:54:48 jmallett Exp $"; + "$FreeBSD: src/bin/cat/cat.c,v 1.25 2002/06/29 04:52:33 tjr Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -278,8 +278,11 @@ fd = socket(AF_UNIX, SOCK_STREAM, 0); if (fd >= 0) { sou.sun_family = AF_UNIX; - snprintf(sou.sun_path, sizeof(sou.sun_path), "%s", path); - len = strlen(sou.sun_path); + if ((len = strlcpy(sou.sun_path, path, + sizeof(sou.sun_path))) >= sizeof(sou.sun_path)) { + errno = ENAMETOOLONG; + return (-1); + } len = offsetof(struct sockaddr_un, sun_path[len+1]); if (connect(fd, (void *)&sou, len) < 0) { ==== //depot/projects/trustedbsd/mac/bin/ln/ln.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)ln.c 8.2 (Berkeley) 3/31/94"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/ln/ln.c,v 1.26 2002/05/30 00:57:38 tjr Exp $"; + "$FreeBSD: src/bin/ln/ln.c,v 1.27 2002/06/29 04:10:40 tjr Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -189,7 +189,12 @@ p = target; else ++p; - (void)snprintf(path, sizeof(path), "%s/%s", source, p); + if (snprintf(path, sizeof(path), "%s/%s", source, p) >= + sizeof(path)) { + errno = ENAMETOOLONG; + warn("%s", target); + return (1); + } source = path; } ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/Makefile,v 1.19 2002/06/27 22:59:11 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/Makefile,v 1.20 2002/06/29 03:19:35 obrien Exp $ # In my absence, bde and jdp have pre-approval for any commit they feel # necessary. @@ -8,11 +8,10 @@ addr2line ar as gasp ld nm objcopy objdump ranlib readelf \ size strings strip doc -NO_GDB=yes TARGET_ARCH?= ${MACHINE_ARCH} .if (${TARGET_ARCH} == "alpha" || ${TARGET_ARCH} == "i386") \ && !defined(NO_GDB) -SUBDIR+= gdb gdbserver gdbreplay +SUBDIR+= gdb gdbreplay .endif .include <bsd.subdir.mk> ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/Makefile#6 (text+ko) ==== @@ -1,15 +1,23 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.60 2002/06/29 01:16:00 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.61 2002/06/29 03:16:10 obrien Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils +.if ${TARGET_ARCH} == "sparc64" +GDB_CPU= sparc +.elif ${TARGET_ARCH} == "x86-64" +GDB_CPU= i386 +.else +GDB_CPU= ${TARGET_ARCH} +.endif + NOSHARED?=yes PROG= gdb XSRCS= annotate.c ax-general.c ax-gdb.c bcache.c blockframe.c \ breakpoint.c buildsym.c c-exp.y c-lang.c c-typeprint.c \ c-valprint.c ch-exp.c ch-lang.c ch-typeprint.c ch-valprint.c \ - coffread.c complaints.c copying.c core-regset.c \ + coffread.c complaints.c copying.c \ corefile.c corelow.c cp-valprint.c dcache.c dbxread.c \ demangle.c dwarfread.c dwarf2read.c elfread.c environ.c eval.c \ exec.c expprint.c f-exp.y f-lang.c f-typeprint.c f-valprint.c \ @@ -40,7 +48,7 @@ .if ${TARGET_ARCH} != ${MACHINE_ARCH} CFLAGS+= -DCROSS_COMPILE=1 .endif -CFLAGS+= -DDEFAULT_BFD_ARCH=bfd_${TARGET_ARCH}_arch +CFLAGS+= -DDEFAULT_BFD_ARCH=bfd_${GDB_CPU}_arch CFLAGS+= -I${.CURDIR}/${TARGET_ARCH} CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -I${SRCDIR}/bfd @@ -117,13 +125,13 @@ .PRECIOUS: init.c nm.h: - echo '#include "${TARGET_ARCH}/nm-fbsd.h"' >${.TARGET} + echo '#include "${GDB_CPU}/nm-fbsd.h"' >${.TARGET} echo '#include "fbsd-kgdb.h"' >>${.TARGET} -.for H in tm-fbsd xm-${TARGET_ARCH} +.for H in tm-fbsd xm-${GDB_CPU} ${H:C/-.*$//}.h: ln -sf \ - ${.CURDIR}/../../../../contrib/gdb/gdb/config/${TARGET_ARCH}/${H}.h \ + ${.CURDIR}/../../../../contrib/gdb/gdb/config/${GDB_CPU}/${H}.h \ ${.TARGET} .endfor ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/Makefile.alpha#5 (text+ko) ==== @@ -1,4 +1,5 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.alpha,v 1.6 2002/06/29 01:16:00 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.alpha,v 1.7 2002/06/29 03:16:10 obrien Exp $ -XSRCS+= alphabsd-nat.c alphafbsd-tdep.c alpha-tdep.c +XSRCS+= alphabsd-nat.c alphafbsd-tdep.c alpha-tdep.c \ + core-regset.c CFLAGS+= -DDEFAULT_BFD_VEC=bfd_elf64_alpha_vec ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/Makefile.i386#5 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.i386,v 1.5 2002/06/29 01:16:00 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.i386,v 1.6 2002/06/29 03:16:10 obrien Exp $ XSRCS+= i386fbsd-nat.c i386bsd-tdep.c i386bsd-nat.c i386-nat.c i386-tdep.c \ i387-nat.c i387-tdep.c \ - core-aout.c + core-regset.c core-aout.c CFLAGS+= -Dprint_insn_i386=print_insn_i386_att CFLAGS+= -DDEFAULT_BFD_VEC=bfd_elf32_i386_vec ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/freebsd-uthread.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/freebsd-uthread.c,v 1.8 2002/06/29 01:16:00 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/freebsd-uthread.c,v 1.9 2002/06/29 03:16:10 obrien Exp $ */ /* Low level interface for debugging FreeBSD user threads for GDB, the GNU debugger. Copyright 1996, 1999 Free Software Foundation, Inc. @@ -408,6 +408,7 @@ return rtnval; } +/* XXX: this needs to be selected by target, not [build] host */ #ifdef __i386__ static char sigmap[MAX_NUM_REGS] = /* map reg to sigcontext */ @@ -488,6 +489,18 @@ #endif +#ifdef __sparc64__ + +static char sigmap[125] = /* map reg to sigcontext */ +{ + -1 +}; +static char jmpmap[125] = { + -1 +}; + +#endif + static void freebsd_uthread_fetch_registers (int regno) { ==== //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/Makefile.inc#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/sparc64/gen/Makefile.inc,v 1.3 2002/03/05 04:03:57 jake Exp $ +# $FreeBSD: src/lib/libc/sparc64/gen/Makefile.inc,v 1.4 2002/06/29 03:23:18 obrien Exp $ -SRCS+= _setjmp.S fixunsdfsi.S flt_rounds.c fpsetmask.c infinity.c isinf.c \ - ldexp.c modf.S setjmp.S sigsetjmp.S +SRCS+= _setjmp.S fixunsdfsi.S flt_rounds.c fpsetmask.c frexp.c \ + infinity.c isinf.c ldexp.c modf.S setjmp.S sigsetjmp.S ==== //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/_setjmp.S#4 (text+ko) ==== @@ -38,19 +38,13 @@ */ #if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)_setjmp.s 8.1 (Berkeley) 6/4/93" #if 0 - .asciz "@(#)_setjmp.s 8.1 (Berkeley) 6/4/93" -#else RCSID("$NetBSD: _setjmp.S,v 1.4 1998/10/08 02:27:59 eeh Exp $") #endif #endif /* LIBC_SCCS and not lint */ - -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/sparc64/gen/_setjmp.S,v 1.3 2001/12/29 06:37:33 jake Exp $" -#endif /* SYSLIBC_RCS and not lint */ - #include <machine/asm.h> +__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/_setjmp.S,v 1.4 2002/06/29 03:23:51 obrien Exp $"); #include "assym.s" ==== //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/fixunsdfsi.S#3 (text+ko) ==== @@ -40,17 +40,12 @@ #include <machine/asm.h> #if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)fixunsdfsi.s 8.1 (Berkeley) 6/4/93" #if 0 - .asciz "@(#)fixunsdfsi.s 8.1 (Berkeley) 6/4/93" -#else RCSID("$NetBSD: fixunsdfsi.S,v 1.3 2000/07/25 04:26:12 mycroft Exp $") #endif #endif /* LIBC_SCCS and not lint */ - -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/sparc64/gen/fixunsdfsi.S,v 1.2 2002/03/11 03:10:55 tmm Exp $" -#endif /* SYSLIBC_RCS and not lint */ +__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/fixunsdfsi.S,v 1.3 2002/06/29 03:23:51 obrien Exp $"); /* * Convert double to unsigned integer (for gcc). ==== //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/modf.S#3 (text+ko) ==== @@ -38,19 +38,13 @@ */ #if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)modf.s 8.1 (Berkeley) 6/4/93" #if 0 - .asciz "@(#)modf.s 8.1 (Berkeley) 6/4/93" -#else .asciz "$NetBSD: modf.S,v 1.2 2000/07/23 07:12:22 eeh Exp $" #endif #endif /* LIBC_SCCS and not lint */ - -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/sparc64/gen/modf.S,v 1.2 2002/03/11 03:13:02 tmm Exp $" -#endif /* SYSLIBC_RCS and not lint */ - #include <machine/asm.h> +__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/modf.S,v 1.3 2002/06/29 03:23:51 obrien Exp $"); #include "assym.s" ==== //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/setjmp.S#3 (text+ko) ==== @@ -38,19 +38,13 @@ */ #if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)_setjmp.s 8.1 (Berkeley) 6/4/93" #if 0 - .asciz "@(#)_setjmp.s 8.1 (Berkeley) 6/4/93" -#else RCSID("$NetBSD: _setjmp.S,v 1.4 1998/10/08 02:27:59 eeh Exp $") #endif #endif /* LIBC_SCCS and not lint */ - -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/sparc64/gen/setjmp.S,v 1.2 2001/12/29 06:39:53 jake Exp $" -#endif /* SYSLIBC_RCS and not lint */ - #include <machine/asm.h> +__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/setjmp.S,v 1.3 2002/06/29 03:23:51 obrien Exp $"); #include "assym.s" ==== //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/sigsetjmp.S#4 (text+ko) ==== @@ -29,12 +29,8 @@ * */ -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/sparc64/gen/sigsetjmp.S,v 1.3 2002/03/05 04:02:04 jake Exp $" -#endif /* SYSLIBC_RCS and not lint */ - #include <machine/asm.h> +__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/sigsetjmp.S,v 1.4 2002/06/29 03:23:51 obrien Exp $"); #include "assym.s" ==== //depot/projects/trustedbsd/mac/sys/boot/alpha/boot1/boot1.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/boot/alpha/boot1/boot1.c,v 1.11 2002/06/11 10:19:59 phk Exp $ + * $FreeBSD: src/sys/boot/alpha/boot1/boot1.c,v 1.12 2002/06/29 02:32:32 peter Exp $ * From $NetBSD: bootxx.c,v 1.4 1997/09/06 14:08:29 drochner Exp $ */ @@ -253,7 +253,7 @@ char *name = "/boot/loader"; char *p; char filename[512]; - void (*entry) __P((void)); + void (*entry)(void); u_long start, freq; int i; ==== //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/common.h#2 (text+ko) ==== @@ -1,11 +1,11 @@ /* - * $FreeBSD: src/sys/boot/alpha/libalpha/common.h,v 1.2 1999/08/28 00:39:26 peter Exp $ + * $FreeBSD: src/sys/boot/alpha/libalpha/common.h,v 1.3 2002/06/29 02:32:32 peter Exp $ * From: $NetBSD: common.h,v 1.2 1998/01/05 07:02:48 perry Exp $ */ -int prom_open __P((char*, int)); -void OSFpal __P((void)); -void halt __P((void)); -u_int64_t prom_dispatch __P((int, ...)); -int cpu_number __P((void)); -void switch_palcode __P((void)); +int prom_open(char*, int); +void OSFpal(void); +void halt(void); +u_int64_t prom_dispatch(int, ...); +int cpu_number(void); +void switch_palcode(void); ==== //depot/projects/trustedbsd/mac/sys/ddb/db_elf.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ddb/db_elf.c,v 1.10 2002/05/07 10:59:52 bde Exp $ */ +/* $FreeBSD: src/sys/ddb/db_elf.c,v 1.11 2002/06/29 02:32:33 peter Exp $ */ /* $NetBSD: db_elf.c,v 1.4 1998/05/03 18:49:54 thorpej Exp $ */ /*- @@ -56,7 +56,7 @@ #include <machine/elf.h> -static char *db_elf_find_strtab __P((db_symtab_t *)); +static char *db_elf_find_strtab(db_symtab_t *); #define STAB_TO_SYMSTART(stab) ((Elf_Sym *)((stab)->start)) #define STAB_TO_SYMEND(stab) ((Elf_Sym *)((stab)->end)) ==== //depot/projects/trustedbsd/mac/sys/dev/sio/sio_ebus.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID($FreeBSD: src/sys/dev/sio/sio_ebus.c,v 1.1 2002/06/18 01:19:31 obrien Exp $); +__FBSDID($FreeBSD: src/sys/dev/sio/sio_ebus.c,v 1.2 2002/06/29 02:32:33 peter Exp $); #include <sys/param.h> #include <sys/systm.h> @@ -40,9 +40,9 @@ #include <ofw/openfirm.h> #include <sparc64/ebus/ebusvar.h> -int sio_ofw_inlist __P((char *name, char *list[])); -static int sio_ebus_attach __P((device_t dev)); -static int sio_ebus_probe __P((device_t dev)); +int sio_ofw_inlist(char *name, char *list[]); +static int sio_ebus_attach(device_t dev); +static int sio_ebus_probe(device_t dev); static device_method_t sio_ebus_methods[] = { /* Device interface */ ==== //depot/projects/trustedbsd/mac/sys/i386/isa/intr_machdep.h#6 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/isa/intr_machdep.h,v 1.40 2002/04/06 08:25:05 nyan Exp $ + * $FreeBSD: src/sys/i386/isa/intr_machdep.h,v 1.41 2002/06/29 02:32:33 peter Exp $ */ #ifndef _I386_ISA_INTR_MACHDEP_H_ @@ -140,7 +140,7 @@ * Type of the first (asm) part of an interrupt handler. */ typedef void inthand_t(u_int cs, u_int ef, u_int esp, u_int ss); -typedef void unpendhand_t __P((void)); +typedef void unpendhand_t(void); #define IDTVEC(name) __CONCAT(X,name) ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#26 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.365 2002/06/28 23:17:36 alfred Exp $ + * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.366 2002/06/29 04:45:09 obrien Exp $ */ /* @@ -2465,7 +2465,7 @@ * List all of the locked vnodes in the system. * Called when debugging the kernel. */ -DB_SHOW_COMMAND(lockedvnodes, lockedvnodes) +DB_SHOW_COMMAND(lockedvnods, lockedvnodes) { struct thread *td = curthread; /* XXX */ struct mount *mp, *nmp; ==== //depot/projects/trustedbsd/mac/sys/pci/if_ti.c#11 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/pci/if_ti.c,v 1.60 2002/06/26 03:34:52 ken Exp $ + * $FreeBSD: src/sys/pci/if_ti.c,v 1.61 2002/06/29 02:32:34 peter Exp $ */ /* @@ -152,7 +152,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/pci/if_ti.c,v 1.60 2002/06/26 03:34:52 ken Exp $"; + "$FreeBSD: src/sys/pci/if_ti.c,v 1.61 2002/06/29 02:32:34 peter Exp $"; #endif struct ti_softc *tis[8]; @@ -270,8 +270,8 @@ static int ti_gibinit (struct ti_softc *); #ifdef TI_JUMBO_HDRSPLIT -static __inline void ti_hdr_split __P((struct mbuf *top, int hdr_len, - int pkt_len, int idx)); +static __inline void ti_hdr_split (struct mbuf *top, int hdr_len, + int pkt_len, int idx); #endif /* TI_JUMBO_HDRSPLIT */ static device_method_t ti_methods[] = { ==== //depot/projects/trustedbsd/mac/sys/sparc64/conf/GENERIC#10 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.22 2002/06/27 14:43:27 mux Exp $ +# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.23 2002/06/29 04:42:03 obrien Exp $ machine sparc64 cpu SUN4U @@ -83,7 +83,9 @@ device atapicd # ATAPI CDROM drives #device atapifd # ATAPI floppy drives #device atapist # ATAPI tape drives -options ATA_STATIC_ID #Static device numbering +# Do NOT enable ATA_STATIC_ID -- cmd646 controller will be !ata2!, +# and you will not mount an ATA /. +#options ATA_STATIC_ID #Static device numbering # SCSI Controllers device ahc # AHA2940 and onboard AIC7xxx devices ==== //depot/projects/trustedbsd/mac/sys/sparc64/include/profile.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * * from: NetBSD: profile.h,v 1.9 1997/04/06 08:47:37 cgd Exp * from: FreeBSD: src/sys/alpha/include/profile.h,v 1.4 1999/12/29 - * $FreeBSD: src/sys/sparc64/include/profile.h,v 1.1 2001/11/18 17:56:46 jake Exp $ + * $FreeBSD: src/sys/sparc64/include/profile.h,v 1.2 2002/06/29 02:32:34 peter Exp $ */ #ifndef _MACHINE_PROFILE_H_ @@ -52,10 +52,10 @@ #ifdef GUPROF struct gmonparam; -void nullfunc_loop_profiled __P((void)); -void nullfunc_profiled __P((void)); -void startguprof __P((struct gmonparam *p)); -void stopguprof __P((struct gmonparam *p)); +void nullfunc_loop_profiled(void); +void nullfunc_profiled(void); +void startguprof(struct gmonparam *p); +void stopguprof(struct gmonparam *p); #else #define startguprof(p) #define stopguprof(p) ==== //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/pmap.c#14 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.62 2002/06/25 15:13:07 jake Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.63 2002/06/29 06:37:24 jake Exp $ */ /* @@ -1200,7 +1200,8 @@ KASSERT(pmap_resident_count(pm) == 0, ("pmap_release: resident pages %ld != 0", pmap_resident_count(pm))); - TAILQ_FOREACH(m, &obj->memq, listq) { + while (!TAILQ_EMPTY(&obj->memq)) { + m = TAILQ_FIRST(&obj->memq); if (vm_page_sleep_busy(m, FALSE, "pmaprl")) continue; vm_page_busy(m); ==== //depot/projects/trustedbsd/mac/usr.bin/csplit/csplit.c#3 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/usr.bin/csplit/csplit.c,v 1.4 2002/06/07 01:04:24 tjr Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/csplit/csplit.c,v 1.5 2002/06/29 05:31:26 tjr Exp $"); #include <sys/types.h> @@ -227,8 +227,11 @@ { FILE *fp; - snprintf(currfile, sizeof(currfile), "%s%0*ld", prefix, (int)sufflen, - nfiles); + if (snprintf(currfile, sizeof(currfile), "%s%0*ld", prefix, + (int)sufflen, nfiles) >= sizeof(currfile)) { + errno = ENAMETOOLONG; + err(1, NULL); + } if ((fp = fopen(currfile, "w+")) == NULL) err(1, "%s", currfile); nfiles++; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200207070343.g673h7hC019905>