From owner-p4-projects@FreeBSD.ORG Mon Feb 25 16:24:37 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07894332; Mon, 25 Feb 2013 16:24:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id BF1A7330 for ; Mon, 25 Feb 2013 16:24:36 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id AF4537AB for ; Mon, 25 Feb 2013 16:24:36 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r1PGOaKQ043107 for ; Mon, 25 Feb 2013 16:24:36 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r1PGOasV043104 for perforce@freebsd.org; Mon, 25 Feb 2013 16:24:36 GMT (envelope-from brooks@freebsd.org) Date: Mon, 25 Feb 2013 16:24:36 GMT Message-Id: <201302251624.r1PGOasV043104@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222345 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2013 16:24:37 -0000 http://p4web.freebsd.org/@@222345?ac=10 Change 222345 by brooks@brooks_zenith on 2013/02/25 16:24:25 It's sufficient to link against vdev_file.c once. Affected files ... .. //depot/projects/ctsrd/tesla/src/cddl/lib/libzpool/Makefile#2 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/cddl/lib/libzpool/Makefile#2 (text+ko) ==== @@ -26,7 +26,7 @@ LIB= zpool -ZFS_COMMON_SRCS= ${ZFS_COMMON_OBJS:C/.o$/.c/} vdev_file.c trim_map.c +ZFS_COMMON_SRCS= ${ZFS_COMMON_OBJS:C/.o$/.c/} trim_map.c ZFS_SHARED_SRCS= ${ZFS_SHARED_OBJS:C/.o$/.c/} KERNEL_SRCS= kernel.c taskq.c util.c LIST_SRCS= list.c From owner-p4-projects@FreeBSD.ORG Mon Feb 25 16:25:38 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4AD38434; Mon, 25 Feb 2013 16:25:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 0DA38432 for ; Mon, 25 Feb 2013 16:25:38 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id F06CC7C4 for ; Mon, 25 Feb 2013 16:25:37 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r1PGPbsC043156 for ; Mon, 25 Feb 2013 16:25:37 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r1PGPbI5043153 for perforce@freebsd.org; Mon, 25 Feb 2013 16:25:37 GMT (envelope-from brooks@freebsd.org) Date: Mon, 25 Feb 2013 16:25:37 GMT Message-Id: <201302251625.r1PGPbI5043153@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222346 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2013 16:25:38 -0000 http://p4web.freebsd.org/@@222346?ac=10 Change 222346 by brooks@brooks_zenith on 2013/02/25 16:25:09 Only list frame-unwind-kluge.c once. Affected files ... .. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/libgdb/Makefile#2 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/libgdb/Makefile#2 (text+ko) ==== @@ -26,7 +26,7 @@ elfread.c environ.c eval.c event-loop.c event-top.c exec.c \ expprint.c \ f-exp.y f-lang.c f-typeprint.c f-valprint.c findvar.c \ - ${_fork_child} frame-base.c frame-unwind-kluge.c frame.c \ + ${_fork_child} frame-base.c frame.c \ gdb-events.c gdbarch.c gdbtypes.c gnu-v2-abi.c gnu-v3-abi.c \ hpacc-abi.c \ inf-loop.c infcall.c infcmd.c inflow.c ${_infptrace} infrun.c \ From owner-p4-projects@FreeBSD.ORG Mon Feb 25 16:26:40 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC5E4787; Mon, 25 Feb 2013 16:26:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 8815E780 for ; Mon, 25 Feb 2013 16:26:39 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6CDB57E1 for ; Mon, 25 Feb 2013 16:26:39 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r1PGQdYi043240 for ; Mon, 25 Feb 2013 16:26:39 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r1PGQdFr043237 for perforce@freebsd.org; Mon, 25 Feb 2013 16:26:39 GMT (envelope-from brooks@freebsd.org) Date: Mon, 25 Feb 2013 16:26:39 GMT Message-Id: <201302251626.r1PGQdFr043237@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222348 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2013 16:26:40 -0000 http://p4web.freebsd.org/@@222348?ac=10 Change 222348 by brooks@brooks_zenith on 2013/02/25 16:26:16 There are infact two fsaccess.c files, but one includes the other so only list one of them (If both were needed one would need to be renamed). Affected files ... .. //depot/projects/ctsrd/tesla/src/lib/bind/isc/Makefile#2 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/lib/bind/isc/Makefile#2 (text+ko) ==== @@ -29,7 +29,7 @@ SRCS+= inet_pton.c \ assertions.c backtrace.c base32.c base64.c bitstring.c \ buffer.c bufferlist.c commandline.c error.c event.c \ - fsaccess.c hash.c \ + hash.c \ heap.c hex.c hmacmd5.c hmacsha.c \ httpd.c inet_aton.c \ inet_ntop.c \ From owner-p4-projects@FreeBSD.ORG Mon Feb 25 16:27:41 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F2457885; Mon, 25 Feb 2013 16:27:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B62B8883 for ; Mon, 25 Feb 2013 16:27:40 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id A66977F4 for ; Mon, 25 Feb 2013 16:27:40 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r1PGReZt043281 for ; Mon, 25 Feb 2013 16:27:40 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r1PGReji043278 for perforce@freebsd.org; Mon, 25 Feb 2013 16:27:40 GMT (envelope-from brooks@freebsd.org) Date: Mon, 25 Feb 2013 16:27:40 GMT Message-Id: <201302251627.r1PGReji043278@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222349 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2013 16:27:41 -0000 http://p4web.freebsd.org/@@222349?ac=10 Change 222349 by brooks@brooks_zenith on 2013/02/25 16:26:48 Only list kinfo_getfile.c once. Affected files ... .. //depot/projects/ctsrd/tesla/src/lib/libutil/Makefile#2 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/lib/libutil/Makefile#2 (text+ko) ==== @@ -9,7 +9,7 @@ SHLIB_MAJOR= 9 SRCS= _secure_path.c auth.c expand_number.c flopen.c fparseln.c gr_util.c \ - hexdump.c humanize_number.c kinfo_getfile.c kinfo_getfile.c \ + hexdump.c humanize_number.c kinfo_getfile.c \ kinfo_getallproc.c kinfo_getproc.c kinfo_getvmmap.c kld.c \ login_auth.c login_cap.c \ login_class.c login_crypt.c login_ok.c login_times.c login_tty.c \ From owner-p4-projects@FreeBSD.ORG Mon Feb 25 18:46:08 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1927B9FE; Mon, 25 Feb 2013 18:46:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D0F0C9FC for ; Mon, 25 Feb 2013 18:46:07 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id B5E3EE94 for ; Mon, 25 Feb 2013 18:46:07 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r1PIk7Kc056844 for ; Mon, 25 Feb 2013 18:46:07 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r1PIk7Or056841 for perforce@freebsd.org; Mon, 25 Feb 2013 18:46:07 GMT (envelope-from brooks@freebsd.org) Date: Mon, 25 Feb 2013 18:46:07 GMT Message-Id: <201302251846.r1PIk7Or056841@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222354 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2013 18:46:08 -0000 http://p4web.freebsd.org/@@222354?ac=10 Change 222354 by brooks@brooks_zenith on 2013/02/25 18:46:05 Checkpoint a set of rules to build llvm bitcode files for programs and libraries. Affected files ... .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.lib.mk#2 edit .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#2 edit .. //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#2 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.lib.mk#2 (text+ko) ==== @@ -48,7 +48,7 @@ # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries # .So used for PIC object files .SUFFIXES: -.SUFFIXES: .out .o .po .So .S .asm .s .c .cc .cpp .cxx .C .f .y .l .ln +.SUFFIXES: .out .o .po .So .S .asm .s .c .cc .cpp .cxx .C .f .y .l .obc .ln .if !defined(PICFLAG) .if ${MACHINE_CPUARCH} == "sparc64" @@ -60,6 +60,9 @@ PO_FLAG=-pg +.c.obc: + ${CC} -c -g -emit-llvm ${CFLAGS} ${.IMPSRC} -o ${.TARGET} + .c.o: ${CC} ${STATIC_CFLAGS} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} @@ -138,6 +141,29 @@ @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} .endif ${RANLIB} ${.TARGET} + +.if defined(LLVM_IR) && !defined(NO_LLVM_IR) +_LIBS+= lib${LIB}.bc lib${LIB}.bc-opt +# XXX: force expantion now to avoid picking up generated C code. +# Ideally we do want it, but there is an undiagnosed dependency issue that +# causes the .obc file to not be built. +LOBJS:= ${SRCS:M*.[Cc]:R:S/$/.obc/:N.obc} \ + ${SRCS:M*.cc:R:S/$/.obc/:N.obc} \ + ${SRCS:M*.cpp:R:S/$/.obc/:N.obc} \ + ${SRCS:M*.cxx:R:S/$/.obc/:N.obc} +LLVM_LINK?= llvm-link + +lib${LIB}.bc: ${LOBJS} + ${LLVM_LINK} -o ${.TARGET} ${LOBJS} + +lib${LIB}.bc-opt: lib${LIB}.bc +.if empty(OPT_PASSES) + cp lib${LIB}.bc ${.TARGET} +.else + ${OPT} -o ${.TARGET} ${OPT_PASSES} ${.ALLSRC} +.endif + +.endif .endif .if !defined(INTERNALLIB) @@ -380,6 +406,9 @@ .endif .if defined(LIB) && !empty(LIB) rm -f a.out ${OBJS} ${OBJS:S/$/.tmp/} ${STATICOBJS} +.if defined(LLVM_IR) + rm -f ${LOBJS} +.endif .endif .if !defined(INTERNALLIB) .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 +# from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 # $FreeBSD: head/share/mk/bsd.prog.mk 245515 2013-01-16 23:21:04Z brooks $ .include @@ -92,6 +92,28 @@ .endif # !defined(SRCS) +.if defined(LLVM_IR) && !defined(NO_LLVM_IR) +LOBJS:= ${SRCS:M*.[Cc]:R:S/$/.obc/:N.obc} \ + ${SRCS:M*.cc:R:S/$/.obc/:N.obc} \ + ${SRCS:M*.cpp:R:S/$/.obc/:N.obc} \ + ${SRCS:M*.cxx:R:S/$/.obc/:N.obc} +CLEANFILES+= ${PROG}.bc ${LOBJS} + +.if !empty(LOBJS) +all: ${PROG}.bc +${PROG}.bc: ${LOBJS} + ${LLVM_LINK} -o ${.TARGET} ${LOBJS} + +all: ${PROG}.bc-opt +${PROG}.bc-opt: ${PROG}.bc +.if empty(OPT_PASSES) + cp ${PROG}.bc ${.TARGET} +.else + ${OPT} -o ${.TARGET} ${OPT_PASSES} ${.IMPSRC} +.endif +.endif +.endif + .if ${MK_MAN} != "no" && !defined(MAN) && \ !defined(MAN1) && !defined(MAN2) && !defined(MAN3) && \ !defined(MAN4) && !defined(MAN5) && !defined(MAN6) && \ ==== //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#2 (text+ko) ==== @@ -32,7 +32,7 @@ .if defined(%POSIX) .SUFFIXES: .o .c .y .l .a .sh .f .else -.SUFFIXES: .out .a .ln .o .c .cc .cpp .cxx .C .m .F .f .e .r .y .l .S .asm .s .cl .p .h .sh +.SUFFIXES: .out .a .obc .ln .o .c .cc .cpp .cxx .C .m .F .f .e .r .y .l .S .asm .s .cl .p .h .sh .endif AR ?= ar @@ -125,6 +125,10 @@ LINTOBJKERNFLAGS?= ${LINTOBJFLAGS} LINTLIBFLAGS ?= -cghapbxu -C ${LIB} +LLC ?= llc + +LLVM_LINK ?= llvm-link + MAKE ?= make .if !defined(%POSIX) @@ -135,6 +139,8 @@ OBJCOPY ?= objcopy +OPT ?= opt + PC ?= pc PFLAGS ?= @@ -222,6 +228,9 @@ cp -fp ${.IMPSRC} ${.TARGET} chmod a+x ${.TARGET} +.c.obc: + ${CC} ${CFLAGS} -cc1 -emit-llvm -c ${.IMPSRC} -o ${.TARGET} + .c.ln: ${LINT} ${LINTOBJFLAGS} ${CFLAGS:M-[DIU]*} ${.IMPSRC} || \ touch ${.TARGET} @@ -241,6 +250,9 @@ .cc .cpp .cxx .C: ${CXX} ${CXXFLAGS} ${LDFLAGS} ${.IMPSRC} ${LDLIBS} -o ${.TARGET} +.cc.obc .C.obc .cpp.obc .cxx.obc: + ${CXX} ${CXXFLAGS} -cc1 -emit-llvm -c ${.IMPSRC} -o ${.TARGET} + .cc.o .cpp.o .cxx.o .C.o: ${CXX} ${CXXFLAGS} -c ${.IMPSRC} From owner-p4-projects@FreeBSD.ORG Mon Feb 25 18:48:10 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43406B11; Mon, 25 Feb 2013 18:48:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 0701AB0F for ; Mon, 25 Feb 2013 18:48:10 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id CEC73EB0 for ; Mon, 25 Feb 2013 18:48:09 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r1PIm9sR056917 for ; Mon, 25 Feb 2013 18:48:09 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r1PIm9Ah056914 for perforce@freebsd.org; Mon, 25 Feb 2013 18:48:09 GMT (envelope-from brooks@freebsd.org) Date: Mon, 25 Feb 2013 18:48:09 GMT Message-Id: <201302251848.r1PIm9Ah056914@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222355 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2013 18:48:10 -0000 http://p4web.freebsd.org/@@222355?ac=10 Change 222355 by brooks@brooks_zenith on 2013/02/25 18:47:56 Don't try to build LLVM bitcode files in cases where it fails. We should at least fix the libnvpair case, the ancient gnu toolchain bits are probably not worth fixing. Affected files ... .. //depot/projects/ctsrd/tesla/src/cddl/lib/libnvpair/Makefile#2 edit .. //depot/projects/ctsrd/tesla/src/gnu/lib/libgcov/Makefile#2 edit .. //depot/projects/ctsrd/tesla/src/gnu/lib/libstdc++/Makefile#2 edit .. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/binutils/libbfd/Makefile#2 edit .. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/cc/Makefile.inc#2 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/cddl/lib/libnvpair/Makefile#2 (text+ko) ==== @@ -11,6 +11,8 @@ nvpair.c \ fnvpair.c +NO_LLVM_IR= + WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common ==== //depot/projects/ctsrd/tesla/src/gnu/lib/libgcov/Makefile#2 (text+ko) ==== @@ -1,6 +1,7 @@ # $FreeBSD: head/gnu/lib/libgcov/Makefile 245539 2013-01-17 05:56:28Z andrew $ NO_PROFILE= +NO_LLVM_IR=No SRCS .include MK_SSP= no .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt" ==== //depot/projects/ctsrd/tesla/src/gnu/lib/libstdc++/Makefile#2 (text+ko) ==== @@ -1,5 +1,6 @@ # $FreeBSD: head/gnu/lib/libstdc++/Makefile 245539 2013-01-17 05:56:28Z andrew $ +NO_LLVM_IR=include path .include GCCVER= 4.2 ==== //depot/projects/ctsrd/tesla/src/gnu/usr.bin/binutils/libbfd/Makefile#2 (text+ko) ==== @@ -1,5 +1,7 @@ # $FreeBSD: head/gnu/usr.bin/binutils/libbfd/Makefile 218822 2011-02-18 20:54:12Z dim $ +NO_LLVM_IR=efi-app-ia32.oll duplicated + .include "../Makefile.inc0" .PATH: ${SRCDIR}/bfd ${SRCDIR}/opcodes ==== //depot/projects/ctsrd/tesla/src/gnu/usr.bin/cc/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,7 @@ # $FreeBSD: head/gnu/usr.bin/cc/Makefile.inc 245539 2013-01-17 05:56:28Z andrew $ +NO_LLVM_IR=version.c fails + .include "../Makefile.inc" # Sometimes this is .include'd several times... From owner-p4-projects@FreeBSD.ORG Mon Feb 25 19:02:25 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2CE2012A; Mon, 25 Feb 2013 19:02:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E4D90128 for ; Mon, 25 Feb 2013 19:02:24 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id BB258F64 for ; Mon, 25 Feb 2013 19:02:24 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r1PJ2OwT058420 for ; Mon, 25 Feb 2013 19:02:24 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r1PJ2OLv058417 for perforce@freebsd.org; Mon, 25 Feb 2013 19:02:24 GMT (envelope-from brooks@freebsd.org) Date: Mon, 25 Feb 2013 19:02:24 GMT Message-Id: <201302251902.r1PJ2OLv058417@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222356 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2013 19:02:25 -0000 http://p4web.freebsd.org/@@222356?ac=10 Change 222356 by brooks@brooks_zenith on 2013/02/25 19:02:10 Allow an external cross compiler to be used by setting XCC, XCXX and XCPP. Currently 32-bit compatibility libs require the normal cross compiler and thus building it is not supressed. You must also specify -DWITHOUT_RESCUE because I've not yet figured out a way to pass --sysroot through to the crunchgen create makefiles. Affected files ... .. //depot/projects/ctsrd/tesla/src/Makefile.inc1#2 edit .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.dep.mk#2 edit .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#2 edit .. //depot/projects/ctsrd/tesla/src/sys/boot/i386/boot2/Makefile#2 edit .. //depot/projects/ctsrd/tesla/src/sys/boot/i386/gptboot/Makefile#2 edit .. //depot/projects/ctsrd/tesla/src/sys/boot/i386/gptzfsboot/Makefile#2 edit .. //depot/projects/ctsrd/tesla/src/sys/boot/i386/zfsboot/Makefile#2 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/Makefile.inc1#2 (text+ko) ==== @@ -280,16 +280,23 @@ .if ${MK_CDDL} == "no" WMAKEENV+= NO_CTF=1 .endif -.if ${CC:T:Mgcc} == "gcc" +XCC?= ${CC} +XCXX?= ${CXX} +XCPP?= ${CPP} +.if ${XCC:T:Mgcc} == "gcc" WMAKE_COMPILER_TYPE= gcc -.elif ${CC:T:Mclang} == "clang" +.elif ${XCC:T:Mclang} == "clang" WMAKE_COMPILER_TYPE= clang .elif ${MK_CLANG_IS_CC} == "no" WMAKE_COMPILER_TYPE= gcc .else WMAKE_COMPILER_TYPE= clang .endif -WMAKEENV+= COMPILER_TYPE=${WMAKE_COMPILER_TYPE} +.if ${XCC:M/*} +WMAKEENV+= SYSROOT=${WORLDTMP} +.endif +WMAKEENV+= CC=${XCC} CXX=${XCXX} CPP=${XCPP} \ + COMPILER_TYPE=${WMAKE_COMPILER_TYPE} WMAKE= ${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP} .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.dep.mk#2 (text+ko) ==== @@ -129,9 +129,10 @@ # Different types of sources are compiled with slightly different flags. # Split up the sources, and filter out headers and non-applicable flags. MKDEP_CFLAGS= ${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BIDU]*} ${CFLAGS:M-std=*} \ - ${CFLAGS:M-ansi} + ${CFLAGS:M-ansi} ${CFLAGS:M--sysroot*} MKDEP_CXXFLAGS= ${CXXFLAGS:M-nostdinc*} ${CXXFLAGS:M-[BIDU]*} \ - ${CXXFLAGS:M-std=*} ${CXXFLAGS:M-ansi} ${CXXFLAGS:M-stdlib=*} + ${CXXFLAGS:M-std=*} ${CXXFLAGS:M-ansi} ${CXXFLAGS:M-stdlib=*} \ + ${CXXFLAGS:M--sysroot*} DPSRCS+= ${SRCS} ${DEPENDFILE}: ${DPSRCS} ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#2 (text+ko) ==== @@ -646,4 +646,9 @@ .endif # !_WITHOUT_SRCCONF +.if defined(SYSROOT) +CFLAGS+= --sysroot=${SYSROOT} +LDFLAGS+= --sysroot=${SYSROOT} +.endif + .endif # !target(____) ==== //depot/projects/ctsrd/tesla/src/sys/boot/i386/boot2/Makefile#2 (text+ko) ==== @@ -42,6 +42,10 @@ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ -Winline --param max-inline-insns-single=100 \ ${CLANG_OPT_SMALL} +.if defined(SYSROOT) +CFLAGS+= --sysroot=${SYSROOT} +.endif + LDFLAGS=-static -N --gc-sections ==== //depot/projects/ctsrd/tesla/src/sys/boot/i386/gptboot/Makefile#2 (text+ko) ==== @@ -35,6 +35,10 @@ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ -Winline --param max-inline-insns-single=100 +.if defined(SYSROOT) +CFLAGS+= --sysroot=${SYSROOT} +.endif + LDFLAGS=-static -N --gc-sections ==== //depot/projects/ctsrd/tesla/src/sys/boot/i386/gptzfsboot/Makefile#2 (text+ko) ==== @@ -33,6 +33,10 @@ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ -Winline --param max-inline-insns-single=100 +.if defined(SYSROOT) +CFLAGS+= --sysroot=${SYSROOT} +.endif + LDFLAGS=-static -N --gc-sections ==== //depot/projects/ctsrd/tesla/src/sys/boot/i386/zfsboot/Makefile#2 (text+ko) ==== @@ -30,6 +30,10 @@ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ -Winline --param max-inline-insns-single=100 +.if defined(SYSROOT) +CFLAGS+= --sysroot=${SYSROOT} +.endif + LDFLAGS=-static -N --gc-sections From owner-p4-projects@FreeBSD.ORG Mon Feb 25 19:42:09 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9BE1371; Mon, 25 Feb 2013 19:42:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 1DA8036F for ; Mon, 25 Feb 2013 19:42:08 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 0B8FC1C9 for ; Mon, 25 Feb 2013 19:42:08 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r1PJg7jI062605 for ; Mon, 25 Feb 2013 19:42:07 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r1PJg6Ul062601 for perforce@freebsd.org; Mon, 25 Feb 2013 19:42:06 GMT (envelope-from brooks@freebsd.org) Date: Mon, 25 Feb 2013 19:42:06 GMT Message-Id: <201302251942.r1PJg6Ul062601@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222360 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2013 19:42:09 -0000 http://p4web.freebsd.org/@@222360?ac=10 Change 222360 by brooks@brooks_zenith on 2013/02/25 19:41:39 IFC@222359. Affected files ... .. //depot/projects/ctsrd/tesla/src/bin/sh/eval.c#2 integrate .. //depot/projects/ctsrd/tesla/src/bin/sh/jobs.c#2 integrate .. //depot/projects/ctsrd/tesla/src/bin/sh/main.c#2 integrate .. //depot/projects/ctsrd/tesla/src/bin/sh/trap.c#2 integrate .. //depot/projects/ctsrd/tesla/src/bin/sh/trap.h#2 integrate .. //depot/projects/ctsrd/tesla/src/bin/test/test.1#2 integrate .. //depot/projects/ctsrd/tesla/src/bin/test/test.c#2 integrate .. //depot/projects/ctsrd/tesla/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#2 integrate .. //depot/projects/ctsrd/tesla/src/cddl/contrib/opensolaris/cmd/zinject/translate.c#2 integrate .. //depot/projects/ctsrd/tesla/src/cddl/contrib/opensolaris/cmd/zinject/zinject.c#2 integrate .. //depot/projects/ctsrd/tesla/src/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#2 integrate .. //depot/projects/ctsrd/tesla/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/binutils/gas/config/tc-i386.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/binutils/opcodes/i386-dis.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/binutils/opcodes/i386-opc.h#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/binutils/opcodes/i386-tbl.h#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/Changelog#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/Makefile.in#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/buffer.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/configure#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/configure.ac#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/dane.c#1 branch .. //depot/projects/ctsrd/tesla/src/contrib/ldns/dname.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/dnssec.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/dnssec_sign.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/dnssec_verify.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/dnssec_zone.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/Makefile.in#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/chasetrace.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/config.h.in#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/configure#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/configure.ac#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/dnssec.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/drill.1#2 delete .. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/drill.1.in#1 branch .. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/drill.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/drill.h#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/drill_util.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/drill_util.h#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/securetrace.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/work.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/error.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/higher.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/host2str.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/host2wire.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/keys.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/buffer.h#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/common.h#1 branch .. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/common.h.in#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/config.h#1 branch .. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/config.h.in#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/dane.h#1 branch .. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/dname.h#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/dnssec.h#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/dnssec_verify.h#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/dnssec_zone.h#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/error.h#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/host2str.h#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/keys.h#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/ldns.h#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/net.h#1 branch .. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/rdata.h#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/resolver.h#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/rr.h#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/util.h#1 branch .. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/util.h.in#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns_symbols.def#2 delete .. //depot/projects/ctsrd/tesla/src/contrib/ldns/libdns.doxygen#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/net.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/packet.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/parse.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/resolver.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/rr.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/str2host.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/tsig.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/util.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/ldns/zone.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/llvm/lib/MC/MCParser/AsmParser.cpp#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/llvm/lib/Target/X86/X86InstrCompiler.td#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/llvm/lib/Target/X86/X86SelectionDAGInfo.cpp#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/llvm/tools/clang/lib/Driver/Tools.cpp#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/llvm/tools/clang/lib/Driver/Tools.h#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/nvi/ex/ex_txt.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/nvi/vi/v_txt.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/openbsm/bin/auditdistd/token.l#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/opie/opiekey.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/sendmail/src/milter.c#2 integrate .. //depot/projects/ctsrd/tesla/src/contrib/wpa/src/crypto/md5-internal.c#2 integrate .. //depot/projects/ctsrd/tesla/src/crypto/heimdal/kcm/cache.c#2 integrate .. //depot/projects/ctsrd/tesla/src/etc/Makefile#2 integrate .. //depot/projects/ctsrd/tesla/src/etc/rc.d/rtadvd#2 integrate .. //depot/projects/ctsrd/tesla/src/etc/rc.resume#2 integrate .. //depot/projects/ctsrd/tesla/src/gnu/lib/libstdc++/config.h#2 integrate .. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/kgdb/kgdb.1#2 integrate .. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/kgdb/kgdb.h#2 integrate .. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/kgdb/kthr.c#2 integrate .. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/kgdb/main.c#2 integrate .. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/kgdb/trgt.c#2 integrate .. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#2 integrate .. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/kgdb/trgt_arm.c#2 integrate .. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 integrate .. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/kgdb/trgt_ia64.c#2 integrate .. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/kgdb/trgt_mips.c#2 integrate .. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/kgdb/trgt_powerpc.c#2 integrate .. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/kgdb/trgt_powerpc64.c#2 integrate .. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c#2 integrate .. //depot/projects/ctsrd/tesla/src/lib/libc/gen/Makefile.inc#2 integrate .. //depot/projects/ctsrd/tesla/src/lib/libc/gen/opendir.c#2 integrate .. //depot/projects/ctsrd/tesla/src/lib/libc/gen/sem_new.c#2 integrate .. //depot/projects/ctsrd/tesla/src/lib/libc/stdio/setbuf.3#2 integrate .. //depot/projects/ctsrd/tesla/src/lib/libc/stdlib/bsearch.3#2 integrate .. //depot/projects/ctsrd/tesla/src/lib/libc/stdlib/qsort.3#2 integrate .. //depot/projects/ctsrd/tesla/src/lib/libc/sys/Makefile.inc#2 integrate .. //depot/projects/ctsrd/tesla/src/lib/libelf/elf_data.c#2 integrate .. //depot/projects/ctsrd/tesla/src/lib/libelf/elf_getdata.3#2 integrate .. //depot/projects/ctsrd/tesla/src/lib/libelf/elf_update.c#2 integrate .. //depot/projects/ctsrd/tesla/src/lib/libldns/Makefile#2 integrate .. //depot/projects/ctsrd/tesla/src/lib/libsm/Makefile#2 integrate .. //depot/projects/ctsrd/tesla/src/lib/libstand/Makefile#2 integrate .. //depot/projects/ctsrd/tesla/src/lib/libstand/stand.h#2 integrate .. //depot/projects/ctsrd/tesla/src/lib/libstand/strtoul.c#1 branch .. //depot/projects/ctsrd/tesla/src/libexec/mail.local/Makefile#2 integrate .. //depot/projects/ctsrd/tesla/src/libexec/smrsh/Makefile#2 integrate .. //depot/projects/ctsrd/tesla/src/release/picobsd/bridge/crunch.conf#2 integrate .. //depot/projects/ctsrd/tesla/src/release/picobsd/qemu/crunch.conf#2 integrate .. //depot/projects/ctsrd/tesla/src/sbin/devd/devd.conf.5#2 integrate .. //depot/projects/ctsrd/tesla/src/sbin/fsck_ffs/dir.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sbin/fsck_ffs/ea.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sbin/fsck_ffs/fsck.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sbin/fsck_ffs/fsutil.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sbin/fsck_ffs/inode.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sbin/fsck_ffs/main.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sbin/fsck_ffs/setup.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sbin/fsdb/fsdbutil.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sbin/hastd/hast.conf.5#2 integrate .. //depot/projects/ctsrd/tesla/src/sbin/hastd/hast.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sbin/hastd/hast_proto.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sbin/hastd/hastd.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sbin/hastd/parse.y#2 integrate .. //depot/projects/ctsrd/tesla/src/sbin/hastd/primary.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sbin/hastd/refcnt.h#1 branch .. //depot/projects/ctsrd/tesla/src/sbin/hastd/secondary.c#2 integrate .. //depot/projects/ctsrd/tesla/src/share/man/man4/carp.4#2 integrate .. //depot/projects/ctsrd/tesla/src/share/man/man5/group.5#2 integrate .. //depot/projects/ctsrd/tesla/src/share/man/man9/VFS_SET.9#2 integrate .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.lib.mk#3 integrate .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.libnames.mk#2 integrate .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.sys.mk#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/amd64/include/elf.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/amd64/include/frame.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/amd64/include/sigframe.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/amd64/include/signal.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/amd64/include/ucontext.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/arm/allwinner/a10_clk.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/arm/allwinner/a10_clk.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/arm/allwinner/a10_ehci.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/arm/allwinner/a10_gpio.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/arm/arm/busdma_machdep-v6.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/arm/arm/pmap-v6.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/arm/at91/at91_machdep.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/arm/econa/econa_machdep.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/arm/include/pmap.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/arm/s3c2xx0/s3c24x0_machdep.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/arm/ti/ti_cpuid.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/arm/ti/ti_gpio.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/arm/xscale/pxa/pxa_machdep.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/boot/common/bootstrap.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/boot/common/module.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/boot/fdt/dts/bcm2835-rpi-b.dts#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/boot/fdt/dts/cubieboard.dts#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/boot/fdt/fdt_loader_cmd.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/boot/uboot/lib/copy.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/boot/uboot/lib/elf_freebsd.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/boot/userboot/userboot/elf32_freebsd.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cam/ata/ata_pmp.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/compat/opensolaris/sys/time.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_boot.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/conf/files#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/changes.txt#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/common/adwalk.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/common/dmextern.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/common/dmtable.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/common/dmtbdump.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/common/dmtbinfo.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/compiler/asldefine.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/compiler/aslfiles.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/compiler/aslmessages.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/compiler/aslpredef.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/compiler/aslprepkg.c#1 branch .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/compiler/aslstartup.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/compiler/aslsupport.l#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/compiler/dtcompiler.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/compiler/dttable.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/compiler/dttemplate.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/debugger/dbcmds.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/debugger/dbinput.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/dispatcher/dsutils.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/events/evevent.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/events/evgpe.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/events/evsci.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/events/evxface.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/events/evxfevnt.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/executer/exprep.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/executer/exutils.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/hardware/hwacpi.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/namespace/nsconvert.c#1 branch .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/namespace/nspredef.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/namespace/nsprepkg.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/namespace/nsrepair.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/namespace/nsrepair2.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/namespace/nsutils.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/parser/psargs.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/resources/rscalc.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/resources/rsdump.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/resources/rslist.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/resources/rsxface.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/utilities/utaddress.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/utilities/utexcep.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/utilities/utglobal.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/include/acexcep.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/include/acglobal.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/include/aclocal.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/include/acoutput.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/include/acpixf.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/include/actbl2.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/include/actbl3.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/include/acutils.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/crypto/aesni/aesni_wrap.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/ath/if_ath_alq.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/ath/if_ath_rx.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/ath/if_ath_sysctl.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/ath/if_ath_tx.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/ath/if_ath_tx.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/ath/if_ath_tx_ht.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/cxgbe/common/t4_hw.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/cxgbe/t4_main.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/cxgbe/t4_sge.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_82571.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_82575.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_82575.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_api.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_api.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_defines.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_hw.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_i210.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_i210.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_ich8lan.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_ich8lan.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_mac.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_mac.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_manage.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_nvm.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_nvm.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_osdep.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_phy.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_phy.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_regs.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/if_em.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/if_igb.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/if_lem.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/fdt/fdt_common.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/isp/isp.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/ixgbe/ixgbe_phy.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/led/led.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/mcd/mcd.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/mxge/mxge_lro.c#2 delete .. //depot/projects/ctsrd/tesla/src/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/ppc/ppc_isa.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/sdhci/sdhci.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/sdhci/sdhci.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/sdhci/sdhci_if.m#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/si/si.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/sound/pci/hda/hdaa.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/usb/usb_pf.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/usb/wlan/if_upgt.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/dev/usb/wlan/if_upgtvar.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/fs/msdosfs/msdosfs_fat.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/fs/msdosfs/msdosfsmount.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/fs/nfs/nfs_commonkrpc.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/fs/nfsclient/nfs_clstate.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/fs/nfsclient/nfs_clvfsops.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/geom/geom_vfs.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/i386/include/elf.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/i386/include/frame.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/i386/include/sigframe.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/i386/include/signal.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/i386/include/ucontext.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/i386/isa/pmtimer.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/i386/xen/pmap.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/ia64/ia64/mem.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/ia64/ia64/syscall.S#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/ia64/include/vmparam.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/kern/kern_fork.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/kern/kern_sig.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/kern/kern_thread.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/kern/subr_trap.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/kern/sys_capability.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/kern/sys_pipe.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/kern/vfs_cluster.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/kern/vfs_export.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/kern/vfs_init.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/modules/mxge/mxge/Makefile#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/net80211/ieee80211_adhoc.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/net80211/ieee80211_mesh.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/netinet/ip_input.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/netinet/tcp_lro.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/nfsclient/nfs_krpc.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/opencrypto/xform.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/pci/ncr.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/powerpc/include/vmparam.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/sys/buf.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/sys/filedesc.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/sys/mount.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/sys/namei.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/sys/protosw.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/sys/signalvar.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/sys/systm.h#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/tools/vnode_if.awk#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/vm/vm_kern.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/x86/include/elf.h#1 branch .. //depot/projects/ctsrd/tesla/src/sys/x86/include/frame.h#1 branch .. //depot/projects/ctsrd/tesla/src/sys/x86/include/sigframe.h#1 branch .. //depot/projects/ctsrd/tesla/src/sys/x86/include/signal.h#1 branch .. //depot/projects/ctsrd/tesla/src/sys/x86/include/ucontext.h#1 branch .. //depot/projects/ctsrd/tesla/src/sys/x86/isa/atrtc.c#2 integrate .. //depot/projects/ctsrd/tesla/src/sys/x86/isa/clock.c#2 integrate .. //depot/projects/ctsrd/tesla/src/tools/regression/bin/sh/builtins/read6.0#1 branch .. //depot/projects/ctsrd/tesla/src/tools/regression/bin/sh/builtins/wait4.0#1 branch .. //depot/projects/ctsrd/tesla/src/tools/regression/bin/sh/builtins/wait5.0#1 branch .. //depot/projects/ctsrd/tesla/src/tools/regression/bin/test/regress.sh#2 integrate .. //depot/projects/ctsrd/tesla/src/tools/tools/ath/athalq/Makefile#2 integrate .. //depot/projects/ctsrd/tesla/src/tools/tools/ath/athalq/ar5416_ds.c#2 integrate .. //depot/projects/ctsrd/tesla/src/tools/tools/ath/athalq/main.c#2 integrate .. //depot/projects/ctsrd/tesla/src/tools/tools/ath/athalq/tdma.c#1 branch .. //depot/projects/ctsrd/tesla/src/tools/tools/ath/athalq/tdma.h#1 branch .. //depot/projects/ctsrd/tesla/src/tools/tools/netmap/Makefile#2 integrate .. //depot/projects/ctsrd/tesla/src/tools/tools/netmap/bridge.c#2 integrate .. //depot/projects/ctsrd/tesla/src/tools/tools/netmap/nm_util.c#1 branch .. //depot/projects/ctsrd/tesla/src/tools/tools/netmap/nm_util.h#1 branch .. //depot/projects/ctsrd/tesla/src/tools/tools/netmap/pcap.c#2 integrate .. //depot/projects/ctsrd/tesla/src/tools/tools/netmap/pkt-gen.c#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.bin/dtc/input_buffer.cc#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.bin/grep/regex/tre-fastmatch.c#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.bin/keylogin/keylogin.c#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.bin/mail/util.c#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.bin/netstat/inet.c#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.bin/netstat/inet6.c#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.bin/netstat/main.c#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.bin/netstat/netisr.c#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.bin/netstat/sctp.c#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.bin/netstat/unix.c#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.bin/systat/ifcmds.c#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.bin/systat/ifstat.c#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.bin/systat/main.c#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.bin/systat/systat.1#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.bin/vacation/Makefile#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.sbin/acpi/acpidb/Makefile#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.sbin/acpi/iasl/Makefile#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.sbin/bhyve/mem.c#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.sbin/bhyve/mem.h#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.sbin/bhyve/pci_emul.c#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.sbin/bsdconfig/startup/rcvar#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.sbin/extattr/rmextattr.c#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.sbin/makefs/makefs.8#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.sbin/makefs/makefs.c#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.sbin/makefs/makefs.h#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.sbin/makefs/mtree.c#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.sbin/makefs/walk.c#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.sbin/mountd/mountd.c#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.sbin/pkg/pkg.c#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.sbin/rtadvd/rtadvd.8#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.sbin/rtadvd/rtadvd.c#2 integrate .. //depot/projects/ctsrd/tesla/src/usr.sbin/sendmail/Makefile#2 integrate Differences ... ==== //depot/projects/ctsrd/tesla/src/bin/sh/eval.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: head/bin/sh/eval.c 246288 2013-02-03 15:54:57Z jilles $"); +__FBSDID("$FreeBSD: head/bin/sh/eval.c 247206 2013-02-23 22:50:57Z jilles $"); #include #include @@ -174,6 +174,7 @@ any = 1; } popstackmark(&smark); + setstackmark(&smark); } popfile(); popstackmark(&smark); @@ -296,10 +297,11 @@ } n = next; popstackmark(&smark); + setstackmark(&smark); } while (n != NULL); out: popstackmark(&smark); - if (pendingsigs) + if (pendingsig) dotrap(); if (eflag && exitstatus != 0 && do_etest) exitshell(exitstatus); ==== //depot/projects/ctsrd/tesla/src/bin/sh/jobs.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: head/bin/sh/jobs.c 246495 2013-02-07 19:00:54Z delphij $"); +__FBSDID("$FreeBSD: head/bin/sh/jobs.c 247206 2013-02-23 22:50:57Z jilles $"); #include #include @@ -521,7 +521,7 @@ } while (dowait(DOWAIT_BLOCK | DOWAIT_SIG, (struct job *)NULL) != -1); in_waitcmd--; - return 0; + return pendingsig + 128; } ==== //depot/projects/ctsrd/tesla/src/bin/sh/main.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: head/bin/sh/main.c 245689 2013-01-20 12:44:50Z jilles $"); +__FBSDID("$FreeBSD: head/bin/sh/main.c 247206 2013-02-23 22:50:57Z jilles $"); #include #include @@ -196,7 +196,7 @@ TRACE(("cmdloop(%d) called\n", top)); setstackmark(&smark); for (;;) { - if (pendingsigs) + if (pendingsig) dotrap(); inter = 0; if (iflag && top) { ==== //depot/projects/ctsrd/tesla/src/bin/sh/trap.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: head/bin/sh/trap.c 238888 2012-07-29 18:04:38Z jilles $"); +__FBSDID("$FreeBSD: head/bin/sh/trap.c 247206 2013-02-23 22:50:57Z jilles $"); #include #include @@ -73,7 +73,7 @@ MKINIT char sigmode[NSIG]; /* current value of signal */ -int pendingsigs; /* indicates some signal received */ +volatile sig_atomic_t pendingsig; /* indicates some signal received */ int in_dotrap; /* do we execute in a trap handler? */ static char *volatile trap[NSIG]; /* trap handler commands */ static volatile sig_atomic_t gotsig[NSIG]; @@ -388,22 +388,25 @@ return; } - if (signo != SIGCHLD || !ignore_sigchld) + /* If we are currently in a wait builtin, prepare to break it */ + if ((signo == SIGINT || signo == SIGQUIT) && in_waitcmd != 0) { + breakwaitcmd = 1; + pendingsig = signo; + } + + if (trap[signo] != NULL && trap[signo][0] != '\0' && + (signo != SIGCHLD || !ignore_sigchld)) { gotsig[signo] = 1; - pendingsigs++; + pendingsig = signo; - /* If we are currently in a wait builtin, prepare to break it */ - if ((signo == SIGINT || signo == SIGQUIT) && in_waitcmd != 0) - breakwaitcmd = 1; - /* - * If a trap is set, not ignored and not the null command, we need - * to make sure traps are executed even when a child blocks signals. - */ - if (Tflag && - trap[signo] != NULL && - ! (trap[signo][0] == '\0') && - ! (trap[signo][0] == ':' && trap[signo][1] == '\0')) - breakwaitcmd = 1; + /* + * If a trap is set, not ignored and not the null command, we + * need to make sure traps are executed even when a child + * blocks signals. + */ + if (Tflag && !(trap[signo][0] == ':' && trap[signo][1] == '\0')) + breakwaitcmd = 1; + } #ifndef NO_HISTORY if (signo == SIGWINCH) @@ -424,7 +427,7 @@ in_dotrap++; for (;;) { - pendingsigs = 0; + pendingsig = 0; for (i = 1; i < NSIG; i++) { if (gotsig[i]) { gotsig[i] = 0; ==== //depot/projects/ctsrd/tesla/src/bin/sh/trap.h#2 (text+ko) ==== @@ -30,10 +30,10 @@ * SUCH DAMAGE. * * @(#)trap.h 8.3 (Berkeley) 6/5/95 - * $FreeBSD: head/bin/sh/trap.h 238888 2012-07-29 18:04:38Z jilles $ + * $FreeBSD: head/bin/sh/trap.h 247206 2013-02-23 22:50:57Z jilles $ */ -extern int pendingsigs; +extern volatile sig_atomic_t pendingsig; extern int in_dotrap; extern volatile sig_atomic_t gotwinch; ==== //depot/projects/ctsrd/tesla/src/bin/test/test.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)test.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: head/bin/test/test.1 244734 2012-12-27 13:21:37Z jilles $ +.\" $FreeBSD: head/bin/test/test.1 247274 2013-02-25 19:05:40Z peterj $ .\" .Dd December 27, 2012 .Dt TEST 1 @@ -169,15 +169,65 @@ .Ar file exists and is a socket. .It Ar file1 Fl nt Ar file2 -True if +True if both +.Ar file1 +and +.Ar file2 +exist and +.Ar file1 +is newer than +.Ar file2 . +.It Ar file1 Fl nt Ns Ar X Ns Ar Y Ar file2 +True if both +.Ar file1 +and +.Ar file2 +exist and .Ar file1 -exists and is newer than +has a more recent last access time +.Pq Ar X Ns = Ns Cm a , +inode creation time +.Pq Ar X Ns = Ns Cm b , +change time +.Pq Ar X Ns = Ns Cm c , +or modification time +.Pq Ar X Ns = Ns Cm m +than the last access time +.Pq Ar Y Ns = Ns Cm a , +inode creation time +.Pq Ar Y Ns = Ns Cm b , +change time +.Pq Ar Y Ns = Ns Cm c , +or modification time +.Pq Ar Y Ns = Ns Cm m +of .Ar file2 . +Note that +.Ic -ntmm +is equivalent to +.Ic -nt . .It Ar file1 Fl ot Ar file2 -True if +True if both +.Ar file1 +and +.Ar file2 +exist and .Ar file1 -exists and is older than +is older than .Ar file2 . +Note that +.Ar file1 +.Ic -ot +.Ar file2 +is equivalent to +.Ar file2 +.Ic -nt +.Ar file1 +.It Ar file1 Fl ot Ns Ar X Ns Ar Y Ar file2 +Equivalent to +.Ar file2 +.Ic -nt Ns Ar Y Ns Ar X +.Ar file1 . .It Ar file1 Fl ef Ar file2 True if .Ar file1 ==== //depot/projects/ctsrd/tesla/src/bin/test/test.c#2 (text+ko) ==== @@ -15,7 +15,7 @@ */ #include -__FBSDID("$FreeBSD: head/bin/test/test.c 227984 2011-11-25 23:45:29Z jilles $"); +__FBSDID("$FreeBSD: head/bin/test/test.c 247274 2013-02-25 19:05:40Z peterj $"); #include #include @@ -63,7 +63,7 @@ "-u"|"-g"|"-k"|"-s"|"-t"|"-z"|"-n"|"-o"|"-O"|"-G"|"-L"|"-S"; binary-operator ::= "="|"!="|"-eq"|"-ne"|"-ge"|"-gt"|"-le"|"-lt"| - "-nt"|"-ot"|"-ef"; + "-nt"|"-nt[abcm][abcm]"|"-ot"|"-ot[abcm][abcm])"|"-ef"; operand ::= */ @@ -85,8 +85,38 @@ FILSUID, FILSGID, FILSTCK, - FILNT, - FILOT, + FILNTAA, + FILNTAB, + FILNTAC, + FILNTAM, + FILNTBA, + FILNTBB, + FILNTBC, + FILNTBM, + FILNTCA, + FILNTCB, + FILNTCC, + FILNTCM, + FILNTMA, + FILNTMB, + FILNTMC, + FILNTMM, + FILOTAA, + FILOTAB, + FILOTAC, + FILOTAM, + FILOTBA, + FILOTBB, + FILOTBC, + FILOTBM, + FILOTCA, + FILOTCB, + FILOTCC, + FILOTCM, + FILOTMA, + FILOTMB, + FILOTMC, + FILOTMM, FILEQ, FILUID, FILGID, @@ -118,9 +148,16 @@ PAREN }; +enum time_types { + ATIME, + BTIME, + CTIME, + MTIME +}; + static struct t_op { - char op_text[4]; - short op_num, op_type; + char op_text[6]; + char op_num, op_type; } const ops [] = { {"-r", FILRD, UNOP}, {"-w", FILWR, UNOP}, @@ -154,8 +191,40 @@ {"-gt", INTGT, BINOP}, {"-le", INTLE, BINOP}, {"-lt", INTLT, BINOP}, - {"-nt", FILNT, BINOP}, - {"-ot", FILOT, BINOP}, + {"-nt", FILNTMM, BINOP}, + {"-ntaa", FILNTAA, BINOP}, + {"-ntab", FILNTAB, BINOP}, + {"-ntac", FILNTAC, BINOP}, + {"-ntam", FILNTAM, BINOP}, + {"-ntba", FILNTBA, BINOP}, + {"-ntbb", FILNTBB, BINOP}, + {"-ntbc", FILNTBC, BINOP}, + {"-ntbm", FILNTBM, BINOP}, + {"-ntca", FILNTCA, BINOP}, + {"-ntcb", FILNTCB, BINOP}, + {"-ntcc", FILNTCC, BINOP}, + {"-ntcm", FILNTCM, BINOP}, + {"-ntma", FILNTMA, BINOP}, + {"-ntmb", FILNTMB, BINOP}, + {"-ntmc", FILNTMC, BINOP}, + {"-ntmm", FILNTMM, BINOP}, + {"-ot", FILOTMM, BINOP}, + {"-otaa", FILOTAA, BINOP}, + {"-otab", FILOTBB, BINOP}, + {"-otac", FILOTAC, BINOP}, + {"-otam", FILOTAM, BINOP}, + {"-otba", FILOTBA, BINOP}, + {"-otbb", FILOTBB, BINOP}, + {"-otbc", FILOTBC, BINOP}, + {"-otbm", FILOTBM, BINOP}, + {"-otca", FILOTCA, BINOP}, + {"-otcb", FILOTCB, BINOP}, + {"-otcc", FILOTCC, BINOP}, + {"-otcm", FILOTCM, BINOP}, + {"-otma", FILOTMA, BINOP}, + {"-otmb", FILOTMB, BINOP}, + {"-otmc", FILOTMC, BINOP}, + {"-otmm", FILOTMM, BINOP}, {"-ef", FILEQ, BINOP}, {"!", UNOT, BUNOP}, {"-a", BAND, BBINOP}, @@ -180,10 +249,10 @@ static int isunopoperand(void); static int islparenoperand(void); static int isrparenoperand(void); -static int newerf(const char *, const char *); +static int newerf(const char *, const char *, enum time_types, + enum time_types); static int nexpr(enum token); static int oexpr(enum token); -static int olderf(const char *, const char *); static int primary(enum token); static void syntax(const char *, const char *); static enum token t_lex(char *); @@ -353,10 +422,70 @@ return intcmp(opnd1, opnd2) <= 0; case INTLT: return intcmp(opnd1, opnd2) < 0; - case FILNT: - return newerf (opnd1, opnd2); - case FILOT: - return olderf (opnd1, opnd2); + case FILNTAA: + return newerf(opnd1, opnd2, ATIME, ATIME); + case FILNTAB: + return newerf(opnd1, opnd2, ATIME, BTIME); + case FILNTAC: + return newerf(opnd1, opnd2, ATIME, CTIME); + case FILNTAM: + return newerf(opnd1, opnd2, ATIME, MTIME); + case FILNTBA: + return newerf(opnd1, opnd2, BTIME, ATIME); + case FILNTBB: + return newerf(opnd1, opnd2, BTIME, BTIME); + case FILNTBC: + return newerf(opnd1, opnd2, BTIME, CTIME); + case FILNTBM: + return newerf(opnd1, opnd2, BTIME, MTIME); + case FILNTCA: + return newerf(opnd1, opnd2, CTIME, ATIME); + case FILNTCB: + return newerf(opnd1, opnd2, CTIME, BTIME); + case FILNTCC: + return newerf(opnd1, opnd2, CTIME, CTIME); + case FILNTCM: + return newerf(opnd1, opnd2, CTIME, MTIME); + case FILNTMA: + return newerf(opnd1, opnd2, MTIME, ATIME); + case FILNTMB: + return newerf(opnd1, opnd2, MTIME, BTIME); + case FILNTMC: + return newerf(opnd1, opnd2, MTIME, CTIME); + case FILNTMM: + return newerf(opnd1, opnd2, MTIME, MTIME); + case FILOTAA: + return newerf(opnd2, opnd1, ATIME, ATIME); + case FILOTAB: + return newerf(opnd2, opnd1, BTIME, ATIME); + case FILOTAC: + return newerf(opnd2, opnd1, CTIME, ATIME); + case FILOTAM: + return newerf(opnd2, opnd1, MTIME, ATIME); + case FILOTBA: + return newerf(opnd2, opnd1, ATIME, BTIME); + case FILOTBB: + return newerf(opnd2, opnd1, BTIME, BTIME); + case FILOTBC: + return newerf(opnd2, opnd1, CTIME, BTIME); + case FILOTBM: + return newerf(opnd2, opnd1, MTIME, BTIME); + case FILOTCA: + return newerf(opnd2, opnd1, ATIME, CTIME); + case FILOTCB: + return newerf(opnd2, opnd1, BTIME, CTIME); + case FILOTCC: + return newerf(opnd2, opnd1, CTIME, CTIME); + case FILOTCM: + return newerf(opnd2, opnd1, MTIME, CTIME); + case FILOTMA: + return newerf(opnd2, opnd1, ATIME, MTIME); + case FILOTMB: + return newerf(opnd2, opnd1, BTIME, MTIME); + case FILOTMC: + return newerf(opnd2, opnd1, CTIME, MTIME); + case FILOTMM: + return newerf(opnd2, opnd1, MTIME, MTIME); case FILEQ: return equalf (opnd1, opnd2); default: @@ -570,25 +699,34 @@ } static int -newerf (const char *f1, const char *f2) +newerf (const char *f1, const char *f2, enum time_types t1, enum time_types t2) { struct stat b1, b2; + struct timespec *ts1, *ts2; if (stat(f1, &b1) != 0 || stat(f2, &b2) != 0) return 0; - if (b1.st_mtim.tv_sec > b2.st_mtim.tv_sec) + switch (t1) { + case ATIME: ts1 = &b1.st_atim; break; + case BTIME: ts1 = &b1.st_birthtim; break; + case CTIME: ts1 = &b1.st_ctim; break; + default: ts1 = &b1.st_mtim; break; + } + + switch (t2) { + case ATIME: ts2 = &b2.st_atim; break; + case BTIME: ts2 = &b2.st_birthtim; break; + case CTIME: ts2 = &b2.st_ctim; break; + default: ts2 = &b2.st_mtim; break; + } + + if (ts1->tv_sec > ts2->tv_sec) return 1; - if (b1.st_mtim.tv_sec < b2.st_mtim.tv_sec) + if (ts1->tv_sec < ts2->tv_sec) return 0; - return (b1.st_mtim.tv_nsec > b2.st_mtim.tv_nsec); -} - -static int -olderf (const char *f1, const char *f2) -{ - return (newerf(f2, f1)); + return (ts1->tv_nsec > ts2->tv_nsec); } static int ==== //depot/projects/ctsrd/tesla/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#2 (text+ko) ==== @@ -195,6 +195,13 @@ verror(fmt, ap); va_end(ap); + /* + * Close the DTrace handle to ensure that any controlled processes are + * correctly restored and continued. + */ + if (g_dtp) + dtrace_close(g_dtp); + exit(E_ERROR); } ==== //depot/projects/ctsrd/tesla/src/cddl/contrib/opensolaris/cmd/zinject/translate.c#2 (text+ko) ==== @@ -20,6 +20,7 @@ */ /* * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 by Delphix. All rights reserved. */ #include @@ -455,6 +456,20 @@ &record->zi_guid) == 0); } + /* + * Device faults can take on three different forms: + * 1). delayed or hanging I/O + * 2). zfs label faults + * 3). generic disk faults + */ + if (record->zi_timer != 0) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 25 22:05:40 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BED9DC3C; Mon, 25 Feb 2013 22:05:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 4BCF4C3A for ; Mon, 25 Feb 2013 22:05:40 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 31446A8A for ; Mon, 25 Feb 2013 22:05:40 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r1PM5dJg076844 for ; Mon, 25 Feb 2013 22:05:39 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r1PM5dOk076841 for perforce@freebsd.org; Mon, 25 Feb 2013 22:05:39 GMT (envelope-from brooks@freebsd.org) Date: Mon, 25 Feb 2013 22:05:39 GMT Message-Id: <201302252205.r1PM5dOk076841@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222371 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2013 22:05:41 -0000 http://p4web.freebsd.org/@@222371?ac=10 Change 222371 by brooks@brooks_zenith on 2013/02/25 22:05:39 Compile LIB32 using XCC/XCXX. Affected files ... .. //depot/projects/ctsrd/tesla/src/Makefile.inc1#3 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/Makefile.inc1#3 (text+ko) ==== @@ -328,6 +328,7 @@ LIB32FLAGS= -m32 ${LIB32CPUFLAGS} -DCOMPAT_32BIT \ + --sysroot=${WORLDTMP} \ -isystem ${LIB32TMP}/usr/include/ \ -L${LIB32TMP}/usr/lib32 \ -B${LIB32TMP}/usr/lib32 @@ -343,8 +344,8 @@ SHLIBDIR=/usr/lib32 \ COMPILER_TYPE=${WMAKE_COMPILER_TYPE} LIB32WMAKEFLAGS+= \ - CC="${CC} ${LIB32FLAGS}" \ - CXX="${CXX} ${LIB32FLAGS}" \ + CC="${XCC} ${LIB32FLAGS}" \ + CXX="${XCXX} ${LIB32FLAGS}" \ DESTDIR=${LIB32TMP} \ -DCOMPAT_32BIT \ -DLIBRARIES_ONLY \ From owner-p4-projects@FreeBSD.ORG Mon Feb 25 23:03:42 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75BCED2E; Mon, 25 Feb 2013 23:03:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 39AA9D2C for ; Mon, 25 Feb 2013 23:03:42 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1E517DC5 for ; Mon, 25 Feb 2013 23:03:42 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r1PN3fWu082652 for ; Mon, 25 Feb 2013 23:03:42 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r1PN3fTS082649 for perforce@freebsd.org; Mon, 25 Feb 2013 23:03:41 GMT (envelope-from brooks@freebsd.org) Date: Mon, 25 Feb 2013 23:03:41 GMT Message-Id: <201302252303.r1PN3fTS082649@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222375 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2013 23:03:42 -0000 http://p4web.freebsd.org/@@222375?ac=10 Change 222375 by brooks@brooks_zenith on 2013/02/25 23:02:52 Revert the SYSROOT portion of 222356 and make --sysroot=${WORLDTMP} part of CC and friends when cross compiling. This is less invasive and and allows rescue to be built. Affected files ... .. //depot/projects/ctsrd/tesla/src/Makefile.inc1#4 edit .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.dep.mk#3 edit .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#3 edit .. //depot/projects/ctsrd/tesla/src/sys/boot/i386/boot2/Makefile#3 edit .. //depot/projects/ctsrd/tesla/src/sys/boot/i386/gptboot/Makefile#3 edit .. //depot/projects/ctsrd/tesla/src/sys/boot/i386/gptzfsboot/Makefile#3 edit .. //depot/projects/ctsrd/tesla/src/sys/boot/i386/zfsboot/Makefile#3 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/Makefile.inc1#4 (text+ko) ==== @@ -293,9 +293,10 @@ WMAKE_COMPILER_TYPE= clang .endif .if ${XCC:M/*} -WMAKEENV+= SYSROOT=${WORLDTMP} +XFLAGS= --sysroot=${WORLDTMP} .endif -WMAKEENV+= CC=${XCC} CXX=${XCXX} CPP=${XCPP} \ +WMAKEENV+= CC="${XCC} ${XFLAGS}" CXX="${XCXX} ${XFLAGS}" \ + CPP="${XCPP} ${XFLAGS}" \ COMPILER_TYPE=${WMAKE_COMPILER_TYPE} WMAKE= ${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP} ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.dep.mk#3 (text+ko) ==== @@ -129,10 +129,9 @@ # Different types of sources are compiled with slightly different flags. # Split up the sources, and filter out headers and non-applicable flags. MKDEP_CFLAGS= ${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BIDU]*} ${CFLAGS:M-std=*} \ - ${CFLAGS:M-ansi} ${CFLAGS:M--sysroot*} + ${CFLAGS:M-ansi} MKDEP_CXXFLAGS= ${CXXFLAGS:M-nostdinc*} ${CXXFLAGS:M-[BIDU]*} \ - ${CXXFLAGS:M-std=*} ${CXXFLAGS:M-ansi} ${CXXFLAGS:M-stdlib=*} \ - ${CXXFLAGS:M--sysroot*} + ${CXXFLAGS:M-std=*} ${CXXFLAGS:M-ansi} ${CXXFLAGS:M-stdlib=*} DPSRCS+= ${SRCS} ${DEPENDFILE}: ${DPSRCS} ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#3 (text+ko) ==== @@ -646,9 +646,4 @@ .endif # !_WITHOUT_SRCCONF -.if defined(SYSROOT) -CFLAGS+= --sysroot=${SYSROOT} -LDFLAGS+= --sysroot=${SYSROOT} -.endif - .endif # !target(____) ==== //depot/projects/ctsrd/tesla/src/sys/boot/i386/boot2/Makefile#3 (text+ko) ==== @@ -42,10 +42,6 @@ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ -Winline --param max-inline-insns-single=100 \ ${CLANG_OPT_SMALL} -.if defined(SYSROOT) -CFLAGS+= --sysroot=${SYSROOT} -.endif - LDFLAGS=-static -N --gc-sections ==== //depot/projects/ctsrd/tesla/src/sys/boot/i386/gptboot/Makefile#3 (text+ko) ==== @@ -35,10 +35,6 @@ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ -Winline --param max-inline-insns-single=100 -.if defined(SYSROOT) -CFLAGS+= --sysroot=${SYSROOT} -.endif - LDFLAGS=-static -N --gc-sections ==== //depot/projects/ctsrd/tesla/src/sys/boot/i386/gptzfsboot/Makefile#3 (text+ko) ==== @@ -33,10 +33,6 @@ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ -Winline --param max-inline-insns-single=100 -.if defined(SYSROOT) -CFLAGS+= --sysroot=${SYSROOT} -.endif - LDFLAGS=-static -N --gc-sections ==== //depot/projects/ctsrd/tesla/src/sys/boot/i386/zfsboot/Makefile#3 (text+ko) ==== @@ -30,10 +30,6 @@ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ -Winline --param max-inline-insns-single=100 -.if defined(SYSROOT) -CFLAGS+= --sysroot=${SYSROOT} -.endif - LDFLAGS=-static -N --gc-sections From owner-p4-projects@FreeBSD.ORG Tue Feb 26 15:47:21 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E7F88D1A; Tue, 26 Feb 2013 15:47:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 63804D18 for ; Tue, 26 Feb 2013 15:47:20 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4898FB1B for ; Tue, 26 Feb 2013 15:47:20 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r1QFlKKj080278 for ; Tue, 26 Feb 2013 15:47:20 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r1QFlKMY080275 for perforce@freebsd.org; Tue, 26 Feb 2013 15:47:20 GMT (envelope-from brooks@freebsd.org) Date: Tue, 26 Feb 2013 15:47:20 GMT Message-Id: <201302261547.r1QFlKMY080275@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222391 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2013 15:47:21 -0000 http://p4web.freebsd.org/@@222391?ac=10 Change 222391 by brooks@brooks_zenith on 2013/02/26 15:46:27 When building for a target other than the build host and using an external compiler that is clang, set the target triple. Affected files ... .. //depot/projects/ctsrd/tesla/src/Makefile.inc1#5 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/Makefile.inc1#5 (text+ko) ==== @@ -294,6 +294,16 @@ .endif .if ${XCC:M/*} XFLAGS= --sysroot=${WORLDTMP} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} && ${WMAKE_COMPILER_TYPE} == "clang" +.if (${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "armv6") && \ +${MK_ARM_EABI} != "no" +TARGET_ABI= gnueabi +.else +TARGET_ABI= unknown +.endif +TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.0 +XFLAGS+= -target ${TARGET_TRIPLE} +.endif .endif WMAKEENV+= CC="${XCC} ${XFLAGS}" CXX="${XCXX} ${XFLAGS}" \ CPP="${XCPP} ${XFLAGS}" \ From owner-p4-projects@FreeBSD.ORG Tue Feb 26 20:36:25 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 681A23EE; Tue, 26 Feb 2013 20:36:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 2B7343EB for ; Tue, 26 Feb 2013 20:36:25 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 049F91DD1 for ; Tue, 26 Feb 2013 20:36:25 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r1QKaOgf009167 for ; Tue, 26 Feb 2013 20:36:24 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r1QKaOaH009164 for perforce@freebsd.org; Tue, 26 Feb 2013 20:36:24 GMT (envelope-from brooks@freebsd.org) Date: Tue, 26 Feb 2013 20:36:24 GMT Message-Id: <201302262036.r1QKaOaH009164@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222403 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2013 20:36:25 -0000 http://p4web.freebsd.org/@@222403?ac=10 Change 222403 by brooks@brooks_zenith on 2013/02/26 20:35:48 Add a WITHOUT_FORMAT extensions option to diable the use of -fformat-extenions for compilers that don't support it. Affected files ... .. //depot/projects/ctsrd/tesla/src/share/man/man5/src.conf.5#2 edit .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#4 edit .. //depot/projects/ctsrd/tesla/src/sys/conf/kern.mk#2 edit .. //depot/projects/ctsrd/tesla/src/tools/build/options/WITHOUT_FORMAT_EXTENSIONS#1 add Differences ... ==== //depot/projects/ctsrd/tesla/src/share/man/man5/src.conf.5#2 (text) ==== @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 236279 2012-05-30 02:37:20Z gjb .\" $FreeBSD: head/share/man/man5/src.conf.5 246838 2013-02-15 15:09:24Z des $ -.Dd February 15, 2013 +.Dd February 26, 2013 .Dt SRC.CONF 5 .Os .Sh NAME @@ -433,6 +433,11 @@ .\" from FreeBSD: head/tools/build/options/WITHOUT_FLOPPY 221540 2011-05-06 19:13:03Z ru Set to not build or install programs for operating floppy disk driver. +.It Va WITHOUT_FORMAT_EXTENSIONS +Set to not enable +.Fl fformat-extensions +when compiling the kernel. +Also disables all format checking. .It Va WITHOUT_FORTH .\" from FreeBSD: head/tools/build/options/WITHOUT_FORTH 156932 2006-03-21 07:50:50Z ru Set to build bootloaders without Forth support. ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#4 (text+ko) ==== @@ -271,6 +271,7 @@ ED_CRYPTO \ EXAMPLES \ FLOPPY \ + FORMAT_EXTENSIONS \ FORTH \ FP_LIBC \ FREEBSD_UPDATE \ ==== //depot/projects/ctsrd/tesla/src/sys/conf/kern.mk#2 (text+ko) ==== @@ -5,7 +5,7 @@ # CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ - -Wundef -Wno-pointer-sign -fformat-extensions \ + -Wundef -Wno-pointer-sign ${FORMAT_EXTENTIONS} \ -Wmissing-include-dirs -fdiagnostics-show-option \ ${CWARNEXTRA} # @@ -29,7 +29,18 @@ # enough to error out the whole kernel build. Display them anyway, so there is # some incentive to fix them eventually. CWARNEXTRA?= -Wno-error-tautological-compare -Wno-error-empty-body \ - -Wno-error-parentheses-equality + -Wno-error-parentheses-equality \ + -Wno-sizeof-pointer-memaccess \ + -Wno-unused-command-line-argument \ + ${NO_WFORMAT} +.endif + +# External compilers may not support our format extensions. Allow them +# to be disabled. WARNING: format checking is disabled in this case. +.if ${MK_FORMAT_EXTENSIONS} == "no" +NO_WFORMAT= -Wno-format +.else +FORMAT_EXTENTIONS= -fformat-extensions .endif # From owner-p4-projects@FreeBSD.ORG Tue Feb 26 21:11:02 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13B3E754; Tue, 26 Feb 2013 21:11:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id C5EE4752 for ; Tue, 26 Feb 2013 21:11:01 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id B8061EB for ; Tue, 26 Feb 2013 21:11:01 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r1QLB1PD012416 for ; Tue, 26 Feb 2013 21:11:01 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r1QLB19v012413 for perforce@freebsd.org; Tue, 26 Feb 2013 21:11:01 GMT (envelope-from brooks@freebsd.org) Date: Tue, 26 Feb 2013 21:11:01 GMT Message-Id: <201302262111.r1QLB19v012413@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222407 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2013 21:11:02 -0000 http://p4web.freebsd.org/@@222407?ac=10 Change 222407 by brooks@brooks_zenith on 2013/02/26 21:10:49 If XCC is an absolute path or WITHOUT_CROSS_COMPILER is set, do not build a cross compiler during the cross-tools phase. Affected files ... .. //depot/projects/ctsrd/tesla/src/Makefile.inc1#6 edit .. //depot/projects/ctsrd/tesla/src/share/man/man5/src.conf.5#3 edit .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#5 edit .. //depot/projects/ctsrd/tesla/src/tools/build/options/WITHOUT_CROSS_COMPILER#1 add Differences ... ==== //depot/projects/ctsrd/tesla/src/Makefile.inc1#6 (text+ko) ==== @@ -1307,6 +1307,9 @@ _binutils= gnu/usr.bin/binutils .endif +# If an full path to an external cross compiler is given, don't build +# a cross compiler. +.if ${XCC:M/*} == "" && ${MK_CROSS_COMPILER} != "no" .if ${MK_CLANG} != "no" && (${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang") _clang= usr.bin/clang _clang_libs= lib/clang @@ -1315,6 +1318,7 @@ .if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" || ${TARGET} == "pc98") _cc= gnu/usr.bin/cc .endif +.endif cross-tools: .for _tool in \ ==== //depot/projects/ctsrd/tesla/src/share/man/man5/src.conf.5#3 (text) ==== @@ -343,6 +343,10 @@ .\" from FreeBSD: head/tools/build/options/WITHOUT_CPP 156932 2006-03-21 07:50:50Z ru Set to not build .Xr cpp 1 . +.It Va WITHOUT_CROSS_COMPILER +.\" $FreeBSD$ +Set to not build a cross compiler in the cross-tools stage of +buildworld, buildkernel, etc. .It Va WITHOUT_CRYPT .\" from FreeBSD: head/tools/build/options/WITHOUT_CRYPT 156932 2006-03-21 07:50:50Z ru Set to not build any crypto code. ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#5 (text+ko) ==== @@ -262,6 +262,7 @@ CAPSICUM \ CDDL \ CPP \ + CROSS_COMPILER \ CRYPT \ CTM \ CVS \ From owner-p4-projects@FreeBSD.ORG Tue Feb 26 21:21:12 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C6B8C47; Tue, 26 Feb 2013 21:21:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 2F31CC45 for ; Tue, 26 Feb 2013 21:21:12 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 20088144 for ; Tue, 26 Feb 2013 21:21:12 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r1QLLCxq014062 for ; Tue, 26 Feb 2013 21:21:12 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r1QLLCPW014059 for perforce@freebsd.org; Tue, 26 Feb 2013 21:21:12 GMT (envelope-from brooks@freebsd.org) Date: Tue, 26 Feb 2013 21:21:12 GMT Message-Id: <201302262121.r1QLLCPW014059@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222408 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2013 21:21:12 -0000 http://p4web.freebsd.org/@@222408?ac=10 Change 222408 by brooks@brooks_zenith on 2013/02/26 21:20:31 Integrate changes from the beribsd branch. This includes switching to the cfi(4) flash driver for storage and Robert's port of boot2. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/bin/dd/dd.c#4 integrate .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_magic/Makefile#2 integrate .. //depot/projects/ctsrd/cheribsd/src/ctsrd/atsectl/atsectl.c#2 integrate .. //depot/projects/ctsrd/cheribsd/src/ctsrd/flashit/flashit.sh#4 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/boot/common/util.c#3 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/boot/fdt/dts/beripad-de4.dts#4 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/boot2/Makefile#2 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/boot2/altera_jtag_uart.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/boot2/boot2.c#2 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/boot2/cons.h#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/boot2/drv.h#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/boot2/flash.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/boot2/linker.cfg#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/boot2/mips.h#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/boot2/start.s#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/conf/files#7 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/conf/files.powerpc#5 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/atse/if_atse.c#2 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/atse/if_atsereg.h#2 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/dev/cfi/cfi_bus_fdt.c#4 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/dev/cfi/cfi_core.c#5 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/dev/cfi/cfi_reg.h#4 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/dev/cfi/cfi_var.h#5 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/beri/files.beri#12 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_DE4.hints#10 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_DE4_BASE#3 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_DE4_MDROOT#9 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_DE4_SDROOT#6 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_TEMPLATE#7 integrate Differences ... ==== //depot/projects/ctsrd/cheribsd/src/bin/dd/dd.c#4 (text+ko) ==== @@ -98,6 +98,13 @@ dd_in(); dd_close(); + /* + * Some devices such as cfi(4) may perform significant amounts + * of work when a write descriptor is closed. Close the out + * descriptor explicitly so that the summary handler (called + * from an atexit() hook) includes this work. + */ + close(out.fd); exit(0); } ==== //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_magic/Makefile#2 (text+ko) ==== @@ -12,7 +12,6 @@ SRCS= apprentice.c apptype.c ascmagic.c cdf.c cdf_time.c compress.c \ encoding.c fsmagic.c funcs.c \ is_tar.c magic.c print.c readcdf.c readelf.c softmagic.c -INCS= magic.h MAGICPATH?= /usr/share/misc ==== //depot/projects/ctsrd/cheribsd/src/ctsrd/atsectl/atsectl.c#2 (text+ko) ==== @@ -42,6 +42,7 @@ #include #include +#include #include #include #include @@ -61,28 +62,34 @@ off_t ir_off; /* Offset of range to delete (set to 0xFF) */ size_t ir_size; /* Size of range */ }; - #define ISF_ERASE _IOW('I', 1, struct isf_range) - #define ISF_ERASE_BLOCK (128 * 1024) - -#if 0 -static enum {UNSET, ERASE} action = UNSET; -#endif - #define DEV_ISF0_PATH "/dev/isf0" +#define DEV_CFI0_PATH "/dev/cfi0" static u_char block[ISF_ERASE_BLOCK]; +#define UNKNOWN 0 +#define ISF 1 +#define CFI 2 +static int fdev = UNKNOWN; +static const char *fdevs[] = { + "UNKNOWN", + "ISF", + "CFI" +}; +static int gflag; + /* XXX-BZ should include if_atsereg.h. */ #define ALTERA_ETHERNET_OPTION_BITS_OFF 0x00008000 #define ALTERA_ETHERNET_OPTION_BITS_LEN 0x00007fff + static void usage(int rc) { - fprintf(stderr, "usage: atsectl [-hlu] [-s ]\n"); + fprintf(stderr, "usage: atsectl [-ghlu] [-s ]\n"); exit(rc); } @@ -93,10 +100,16 @@ fd = open(DEV_ISF0_PATH, O_RDONLY, 0); if (fd == -1) - errx(1, "Failed to open " DEV_ISF0_PATH); + fd = open(DEV_CFI0_PATH, O_RDONLY, 0); + else + fdev = ISF; + if (fd == -1) + errx(1, "Failed to open " DEV_CFI0_PATH); + else + fdev = CFI; if (read(fd, block, sizeof(block)) != ISF_ERASE_BLOCK) - errx(1, "Short read from " DEV_ISF0_PATH); + errx(1, "Short read from %s", fdevs[fdev]); close(fd); } @@ -107,6 +120,9 @@ struct isf_range ir; int fd; + if (fdev != ISF) + return; + fd = open(DEV_ISF0_PATH, O_RDONLY, 0); if (fd == -1) errx(1, "Failed to open " DEV_ISF0_PATH); @@ -126,12 +142,16 @@ { int fd; + assert(fdev == ISF || fdev == CFI); + fd = open(DEV_ISF0_PATH, O_WRONLY, 0); if (fd == -1) - errx(1, "Failed to open " DEV_ISF0_PATH); + fd = open(DEV_CFI0_PATH, O_WRONLY, 0); + if (fd == -1) + errx(1, "Failed to open " DEV_CFI0_PATH); if (write(fd, block, sizeof(block)) != ISF_ERASE_BLOCK) - errx(1, "Short write on " DEV_ISF0_PATH); + errx(1, "Short write on %s", fdevs[fdev]); close(fd); } @@ -188,15 +208,20 @@ { uint8_t buf[32]; MD5_CTX ctx; + int rc; printf("Original:\n"); read_block(); print_eaddr(); if (eaddr == NULL) { - /* isf0.factory_ppr="0x0123456789abcdef" */ - if (kenv(KENV_GET, "isf0.factory_ppr", buf, sizeof(buf)) == -1) - err(1, "Could not find isf PPR serial\n"); + /* (isf|cfi)0.factory_ppr="0x0123456789abcdef" */ + rc = kenv(KENV_GET, "isf0.factory_ppr", buf, sizeof(buf)); + if (rc == -1) + rc = kenv(KENV_GET, "cfi0.factory_ppr", buf, + sizeof(buf)); + if (rc == -1) + err(1, "Could not find Intel flash PPR serial\n"); MD5Init(&ctx); MD5Update(&ctx, buf+2, 16); @@ -211,8 +236,11 @@ /* Just make sure the last half-byte is really zero. */ block[ALTERA_ETHERNET_OPTION_BITS_OFF + 9] &= ~0x0f; - /* Set locally administred flag. */ - block[ALTERA_ETHERNET_OPTION_BITS_OFF + 4] |= 2; + /* Set (or clear) locally administred flag. */ + if (gflag == 0) + block[ALTERA_ETHERNET_OPTION_BITS_OFF + 4] |= 2; + else + block[ALTERA_ETHERNET_OPTION_BITS_OFF + 4] &= ~2; /* Make sure it is not a MC address by accident we start with. */ block[ALTERA_ETHERNET_OPTION_BITS_OFF + 4] &= ~1; } else { @@ -231,7 +259,7 @@ warnx("WARN: Selected Ethernet Address is " "not multi-MAC compatible.\n"); } - if ((eaddr[0] & 0x2) == 0x0) { + if (gflag == 0 && ((eaddr[0] & 0x2) == 0x0)) { e++; warnx("WARN: Locally administered bit not set.\n"); } @@ -303,8 +331,11 @@ char ch, *s; s = NULL; - while ((ch = getopt(argc, argv, "hlus:")) != -1) { + while ((ch = getopt(argc, argv, "ghlus:")) != -1) { switch (ch) { + case 'g': + gflag = 1; + break; case 'h': usage(0); /* NOTREACHED */ ==== //depot/projects/ctsrd/cheribsd/src/ctsrd/flashit/flashit.sh#4 (text+ko) ==== @@ -1,32 +1,28 @@ #!/bin/sh -isf0_DEV=isf0 -isf0_OFFSET=0 -isf0_MAXLEN=0x02000000 - -isf1_DEV=isf1 -isf1_OFFSET=0 -isf1_MAXLEN=0x02000000 - -boot_DEV=isf0 +boot_DEV=cfid0 boot_OFFSET=0x01F00000 boot_MAXLEN=0x100000 -fpga_DEV=isf0 +fpga_DEV=cfid0 fpga_OFFSET=0x00020000 fpga_MAXLEN=0x00C00000 fpga_SKIP=0x20000 -fpga2_DEV=isf0 +fpga2_DEV=cfid0 fpga2_OFFSET=0x00C20000 fpga2_MAXLEN=0x00C00000 fpga2_SKIP=0x20000 -kernel_DEV=isf1 -kernel_OFFSET=0x00000000 +osconfig_DEV=cfid0 +osconfig_OFFSET=0x01820000 +osconfig_MAXLEN=0x00020000 + +kernel_DEV=cfid0 +kernel_OFFSET=0x02000000 kernel_MAXLEN=0x02000000 -TARGETS="boot:fpga:kernel:kernel2:root" +TARGETS="boot:fpga:fpga2:osconfig:kernel" prog=`basename "$0"` @@ -152,20 +148,6 @@ fi fi -ksize=$((${size} / 1024)) -eblocks=$((${ksize} / 128)) -if [ $((${ksize} % 128)) -ne 0 ]; then - eblocks=$((${eblocks} + 1)) -fi -echo "Erasing ${eblocks} 128K blocks from ${OFFSET} on ${DEV}" -if [ ${DRYRUN} -eq 0 ]; then - /usr/sbin/isfctl ${DEV} erase ${OFFSET} \ - $((${eblocks} * 128 * 1024)) - if [ $? -ne 0 ]; then - err 1 "Failed to erase" - fi -fi - echo "Writing ${binfile} to ${DEV} @ ${OFFSET}" if [ ${DRYRUN} -eq 0 ]; then iseek=$((`printf "%d" ${SKIP}` / 512)) ==== //depot/projects/ctsrd/cheribsd/src/sys/boot/common/util.c#3 (text+ko) ==== @@ -125,7 +125,15 @@ va_start(ap, fmt); while ((c = *fmt++) != '\0') { - if (c != '%') { + switch (c) { + case '%': + break; + + case '\n': + putchar('\r'); + /* FALLTHROUGH */ + + default: putchar(c); continue; } ==== //depot/projects/ctsrd/cheribsd/src/sys/boot/fdt/dts/beripad-de4.dts#4 (text+ko) ==== @@ -99,14 +99,9 @@ * XXX-BZ keep flash before ethernet so that atse can read the * Ethernet addresses for now. */ - flash@0x74000000 { - compatible = "intel,strataflash"; - reg = <0x74000000 0x2000000>; - }; - - flash@0x76000000 { - compatible = "intel,strataflash"; - reg = <0x76000000 0x2000000>; + flash@74000000 { + compatible = "cfi-flash"; + reg = <0x74000000 0x4000000>; }; ethernet@7f007000 { ==== //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/boot2/Makefile#2 (text+ko) ==== @@ -1,15 +1,38 @@ # $FreeBSD$ -P=boot2 -FILES=${P} -SRCS=mips_init.S boot2.c beri_board.c +PROG= boot2 +BINDIR?= /boot +INSTALLFLAGS= -b + +FILES= ${PROG} +SRCS= start.s \ + boot2.c \ + altera_jtag_uart.c \ + flash.c + NO_MAN= -LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg -OBJS+= ${SRCS:N*.h:R:S/$/.o/g} + +AFLAGS= -G0 + +CFLAGS= -ffreestanding \ + -I${.CURDIR} \ + -I${.CURDIR}/../../../common \ + -I${.CURDIR}/../../../.. \ + -D_KERNEL \ + -Wall \ + -G0 -Xassembler -G0 \ + -fno-pic -mno-abicalls \ + -g + +LDFLAGS= -nostdlib \ + -static \ + -N \ + -T linker.cfg \ + -G0 + +boot2: linker.cfg + +boot2.img: boot2 + objcopy -S -O binary boot2 boot2.img .include - -CFLAGS+= \ - -I${.CURDIR}/../../../common \ - -I${.CURDIR}/../../../.. \ - -D_KERNEL ==== //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/boot2/boot2.c#2 (text+ko) ==== @@ -1,4 +1,32 @@ /*- + * Copyright (c) 2013 Robert N. M. Watson + * All rights reserved. + * + * This software was developed by SRI International and the University of + * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237) + * ("CTSRD"), as part of the DARPA CRASH research programme. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * * Copyright (c) 2008 John Hay * Copyright (c) 2006 Warner Losh * Copyright (c) 1998 Robert Nordier @@ -28,8 +56,11 @@ #include -#include "lib.h" -#include "board.h" +#include "cons.h" +#include "drv.h" + +//#include "lib.h" +//#include "board.h" #define RBX_ASKNAME 0x0 /* -a */ #define RBX_SINGLE 0x1 /* -s */ @@ -66,8 +97,7 @@ #define PATH_DOTCONFIG "/boot.config" #define PATH_CONFIG "/boot/config" -//#define PATH_KERNEL "/boot/kernel/kernel" -#define PATH_KERNEL "/boot/kernel/kernel.gz.tramp" +#define PATH_KERNEL "/boot/kernel/kernel" extern uint32_t _end; @@ -100,9 +130,12 @@ static void fixup_boot_drv(caddr_t, int, int, int); #endif +#include "util.c" #define UFS_SMALL_CGBASE #include "ufsread.c" +static struct dmadat __dmadat; + #ifdef DEBUG #define DPRINTF(fmt, ...) printf(fmt, __VA_ARGS__) #else @@ -143,7 +176,7 @@ default: if (s - cmd < sizeof(cmd) - 1) *s++ = c; - xputchar(c); + putchar(c); } c = getc(10000); } @@ -155,8 +188,8 @@ int autoboot, c = 0; ufs_ino_t ino; - dmadat = (void *)(0x20000000 + (16 << 20)); - board_init(); + dmadat = &__dmadat; + //board_init(); autoboot = 1; @@ -182,11 +215,11 @@ if (!autoboot || (OPT_CHECK(RBX_NOINTR) == 0 && (c = getc(2)) != 0)) getstr(c); - xputchar('\n'); + printf("\n"); autoboot = 0; c = 0; if (parse()) - xputchar('\a'); + putchar('\a'); else load(); } @@ -195,11 +228,11 @@ static void load(void) { - Elf32_Ehdr eh; - static Elf32_Phdr ep[2]; + Elf64_Ehdr eh; + static Elf64_Phdr ep[2]; caddr_t p; ufs_ino_t ino; - uint32_t addr; + uint64_t addr; int i, j; #ifdef FIXUP_BOOT_DRV caddr_t staddr; @@ -281,6 +314,7 @@ static int dskread(void *buf, unsigned lba, unsigned nblk) { +#if 0 struct dos_partition *dp; struct disklabel *d; char *sec; @@ -321,6 +355,7 @@ dsk_start -= d->d_partitions[RAW_PART].p_offset; dsk_meta++; } +#endif return drvread(buf, dsk_start + lba, nblk); } ==== //depot/projects/ctsrd/cheribsd/src/sys/conf/files#7 (text+ko) ==== @@ -1046,6 +1046,8 @@ dev/cardbus/cardbus_cis.c optional cardbus dev/cardbus/cardbus_device.c optional cardbus dev/cas/if_cas.c optional cas +dev/cfi/cfi_bus_fdt.c optional cfi fdt +dev/cfi/cfi_bus_nexus.c optional cfi dev/cfi/cfi_core.c optional cfi dev/cfi/cfi_dev.c optional cfi dev/cfi/cfi_disk.c optional cfid ==== //depot/projects/ctsrd/cheribsd/src/sys/conf/files.powerpc#5 (text+ko) ==== @@ -27,7 +27,6 @@ dev/adb/adb_if.m optional adb dev/adb/adb_buttons.c optional adb dev/agp/agp_apple.c optional agp powermac -dev/cfi/cfi_bus_fdt.c optional cfi fdt dev/fb/fb.c optional sc dev/fdt/fdt_powerpc.c optional fdt dev/hwpmc/hwpmc_powerpc.c optional hwpmc ==== //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/atse/if_atse.c#2 (text+ko) ==== @@ -630,18 +630,21 @@ atse_ethernet_option_bits_read_fdt(device_t dev) { struct resource *res; - device_t isfdev; + device_t fdev; int i, rid; if (atse_ethernet_option_bits_flag & ATSE_ETHERNET_OPTION_BITS_READ) return (0); - isfdev = device_find_child(device_get_parent(dev), "isf", 0); - if (isfdev == NULL) - return (ENOENT); + fdev = device_find_child(device_get_parent(dev), "isf", 0); + if (fdev == NULL) { + fdev = device_find_child(device_get_parent(dev), "cfi", 0); + if (fdev == NULL) + return (ENOENT); + } rid = 0; - res = bus_alloc_resource_any(isfdev, SYS_RES_MEMORY, &rid, + res = bus_alloc_resource_any(fdev, SYS_RES_MEMORY, &rid, RF_ACTIVE | RF_SHAREABLE); if (res == NULL) return (ENXIO); @@ -650,7 +653,7 @@ atse_ethernet_option_bits[i] = bus_read_1(res, ALTERA_ETHERNET_OPTION_BITS_OFF + i); - bus_release_resource(dev, SYS_RES_MEMORY, rid, res); + bus_release_resource(fdev, SYS_RES_MEMORY, rid, res); atse_ethernet_option_bits_flag |= ATSE_ETHERNET_OPTION_BITS_READ; return (0); @@ -1195,6 +1198,17 @@ return (error); } +static void +atse_update_rx_err(struct atse_softc *sc, uint32_t mask) +{ + int i; + + /* RX error are 6 bits, we only know 4 of them. */ + for (i = 0; i < ATSE_RX_ERR_MAX; i++) + if ((mask & (1 << i)) != 0) + sc->atse_rx_err[i]++; +} + static int atse_rx_locked(struct atse_softc *sc) { @@ -1235,6 +1249,9 @@ meta = ATSE_RX_META_READ(sc); if (meta & A_ONCHIP_FIFO_MEM_CORE_ERROR_MASK) { /* XXX-BZ evaluate error. */ + atse_update_rx_err(sc, ((meta & + A_ONCHIP_FIFO_MEM_CORE_ERROR_MASK) >> + A_ONCHIP_FIFO_MEM_CORE_ERROR_SHIFT) & 0xff); ifp->if_ierrors++; sc->atse_rx_buf_len = 0; /* @@ -1382,6 +1399,9 @@ if (rx & (A_ONCHIP_FIFO_MEM_CORE_EVENT_OVERFLOW| A_ONCHIP_FIFO_MEM_CORE_EVENT_UNDERFLOW)) { /* XXX-BZ ERROR HANDLING. */ + atse_update_rx_err(sc, ((rx & + A_ONCHIP_FIFO_MEM_CORE_ERROR_MASK) >> + A_ONCHIP_FIFO_MEM_CORE_ERROR_SHIFT) & 0xff); ifp->if_ierrors++; } if ((rx & A_ONCHIP_FIFO_MEM_CORE_EVENT_EMPTY) != 0) { @@ -1448,6 +1468,9 @@ if (rx & (A_ONCHIP_FIFO_MEM_CORE_EVENT_OVERFLOW| A_ONCHIP_FIFO_MEM_CORE_EVENT_UNDERFLOW)) { /* XXX-BZ ERROR HANDLING. */ + atse_update_rx_err(sc, ((rx & + A_ONCHIP_FIFO_MEM_CORE_ERROR_MASK) >> + A_ONCHIP_FIFO_MEM_CORE_ERROR_SHIFT) & 0xff); ifp->if_ierrors++; } if (tx & (A_ONCHIP_FIFO_MEM_CORE_EVENT_OVERFLOW| @@ -1471,6 +1494,208 @@ } #endif /* DEVICE_POLLING */ +static struct atse_mac_stats_regs { + const char *name; + const char *descr; /* Mostly copied from Altera datasheet. */ +} atse_mac_stats_regs[] = { + [0x1a] = + { "aFramesTransmittedOK", + "The number of frames that are successfully transmitted including " + "the pause frames." }, + { "aFramesReceivedOK", + "The number of frames that are successfully received including the " + "pause frames." }, + { "aFrameCheckSequenceErrors", + "The number of receive frames with CRC error." }, + { "aAlignmentErrors", + "The number of receive frames with alignment error." }, + { "aOctetsTransmittedOK", + "The lower 32 bits of the number of data and padding octets that " + "are successfully transmitted." }, + { "aOctetsReceivedOK", + "The lower 32 bits of the number of data and padding octets that " + " are successfully received." }, + { "aTxPAUSEMACCtrlFrames", + "The number of pause frames transmitted." }, + { "aRxPAUSEMACCtrlFrames", + "The number received pause frames received." }, + { "ifInErrors", + "The number of errored frames received." }, + { "ifOutErrors", + "The number of transmit frames with either a FIFO overflow error, " + "a FIFO underflow error, or a error defined by the user " + "application." }, + { "ifInUcastPkts", + "The number of valid unicast frames received." }, + { "ifInMulticastPkts", + "The number of valid multicast frames received. The count does " + "not include pause frames." }, + { "ifInBroadcastPkts", + "The number of valid broadcast frames received." }, + { "ifOutDiscards", + "This statistics counter is not in use. The MAC function does not " + "discard frames that are written to the FIFO buffer by the user " + "application." }, + { "ifOutUcastPkts", + "The number of valid unicast frames transmitted." }, + { "ifOutMulticastPkts", + "The number of valid multicast frames transmitted, excluding pause " + "frames." }, + { "ifOutBroadcastPkts", + "The number of valid broadcast frames transmitted." }, + { "etherStatsDropEvents", + "The number of frames that are dropped due to MAC internal errors " + "when FIFO buffer overflow persists." }, + { "etherStatsOctets", + "The lower 32 bits of the total number of octets received. This " + "count includes both good and errored frames." }, + { "etherStatsPkts", + "The total number of good and errored frames received." }, + { "etherStatsUndersizePkts", + "The number of frames received with length less than 64 bytes. " + "This count does not include errored frames." }, + { "etherStatsOversizePkts", + "The number of frames received that are longer than the value " + "configured in the frm_length register. This count does not " + "include errored frames." }, + { "etherStatsPkts64Octets", + "The number of 64-byte frames received. This count includes good " + "and errored frames." }, + { "etherStatsPkts65to127Octets", + "The number of received good and errored frames between the length " + "of 65 and 127 bytes." }, + { "etherStatsPkts128to255Octets", + "The number of received good and errored frames between the length " + "of 128 and 255 bytes." }, + { "etherStatsPkts256to511Octets", + "The number of received good and errored frames between the length " + "of 256 and 511 bytes." }, + { "etherStatsPkts512to1023Octets", + "The number of received good and errored frames between the length " + "of 512 and 1023 bytes." }, + { "etherStatsPkts1024to1518Octets", + "The number of received good and errored frames between the length " + "of 1024 and 1518 bytes." }, + { "etherStatsPkts1519toXOctets", + "The number of received good and errored frames between the length " + "of 1519 and the maximum frame length configured in the frm_length " + "register." }, + { "etherStatsJabbers", + "Too long frames with CRC error." }, + { "etherStatsFragments", + "Too short frames with CRC error." }, + /* 0x39 unused, 0x3a/b non-stats. */ + [0x3c] = + /* Extended Statistics Counters */ + { "msb_aOctetsTransmittedOK", + "Upper 32 bits of the number of data and padding octets that are " + "successfully transmitted." }, + { "msb_aOctetsReceivedOK", + "Upper 32 bits of the number of data and padding octets that are " + "successfully received." }, + { "msb_etherStatsOctets", + "Upper 32 bits of the total number of octets received. This count " + "includes both good and errored frames." } +}; + +static int +sysctl_atse_mac_stats_proc(SYSCTL_HANDLER_ARGS) +{ + struct atse_softc *sc; + int error, offset, s; + + sc = arg1; + offset = arg2; + + s = CSR_READ_4(sc, offset); + error = sysctl_handle_int(oidp, &s, 0, req); + if (error || !req->newptr) + return (error); + + return (0); +} + +static struct atse_rx_err_stats_regs { + const char *name; + const char *descr; +} atse_rx_err_stats_regs[] = { + +#define ATSE_RX_ERR_FIFO_THRES_EOP 0 /* FIFO threshold reached, on EOP. */ +#define ATSE_RX_ERR_ELEN 1 /* Frame/payload length not valid. */ +#define ATSE_RX_ERR_CRC32 2 /* CRC-32 error. */ +#define ATSE_RX_ERR_FIFO_THRES_TRUNC 3 /* FIFO thresh., truncated frame. */ +#define ATSE_RX_ERR_4 4 /* ? */ +#define ATSE_RX_ERR_5 5 /* / */ + + { "rx_err_fifo_thres_eop", + "FIFO threshold reached, reported on EOP." }, + { "rx_err_fifo_elen", + "Frame or payload length not valid." }, + { "rx_err_fifo_crc32", + "CRC-32 error." }, + { "rx_err_fifo_thres_trunc", + "FIFO threshold reached, truncated frame" }, + { "rx_err_4", + "?" }, + { "rx_err_5", + "?" }, +}; + +static int +sysctl_atse_rx_err_stats_proc(SYSCTL_HANDLER_ARGS) +{ + struct atse_softc *sc; + int error, offset, s; + + sc = arg1; + offset = arg2; + + s = sc->atse_rx_err[offset]; + error = sysctl_handle_int(oidp, &s, 0, req); + if (error || !req->newptr) + return (error); + + return (0); +} + +static void +atse_sysctl_stats_attach(device_t dev) +{ + struct sysctl_ctx_list *sctx; + struct sysctl_oid *soid; + struct atse_softc *sc; + int i; + + sc = device_get_softc(dev); + sctx = device_get_sysctl_ctx(dev); + soid = device_get_sysctl_tree(dev); + + /* MAC statistics. */ + for (i = 0; i < sizeof(atse_mac_stats_regs) / + sizeof(*atse_mac_stats_regs); i++) { + if (atse_mac_stats_regs[i].name == NULL || + atse_mac_stats_regs[i].descr == NULL) + continue; + + SYSCTL_ADD_PROC(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, + atse_mac_stats_regs[i].name, CTLTYPE_UINT|CTLFLAG_RD, + sc, i, sysctl_atse_mac_stats_proc, "IU", + atse_mac_stats_regs[i].descr); + } + + /* rx_err[]. */ + for (i = 0; i < ATSE_RX_ERR_MAX; i++) { + if (atse_rx_err_stats_regs[i].name == NULL || + atse_rx_err_stats_regs[i].descr == NULL) + continue; + + SYSCTL_ADD_PROC(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, + atse_rx_err_stats_regs[i].name, CTLTYPE_UINT|CTLFLAG_RD, + sc, i, sysctl_atse_rx_err_stats_proc, "IU", + atse_rx_err_stats_regs[i].descr); + } +} + /* * Generic device handling routines. */ @@ -1595,6 +1820,9 @@ if (error != 0) atse_detach(dev); + if (error == 0) + atse_sysctl_stats_attach(dev); + return (error); } ==== //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/atse/if_atsereg.h#2 (text+ko) ==== @@ -395,7 +395,7 @@ /* -------------------------------------------------------------------------- */ /* DE4 Intel Strata Flash Ethernet Option Bits area. */ -/* XXX-BZ this is something a loader will ahve to handle for us. */ +/* XXX-BZ this is something a loader will have to handle for us. */ #define ALTERA_ETHERNET_OPTION_BITS_OFF 0x00008000 #define ALTERA_ETHERNET_OPTION_BITS_LEN 0x00007fff @@ -456,6 +456,14 @@ uint16_t atse_rx_buf_len; int16_t atse_rx_cycles; /* POLLING */ #define RX_CYCLES_IN_INTR 5 + uint32_t atse_rx_err[6]; +#define ATSE_RX_ERR_FIFO_THRES_EOP 0 /* FIFO threshold reached, on EOP. */ +#define ATSE_RX_ERR_ELEN 1 /* Frame/payload length not valid. */ +#define ATSE_RX_ERR_CRC32 2 /* CRC-32 error. */ +#define ATSE_RX_ERR_FIFO_THRES_TRUNC 3 /* FIFO thresh., truncated frame. */ +#define ATSE_RX_ERR_4 4 /* ? */ +#define ATSE_RX_ERR_5 5 /* / */ +#define ATSE_RX_ERR_MAX 6 struct callout atse_tick; struct mtx atse_mtx; }; ==== //depot/projects/ctsrd/cheribsd/src/sys/dev/cfi/cfi_bus_fdt.c#4 (text+ko) ==== @@ -61,6 +61,7 @@ }; DRIVER_MODULE (cfi, lbc, cfi_fdt_driver, cfi_devclass, 0, 0); +DRIVER_MODULE (cfi, simplebus, cfi_fdt_driver, cfi_devclass, 0, 0); static int cfi_fdt_probe(device_t dev) ==== //depot/projects/ctsrd/cheribsd/src/sys/dev/cfi/cfi_core.c#5 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -259,26 +260,63 @@ cfi_attach(device_t dev) { struct cfi_softc *sc; + struct timeval tv; u_int blksz, blocks; - u_int r, u; + u_int r, u, usec; +#ifdef CFI_SUPPORT_STRATAFLASH + uint64_t ppr; + char name[KENV_MNAMELEN], value[32]; +#endif sc = device_get_softc(dev); sc->sc_dev = dev; sc->sc_rid = 0; sc->sc_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->sc_rid, - RF_ACTIVE); + RF_ACTIVE | RF_SHAREABLE); if (sc->sc_res == NULL) return (ENXIO); sc->sc_tag = rman_get_bustag(sc->sc_res); sc->sc_handle = rman_get_bushandle(sc->sc_res); - /* Get time-out values for erase and write. */ - sc->sc_write_timeout = 1 << cfi_read_qry(sc, CFI_QRY_TTO_WRITE); - sc->sc_erase_timeout = 1 << cfi_read_qry(sc, CFI_QRY_TTO_ERASE); - sc->sc_write_timeout *= 1 << cfi_read_qry(sc, CFI_QRY_MTO_WRITE); - sc->sc_erase_timeout *= 1 << cfi_read_qry(sc, CFI_QRY_MTO_ERASE); + /* Get time-out values for erase, write, and buffer write. */ + bintime_clear(&sc->sc_typical_timeouts[CFI_TIMEOUT_ERASE]); + usec = 1000 * (1 << cfi_read_qry(sc, CFI_QRY_TTO_ERASE)); + tv.tv_sec = usec / 1000000; + tv.tv_usec = usec % 1000000; + timeval2bintime(&tv, &sc->sc_typical_timeouts[CFI_TIMEOUT_ERASE]); + sc->sc_max_timeouts[CFI_TIMEOUT_ERASE] = + sc->sc_typical_timeouts[CFI_TIMEOUT_ERASE]; + bintime_mul(&sc->sc_max_timeouts[CFI_TIMEOUT_ERASE], + 1 << cfi_read_qry(sc, CFI_QRY_MTO_ERASE)); + + bintime_clear(&sc->sc_typical_timeouts[CFI_TIMEOUT_WRITE]); + usec = 1 << cfi_read_qry(sc, CFI_QRY_TTO_WRITE); + tv.tv_sec = usec / 1000000; + tv.tv_usec = usec % 1000000; + timeval2bintime(&tv, &sc->sc_typical_timeouts[CFI_TIMEOUT_WRITE]); + sc->sc_max_timeouts[CFI_TIMEOUT_WRITE] = + sc->sc_typical_timeouts[CFI_TIMEOUT_WRITE]; + bintime_mul(&sc->sc_max_timeouts[CFI_TIMEOUT_WRITE], + 1 << cfi_read_qry(sc, CFI_QRY_MTO_WRITE)); + + bintime_clear(&sc->sc_typical_timeouts[CFI_TIMEOUT_BUFWRITE]); + usec = 1 << cfi_read_qry(sc, CFI_QRY_TTO_BUFWRITE); + tv.tv_sec = usec / 1000000; + tv.tv_usec = usec % 1000000; + timeval2bintime(&tv, &sc->sc_typical_timeouts[CFI_TIMEOUT_BUFWRITE]); + sc->sc_max_timeouts[CFI_TIMEOUT_BUFWRITE] = + sc->sc_typical_timeouts[CFI_TIMEOUT_BUFWRITE]; + bintime_mul(&sc->sc_max_timeouts[CFI_TIMEOUT_BUFWRITE], + 1 << cfi_read_qry(sc, CFI_QRY_MTO_BUFWRITE)); + + /* Get the maximum size of a multibyte program */ + if (bintime_isset(&sc->sc_typical_timeouts[CFI_TIMEOUT_BUFWRITE])) + sc->sc_maxbuf = 1 << (cfi_read_qry(sc, CFI_QRY_MAXBUF) | + cfi_read_qry(sc, CFI_QRY_MAXBUF) << 8); + else + sc->sc_maxbuf = 0; /* Get erase regions. */ sc->sc_regions = cfi_read_qry(sc, CFI_QRY_NREGIONS); @@ -312,6 +350,20 @@ "%s%u", cfi_driver_name, u); sc->sc_nod->si_drv1 = sc; +#ifdef CFI_SUPPORT_STRATAFLASH + /* + * Store the Intel factory PPR in the environment. In many + * cases it is the most unique ID on a board. + */ + if (cfi_intel_get_factory_pr(sc, &ppr) == 0) { + if (snprintf(name, sizeof(name), "%s.factory_ppr", + device_get_nameunit(dev)) < (sizeof(name) - 1) && + snprintf(value, sizeof(value), "0x%016jx", ppr) < + (sizeof(value) - 1)) + (void) setenv(name, value); + } +#endif + device_add_child(dev, "cfid", -1); bus_generic_attach(dev); @@ -332,18 +384,21 @@ } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Feb 26 22:25:21 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 100F555C; Tue, 26 Feb 2013 22:25:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id BD29255A for ; Tue, 26 Feb 2013 22:25:20 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id A380E636 for ; Tue, 26 Feb 2013 22:25:20 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r1QMPK8k020050 for ; Tue, 26 Feb 2013 22:25:20 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r1QMPK6A020047 for perforce@freebsd.org; Tue, 26 Feb 2013 22:25:20 GMT (envelope-from brooks@freebsd.org) Date: Tue, 26 Feb 2013 22:25:20 GMT Message-Id: <201302262225.r1QMPK6A020047@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222411 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2013 22:25:21 -0000 http://p4web.freebsd.org/@@222411?ac=10 Change 222411 by brooks@brooks_zenith on 2013/02/26 22:25:07 Add -B${WORLDTMP}/usr/bin to the cross compiler flags when using an external compiler. With this change arm worlds cross build. Affected files ... .. //depot/projects/ctsrd/tesla/src/Makefile.inc1#7 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/Makefile.inc1#7 (text+ko) ==== @@ -293,7 +293,7 @@ WMAKE_COMPILER_TYPE= clang .endif .if ${XCC:M/*} -XFLAGS= --sysroot=${WORLDTMP} +XFLAGS= --sysroot=${WORLDTMP} -B${WORLDTMP}/usr/bin .if ${TARGET_ARCH} != ${MACHINE_ARCH} && ${WMAKE_COMPILER_TYPE} == "clang" .if (${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "armv6") && \ ${MK_ARM_EABI} != "no" From owner-p4-projects@FreeBSD.ORG Wed Feb 27 23:32:40 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59607B77; Wed, 27 Feb 2013 23:32:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 1DA1CB75 for ; Wed, 27 Feb 2013 23:32:40 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id D66AAA59 for ; Wed, 27 Feb 2013 23:32:39 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r1RNWd2x067469 for ; Wed, 27 Feb 2013 23:32:39 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r1RNWdJq067466 for perforce@freebsd.org; Wed, 27 Feb 2013 23:32:39 GMT (envelope-from brooks@freebsd.org) Date: Wed, 27 Feb 2013 23:32:39 GMT Message-Id: <201302272332.r1RNWdJq067466@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222446 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Feb 2013 23:32:40 -0000 http://p4web.freebsd.org/@@222446?ac=10 Change 222446 by brooks@brooks_zenith on 2013/02/27 23:31:46 Add CROSS_COMPILER_PATH, CROSS_BINUTILS_PATH, and CROSS_TOOLCHAIN_PATH variables to make it easier to set X* commands. Extend X* support to a likely set of binutils. Affected files ... .. //depot/projects/ctsrd/tesla/src/Makefile.inc1#8 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/Makefile.inc1#8 (text+ko) ==== @@ -280,9 +280,32 @@ .if ${MK_CDDL} == "no" WMAKEENV+= NO_CTF=1 .endif -XCC?= ${CC} -XCXX?= ${CXX} -XCPP?= ${CPP} + +.if defined(CROSS_TOOLCHAIN_PATH) +CROSS_COMPILER_PATH?=${CROSS_TOOLCHAIN_PATH} +CROSS_BINUTILS_PATH?=${CROSS_TOOLCHAIN_PATH} +.endif +XCOMPILERS= CC CXX CPP +.for COMPILER in ${XCOMPILERS} +.if defined(CROSS_COMPILER_PATH) +X${COMPILER}?= ${CROSS_COMPILER_PATH}/${${COMPILER}} +.else +X${COMPILER}?= ${${COMPILER}} +.endif +.endfor +XBINUTILS= AS AR LD NM OBJDUMP RANLIB STRINGS +.for BINUTIL in ${XBINUTILS} +.if defined(CROSS_BINUTILS_PATH) +X${BINUTIL}?= ${CROSS_BINUTILS_PATH}/${${BINUTIL}} +.else +X${BINUTIL}?= ${${BINUTIL}} +.endif +.endfor +WMAKEENV+= CC="${XCC} ${XFLAGS}" CXX="${XCXX} ${XFLAGS}" \ + CPP="${XCPP} ${XFLAGS}" \ + AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \ + OBJDUMP=${XOBJDUMP} RANLIB=${RANLIB} STRINGS=${XSTRINGS} + .if ${XCC:T:Mgcc} == "gcc" WMAKE_COMPILER_TYPE= gcc .elif ${XCC:T:Mclang} == "clang" @@ -292,8 +315,14 @@ .else WMAKE_COMPILER_TYPE= clang .endif + .if ${XCC:M/*} -XFLAGS= --sysroot=${WORLDTMP} -B${WORLDTMP}/usr/bin +XFLAGS= --sysroot=${WORLDTMP} +.if defined(CROSS_BINUTILS_PATH) +XFLAGS+= -B${CROSS_BINUTILS_PATH} +.else +XFLAGS+= -B${WORLDTMP}/usr/bin +.endif .if ${TARGET_ARCH} != ${MACHINE_ARCH} && ${WMAKE_COMPILER_TYPE} == "clang" .if (${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "armv6") && \ ${MK_ARM_EABI} != "no" @@ -305,9 +334,8 @@ XFLAGS+= -target ${TARGET_TRIPLE} .endif .endif -WMAKEENV+= CC="${XCC} ${XFLAGS}" CXX="${XCXX} ${XFLAGS}" \ - CPP="${XCPP} ${XFLAGS}" \ - COMPILER_TYPE=${WMAKE_COMPILER_TYPE} + +WMAKEENV+= COMPILER_TYPE=${WMAKE_COMPILER_TYPE} WMAKE= ${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP} .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" @@ -1303,7 +1331,7 @@ .endif .endif -.if ${MK_BINUTILS} != "no" +.if ${XAS:M/*} == "" && ${MK_BINUTILS} != "no" _binutils= gnu/usr.bin/binutils .endif From owner-p4-projects@FreeBSD.ORG Thu Feb 28 16:44:43 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54CBEBB0; Thu, 28 Feb 2013 16:44:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 187A4BAB for ; Thu, 28 Feb 2013 16:44:43 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id E5361E9 for ; Thu, 28 Feb 2013 16:44:42 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r1SGigUb077261 for ; Thu, 28 Feb 2013 16:44:42 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r1SGigmW077258 for perforce@freebsd.org; Thu, 28 Feb 2013 16:44:42 GMT (envelope-from brooks@freebsd.org) Date: Thu, 28 Feb 2013 16:44:42 GMT Message-Id: <201302281644.r1SGigmW077258@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222461 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Feb 2013 16:44:43 -0000 http://p4web.freebsd.org/@@222461?ac=10 Change 222461 by brooks@brooks_zenith on 2013/02/28 16:44:30 To allow xdev-build trees to be used change CROSS_*_PATH to CROSS_*_PREFIX and prepend it to X* tools without a / between them. Don't add -B${CROSS_BINUTILS_PATH} to the compiler if it doesn't exist in the filesystem. Suggested by: imp Affected files ... .. //depot/projects/ctsrd/tesla/src/Makefile.inc1#9 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/Makefile.inc1#9 (text+ko) ==== @@ -281,22 +281,22 @@ WMAKEENV+= NO_CTF=1 .endif -.if defined(CROSS_TOOLCHAIN_PATH) -CROSS_COMPILER_PATH?=${CROSS_TOOLCHAIN_PATH} -CROSS_BINUTILS_PATH?=${CROSS_TOOLCHAIN_PATH} +.if defined(CROSS_TOOLCHAIN_PREFIX) +CROSS_COMPILER_PREFIX?=${CROSS_TOOLCHAIN_PREFIX} +CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX} .endif XCOMPILERS= CC CXX CPP .for COMPILER in ${XCOMPILERS} -.if defined(CROSS_COMPILER_PATH) -X${COMPILER}?= ${CROSS_COMPILER_PATH}/${${COMPILER}} +.if defined(CROSS_COMPILER_PREFIX) +X${COMPILER}?= ${CROSS_COMPILER_PREFIX}${${COMPILER}} .else X${COMPILER}?= ${${COMPILER}} .endif .endfor XBINUTILS= AS AR LD NM OBJDUMP RANLIB STRINGS .for BINUTIL in ${XBINUTILS} -.if defined(CROSS_BINUTILS_PATH) -X${BINUTIL}?= ${CROSS_BINUTILS_PATH}/${${BINUTIL}} +.if defined(CROSS_BINUTILS_PREFIX) +X${BINUTIL}?= ${CROSS_BINUTILS_PREFIX}${${BINUTIL}} .else X${BINUTIL}?= ${${BINUTIL}} .endif @@ -304,7 +304,7 @@ WMAKEENV+= CC="${XCC} ${XFLAGS}" CXX="${XCXX} ${XFLAGS}" \ CPP="${XCPP} ${XFLAGS}" \ AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \ - OBJDUMP=${XOBJDUMP} RANLIB=${RANLIB} STRINGS=${XSTRINGS} + OBJDUMP=${XOBJDUMP} RANLIB=${XRANLIB} STRINGS=${XSTRINGS} .if ${XCC:T:Mgcc} == "gcc" WMAKE_COMPILER_TYPE= gcc @@ -318,8 +318,13 @@ .if ${XCC:M/*} XFLAGS= --sysroot=${WORLDTMP} -.if defined(CROSS_BINUTILS_PATH) -XFLAGS+= -B${CROSS_BINUTILS_PATH} +.if defined(CROSS_BINUTILS_PREFIX) +# In the case of xdev-build tools, CROSS_BINUTILS_PREFIX won't be a +# directory, but the compiler will look in the right place for it's +# tools so we don't need to tell it where to look. +.if exists(${CROSS_BINUTILS_PREFIX}) +XFLAGS+= -B${CROSS_BINUTILS_PREFIX} +.endif .else XFLAGS+= -B${WORLDTMP}/usr/bin .endif