Date: Sat, 29 Jun 2002 00:54:41 -0700 (PDT) From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 13579 for review Message-ID: <200206290754.g5T7sfM7026636@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13579 Change 13579 by julian@julian_jules1 on 2002/06/29 00:54:00 MFC Affected files ... .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile#7 integrate .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile.alpha#5 integrate .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile.arm#1 branch .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile.i386#5 integrate .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile.ia64#1 branch .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile.powerpc#1 branch .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile.sparc64#1 branch .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/freebsd-uthread.c#5 integrate .. //depot/projects/kse/sys/geom/geom_kern.c#3 integrate .. //depot/projects/kse/sys/kern/vfs_subr.c#36 integrate .. //depot/projects/kse/sys/sparc64/conf/GENERIC#16 integrate .. //depot/projects/kse/sys/sys/kse.h#14 integrate Differences ... ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile#7 (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/kse/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/kse/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/kse/gnu/usr.bin/binutils/gdb/freebsd-uthread.c#5 (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/kse/sys/geom/geom_kern.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_kern.c,v 1.3 2002/03/26 22:07:38 phk Exp $ + * $FreeBSD: src/sys/geom/geom_kern.c,v 1.4 2002/06/29 07:47:20 julian Exp $ */ #include <sys/param.h> @@ -63,7 +63,7 @@ g_up_procbody(void) { struct proc *p = g_up_proc; - struct thread *tp = &p->p_xxthread; + struct thread *tp = FIRST_THREAD_IN_PROC(p); curthread->td_base_pri = PRIBIO; for(;;) { @@ -86,7 +86,7 @@ g_down_procbody(void) { struct proc *p = g_down_proc; - struct thread *tp = &p->p_xxthread; + struct thread *tp = FIRST_THREAD_IN_PROC(p); curthread->td_base_pri = PRIBIO; for(;;) { ==== //depot/projects/kse/sys/kern/vfs_subr.c#36 (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 $ */ /* @@ -2456,7 +2456,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/kse/sys/sparc64/conf/GENERIC#16 (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/kse/sys/sys/kse.h#14 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD: src/sys/sys/kse.h,v 1.1 2002/02/19 02:12:36 julian Exp $ + * $FreeBSD: src/sys/sys/kse.h,v 1.3 2002/06/29 07:16:24 julian Exp $ */ #ifndef SYS_KSE_H @@ -75,12 +75,4 @@ }; #define GMBXF_CRITICAL 0x00000001 -/* some provisional sycalls: */ - -#ifndef _KERNEL -int kse_new(struct kse_mailbox *mbx, int new_grp_flag); -int kse_exit(void); -int thread_wakeup(struct thread_mailbox *tmbx); -int kse_wakeup(void); -#endif #endif 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?200206290754.g5T7sfM7026636>