Date: Mon, 9 Jun 2008 06:44:12 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 143182 for review Message-ID: <200806090644.m596iCEC081665@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=143182 Change 143182 by jb@freebsd3 on 2008/06/09 06:44:06 IFC Affected files ... .. //depot/projects/dtrace/ports/Mk/bsd.database.mk#12 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i8134x/crb_machdep.c#6 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/pxa/pxa_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/conf/kern.pre.mk#15 integrate .. //depot/projects/dtrace/src/usr.sbin/config/mkmakefile.c#11 integrate Differences ... ==== //depot/projects/dtrace/ports/Mk/bsd.database.mk#12 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.database.mk,v 1.28 2008/04/11 13:52:57 vsevolod Exp $ +# $FreeBSD: ports/Mk/bsd.database.mk,v 1.29 2008/06/09 06:01:41 vanilla Exp $ # .if defined(_POSTMKINCLUDED) && !defined(Database_Post_Include) @@ -206,7 +206,7 @@ .if defined(USE_BDB) -_DB_PORTS= 2 3 40 41 42 43 44 45 46 3+ 40+ 41+ 42+ 43+ 44+ 45+ 46+ +_DB_PORTS= 2 3 40 41 42 43 44 45 46 47 3+ 40+ 41+ 42+ 43+ 44+ 45+ 46+ 47+ # Dependence lines for different db versions db2_DEPENDS= db2.0:${PORTSDIR}/databases/db2 db3_DEPENDS= db3.3:${PORTSDIR}/databases/db3 @@ -217,6 +217,7 @@ db44_DEPENDS= db-4.4.0:${PORTSDIR}/databases/db44 db45_DEPENDS= db-4.5.0:${PORTSDIR}/databases/db45 db46_DEPENDS= db-4.6.0:${PORTSDIR}/databases/db46 +db47_DEPENDS= db-4.7.0:${PORTSDIR}/databases/db47 # Detect db versions by finding some files db3_FIND= ${LOCALBASE}/include/db3/db.h db40_FIND= ${LOCALBASE}/include/db4/db.h @@ -226,6 +227,7 @@ db44_FIND= ${LOCALBASE}/include/db44/db.h db45_FIND= ${LOCALBASE}/include/db45/db.h db46_FIND= ${LOCALBASE}/include/db46/db.h +db47_FIND= ${LOCALBASE}/include/db47/db.h # For specifying [3, 40, 41, ..]+ _DB_3P= 3 ${_DB_40P} @@ -235,7 +237,8 @@ _DB_43P= 43 ${_DB_44P} _DB_44P= 44 ${_DB_45P} _DB_45P= 45 ${_DB_46P} -_DB_46P= 46 +_DB_46P= 46 ${_DB_47P} +_DB_47P= 47 # Override the global WITH_BDB_VER with the # port specific <UNIQUENAME>_WITH_BDB_VER @@ -367,6 +370,10 @@ BDB_LIB_NAME= db-4.6 BDB_LIB_CXX_NAME= db_cxx-4.6 BDB_LIB_DIR= ${LOCALBASE}/lib/db46 +. elif ${_BDB_VER} == 47 +BDB_LIB_NAME= db-4.7 +BDB_LIB_CXX_NAME= db_cxx-4.7 +BDB_LIB_DIR= ${LOCALBASE}/lib/db47 . endif BDB_LIB_NAME?= db${_BDB_VER} BDB_LIB_CXX_NAME?= db${_BDB_VER}_cxx ==== //depot/projects/dtrace/src/sys/arm/xscale/i8134x/crb_machdep.c#6 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_msgbuf.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/crb_machdep.c,v 1.6 2008/04/08 10:24:41 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/crb_machdep.c,v 1.7 2008/06/09 05:53:04 kevlo Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> @@ -77,7 +77,6 @@ #include <vm/vm.h> #include <vm/pmap.h> -#include <vm/vm.h> #include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_pager.h> @@ -120,7 +119,6 @@ extern u_int undefined_handler_address; struct pv_addr kernel_pt_table[NUM_KERNEL_PTS]; -extern vm_offset_t sa1_cache_clean_addr; extern int *end; struct pcpu __pcpu; ==== //depot/projects/dtrace/src/sys/arm/xscale/pxa/pxa_machdep.c#2 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_ddb.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/pxa/pxa_machdep.c,v 1.1 2008/06/06 05:08:09 benno Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/pxa/pxa_machdep.c,v 1.2 2008/06/09 05:50:42 kevlo Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> @@ -78,7 +78,6 @@ #include <vm/vm.h> #include <vm/pmap.h> -#include <vm/vm.h> #include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_pager.h> @@ -109,11 +108,7 @@ /* Define various stack sizes in pages */ #define IRQ_STACK_SIZE 1 #define ABT_STACK_SIZE 1 -#ifdef IPKDB -#define UND_STACK_SIZE 2 -#else #define UND_STACK_SIZE 1 -#endif extern u_int data_abort_handler_address; extern u_int prefetch_abort_handler_address; @@ -123,8 +118,6 @@ extern void *_end; -extern vm_offset_t sa1_cache_clean_addr; - extern int *end; struct pcpu __pcpu; @@ -145,7 +138,6 @@ struct pv_addr kernelstack; struct pv_addr minidataclean; -void enable_mmu(vm_offset_t); static struct trapframe proc0_tf; static void pxa_probe_sdram(bus_space_tag_t, bus_space_handle_t, @@ -169,14 +161,8 @@ #define SDRAM_START 0xa0000000 -#ifdef DDB -extern vm_offset_t ksym_start, ksym_end; -#endif - extern vm_offset_t xscale_cache_clean_addr; -extern void boot_putc(int); - void * initarm(void *arg, void *arg2) { @@ -188,58 +174,15 @@ vm_offset_t afterkern; vm_offset_t freemem_after; vm_offset_t lastaddr; -#ifdef DDB - vm_offset_t zstart = 0, zend = 0; -#endif int i, j; - uint32_t fake_preload[35]; uint32_t memsize[PXA2X0_SDRAM_BANKS], memstart[PXA2X0_SDRAM_BANKS]; - i = 0; - j = 0; - boothowto |= RB_SERIAL | RB_SINGLE; - bootverbose = 1; - set_cpufuncs(); - fake_preload[i++] = MODINFO_NAME; - fake_preload[i++] = strlen("elf kernel") + 1; - strcpy((char*)&fake_preload[i++], "elf kernel"); - i += 2; - fake_preload[i++] = MODINFO_TYPE; - fake_preload[i++] = strlen("elf kernel") + 1; - strcpy((char*)&fake_preload[i++], "elf kernel"); - i += 2; - fake_preload[i++] = MODINFO_ADDR; - fake_preload[i++] = sizeof(vm_offset_t); - fake_preload[i++] = KERNBASE + 0x00200000; - fake_preload[i++] = MODINFO_SIZE; - fake_preload[i++] = sizeof(uint32_t); - fake_preload[i++] = (uint32_t)&end - KERNBASE - 0x00200000; -#ifdef DDB - if (*(uint32_t *)KERNVIRTADDR == MAGIC_TRAMP_NUMBER) { - fake_preload[i++] = MODINFO_METADATA|MODINFOMD_SSYM; - fake_preload[i++] = sizeof(vm_offset_t); - fake_preload[i++] = *(uint32_t *)(KERNVIRTADDR + 4); - fake_preload[i++] = MODINFO_METADATA|MODINFOMD_ESYM; - fake_preload[i++] = sizeof(vm_offset_t); - fake_preload[i++] = *(uint32_t *)(KERNVIRTADDR + 8); - lastaddr = *(uint32_t *)(KERNVIRTADDR + 8); - zend = lastaddr; - zstart = *(uint32_t *)(KERNVIRTADDR + 4); - ksym_start = zstart; - ksym_end = zend; - } else -#endif - lastaddr = (vm_offset_t)&end; - fake_preload[i++] = 0; - fake_preload[i] = 0; - preload_metadata = (void *)fake_preload; - + lastaddr = fake_preload_metadata(); pcpu_init(pcpup, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0); -#define KERNEL_TEXT_BASE (KERNBASE + 0x00200000) freemempos = 0xa0200000; /* Define a macro to simplify memory allocation */ #define valloc_pages(var, np) \ ==== //depot/projects/dtrace/src/sys/conf/kern.pre.mk#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.98 2008/05/23 03:53:49 jb Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.99 2008/06/09 06:31:17 jb Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -33,8 +33,6 @@ . endif . if ${MACHINE_ARCH} == "amd64" COPTFLAGS?=-O2 -frename-registers -pipe -. elif ${MACHINE_ARCH} == "sparc64" -COPTFLAGS?=-pipe . else COPTFLAGS?=${_MINUS_O} -pipe . endif ==== //depot/projects/dtrace/src/usr.sbin/config/mkmakefile.c#11 (text+ko) ==== @@ -32,7 +32,7 @@ static char sccsid[] = "@(#)mkmakefile.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$FreeBSD: src/usr.sbin/config/mkmakefile.c,v 1.92 2008/05/23 03:55:26 jb Exp $"; + "$FreeBSD: src/usr.sbin/config/mkmakefile.c,v 1.93 2008/06/09 06:33:26 jb Exp $"; #endif /* not lint */ /* @@ -735,7 +735,7 @@ printf("config: don't know rules for %s\n", np); break; } - snprintf(cmd, sizeof(cmd), "${%s_%c%s}; ${NORMAL_CTFCONVERT}", ftype, + snprintf(cmd, sizeof(cmd), "${%s_%c%s}\n\t${NORMAL_CTFCONVERT}", ftype, toupper(och), ftp->f_flags & NOWERROR ? "_NOWERROR" : ""); compilewith = cmd;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200806090644.m596iCEC081665>