From owner-svn-src-projects@FreeBSD.ORG Sun Nov 23 00:08:24 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7A2D4701; Sun, 23 Nov 2014 00:08:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5BDBE760; Sun, 23 Nov 2014 00:08:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAN08OPk088626; Sun, 23 Nov 2014 00:08:24 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAN08Nei088622; Sun, 23 Nov 2014 00:08:23 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201411230008.sAN08Nei088622@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Sun, 23 Nov 2014 00:08:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274902 - in projects/bmake/pkgs/pseudo: hosttools universe X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Nov 2014 00:08:24 -0000 Author: sjg Date: Sun Nov 23 00:08:22 2014 New Revision: 274902 URL: https://svnweb.freebsd.org/changeset/base/274902 Log: Leverage dirdeps.mk by tweaking _DIRDEP_USE_LEVEL so we can have a 2nd stage of dependencies computed in parallel. Reviewed by: marcel Added: projects/bmake/pkgs/pseudo/hosttools/ projects/bmake/pkgs/pseudo/hosttools/Makefile (contents, props changed) projects/bmake/pkgs/pseudo/hosttools/Makefile.depend (contents, props changed) projects/bmake/pkgs/pseudo/universe/ projects/bmake/pkgs/pseudo/universe/Makefile (contents, props changed) projects/bmake/pkgs/pseudo/universe/Makefile.depend (contents, props changed) Added: projects/bmake/pkgs/pseudo/hosttools/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/pkgs/pseudo/hosttools/Makefile Sun Nov 23 00:08:22 2014 (r274902) @@ -0,0 +1,3 @@ +# $FreeBSD$ + +.include "../Makefile.inc" Added: projects/bmake/pkgs/pseudo/hosttools/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/pkgs/pseudo/hosttools/Makefile.depend Sun Nov 23 00:08:22 2014 (r274902) @@ -0,0 +1,24 @@ +# $FreeBSD$ + +# This file is not autogenerated - take care! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + lib/clang/include.host \ + lib/libc++.host \ + lib/libcxxrt.host \ + share/doc/llvm/clang.host \ + usr.bin/clang/clang-tblgen.host \ + usr.bin/clang/clang.host \ + usr.bin/clang/tblgen.host \ + usr.bin/lex/lib.host \ + usr.bin/mkcsmapper_static.host \ + usr.bin/mkesdb_static.host \ + usr.bin/mkuzip.host \ + usr.bin/xinstall.host \ + usr.sbin/config.host \ + + + +.include Added: projects/bmake/pkgs/pseudo/universe/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/pkgs/pseudo/universe/Makefile Sun Nov 23 00:08:22 2014 (r274902) @@ -0,0 +1,73 @@ +# $FreeBSD$ + +# This target is "special". +# +# The actual work is done via another target; +# UNIVERSE_TARGET_RELDIR is used to identify it. +# +# We leverage dirdeps.mk to run a sub-make per +# MACHINE/ARCH to each build ${UNIVERSE_TARGET_RELDIR} +# in meta mode. +# +# We simply override the level at which dirdeps.mk normally does +# its thing, and give it a DIRDEPS list that corresponds to +# ${UNIVERSE_TARGET_RELDIR}.${TARGET_SPEC} for each TARGET_SPEC we +# want. +# +# This allows the computation of dependencies for each ${TARGET_SPEC} +# to happen in parallel - avoiding a very long startup time. +# We can even export each sub-make to a different machine if using a +# cluster. +# +# The above works fine so long as our sub-makes remain independent. +# That is; none of them attempts to visit any directory for a machine +# other than the TARGET_SPEC we gave it. +# For example; to build some tool for the pseudo machine "host". +# To avoid that, our Makefile.depend lists all the hosttools we might +# need and these will thus be built before we launch the +# ${UNIVERSE_TARGET_RELDIR} sub-makes. +# Further we add a filter to skip any "host" dirdeps during those +# sub-makes. +# +# + +# this is the RELDIR of the target we build +UNIVERSE_TARGET_RELDIR?= pkgs/pseudo/the-lot + +# the list of machines +TARGET_MACHINE_LIST = i386 amd64 +# some machines have more than one arch +TARGET_ARCHES_arm?= arm armeb armv6 armv6hf + +# avoid ../Makefile.inc defining this +all: + +.include "../Makefile.inc" + +.if ${.MAKE.LEVEL} > 0 +# ok our prerequisites have been built +.if !defined(UNIVERSE_GUARD) +# just incase we end up back here, +# we cannot rely on .MAKE.LEVEL as we normally would +UNIVERSE_GUARD=1 +.export UNIVERSE_GUARD + +# we want to re-use dirdeps +_DIRDEP_USE_LEVEL = ${.MAKE.LEVEL} + +# we want our sub-makes to think they are level 0 +# and we don't want failure of one to stop all. +DIRDEP_USE_ENV= \ + MAKELEVEL=0 \ + MAKE_JOB_ERROR_TOKEN=no + + +_target_specs:= ${TARGET_MACHINE_LIST:@m@${TARGET_ARCHES_$m:U$m:@a@$m,$a@}@:O:u} + +DIRDEPS:= ${_target_specs:@t@${UNIVERSE_TARGET_RELDIR}.$t@} + +all: dirdeps + +.include +.endif +.endif Added: projects/bmake/pkgs/pseudo/universe/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/pkgs/pseudo/universe/Makefile.depend Sun Nov 23 00:08:22 2014 (r274902) @@ -0,0 +1,15 @@ +# $FreeBSD$ + +# This file is not autogenerated - take care! + +# this is not normally needed, but we are not normal +.if ${.MAKE.LEVEL} == 0 +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +# our role here is to build all the host tools etc. +DIRDEPS = \ + pkgs/pseudo/hosttools.host \ + + +.include +.endif From owner-svn-src-projects@FreeBSD.ORG Sun Nov 23 01:08:47 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EE959867; Sun, 23 Nov 2014 01:08:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D68EEC66; Sun, 23 Nov 2014 01:08:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAN18kaH017163; Sun, 23 Nov 2014 01:08:46 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAN18hXa017148; Sun, 23 Nov 2014 01:08:43 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411230108.sAN18hXa017148@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Sun, 23 Nov 2014 01:08:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274908 - in projects/sendfile: bin/sh contrib/binutils/gas/config contrib/libarchive/cpio contrib/mdocml contrib/sqlite3 etc/defaults lib lib/libmandoc lib/libsqlite3 sbin/mount sbin/u... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Nov 2014 01:08:47 -0000 Author: glebius Date: Sun Nov 23 01:08:42 2014 New Revision: 274908 URL: https://svnweb.freebsd.org/changeset/base/274908 Log: Merge head r258543 through r274907. Added: projects/sendfile/contrib/mdocml/INSTALL - copied unchanged from r274907, head/contrib/mdocml/INSTALL projects/sendfile/contrib/mdocml/LICENSE - copied unchanged from r274907, head/contrib/mdocml/LICENSE projects/sendfile/contrib/mdocml/Makefile - copied unchanged from r274907, head/contrib/mdocml/Makefile projects/sendfile/contrib/mdocml/Makefile.depend - copied unchanged from r274907, head/contrib/mdocml/Makefile.depend projects/sendfile/contrib/mdocml/apropos.1 - copied unchanged from r274907, head/contrib/mdocml/apropos.1 projects/sendfile/contrib/mdocml/apropos.c - copied unchanged from r274907, head/contrib/mdocml/apropos.c projects/sendfile/contrib/mdocml/cgi.c - copied unchanged from r274907, head/contrib/mdocml/cgi.c projects/sendfile/contrib/mdocml/cgi.h.example - copied unchanged from r274907, head/contrib/mdocml/cgi.h.example projects/sendfile/contrib/mdocml/compat_ohash.c - copied unchanged from r274907, head/contrib/mdocml/compat_ohash.c projects/sendfile/contrib/mdocml/compat_ohash.h - copied unchanged from r274907, head/contrib/mdocml/compat_ohash.h projects/sendfile/contrib/mdocml/compat_reallocarray.c - copied unchanged from r274907, head/contrib/mdocml/compat_reallocarray.c projects/sendfile/contrib/mdocml/compat_sqlite3_errstr.c - copied unchanged from r274907, head/contrib/mdocml/compat_sqlite3_errstr.c projects/sendfile/contrib/mdocml/compat_strcasestr.c - copied unchanged from r274907, head/contrib/mdocml/compat_strcasestr.c projects/sendfile/contrib/mdocml/compat_strsep.c - copied unchanged from r274907, head/contrib/mdocml/compat_strsep.c projects/sendfile/contrib/mdocml/config.h.post - copied unchanged from r274907, head/contrib/mdocml/config.h.post projects/sendfile/contrib/mdocml/config.h.pre - copied unchanged from r274907, head/contrib/mdocml/config.h.pre projects/sendfile/contrib/mdocml/configure - copied unchanged from r274907, head/contrib/mdocml/configure projects/sendfile/contrib/mdocml/demandoc.1 - copied unchanged from r274907, head/contrib/mdocml/demandoc.1 projects/sendfile/contrib/mdocml/demandoc.c - copied unchanged from r274907, head/contrib/mdocml/demandoc.c projects/sendfile/contrib/mdocml/gmdiff - copied unchanged from r274907, head/contrib/mdocml/gmdiff projects/sendfile/contrib/mdocml/makewhatis.8 - copied unchanged from r274907, head/contrib/mdocml/makewhatis.8 projects/sendfile/contrib/mdocml/man-cgi.css - copied unchanged from r274907, head/contrib/mdocml/man-cgi.css projects/sendfile/contrib/mdocml/man.cgi.8 - copied unchanged from r274907, head/contrib/mdocml/man.cgi.8 projects/sendfile/contrib/mdocml/mandoc.db.5 - copied unchanged from r274907, head/contrib/mdocml/mandoc.db.5 projects/sendfile/contrib/mdocml/mandoc_aux.c - copied unchanged from r274907, head/contrib/mdocml/mandoc_aux.c projects/sendfile/contrib/mdocml/mandoc_aux.h - copied unchanged from r274907, head/contrib/mdocml/mandoc_aux.h projects/sendfile/contrib/mdocml/mandoc_escape.3 - copied unchanged from r274907, head/contrib/mdocml/mandoc_escape.3 projects/sendfile/contrib/mdocml/mandoc_html.3 - copied unchanged from r274907, head/contrib/mdocml/mandoc_html.3 projects/sendfile/contrib/mdocml/mandoc_malloc.3 - copied unchanged from r274907, head/contrib/mdocml/mandoc_malloc.3 projects/sendfile/contrib/mdocml/mandocdb.c - copied unchanged from r274907, head/contrib/mdocml/mandocdb.c projects/sendfile/contrib/mdocml/manpage.c - copied unchanged from r274907, head/contrib/mdocml/manpage.c projects/sendfile/contrib/mdocml/manpath.c - copied unchanged from r274907, head/contrib/mdocml/manpath.c projects/sendfile/contrib/mdocml/manpath.h - copied unchanged from r274907, head/contrib/mdocml/manpath.h projects/sendfile/contrib/mdocml/mansearch.3 - copied unchanged from r274907, head/contrib/mdocml/mansearch.3 projects/sendfile/contrib/mdocml/mansearch.c - copied unchanged from r274907, head/contrib/mdocml/mansearch.c projects/sendfile/contrib/mdocml/mansearch.h - copied unchanged from r274907, head/contrib/mdocml/mansearch.h projects/sendfile/contrib/mdocml/mansearch_const.c - copied unchanged from r274907, head/contrib/mdocml/mansearch_const.c projects/sendfile/contrib/mdocml/mchars_alloc.3 - copied unchanged from r274907, head/contrib/mdocml/mchars_alloc.3 projects/sendfile/contrib/mdocml/preconv.1 - copied unchanged from r274907, head/contrib/mdocml/preconv.1 projects/sendfile/contrib/mdocml/preconv.c - copied unchanged from r274907, head/contrib/mdocml/preconv.c projects/sendfile/contrib/mdocml/tbl.3 - copied unchanged from r274907, head/contrib/mdocml/tbl.3 projects/sendfile/contrib/mdocml/test-fgetln.c - copied unchanged from r274907, head/contrib/mdocml/test-fgetln.c projects/sendfile/contrib/mdocml/test-getsubopt.c - copied unchanged from r274907, head/contrib/mdocml/test-getsubopt.c projects/sendfile/contrib/mdocml/test-mmap.c - copied unchanged from r274907, head/contrib/mdocml/test-mmap.c projects/sendfile/contrib/mdocml/test-ohash.c - copied unchanged from r274907, head/contrib/mdocml/test-ohash.c projects/sendfile/contrib/mdocml/test-reallocarray.c - copied unchanged from r274907, head/contrib/mdocml/test-reallocarray.c projects/sendfile/contrib/mdocml/test-sqlite3_errstr.c - copied unchanged from r274907, head/contrib/mdocml/test-sqlite3_errstr.c projects/sendfile/contrib/mdocml/test-strcasestr.c - copied unchanged from r274907, head/contrib/mdocml/test-strcasestr.c projects/sendfile/contrib/mdocml/test-strlcat.c - copied unchanged from r274907, head/contrib/mdocml/test-strlcat.c projects/sendfile/contrib/mdocml/test-strlcpy.c - copied unchanged from r274907, head/contrib/mdocml/test-strlcpy.c projects/sendfile/contrib/mdocml/test-strptime.c - copied unchanged from r274907, head/contrib/mdocml/test-strptime.c projects/sendfile/contrib/mdocml/test-strsep.c - copied unchanged from r274907, head/contrib/mdocml/test-strsep.c projects/sendfile/lib/libsqlite3/ - copied from r274907, head/lib/libsqlite3/ projects/sendfile/usr.bin/demandoc/ - copied from r274907, head/usr.bin/demandoc/ projects/sendfile/usr.bin/preconv/ - copied from r274907, head/usr.bin/preconv/ projects/sendfile/usr.bin/soeliminate/ - copied from r274907, head/usr.bin/soeliminate/ Deleted: projects/sendfile/contrib/mdocml/external.png projects/sendfile/sys/dev/joy/joy_pccard.c projects/sendfile/usr.bin/svn/lib/libsqlite3/ Modified: projects/sendfile/bin/sh/error.c projects/sendfile/bin/sh/expand.c projects/sendfile/bin/sh/parser.c projects/sendfile/contrib/binutils/gas/config/tc-arm.c projects/sendfile/contrib/libarchive/cpio/cpio.c projects/sendfile/contrib/mdocml/NEWS projects/sendfile/contrib/mdocml/TODO projects/sendfile/contrib/mdocml/arch.c projects/sendfile/contrib/mdocml/arch.in projects/sendfile/contrib/mdocml/att.c projects/sendfile/contrib/mdocml/chars.c projects/sendfile/contrib/mdocml/chars.in projects/sendfile/contrib/mdocml/config.h projects/sendfile/contrib/mdocml/eqn.c projects/sendfile/contrib/mdocml/eqn_html.c projects/sendfile/contrib/mdocml/eqn_term.c projects/sendfile/contrib/mdocml/html.c projects/sendfile/contrib/mdocml/html.h projects/sendfile/contrib/mdocml/lib.c projects/sendfile/contrib/mdocml/lib.in projects/sendfile/contrib/mdocml/libman.h projects/sendfile/contrib/mdocml/libmandoc.h projects/sendfile/contrib/mdocml/libmdoc.h projects/sendfile/contrib/mdocml/libroff.h projects/sendfile/contrib/mdocml/main.c projects/sendfile/contrib/mdocml/main.h projects/sendfile/contrib/mdocml/man.7 projects/sendfile/contrib/mdocml/man.c projects/sendfile/contrib/mdocml/man.h projects/sendfile/contrib/mdocml/man_hash.c projects/sendfile/contrib/mdocml/man_html.c projects/sendfile/contrib/mdocml/man_macro.c projects/sendfile/contrib/mdocml/man_term.c projects/sendfile/contrib/mdocml/man_validate.c projects/sendfile/contrib/mdocml/mandoc.1 projects/sendfile/contrib/mdocml/mandoc.3 projects/sendfile/contrib/mdocml/mandoc.c projects/sendfile/contrib/mdocml/mandoc.h projects/sendfile/contrib/mdocml/mdoc.7 projects/sendfile/contrib/mdocml/mdoc.c projects/sendfile/contrib/mdocml/mdoc.h projects/sendfile/contrib/mdocml/mdoc_argv.c projects/sendfile/contrib/mdocml/mdoc_hash.c projects/sendfile/contrib/mdocml/mdoc_html.c projects/sendfile/contrib/mdocml/mdoc_macro.c projects/sendfile/contrib/mdocml/mdoc_man.c projects/sendfile/contrib/mdocml/mdoc_term.c projects/sendfile/contrib/mdocml/mdoc_validate.c projects/sendfile/contrib/mdocml/msec.c projects/sendfile/contrib/mdocml/out.c projects/sendfile/contrib/mdocml/out.h projects/sendfile/contrib/mdocml/read.c projects/sendfile/contrib/mdocml/roff.7 projects/sendfile/contrib/mdocml/roff.c projects/sendfile/contrib/mdocml/st.c projects/sendfile/contrib/mdocml/st.in projects/sendfile/contrib/mdocml/tbl.c projects/sendfile/contrib/mdocml/tbl_data.c projects/sendfile/contrib/mdocml/tbl_html.c projects/sendfile/contrib/mdocml/tbl_layout.c projects/sendfile/contrib/mdocml/tbl_opts.c projects/sendfile/contrib/mdocml/tbl_term.c projects/sendfile/contrib/mdocml/term.c projects/sendfile/contrib/mdocml/term.h projects/sendfile/contrib/mdocml/term_ascii.c projects/sendfile/contrib/mdocml/term_ps.c projects/sendfile/contrib/mdocml/tree.c projects/sendfile/contrib/mdocml/vol.c projects/sendfile/contrib/sqlite3/configure projects/sendfile/contrib/sqlite3/configure.ac projects/sendfile/contrib/sqlite3/shell.c projects/sendfile/contrib/sqlite3/sqlite3.c projects/sendfile/contrib/sqlite3/sqlite3.h projects/sendfile/contrib/sqlite3/sqlite3ext.h projects/sendfile/etc/defaults/rc.conf projects/sendfile/lib/Makefile projects/sendfile/lib/libmandoc/Makefile projects/sendfile/sbin/mount/mount.8 projects/sendfile/sbin/umount/umount.8 projects/sendfile/share/mk/bsd.libnames.mk projects/sendfile/share/mk/src.libnames.mk projects/sendfile/sys/arm/arm/busdma_machdep-v6.c projects/sendfile/sys/cam/ctl/ctl_frontend_iscsi.c projects/sendfile/sys/conf/files projects/sendfile/sys/dev/asr/asr.c projects/sendfile/sys/dev/iscsi/icl.c projects/sendfile/sys/dev/iscsi/iscsi.c projects/sendfile/sys/dev/pccard/pccardvar.h projects/sendfile/sys/dev/usb/controller/saf1761_otg.c projects/sendfile/sys/dev/usb/controller/saf1761_otg_reg.h projects/sendfile/sys/dev/wi/if_wi_pccard.c projects/sendfile/sys/fs/autofs/autofs.c projects/sendfile/sys/fs/autofs/autofs.h projects/sendfile/sys/fs/autofs/autofs_vfsops.c projects/sendfile/sys/kern/imgact_elf.c projects/sendfile/sys/kern/kern_descrip.c projects/sendfile/sys/modules/joy/Makefile projects/sendfile/sys/ufs/ffs/ffs_suspend.c projects/sendfile/sys/ufs/ufs/ufs_acl.c projects/sendfile/sys/ufs/ufs/ufs_dirhash.c projects/sendfile/sys/ufs/ufs/ufs_gjournal.c projects/sendfile/sys/ufs/ufs/ufsmount.h projects/sendfile/sys/vm/vm_reserv.c projects/sendfile/usr.bin/Makefile projects/sendfile/usr.bin/dpv/Makefile projects/sendfile/usr.bin/locate/locate/util.c projects/sendfile/usr.bin/man/man.sh projects/sendfile/usr.bin/mandoc/Makefile projects/sendfile/usr.bin/svn/Makefile.inc projects/sendfile/usr.bin/svn/lib/Makefile projects/sendfile/usr.bin/svn/svn/Makefile projects/sendfile/usr.bin/svn/svnadmin/Makefile projects/sendfile/usr.bin/svn/svndumpfilter/Makefile projects/sendfile/usr.bin/svn/svnlook/Makefile projects/sendfile/usr.bin/svn/svnmucc/Makefile projects/sendfile/usr.bin/svn/svnrdump/Makefile projects/sendfile/usr.bin/svn/svnserve/Makefile projects/sendfile/usr.bin/svn/svnsync/Makefile projects/sendfile/usr.bin/svn/svnversion/Makefile projects/sendfile/usr.sbin/autofs/automount.8 projects/sendfile/usr.sbin/autofs/automount.c projects/sendfile/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c projects/sendfile/usr.sbin/ctld/ctld.c projects/sendfile/usr.sbin/ctld/ctld.h projects/sendfile/usr.sbin/iscsid/iscsid.c projects/sendfile/usr.sbin/iscsid/iscsid.h projects/sendfile/usr.sbin/rtadvd/rtadvd.c Directory Properties: projects/sendfile/ (props changed) projects/sendfile/contrib/binutils/ (props changed) projects/sendfile/contrib/libarchive/ (props changed) projects/sendfile/contrib/libarchive/cpio/ (props changed) projects/sendfile/contrib/mdocml/ (props changed) projects/sendfile/contrib/sqlite3/ (props changed) projects/sendfile/etc/ (props changed) projects/sendfile/sbin/ (props changed) projects/sendfile/share/ (props changed) projects/sendfile/sys/ (props changed) projects/sendfile/sys/conf/ (props changed) projects/sendfile/usr.sbin/rtadvd/ (props changed) Modified: projects/sendfile/bin/sh/error.c ============================================================================== --- projects/sendfile/bin/sh/error.c Sun Nov 23 01:02:19 2014 (r274907) +++ projects/sendfile/bin/sh/error.c Sun Nov 23 01:08:42 2014 (r274908) @@ -139,6 +139,8 @@ vwarning(const char *msg, va_list ap) { if (commandname) outfmt(out2, "%s: ", commandname); + else if (arg0) + outfmt(out2, "%s: ", arg0); doformat(out2, msg, ap); out2fmt_flush("\n"); } Modified: projects/sendfile/bin/sh/expand.c ============================================================================== --- projects/sendfile/bin/sh/expand.c Sun Nov 23 01:02:19 2014 (r274907) +++ projects/sendfile/bin/sh/expand.c Sun Nov 23 01:08:42 2014 (r274908) @@ -337,7 +337,7 @@ done: if (home == NULL || *home == '\0') return (startp); if (quotes) - STPUTS_QUOTES(home, SQSYNTAX, expdest); + STPUTS_QUOTES(home, DQSYNTAX, expdest); else STPUTS(home, expdest); return (p); Modified: projects/sendfile/bin/sh/parser.c ============================================================================== --- projects/sendfile/bin/sh/parser.c Sun Nov 23 01:02:19 2014 (r274907) +++ projects/sendfile/bin/sh/parser.c Sun Nov 23 01:08:42 2014 (r274908) @@ -1879,6 +1879,8 @@ synerror(const char *msg) { if (commandname) outfmt(out2, "%s: %d: ", commandname, startlinno); + else if (arg0) + outfmt(out2, "%s: ", arg0); outfmt(out2, "Syntax error: %s\n", msg); error((char *)NULL); } Modified: projects/sendfile/contrib/binutils/gas/config/tc-arm.c ============================================================================== --- projects/sendfile/contrib/binutils/gas/config/tc-arm.c Sun Nov 23 01:02:19 2014 (r274907) +++ projects/sendfile/contrib/binutils/gas/config/tc-arm.c Sun Nov 23 01:08:42 2014 (r274908) @@ -6079,7 +6079,7 @@ parse_operands (char *str, const unsigne /* Functions for operand encoding. ARM, then Thumb. */ -#define rotate_left(v, n) (v << n | v >> (32 - n)) +#define rotate_left(v, n) (v << (n % 32) | v >> ((32 - n) % 32)) /* If VAL can be encoded in the immediate field of an ARM instruction, return the encoded form. Otherwise, return FAIL. */ Modified: projects/sendfile/contrib/libarchive/cpio/cpio.c ============================================================================== --- projects/sendfile/contrib/libarchive/cpio/cpio.c Sun Nov 23 01:02:19 2014 (r274907) +++ projects/sendfile/contrib/libarchive/cpio/cpio.c Sun Nov 23 01:08:42 2014 (r274908) @@ -1140,7 +1140,8 @@ list_item_verbose(struct cpio *cpio, str else fmt = cpio->day_first ? "%d %b %H:%M" : "%b %d %H:%M"; #else - if (abs(mtime - now) > (365/2)*86400) + if (mtime - now > 365*86400/2 + || mtime - now < -365*86400/2) fmt = cpio->day_first ? "%e %b %Y" : "%b %e %Y"; else fmt = cpio->day_first ? "%e %b %H:%M" : "%b %e %H:%M"; Copied: projects/sendfile/contrib/mdocml/INSTALL (from r274907, head/contrib/mdocml/INSTALL) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sendfile/contrib/mdocml/INSTALL Sun Nov 23 01:08:42 2014 (r274908, copy of r274907, head/contrib/mdocml/INSTALL) @@ -0,0 +1,187 @@ +$Id: INSTALL,v 1.2 2014/08/10 17:22:26 schwarze Exp $ + +About mdocml, the portable mandoc distribution +---------------------------------------------- +The mandoc manpage compiler toolset is a suite of tools compiling +mdoc(7), the roff(7) macro language of choice for BSD manual pages, +and man(7), the predominant historical language for UNIX manuals. +The toolset does not yet implement man(1); that is only scheduled +for the next release, 1.13.2. It can, however, already serve to +translate source manpages to the output displayed by man(1). +For general information, see . + +In this document, we describe the installation and deployment of +mandoc(1), first as a simple, standalone formatter, and then as part of +the man(1) system. + +In case you have questions or want to provide feedback, read +. Consider subscribing to the +discuss@ mailing list mentioned on that page. If you intend to +help with the development of mandoc, consider subscribing to the +tech@ mailing list, too. + +Enjoy using the mandoc toolset! + +Ingo Schwarze, Karlsruhe, August 2014 + + +Installation +------------ +Before manually installing mandoc on your system, please check +whether the newest version of mandoc is already installed by default +or available via a binary package or a ports system. A list of the +latest bundled and ported versions of mandoc for various operating +systems is maintained at . + +If mandoc is installed, you can check the version by running "mandoc -V". +The version contained in this distribution tarball is listed near +the beginning of the file "Makefile". + +Regarding how packages and ports are maintained for your operating +system, please consult your operating system documentation. +To install mandoc manually, the following steps are needed: + +1. Decide whether you want to build the base tools mandoc(1), +preconv(1) and demandoc(1) only or whether you also want to build the +database tools apropos(1) and makewhatis(8). For the latter, +the following dependencies are required: + +1.1. The SQLite database system, see . +The recommended version of SQLite is 3.8.4.3 or newer. The mandoc +toolset is known to work with version 3.7.5 or newer. Versions +older than 3.8.3 may not achieve full performance due to the +missing SQLITE_DETERMINISTIC optimization flag. Versions older +than 3.8.0 may not show full error information if opening a database +fails due to the missing sqlite3_errstr() API. Both are very minor +problems, apropos(1) is fully usable with SQLite 3.7.5. Versions +older than 3.7.5 may or may not work, they have not been tested. + +1.2. The fts(3) directory traversion functions. +A compatibility version will be bundled for 1.13.2 but is not available +yet. If you want apropos(1) and makewhatis(8) but do not have fts(3), +please stay with mandoc 1.12.3 for now and upgrade first to 1.12.4, +then to 1.13.2 when these versionns are released. Be careful: the +glibc version of fts(3) is known to be broken on 32bit platforms, +see . + +1.3. Marc Espie's ohash(3) library. +If your system does not have it, the bundled compatibility version +will be used, so you probably need not worry about it. + +2. If you choose to build the database tools, too, decide whether +you also want to build the CGI program, man.cgi(8). + +3. Read the beginning of the file "Makefile" from "USER SETTINGS" +to "END OF USER SETTINGS" and edit it as required. In particular, +disable "BUILD_TARGETS += db-build" if you do not want database +support or enable "BUILD_TARGETS += cgi-build" if you do want +the CGI program. + +4. Run "make". No separate "./configure" or "make depend" steps +are needed. The former is run automatically by "make". The latter +is a maintainer target. If you merely want to build the released +version as opposed to doing active development, there is no need +to regenerate the dependency specifications. Any POSIX-compatible +make, in particular both BSD make and GNU make, should work. + +5. Run "make -n install" and check whether everything will be +installed to the intended places. Otherwise, edit the *DIR variables +in the Makefile until it is. + +6. Run "sudo make install". If you intend to build a binary +package using some kind of fake root mechanism, you may need a +command like "make DESTDIR=... install". Read the *-install targets +in the "Makefile" to understand how DESTDIR is used. + +7. To set up a man.cgi(8) server, read its manual page. + +8. To use mandoc(1) as your man(1) formatter, read the "Deployment" +section below. + + +Checking autoconfiguration quality +---------------------------------- +If you want to check whether automatic configuration works well +on your platform, consider the following: + +The mandoc package intentionally does not use GNU autoconf because +we consider that toolset a blatant example of overengineering that +is obsolete nowadays, since all modern operating systems are now +reasonably close to POSIX and do not need arcane shell magic any +longer. If your system does need such magic, consider upgrading +to reasonably modern POSIX-compliant tools rather than asking for +autoconf-style workarounds. + +As far as mandoc is using any features not mandated by ANSI X3.159-1989 +("ANSI C") or IEEE Std 1003.1-2008 ("POSIX") that some modern systems +do not have, we intend to provide autoconfiguration tests and +compat_*.c implementations. Please report any that turn out to be +missing. Note that while we do strive to produce portable code, +we do not slavishly restrict ourselves to POSIX-only interfaces. +For improved security and readability, we do use well-designed, +modern interfaces like reallocarray(3) even if they are still rather +uncommon, of course bundling compat_*.c implementations as needed. + +Where mandoc is using ANSI C or POSIX features that some systems +still lack and that compat_*.c implementations can be provided for +without too much hassle, we will consider adding them, too, so +please report whatever is missing on your platform. + +The following steps can be used to manually check the automatic +configuration on your platform: + +1. Run "make clean". + +2. Run "make config.h" + +3. Read the file "config.log". It shows the compiler commands used +to test the libraries installed on your system and the standard +output and standard error output these commands produce. Watch out +for unexpected failures. Those are most likely to happen if headers +or libraries are installed in unusual places or interfaces defined +in unusual headers. You can also look at the file "config.h" and +check that no expected "#define HAVE_*" lines are missing. The +list of tests run can be found in the file "configure". + + +Deployment +---------- +If you want to integrate the mandoc(1) tools with your existing +man(1) system as a formatter, then contact us first: on systems without +mandoc(1) as the default, you may have your work cut out for you! +Usually, you can have your default installation and mandoc(1) work right +alongside each other by using user-specific versions of the files +mentioned below. + +0. Back up each file you want to change! + +1. First see whether your system has "/etc/man.conf" or "/etc/manpath.conf" +(if it has neither, but man(1) is functional, then let us know) or, +if running as your own user, a per-user override file. In either +case, find where man(1) is executing nroff(1) or groff(1) to format +manuals. Replace these calls with mandoc(1). + +2. Then make sure that man(1) isn't running preprocessors, so you may +need to replace tbl(1), eqn(1), and similar references with cat(1). +Some man(1) implementations, like that on Mac OSX, let you run "man -d" +to see how the formatter is invoked. Use this to test your changes. On +Mac OS X, for instance, man(1) will prepend all files with ".ll" and +".nr" to set the terminal size, so you need to pass "tail -n+2 | +mandoc(1)" to disregard them. + +3. Finally, make sure that mandoc(1) is actually being invoked instead +of cached pages being pulled up. You can usually do this by commenting +out NOCACHE or similar. + +mandoc(1) still has a long way to go in understanding non-trivial +low-level roff(7) markup embedded in some man(7) pages. On the BSD +systems using mandoc(1), third-party software is generally vetted +on whether it may be formatted with mandoc(1). If not, groff(1) +is pulled in as a dependency and used to install a pre-formatted +"catpage" intead of directly as manual page source. + +For more background on switching operating systems to use mandoc(1) +instead of groff(1) to format manuals, see the two BSDCan presentations +by Ingo Schwarze: + + Copied: projects/sendfile/contrib/mdocml/LICENSE (from r274907, head/contrib/mdocml/LICENSE) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sendfile/contrib/mdocml/LICENSE Sun Nov 23 01:08:42 2014 (r274908, copy of r274907, head/contrib/mdocml/LICENSE) @@ -0,0 +1,44 @@ +$Id: LICENSE,v 1.2 2014/04/23 21:06:41 schwarze Exp $ + +With the exceptions noted below, all code and documentation +contained in the mdocml toolkit is protected by the Copyright +of the following developers: + +Copyright (c) 2008, 2009, 2010, 2011, 2012 Kristaps Dzonsons +Copyright (c) 2010, 2011, 2012, 2013, 2014 Ingo Schwarze +Copyright (c) 2009, 2010, 2011, 2012 Joerg Sonnenberger +Copyright (c) 2013 Franco Fichtner +Copyright (c) 1999, 2004 Marc Espie +Copyright (c) 1998, 2010 Todd C. Miller +Copyright (c) 2008 Otto Moerbeek +Copyright (c) 2003 Jason McIntyre + +See the individual source files for information about who contributed +to which file during which years. + + +The mdocml distribution as a whole is distributed by its developers +under the following license: + +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +The following files included from outside sources are protected by +other people's Copyright and are distributed under a 3-clause BSD +license; see these individual files for details. + +compat_getsubopt.c, compat_strcasestr.c, compat_strsep.c: +Copyright (c) 1990, 1993 The Regents of the University of California + +compat_fgetln.c: +Copyright (c) 1998 The NetBSD Foundation, Inc. Copied: projects/sendfile/contrib/mdocml/Makefile (from r274907, head/contrib/mdocml/Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sendfile/contrib/mdocml/Makefile Sun Nov 23 01:08:42 2014 (r274908, copy of r274907, head/contrib/mdocml/Makefile) @@ -0,0 +1,505 @@ +# $Id: Makefile,v 1.435 2014/08/10 02:45:04 schwarze Exp $ +# +# Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons +# Copyright (c) 2011, 2013, 2014 Ingo Schwarze +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +VERSION = 1.13.1 + +# === USER SETTINGS ==================================================== + +# --- user settings relevant for all builds ---------------------------- + +# Specify this if you want to hard-code the operating system to appear +# in the lower-left hand corner of -mdoc manuals. +# +# CFLAGS += -DOSNAME="\"OpenBSD 5.5\"" + +# IFF your system supports multi-byte functions (setlocale(), wcwidth(), +# putwchar()) AND has __STDC_ISO_10646__ (that is, wchar_t is simply a +# UCS-4 value) should you define USE_WCHAR. If you define it and your +# system DOESN'T support this, -Tlocale will produce garbage. +# If you don't define it, -Tlocale is a synonym for -Tacsii. +# +CFLAGS += -DUSE_WCHAR + +CFLAGS += -g -DHAVE_CONFIG_H +CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings +PREFIX = /usr/local +BINDIR = $(PREFIX)/bin +INCLUDEDIR = $(PREFIX)/include/mandoc +LIBDIR = $(PREFIX)/lib/mandoc +MANDIR = $(PREFIX)/man +EXAMPLEDIR = $(PREFIX)/share/examples/mandoc + +INSTALL = install +INSTALL_PROGRAM = $(INSTALL) -m 0555 +INSTALL_DATA = $(INSTALL) -m 0444 +INSTALL_LIB = $(INSTALL) -m 0444 +INSTALL_SOURCE = $(INSTALL) -m 0644 +INSTALL_MAN = $(INSTALL_DATA) + +# --- user settings related to database support ------------------------ + +# Building apropos(1) and makewhatis(8) requires both SQLite3 and fts(3). +# To avoid those dependencies, comment the following line. +# Be careful: the fts(3) implementation in glibc is broken on 32bit +# machines, see: https://sourceware.org/bugzilla/show_bug.cgi?id=15838 +# +BUILD_TARGETS += db-build + +# The remaining settings in this section +# are only relevant if db-build is enabled. +# Otherwise, they have no effect either way. + +# If your system has manpath(1), uncomment this. This is most any +# system that's not OpenBSD or NetBSD. If uncommented, apropos(1) +# and makewhatis(8) will use manpath(1) to get the MANPATH variable. +# +#CFLAGS += -DUSE_MANPATH + +# On some systems, SQLite3 may be installed below /usr/local. +# In that case, uncomment the following two lines. +# +#CFLAGS += -I/usr/local/include +#DBLIB += -L/usr/local/lib + +# OpenBSD has the ohash functions in libutil. +# Comment the following line if your system doesn't. +# +DBLIB += -lutil + +SBINDIR = $(PREFIX)/sbin + +# --- user settings related to man.cgi --------------------------------- + +# To build man.cgi, copy cgi.h.example to cgi.h, edit it, +# and enable the following line. +# Obviously, this requires that db-build is enabled, too. +# +#BUILD_TARGETS += cgi-build + +# The remaining settings in this section +# are only relevant if cgi-build is enabled. +# Otherwise, they have no effect either way. + +# If your system does not support static binaries, comment this, +# for example on Mac OS X. +# +STATIC = -static + +# Linux requires -pthread for statical linking. +# +#STATIC += -pthread + +WWWPREFIX = /var/www +HTDOCDIR = $(WWWPREFIX)/htdocs +CGIBINDIR = $(WWWPREFIX)/cgi-bin + +# === END OF USER SETTINGS ============================================= + +INSTALL_TARGETS = $(BUILD_TARGETS:-build=-install) + +BASEBIN = mandoc preconv demandoc +DBBIN = apropos makewhatis +CGIBIN = man.cgi + +DBLIB += -lsqlite3 + +TESTSRCS = test-fgetln.c \ + test-getsubopt.c \ + test-mmap.c \ + test-ohash.c \ + test-reallocarray.c \ + test-sqlite3_errstr.c \ + test-strcasestr.c \ + test-strlcat.c \ + test-strlcpy.c \ + test-strptime.c \ + test-strsep.c + +SRCS = apropos.c \ + arch.c \ + att.c \ + cgi.c \ + chars.c \ + compat_fgetln.c \ + compat_getsubopt.c \ + compat_ohash.c \ + compat_reallocarray.c \ + compat_sqlite3_errstr.c \ + compat_strcasestr.c \ + compat_strlcat.c \ + compat_strlcpy.c \ + compat_strsep.c \ + demandoc.c \ + eqn.c \ + eqn_html.c \ + eqn_term.c \ + html.c \ + lib.c \ + main.c \ + man.c \ + man_hash.c \ + man_html.c \ + man_macro.c \ + man_term.c \ + man_validate.c \ + mandoc.c \ + mandoc_aux.c \ + mandocdb.c \ + manpage.c \ + manpath.c \ + mansearch.c \ + mansearch_const.c \ + mdoc.c \ + mdoc_argv.c \ + mdoc_hash.c \ + mdoc_html.c \ + mdoc_macro.c \ + mdoc_man.c \ + mdoc_term.c \ + mdoc_validate.c \ + msec.c \ + out.c \ + preconv.c \ + read.c \ + roff.c \ + st.c \ + tbl.c \ + tbl_data.c \ + tbl_html.c \ + tbl_layout.c \ + tbl_opts.c \ + tbl_term.c \ + term.c \ + term_ascii.c \ + term_ps.c \ + tree.c \ + vol.c \ + $(TESTSRCS) + +DISTFILES = INSTALL \ + LICENSE \ + Makefile \ + Makefile.depend \ + NEWS \ + TODO \ + apropos.1 \ + arch.in \ + att.in \ + cgi.h.example \ + chars.in \ + compat_ohash.h \ + config.h.post \ + config.h.pre \ + configure \ + demandoc.1 \ + eqn.7 \ + example.style.css \ + gmdiff \ + html.h \ + lib.in \ + libman.h \ + libmandoc.h \ + libmdoc.h \ + libroff.h \ + main.h \ + makewhatis.8 \ + man-cgi.css \ + man.7 \ + man.cgi.8 \ + man.h \ + mandoc.1 \ + mandoc.3 \ + mandoc.db.5 \ + mandoc.h \ + mandoc_aux.h \ + mandoc_char.7 \ + mandoc_escape.3 \ + mandoc_html.3 \ + mandoc_malloc.3 \ + manpath.h \ + mansearch.3 \ + mansearch.h \ + mchars_alloc.3 \ + mdoc.7 \ + mdoc.h \ + msec.in \ + out.h \ + preconv.1 \ + predefs.in \ + roff.7 \ + st.in \ + style.css \ + tbl.3 \ + tbl.7 \ + term.h \ + vol.in \ + $(SRCS) + +LIBMAN_OBJS = man.o \ + man_hash.o \ + man_macro.o \ + man_validate.o + +LIBMDOC_OBJS = arch.o \ + att.o \ + lib.o \ + mdoc.o \ + mdoc_argv.o \ + mdoc_hash.o \ + mdoc_macro.o \ + mdoc_validate.o \ + st.o \ + vol.o + +LIBROFF_OBJS = eqn.o \ + roff.o \ + tbl.o \ + tbl_data.o \ + tbl_layout.o \ + tbl_opts.o + +LIBMANDOC_OBJS = $(LIBMAN_OBJS) \ + $(LIBMDOC_OBJS) \ + $(LIBROFF_OBJS) \ + chars.o \ + mandoc.o \ + mandoc_aux.o \ + msec.o \ + read.o + +COMPAT_OBJS = compat_fgetln.o \ + compat_getsubopt.o \ + compat_ohash.o \ + compat_reallocarray.o \ + compat_sqlite3_errstr.o \ + compat_strcasestr.o \ + compat_strlcat.o \ + compat_strlcpy.o \ + compat_strsep.o + +MANDOC_HTML_OBJS = eqn_html.o \ + html.o \ + man_html.o \ + mdoc_html.o \ + tbl_html.o + +MANDOC_MAN_OBJS = mdoc_man.o + +MANDOC_TERM_OBJS = eqn_term.o \ + man_term.o \ + mdoc_term.o \ + term.o \ + term_ascii.o \ + term_ps.o \ + tbl_term.o + +MANDOC_OBJS = $(MANDOC_HTML_OBJS) \ + $(MANDOC_MAN_OBJS) \ + $(MANDOC_TERM_OBJS) \ + main.o \ + out.o \ + tree.o + +MAKEWHATIS_OBJS = mandocdb.o mansearch_const.o manpath.o + +PRECONV_OBJS = preconv.o + +APROPOS_OBJS = apropos.o mansearch.o mansearch_const.o manpath.o + +CGI_OBJS = $(MANDOC_HTML_OBJS) \ + cgi.o \ + mansearch.o \ + mansearch_const.o \ + out.o + +MANPAGE_OBJS = manpage.o mansearch.o mansearch_const.o manpath.o + +DEMANDOC_OBJS = demandoc.o + +WWW_MANS = apropos.1.html \ + demandoc.1.html \ + mandoc.1.html \ + preconv.1.html \ + mandoc.3.html \ + mandoc_escape.3.html \ + mandoc_html.3.html \ + mandoc_malloc.3.html \ + mansearch.3.html \ + mchars_alloc.3.html \ + tbl.3.html \ + mandoc.db.5.html \ + eqn.7.html \ + man.7.html \ + mandoc_char.7.html \ + mdoc.7.html \ + roff.7.html \ + tbl.7.html \ + makewhatis.8.html \ + man.cgi.8.html \ + man.h.html \ + mandoc.h.html \ + mandoc_aux.h.html \ + manpath.h.html \ + mansearch.h.html \ + mdoc.h.html + +WWW_OBJS = mdocml.tar.gz \ + mdocml.sha256 + +# === DEPENDENCY HANDLING ============================================== + +all: base-build $(BUILD_TARGETS) + +base-build: $(BASEBIN) + +db-build: $(DBBIN) + +cgi-build: $(CGIBIN) + +install: base-install $(INSTALL_TARGETS) + +www: $(WWW_OBJS) $(WWW_MANS) + +include Makefile.depend + +# === TARGETS CONTAINING SHELL COMMANDS ================================ + +clean: + rm -f libmandoc.a $(LIBMANDOC_OBJS) + rm -f apropos $(APROPOS_OBJS) + rm -f makewhatis $(MAKEWHATIS_OBJS) + rm -f preconv $(PRECONV_OBJS) + rm -f man.cgi $(CGI_OBJS) + rm -f manpage $(MANPAGE_OBJS) + rm -f demandoc $(DEMANDOC_OBJS) + rm -f mandoc $(MANDOC_OBJS) + rm -f config.h config.log $(COMPAT_OBJS) + rm -f $(WWW_MANS) $(WWW_OBJS) + rm -rf *.dSYM + +base-install: base-build + mkdir -p $(DESTDIR)$(BINDIR) + mkdir -p $(DESTDIR)$(EXAMPLEDIR) + mkdir -p $(DESTDIR)$(LIBDIR) + mkdir -p $(DESTDIR)$(INCLUDEDIR) + mkdir -p $(DESTDIR)$(MANDIR)/man1 + mkdir -p $(DESTDIR)$(MANDIR)/man3 + mkdir -p $(DESTDIR)$(MANDIR)/man7 + $(INSTALL_PROGRAM) $(BASEBIN) $(DESTDIR)$(BINDIR) + $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR) + $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h \ + $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_MAN) mandoc.1 preconv.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1 + $(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \ + mchars_alloc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3 + $(INSTALL_MAN) man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7 \ + $(DESTDIR)$(MANDIR)/man7 + $(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR) + +db-install: db-build + mkdir -p $(DESTDIR)$(BINDIR) + mkdir -p $(DESTDIR)$(SBINDIR) + mkdir -p $(DESTDIR)$(MANDIR)/man1 + mkdir -p $(DESTDIR)$(MANDIR)/man3 + mkdir -p $(DESTDIR)$(MANDIR)/man5 + mkdir -p $(DESTDIR)$(MANDIR)/man8 + $(INSTALL_PROGRAM) apropos $(DESTDIR)$(BINDIR) + ln -f $(DESTDIR)$(BINDIR)/apropos $(DESTDIR)$(BINDIR)/whatis + $(INSTALL_PROGRAM) makewhatis $(DESTDIR)$(SBINDIR) + $(INSTALL_MAN) apropos.1 $(DESTDIR)$(MANDIR)/man1 + ln -f $(DESTDIR)$(MANDIR)/man1/apropos.1 \ + $(DESTDIR)$(MANDIR)/man1/whatis.1 + $(INSTALL_MAN) mansearch.3 $(DESTDIR)$(MANDIR)/man3 + $(INSTALL_MAN) mandoc.db.5 $(DESTDIR)$(MANDIR)/man5 + $(INSTALL_MAN) makewhatis.8 $(DESTDIR)$(MANDIR)/man8 + +cgi-install: cgi-build + mkdir -p $(DESTDIR)$(CGIBINDIR) + mkdir -p $(DESTDIR)$(HTDOCDIR) + mkdir -p $(DESTDIR)$(WWWPREFIX)/man/mandoc/man1 + mkdir -p $(DESTDIR)$(WWWPREFIX)/man/mandoc/man8 + $(INSTALL_PROGRAM) man.cgi $(DESTDIR)$(CGIBINDIR) + $(INSTALL_DATA) example.style.css $(DESTDIR)$(HTDOCDIR)/man.css + $(INSTALL_DATA) man-cgi.css $(DESTDIR)$(HTDOCDIR) + $(INSTALL_MAN) apropos.1 $(DESTDIR)$(WWWPREFIX)/man/mandoc/man1/ + $(INSTALL_MAN) man.cgi.8 $(DESTDIR)$(WWWPREFIX)/man/mandoc/man8/ + +www-install: www + mkdir -p $(DESTDIR)$(HTDOCDIR)/snapshots + $(INSTALL_DATA) $(WWW_MANS) style.css $(DESTDIR)$(HTDOCDIR) + $(INSTALL_DATA) $(WWW_OBJS) $(DESTDIR)$(HTDOCDIR)/snapshots + $(INSTALL_DATA) mdocml.tar.gz \ + $(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).tar.gz + $(INSTALL_DATA) mdocml.sha256 \ + $(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).sha256 + +depend: config.h + mkdep -f Makefile.depend $(CFLAGS) $(SRCS) + perl -e 'undef $$/; $$_ = <>; s|/usr/include/\S+||g; \ + s|\\\n||g; s| +| |g; print;' Makefile.depend > Makefile.tmp + mv Makefile.tmp Makefile.depend + +libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS) + $(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS) + +mandoc: $(MANDOC_OBJS) libmandoc.a + $(CC) $(LDFLAGS) -o $@ $(MANDOC_OBJS) libmandoc.a + +makewhatis: $(MAKEWHATIS_OBJS) libmandoc.a + $(CC) $(LDFLAGS) -o $@ $(MAKEWHATIS_OBJS) libmandoc.a $(DBLIB) + +preconv: $(PRECONV_OBJS) + $(CC) $(LDFLAGS) -o $@ $(PRECONV_OBJS) + +manpage: $(MANPAGE_OBJS) libmandoc.a + $(CC) $(LDFLAGS) -o $@ $(MANPAGE_OBJS) libmandoc.a $(DBLIB) + +apropos: $(APROPOS_OBJS) libmandoc.a + $(CC) $(LDFLAGS) -o $@ $(APROPOS_OBJS) libmandoc.a $(DBLIB) + +man.cgi: $(CGI_OBJS) libmandoc.a + $(CC) $(LDFLAGS) $(STATIC) -o $@ $(CGI_OBJS) libmandoc.a $(DBLIB) + +demandoc: $(DEMANDOC_OBJS) libmandoc.a + $(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a + +mdocml.sha256: mdocml.tar.gz + sha256 mdocml.tar.gz > $@ + +mdocml.tar.gz: $(DISTFILES) + mkdir -p .dist/mdocml-$(VERSION)/ + $(INSTALL_SOURCE) $(DISTFILES) .dist/mdocml-$(VERSION) + chmod 755 .dist/mdocml-$(VERSION)/configure + ( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) ) + rm -rf .dist/ + +config.h: configure config.h.pre config.h.post $(TESTSRCS) + rm -f config.log + CC="$(CC)" CFLAGS="$(CFLAGS)" DBLIB="$(DBLIB)" \ + VERSION="$(VERSION)" ./configure + +.PHONY: base-install cgi-install db-install install www-install +.PHONY: clean depend +.SUFFIXES: .1 .3 .5 .7 .8 .h +.SUFFIXES: .1.html .3.html .5.html .7.html .8.html .h.html + +.h.h.html: + highlight -I $< > $@ + +.1.1.html .3.3.html .5.5.html .7.7.html .8.8.html: mandoc + ./mandoc -Thtml -Wall,stop \ + -Ostyle=style.css,man=%N.%S.html,includes=%I.html $< > $@ Copied: projects/sendfile/contrib/mdocml/Makefile.depend (from r274907, head/contrib/mdocml/Makefile.depend) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sendfile/contrib/mdocml/Makefile.depend Sun Nov 23 01:08:42 2014 (r274908, copy of r274907, head/contrib/mdocml/Makefile.depend) @@ -0,0 +1,70 @@ +apropos.o: apropos.c config.h manpath.h mansearch.h +arch.o: arch.c config.h mdoc.h libmdoc.h arch.in +att.o: att.c config.h mdoc.h libmdoc.h att.in +cgi.o: cgi.c config.h mandoc.h mandoc_aux.h main.h manpath.h mansearch.h cgi.h +chars.o: chars.c config.h mandoc.h mandoc_aux.h libmandoc.h chars.in +compat_fgetln.o: compat_fgetln.c config.h +compat_getsubopt.o: compat_getsubopt.c config.h +compat_ohash.o: compat_ohash.c config.h +compat_reallocarray.o: compat_reallocarray.c config.h +compat_sqlite3_errstr.o: compat_sqlite3_errstr.c config.h +compat_strcasestr.o: compat_strcasestr.c config.h +compat_strlcat.o: compat_strlcat.c config.h +compat_strlcpy.o: compat_strlcpy.c config.h +compat_strsep.o: compat_strsep.c config.h +demandoc.o: demandoc.c config.h man.h mdoc.h mandoc.h +eqn.o: eqn.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h +eqn_html.o: eqn_html.c config.h mandoc.h out.h html.h +eqn_term.o: eqn_term.c config.h mandoc.h out.h term.h +html.o: html.c config.h mandoc.h mandoc_aux.h libmandoc.h out.h html.h main.h +lib.o: lib.c config.h mdoc.h libmdoc.h lib.in +main.o: main.c config.h mandoc.h mandoc_aux.h main.h mdoc.h man.h +man.o: man.c config.h man.h mandoc.h mandoc_aux.h libman.h libmandoc.h +man_hash.o: man_hash.c config.h man.h mandoc.h libman.h +man_html.o: man_html.c config.h mandoc.h mandoc_aux.h out.h html.h man.h main.h +man_macro.o: man_macro.c config.h man.h mandoc.h libmandoc.h libman.h +man_term.o: man_term.c config.h mandoc.h mandoc_aux.h out.h man.h term.h main.h +man_validate.o: man_validate.c config.h man.h mandoc.h mandoc_aux.h libman.h libmandoc.h +mandoc.o: mandoc.c config.h mandoc.h mandoc_aux.h libmandoc.h +mandoc_aux.o: mandoc_aux.c config.h mandoc.h mandoc_aux.h +mandocdb.o: mandocdb.c config.h mdoc.h man.h mandoc.h mandoc_aux.h manpath.h mansearch.h +manpage.o: manpage.c config.h manpath.h mansearch.h +manpath.o: manpath.c config.h mandoc_aux.h manpath.h +mansearch.o: mansearch.c config.h mandoc.h mandoc_aux.h manpath.h mansearch.h +mansearch_const.o: mansearch_const.c config.h manpath.h mansearch.h +mdoc.o: mdoc.c config.h mdoc.h mandoc.h mandoc_aux.h libmdoc.h libmandoc.h +mdoc_argv.o: mdoc_argv.c config.h mdoc.h mandoc.h mandoc_aux.h libmdoc.h libmandoc.h +mdoc_hash.o: mdoc_hash.c config.h mdoc.h libmdoc.h +mdoc_html.o: mdoc_html.c config.h mandoc.h mandoc_aux.h out.h html.h mdoc.h main.h +mdoc_macro.o: mdoc_macro.c config.h mdoc.h mandoc.h libmdoc.h libmandoc.h +mdoc_man.o: mdoc_man.c config.h mandoc.h mandoc_aux.h out.h man.h mdoc.h main.h +mdoc_term.o: mdoc_term.c config.h mandoc.h mandoc_aux.h out.h term.h mdoc.h main.h +mdoc_validate.o: mdoc_validate.c config.h mdoc.h mandoc.h mandoc_aux.h libmdoc.h libmandoc.h +msec.o: msec.c config.h mandoc.h libmandoc.h msec.in +out.o: out.c config.h mandoc_aux.h mandoc.h out.h +preconv.o: preconv.c config.h +read.o: read.c config.h mandoc.h mandoc_aux.h libmandoc.h mdoc.h man.h main.h +roff.o: roff.c config.h mandoc.h mandoc_aux.h libroff.h libmandoc.h predefs.in +st.o: st.c config.h mdoc.h libmdoc.h st.in +tbl.o: tbl.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h +tbl_data.o: tbl_data.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h +tbl_html.o: tbl_html.c config.h mandoc.h out.h html.h +tbl_layout.o: tbl_layout.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h +tbl_opts.o: tbl_opts.c config.h mandoc.h libmandoc.h libroff.h +tbl_term.o: tbl_term.c config.h mandoc.h out.h term.h +term.o: term.c config.h mandoc.h mandoc_aux.h out.h term.h main.h +term_ascii.o: term_ascii.c config.h mandoc.h mandoc_aux.h out.h term.h main.h +term_ps.o: term_ps.c config.h mandoc.h mandoc_aux.h out.h main.h term.h +tree.o: tree.c config.h mandoc.h mdoc.h man.h main.h +vol.o: vol.c config.h mdoc.h libmdoc.h vol.in +test-fgetln.o: test-fgetln.c +test-getsubopt.o: test-getsubopt.c +test-mmap.o: test-mmap.c +test-ohash.o: test-ohash.c +test-reallocarray.o: test-reallocarray.c +test-sqlite3_errstr.o: test-sqlite3_errstr.c +test-strcasestr.o: test-strcasestr.c +test-strlcat.o: test-strlcat.c +test-strlcpy.o: test-strlcpy.c +test-strptime.o: test-strptime.c +test-strsep.o: test-strsep.c Modified: projects/sendfile/contrib/mdocml/NEWS ============================================================================== --- projects/sendfile/contrib/mdocml/NEWS Sun Nov 23 01:02:19 2014 (r274907) +++ projects/sendfile/contrib/mdocml/NEWS Sun Nov 23 01:08:42 2014 (r274908) @@ -1,7 +1,87 @@ -$Id: NEWS,v 1.3 2013/10/13 16:06:50 schwarze Exp $ +$Id: NEWS,v 1.5 2014/08/10 16:32:57 schwarze Exp $ This file lists the most important changes in the mdocml.bsd.lv distribution. +Changes in version 1.13.1, released on August 10, 2014 + + --- MAJOR NEW FEATURES --- + * A complete apropos(1)/makewhatis(8)/man.cgi(8) suite + based on SQLite3 is now included. + CAVEAT: This also requires a working fts(3) implementation. + If your system lacks that *and* you want apropos(1)/makewhatis(8), + stay with 1.12.3 for now, then go to 1.12.4 and 1.13.2. + * The roff(7) parser now provides an almost complete implementation + of numerical expressions. + * Warning and error messages have been improved in many ways. + Almost all fatal errors were downgraded to normal errors and some + even to warnings. Almost all messages now mention the macro where + the issue is detected and many indicate the workaround employed. + The mandoc(1) manual now includes a list explaining all messages. + --- MINOR NEW FEATURES --- + * The roff(7) parser now supports the .ami (append to macro with + indirectly specified name), .as (append to user-defined + string), .dei (define macro with indirectly specified name), + .ll (line length), and .rr (remove register) requests. + * The roff(7) parser now supports string comparison and numerical + conditionals in the .if and .ie requests. + * The roff parser now fully supports the \B (validate numerical + expression) and partially supports the \w (measure text width) + escape sequences. + * The terminal formatter now supports the \: (optional line break) + escape sequence. + * The roff parser now supports expansion of user-defined strings + involving indirect references. + * The roff(7) parser now handles some pre-defined read-only + number registers that occur in the pod2man(1) preamble. + * For backward compatibility, the mdoc(7) parser and formatters + now support the obsolete macros .En, .Es, .Fr, and .Ot. + * The mdoc(7) formatter non partially supports .Bd -centered. + * tbl(7) now handles leading and trailing vertical lines. + * The build system now provides fallback versions of strcasestr(3) + and strsep(3) for systems lacking them. + * The mdoc(7) manual now explains how various standards + supported by the .St macro are related to each other. + --- BUGFIXES --- + * In the roff(7) parser, several bugs were fixed with respect + to closing conditional blocks on macro lines. + * Parsing of roff(7) identifiers and escape sequences was improved + in multiple respects. + * In the mdoc(7) parser, the handling of defective document + prologues was improved in multiple ways. + * The mdoc(7) parser no longer skips content before the first section + header, and it no longer deletes non-.% content from .Rs blocks. + * In the mdoc(7) parser, a crash was fixed related to weird .Sh headers. + * In the mdoc(7) parser, handling of .Sm with missing or invalid + arguments was corrected. + * In the mdoc(7) parser, trailing punctuation at the end of partial + implicit macros no longer triggers end-of-sentence spacing. + * In the terminal formatter, two crashes were fixed: one triggered by + excessive indentation and another by excessively long .Nm arguments. + * In the terminal formatter, a floating point rounding bug was + fixed that sometimes caused an off-by-one error in indentation. + * In the UTF-8 formatter, rendering of accents, breakable hyphens, + and non-breakable spaces was corrected. + * In the HTML formatter, encoding of special characters was + corrected in multiple respects. + * In the mdoc(7) formatter, rendering of .Ex and .Rv was + improved for various edge cases. + * In the mdoc(7) formatter, handling of empty .Bl -inset item + heads was improved. + * In the man(7) formatter, some bugs were fixed with respect + to same-line detection in the context of .TP and .nf macros, + and the indentation of .IP and .TP blocks was improved. + * The mandoc(3) library no longer prints to stderr. + --- THANKS TO --- + Abhinav Upadhyay (NetBSD), Andreas Voegele, Anthony Bentley (OpenBSD), + Christian Weisgerber (OpenBSD), Havard Eidnes (NetBSD), Jan Stary, + Jason McIntyre (OpenBSD), Jeremie Courreges-Anglas (OpenBSD), + Joerg Sonnenberger (NetBSD), Juan Francisco Cantero Hurtado (OpenBSD), + Marc Espie (OpenBSD), Matthias Scheler (NetBSD), Pascal Stumpf (OpenBSD), + Paul Onyschuk (Alpine Linux), Sebastien Marie, Steffen Nurpmeso, + Stuart Henderson (OpenBSD), Ted Unangst (OpenBSD), Theo de Raadt (OpenBSD), + Thomas Klausner (NetBSD), and Ulrich Spoerlein (FreeBSD) + for reporting bugs and missing features. + Changes in version 1.12.3, released on December 31, 2013 * In the mdoc(7) SYNOPSIS, line breaks and hanging indentation Modified: projects/sendfile/contrib/mdocml/TODO ============================================================================== --- projects/sendfile/contrib/mdocml/TODO Sun Nov 23 01:02:19 2014 (r274907) +++ projects/sendfile/contrib/mdocml/TODO Sun Nov 23 01:08:42 2014 (r274908) @@ -1,13 +1,15 @@ ************************************************************************ * Official mandoc TODO. -* $Id: TODO,v 1.162 2013/12/25 14:40:34 schwarze Exp $ +* $Id: TODO,v 1.176 2014/08/09 14:24:53 schwarze Exp $ ************************************************************************ ************************************************************************ * crashes ************************************************************************ -None known. +- The abort() in bufcat(), html.c, can be triggered via buffmt_includes() + by running -Thtml -Oincludes on a file containing a long .In argument. + Fixing this will probably require reworking the whole bufcat() concept. ************************************************************************ * missing features @@ -15,11 +17,6 @@ None known. --- missing roff features ---------------------------------------------- -- roff.c should treat \n(.H>23 and \n(.V>19 in the pod2man(1) - preamble as true, see for example AUTHORS in MooseX::Getopt.3p - reported by Andreas Voegele - Tue, 22 Nov 2011 15:34:47 +0100 on ports@ - - .ad (adjust margins) .ad l -- adjust left margin only (flush left) .ad r -- adjust right margin only (flush right) @@ -29,20 +26,9 @@ None known. .ad -- re-enable adjustment without changing the mode Adjustment mode is ignored while in no-fill mode (.nf). *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Sun Nov 23 08:17:48 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 25FDF221; Sun, 23 Nov 2014 08:17:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1258F7A2; Sun, 23 Nov 2014 08:17:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAN8HlPW017007; Sun, 23 Nov 2014 08:17:47 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAN8Hlbu017004; Sun, 23 Nov 2014 08:17:47 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411230817.sAN8Hlbu017004@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Sun, 23 Nov 2014 08:17:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274910 - projects/sendfile/sys/vm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Nov 2014 08:17:48 -0000 Author: glebius Date: Sun Nov 23 08:17:46 2014 New Revision: 274910 URL: https://svnweb.freebsd.org/changeset/base/274910 Log: Various style(9) changes. Submitted by: kib Modified: projects/sendfile/sys/vm/swap_pager.c projects/sendfile/sys/vm/vm_pager.h projects/sendfile/sys/vm/vnode_pager.c Modified: projects/sendfile/sys/vm/swap_pager.c ============================================================================== --- projects/sendfile/sys/vm/swap_pager.c Sun Nov 23 04:17:39 2014 (r274909) +++ projects/sendfile/sys/vm/swap_pager.c Sun Nov 23 08:17:46 2014 (r274910) @@ -1284,7 +1284,7 @@ swap_pager_getpages_async(vm_object_t ob error = EINVAL; break; default: - error = EDOOFUS; + panic("unhandled swap_pager_getpages() error %d\n", r); } (iodone)(arg, m, count, error); VM_OBJECT_WLOCK(object); Modified: projects/sendfile/sys/vm/vm_pager.h ============================================================================== --- projects/sendfile/sys/vm/vm_pager.h Sun Nov 23 04:17:39 2014 (r274909) +++ projects/sendfile/sys/vm/vm_pager.h Sun Nov 23 08:17:46 2014 (r274910) @@ -143,12 +143,10 @@ static inline int vm_pager_get_pages_async(vm_object_t object, vm_page_t *m, int count, int reqpage, pgo_getpages_iodone_t iodone, void *arg) { - int r; VM_OBJECT_ASSERT_WLOCKED(object); - r = (*pagertab[object->type]->pgo_getpages_async)(object, m, count, - reqpage, iodone, arg); - return (r); + return ((*pagertab[object->type]->pgo_getpages_async)(object, m, + count, reqpage, iodone, arg)); } static __inline void Modified: projects/sendfile/sys/vm/vnode_pager.c ============================================================================== --- projects/sendfile/sys/vm/vnode_pager.c Sun Nov 23 04:17:39 2014 (r274909) +++ projects/sendfile/sys/vm/vnode_pager.c Sun Nov 23 08:17:46 2014 (r274910) @@ -675,17 +675,17 @@ static int vnode_pager_getpages_async(vm_object_t object, vm_page_t *m, int count, int reqpage, vop_getpages_iodone_t iodone, void *arg) { - int rtval; struct vnode *vp; - int bytes = count * PAGE_SIZE; + int rtval; vp = object->handle; VM_OBJECT_WUNLOCK(object); - rtval = VOP_GETPAGES_ASYNC(vp, m, bytes, reqpage, 0, iodone, arg); + rtval = VOP_GETPAGES_ASYNC(vp, m, count * PAGE_SIZE, reqpage, 0, + iodone, arg); KASSERT(rtval != EOPNOTSUPP, ("vnode_pager: FS getpages_async not implemented\n")); VM_OBJECT_WLOCK(object); - return rtval; + return (rtval); } /* @@ -981,7 +981,7 @@ vnode_pager_generic_getpages(struct vnod /* do the input */ bp->b_iooffset = dbtob(bp->b_blkno); - if (iodone) { /* async */ + if (iodone != NULL) { /* async */ bp->b_pager.pg_iodone = iodone; bp->b_caller1 = arg; bp->b_iodone = vnode_pager_generic_getpages_done_async; @@ -1022,14 +1022,12 @@ vnode_pager_generic_getpages_done_async( static int vnode_pager_generic_getpages_done(struct buf *bp) { - vm_object_t object = bp->b_vp->v_object; + vm_object_t object; off_t tfoff, nextoff; int i, error; - if ((bp->b_ioflags & BIO_ERROR) != 0) - error = EIO; - else - error = 0; + error = (bp->b_ioflags & BIO_ERROR) != 0 ? EIO : 0; + object = bp->b_vp->v_object; if (error == 0 && bp->b_bcount != bp->b_npages * PAGE_SIZE) { if ((bp->b_flags & B_UNMAPPED) != 0) { @@ -1084,7 +1082,7 @@ vnode_pager_generic_getpages_done(struct vm_page_readahead_finish(mt); } VM_OBJECT_WUNLOCK(object); - if (error) + if (error != 0) printf("%s: I/O read error %d\n", __func__, error); return (error); From owner-svn-src-projects@FreeBSD.ORG Sun Nov 23 08:37:09 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 93AFA9B1; Sun, 23 Nov 2014 08:37:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6720E956; Sun, 23 Nov 2014 08:37:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAN8b9dM027307; Sun, 23 Nov 2014 08:37:09 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAN8b91o027303; Sun, 23 Nov 2014 08:37:09 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411230837.sAN8b91o027303@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Sun, 23 Nov 2014 08:37:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274912 - projects/sendfile/sys/vm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Nov 2014 08:37:09 -0000 Author: glebius Date: Sun Nov 23 08:37:08 2014 New Revision: 274912 URL: https://svnweb.freebsd.org/changeset/base/274912 Log: Consistently use function type without asterisk. Modified: projects/sendfile/sys/vm/swap_pager.c projects/sendfile/sys/vm/vm_pager.h Modified: projects/sendfile/sys/vm/swap_pager.c ============================================================================== --- projects/sendfile/sys/vm/swap_pager.c Sun Nov 23 08:25:44 2014 (r274911) +++ projects/sendfile/sys/vm/swap_pager.c Sun Nov 23 08:37:08 2014 (r274912) @@ -362,7 +362,7 @@ static vm_object_t static void swap_pager_dealloc(vm_object_t object); static int swap_pager_getpages(vm_object_t, vm_page_t *, int, int); static int swap_pager_getpages_async(vm_object_t, vm_page_t *, int, int, - pgo_getpages_iodone_t *, void *); + pgo_getpages_iodone_t, void *); static void swap_pager_putpages(vm_object_t, vm_page_t *, int, boolean_t, int *); static boolean_t swap_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *before, int *after); @@ -1267,7 +1267,7 @@ swap_pager_getpages(vm_object_t object, */ static int swap_pager_getpages_async(vm_object_t object, vm_page_t *m, int count, - int reqpage, pgo_getpages_iodone_t *iodone, void *arg) + int reqpage, pgo_getpages_iodone_t iodone, void *arg) { int r, error; Modified: projects/sendfile/sys/vm/vm_pager.h ============================================================================== --- projects/sendfile/sys/vm/vm_pager.h Sun Nov 23 08:25:44 2014 (r274911) +++ projects/sendfile/sys/vm/vm_pager.h Sun Nov 23 08:37:08 2014 (r274912) @@ -53,7 +53,7 @@ typedef void pgo_dealloc_t(vm_object_t); typedef int pgo_getpages_t(vm_object_t, vm_page_t *, int, int); typedef void pgo_getpages_iodone_t(void *, vm_page_t *, int, int); typedef int pgo_getpages_async_t(vm_object_t, vm_page_t *, int, int, - pgo_getpages_iodone_t *, void *); + pgo_getpages_iodone_t, void *); typedef void pgo_putpages_t(vm_object_t, vm_page_t *, int, int, int *); typedef boolean_t pgo_haspage_t(vm_object_t, vm_pindex_t, int *, int *); typedef void pgo_pageunswapped_t(vm_page_t); @@ -108,7 +108,7 @@ void vm_pager_bufferinit(void); void vm_pager_deallocate(vm_object_t); static __inline int vm_pager_get_pages(vm_object_t, vm_page_t *, int, int); static inline int vm_pager_get_pages_async(vm_object_t, vm_page_t *, int, - int, pgo_getpages_iodone_t *, void *); + int, pgo_getpages_iodone_t, void *); static __inline boolean_t vm_pager_has_page(vm_object_t, vm_pindex_t, int *, int *); void vm_pager_init(void); vm_object_t vm_pager_object_lookup(struct pagerlst *, void *); From owner-svn-src-projects@FreeBSD.ORG Sun Nov 23 12:05:51 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 84EF6F05; Sun, 23 Nov 2014 12:05:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 65A4ECF4; Sun, 23 Nov 2014 12:05:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sANC5pQm026598; Sun, 23 Nov 2014 12:05:51 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sANC5okE026594; Sun, 23 Nov 2014 12:05:50 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411231205.sANC5okE026594@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Sun, 23 Nov 2014 12:05:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274915 - in projects/sendfile: lib/libprocstat sys/kern sys/sys X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Nov 2014 12:05:51 -0000 Author: glebius Date: Sun Nov 23 12:05:49 2014 New Revision: 274915 URL: https://svnweb.freebsd.org/changeset/base/274915 Log: Merge head r258543 through r274914. Modified: projects/sendfile/lib/libprocstat/udf.c projects/sendfile/sys/kern/kern_resource.c projects/sendfile/sys/sys/racct.h projects/sendfile/sys/sys/resourcevar.h Directory Properties: projects/sendfile/ (props changed) projects/sendfile/sys/ (props changed) Modified: projects/sendfile/lib/libprocstat/udf.c ============================================================================== --- projects/sendfile/lib/libprocstat/udf.c Sun Nov 23 12:01:52 2014 (r274914) +++ projects/sendfile/lib/libprocstat/udf.c Sun Nov 23 12:05:49 2014 (r274915) @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #define _KERNEL #include #undef _KERNEL Modified: projects/sendfile/sys/kern/kern_resource.c ============================================================================== --- projects/sendfile/sys/kern/kern_resource.c Sun Nov 23 12:01:52 2014 (r274914) +++ projects/sendfile/sys/kern/kern_resource.c Sun Nov 23 12:05:49 2014 (r274915) @@ -1334,6 +1334,7 @@ uifree(struct uidinfo *uip) free(uip, M_UIDINFO); } +#ifdef RACCT void ui_racct_foreach(void (*callback)(struct racct *racct, void *arg2, void *arg3), void *arg2, void *arg3) @@ -1349,6 +1350,7 @@ ui_racct_foreach(void (*callback)(struct } rw_runlock(&uihashtbl_lock); } +#endif /* * Change the count associated with number of processes Modified: projects/sendfile/sys/sys/racct.h ============================================================================== --- projects/sendfile/sys/sys/racct.h Sun Nov 23 12:01:52 2014 (r274914) +++ projects/sendfile/sys/sys/racct.h Sun Nov 23 12:05:49 2014 (r274915) @@ -220,15 +220,8 @@ racct_get_available(struct proc *p, int return (UINT64_MAX); } -static inline void -racct_create(struct racct **racctp) -{ -} - -static inline void -racct_destroy(struct racct **racctp) -{ -} +#define racct_create(x) +#define racct_destroy(x) static inline int racct_proc_fork(struct proc *parent, struct proc *child) Modified: projects/sendfile/sys/sys/resourcevar.h ============================================================================== --- projects/sendfile/sys/sys/resourcevar.h Sun Nov 23 12:01:52 2014 (r274914) +++ projects/sendfile/sys/sys/resourcevar.h Sun Nov 23 12:05:49 2014 (r274915) @@ -102,7 +102,9 @@ struct uidinfo { long ui_kqcnt; /* (b) number of kqueues */ uid_t ui_uid; /* (a) uid */ u_int ui_ref; /* (b) reference count */ +#ifdef RACCT struct racct *ui_racct; /* (a) resource accounting */ +#endif }; #define UIDINFO_VMSIZE_LOCK(ui) mtx_lock(&((ui)->ui_vmsize_mtx)) @@ -148,8 +150,10 @@ struct uidinfo void uifree(struct uidinfo *uip); void uihashinit(void); void uihold(struct uidinfo *uip); +#ifdef RACCT void ui_racct_foreach(void (*callback)(struct racct *racct, void *arg2, void *arg3), void *arg2, void *arg3); +#endif #endif /* _KERNEL */ #endif /* !_SYS_RESOURCEVAR_H_ */ From owner-svn-src-projects@FreeBSD.ORG Sun Nov 23 12:15:30 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 28BE72E0; Sun, 23 Nov 2014 12:15:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 09BA3DC7; Sun, 23 Nov 2014 12:15:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sANCFTjU031419; Sun, 23 Nov 2014 12:15:29 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sANCFTsB031413; Sun, 23 Nov 2014 12:15:29 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411231215.sANCFTsB031413@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sun, 23 Nov 2014 12:15:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274916 - in projects/routing/sys: net netinet netinet6 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Nov 2014 12:15:30 -0000 Author: melifaro Date: Sun Nov 23 12:15:28 2014 New Revision: 274916 URL: https://svnweb.freebsd.org/changeset/base/274916 Log: * Add lltable llt_hash callback * Move lltable items insertions/deletions to generic llt code. Modified: projects/routing/sys/net/if_llatbl.c projects/routing/sys/net/if_llatbl.h projects/routing/sys/netinet/in.c projects/routing/sys/netinet6/in6.c Modified: projects/routing/sys/net/if_llatbl.c ============================================================================== --- projects/routing/sys/net/if_llatbl.c Sun Nov 23 12:05:49 2014 (r274915) +++ projects/routing/sys/net/if_llatbl.c Sun Nov 23 12:15:28 2014 (r274916) @@ -92,6 +92,42 @@ done: return (error); } + +void +llentry_link(struct lltable *llt, struct llentry *lle) +{ + struct llentries *lleh; + uint32_t hashkey; + + hashkey = llt->llt_hash(lle); + lleh = &llt->lle_head[LLATBL_HASH(hashkey, LLTBL_HASHMASK)]; + + lle->lle_tbl = llt; + lle->lle_head = lleh; + lle->la_flags |= LLE_LINKED; + LIST_INSERT_HEAD(lleh, lle, lle_next); +} + +void +llentry_unlink(struct llentry *lle) +{ + + LIST_REMOVE(lle, lle_next); + lle->la_flags &= ~(LLE_VALID | LLE_LINKED); + lle->lle_tbl = NULL; + lle->lle_head = NULL; +} + +void +llentries_unlink(struct llentries *head) +{ + struct llentry *lle, *next; + + LIST_FOREACH_SAFE(lle, head, lle_chain, next) { + llentry_unlink(lle); + } +} + /* * Deletes an address from the address table. * This function is called by the timer functions Modified: projects/routing/sys/net/if_llatbl.h ============================================================================== --- projects/routing/sys/net/if_llatbl.h Sun Nov 23 12:05:49 2014 (r274915) +++ projects/routing/sys/net/if_llatbl.h Sun Nov 23 12:15:28 2014 (r274916) @@ -80,6 +80,7 @@ struct llentry { uint16_t ln_router; time_t ln_ntick; int lle_refcnt; + LIST_ENTRY(llentry) lle_chain; /* chain of deleted items */ struct rwlock lle_lock; /* XXX af-private? */ @@ -94,8 +95,6 @@ struct llentry { #define LLE_RLOCK(lle) rw_rlock(&(lle)->lle_lock) #define LLE_WUNLOCK(lle) rw_wunlock(&(lle)->lle_lock) #define LLE_RUNLOCK(lle) rw_runlock(&(lle)->lle_lock) -#define LLE_DOWNGRADE(lle) rw_downgrade(&(lle)->lle_lock) -#define LLE_TRY_UPGRADE(lle) rw_try_upgrade(&(lle)->lle_lock) #define LLE_LOCK_INIT(lle) rw_init_flags(&(lle)->lle_lock, "lle", RW_DUPOK) #define LLE_LOCK_DESTROY(lle) rw_destroy(&(lle)->lle_lock) #define LLE_WLOCK_ASSERT(lle) rw_assert(&(lle)->lle_lock, RA_WLOCKED) @@ -157,6 +156,7 @@ typedef int (llt_delete_t)(struct lltabl typedef void (llt_prefix_free_t)(struct lltable *, const struct sockaddr *prefix, const struct sockaddr *mask, u_int flags); typedef int (llt_dump_t)(struct lltable *, struct sysctl_req *); +typedef uint32_t (llt_hash_t)(const struct llentry *); struct lltable { SLIST_ENTRY(lltable) llt_link; @@ -169,6 +169,7 @@ struct lltable { llt_delete_t *llt_delete; llt_prefix_free_t *llt_prefix_free; llt_dump_t *llt_dump; + llt_hash_t *llt_hash; }; MALLOC_DECLARE(M_LLTABLE); @@ -204,6 +205,9 @@ void lltable_drain(int); #endif int lltable_sysctl_dumparp(int, struct sysctl_req *); +void llentry_link(struct lltable *, struct llentry *); +void llentry_unlink(struct llentry *); +void llentries_unlink(struct llentries *); size_t llentry_free(struct llentry *); struct llentry *llentry_alloc(struct ifnet *, struct lltable *, struct sockaddr_storage *); Modified: projects/routing/sys/netinet/in.c ============================================================================== --- projects/routing/sys/netinet/in.c Sun Nov 23 12:05:49 2014 (r274915) +++ projects/routing/sys/netinet/in.c Sun Nov 23 12:15:28 2014 (r274916) @@ -78,9 +78,6 @@ static int in_difaddr_ioctl(caddr_t, str static void in_socktrim(struct sockaddr_in *); static void in_purgemaddrs(struct ifnet *); -static void in_lltable_link(struct lltable *llt, struct llentry *lle); -static void in_lltable_unlink(struct llentry *lle); - static VNET_DEFINE(int, nosameprefix); #define V_nosameprefix VNET(nosameprefix) SYSCTL_INT(_net_inet_ip, OID_AUTO, no_same_prefix, CTLFLAG_VNET | CTLFLAG_RW, @@ -1048,9 +1045,11 @@ in_lltable_prefix_free(struct lltable *l const struct sockaddr_in *pfx = (const struct sockaddr_in *)prefix; const struct sockaddr_in *msk = (const struct sockaddr_in *)mask; struct llentry *lle, *next; + struct llentries dchain; int i; size_t pkts_dropped; + LIST_INIT(&dchain); IF_AFDATA_WLOCK(llt->llt_ifp); for (i = 0; i < LLTBL_HASHTBL_SIZE; i++) { LIST_FOREACH_SAFE(lle, &llt->lle_head[i], lle_next, next) { @@ -1066,11 +1065,16 @@ in_lltable_prefix_free(struct lltable *l LLE_REMREF(lle); lle->la_flags &= ~LLE_CALLOUTREF; } - pkts_dropped = llentry_free(lle); - ARPSTAT_ADD(dropped, pkts_dropped); + LIST_INSERT_HEAD(&dchain, lle, lle_chain); } } } + /* Unlink chain */ + llentries_unlink(&dchain); + LIST_FOREACH_SAFE(lle, &dchain, lle_chain, next) { + pkts_dropped = llentry_free(lle); + ARPSTAT_ADD(dropped, pkts_dropped); + } IF_AFDATA_WUNLOCK(llt->llt_ifp); } @@ -1116,6 +1120,20 @@ in_lltable_rtcheck(struct ifnet *ifp, u_ return (0); } +static inline uint32_t +in_lltable_hash_dst(const struct in_addr dst) +{ + + return (dst.s_addr); +} + +static uint32_t +in_lltable_hash(const struct llentry *lle) +{ + + return (in_lltable_hash_dst(lle->r_l3addr.addr4)); +} + static inline struct llentry * in_lltable_find_dst(struct lltable *llt, struct in_addr dst) { @@ -1157,7 +1175,7 @@ in_lltable_delete(struct lltable *llt, u LLE_WLOCK(lle); lle->la_flags |= LLE_DELETED; EVENTHANDLER_INVOKE(lle_event, lle, LLENTRY_DELETED); - in_lltable_unlink(lle); + llentry_unlink(lle); #ifdef DIAGNOSTIC log(LOG_INFO, "ifaddr cache = %p is deleted\n", lle); #endif @@ -1210,40 +1228,12 @@ in_lltable_create(struct lltable *llt, u lle->la_flags |= (LLE_VALID | LLE_STATIC); } - in_lltable_link(llt, lle); + llentry_link(llt, lle); LLE_WLOCK(lle); return (lle); } -static void -in_lltable_link(struct lltable *llt, struct llentry *lle) -{ - struct in_addr dst; - struct llentries *lleh; - u_int hashkey; - - dst = lle->r_l3addr.addr4; - hashkey = dst.s_addr; - lleh = &llt->lle_head[LLATBL_HASH(hashkey, LLTBL_HASHMASK)]; - - lle->lle_tbl = llt; - lle->lle_head = lleh; - lle->la_flags |= LLE_LINKED; - LIST_INSERT_HEAD(lleh, lle, lle_next); - -} - -static void -in_lltable_unlink(struct llentry *lle) -{ - - LIST_REMOVE(lle, lle_next); - lle->la_flags &= ~(LLE_VALID | LLE_LINKED); - lle->lle_tbl = NULL; - lle->lle_head = NULL; -} - /* * Return NULL if not found or marked for deletion. * If found return lle read locked. @@ -1363,6 +1353,7 @@ in_domifattach(struct ifnet *ifp) llt->llt_create = in_lltable_create; llt->llt_delete = in_lltable_delete; llt->llt_dump = in_lltable_dump; + llt->llt_hash = in_lltable_hash; } ii->ii_llt = llt; Modified: projects/routing/sys/netinet6/in6.c ============================================================================== --- projects/routing/sys/netinet6/in6.c Sun Nov 23 12:05:49 2014 (r274915) +++ projects/routing/sys/netinet6/in6.c Sun Nov 23 12:15:28 2014 (r274916) @@ -149,9 +149,6 @@ static int in6_update_ifa_internal(struc static int in6_broadcast_ifa(struct ifnet *, struct in6_aliasreq *, struct in6_ifaddr *, int); -static void in6_lltable_link(struct lltable *llt, struct llentry *lle); -static void in6_lltable_unlink(struct llentry *lle); - #define ifa2ia6(ifa) ((struct in6_ifaddr *)(ifa)) #define ia62ifa(ia6) (&((ia6)->ia_ifa)) @@ -2094,6 +2091,7 @@ in6_lltable_prefix_free(struct lltable * { const struct sockaddr_in6 *pfx = (const struct sockaddr_in6 *)prefix; const struct sockaddr_in6 *msk = (const struct sockaddr_in6 *)mask; + struct llentries dchain; struct llentry *lle, *next; int i; @@ -2101,6 +2099,7 @@ in6_lltable_prefix_free(struct lltable * * (flags & LLE_STATIC) means deleting all entries * including static ND6 entries. */ + LIST_INIT(&dchain); IF_AFDATA_WLOCK(llt->llt_ifp); for (i = 0; i < LLTBL_HASHTBL_SIZE; i++) { LIST_FOREACH_SAFE(lle, &llt->lle_head[i], lle_next, next) { @@ -2114,10 +2113,13 @@ in6_lltable_prefix_free(struct lltable * LLE_REMREF(lle); lle->la_flags &= ~LLE_CALLOUTREF; } - llentry_free(lle); + LIST_INSERT_HEAD(&dchain, lle, lle_chain); } } } + llentries_unlink(&dchain); + LIST_FOREACH_SAFE(lle, &dchain, lle_chain, next) + llentry_free(lle); IF_AFDATA_WUNLOCK(llt->llt_ifp); } @@ -2158,6 +2160,20 @@ in6_lltable_rtcheck(struct ifnet *ifp, return 0; } +static inline uint32_t +in6_lltable_hash_dst(const struct in6_addr *dst) +{ + + return (dst->s6_addr32[3]); +} + +static uint32_t +in6_lltable_hash(const struct llentry *lle) +{ + + return (in6_lltable_hash_dst(&lle->r_l3addr.addr6)); +} + static inline struct llentry * in6_lltable_find_dst(struct lltable *llt, const struct in6_addr *dst) { @@ -2165,7 +2181,7 @@ in6_lltable_find_dst(struct lltable *llt struct llentries *lleh; u_int hashkey; - hashkey = dst->s6_addr32[3]; + hashkey = in6_lltable_hash_dst(dst); lleh = &llt->lle_head[LLATBL_HASH(hashkey, LLTBL_HASHMASK)]; LIST_FOREACH(lle, lleh, lle_next) { if (IN6_ARE_ADDR_EQUAL(&lle->r_l3addr.addr6, dst) != 0) @@ -2194,7 +2210,7 @@ in6_lltable_delete(struct lltable *llt, if (!(lle->la_flags & LLE_IFADDR) || (flags & LLE_IFADDR)) { LLE_WLOCK(lle); lle->la_flags |= LLE_DELETED; - in6_lltable_unlink(lle); + llentry_unlink(lle); #ifdef DIAGNOSTIC log(LOG_INFO, "ifaddr cache = %p is deleted\n", lle); #endif @@ -2246,41 +2262,12 @@ in6_lltable_create(struct lltable *llt, lle->la_flags |= (LLE_VALID | LLE_STATIC); } - in6_lltable_link(llt, lle); + llentry_link(llt, lle); LLE_WLOCK(lle); return (lle); } -static void -in6_lltable_link(struct lltable *llt, struct llentry *lle) -{ - struct in6_addr dst; - struct llentries *lleh; - u_int hashkey; - - dst = lle->r_l3addr.addr6;; - hashkey = dst.s6_addr32[3]; - lleh = &llt->lle_head[LLATBL_HASH(hashkey, LLTBL_HASHMASK)]; - - lle->lle_tbl = llt; - lle->lle_head = lleh; - lle->la_flags |= LLE_LINKED; - LIST_INSERT_HEAD(lleh, lle, lle_next); - -} - -static void -in6_lltable_unlink(struct llentry *lle) -{ - - LIST_REMOVE(lle, lle_next); - lle->la_flags &= ~(LLE_VALID | LLE_LINKED); - lle->lle_tbl = NULL; - lle->lle_head = NULL; -} - - static struct llentry * in6_lltable_lookup(struct lltable *llt, u_int flags, const struct sockaddr *l3addr) @@ -2421,6 +2408,7 @@ in6_domifattach(struct ifnet *ifp) ext->lltable->llt_create = in6_lltable_create; ext->lltable->llt_delete = in6_lltable_delete; ext->lltable->llt_dump = in6_lltable_dump; + ext->lltable->llt_hash = in6_lltable_hash; } ext->mld_ifinfo = mld_domifattach(ifp); From owner-svn-src-projects@FreeBSD.ORG Sun Nov 23 15:38:09 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E5779855; Sun, 23 Nov 2014 15:38:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D10D320C; Sun, 23 Nov 2014 15:38:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sANFc9sE026706; Sun, 23 Nov 2014 15:38:09 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sANFc7HN026690; Sun, 23 Nov 2014 15:38:07 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411231538.sANFc7HN026690@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sun, 23 Nov 2014 15:38:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274917 - in projects/routing/sys: net netinet netinet6 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Nov 2014 15:38:10 -0000 Author: melifaro Date: Sun Nov 23 15:38:06 2014 New Revision: 274917 URL: https://svnweb.freebsd.org/changeset/base/274917 Log: Do more fine-grained lltable locking: use table runtime lock as rare as we can. Modified: projects/routing/sys/net/if.c projects/routing/sys/net/if_llatbl.c projects/routing/sys/net/if_var.h projects/routing/sys/net/rt_nhops.c projects/routing/sys/netinet/if_ether.c projects/routing/sys/netinet/in.c projects/routing/sys/netinet/toecore.c projects/routing/sys/netinet6/in6.c projects/routing/sys/netinet6/nd6.c projects/routing/sys/netinet6/scope6.c Modified: projects/routing/sys/net/if.c ============================================================================== --- projects/routing/sys/net/if.c Sun Nov 23 12:15:28 2014 (r274916) +++ projects/routing/sys/net/if.c Sun Nov 23 15:38:06 2014 (r274917) @@ -774,16 +774,16 @@ if_attachdomain1(struct ifnet *ifp) * Since dp->dom_ifattach calls malloc() with M_WAITOK, we * cannot lock ifp->if_afdata initialization, entirely. */ - if (IF_AFDATA_TRY_WLOCK(ifp) == 0) + if (IF_AFDATA_CFG_TRY_WLOCK(ifp) == 0) return; if (ifp->if_afdata_initialized >= domain_init_status) { - IF_AFDATA_UNLOCK(ifp); + IF_AFDATA_CFG_WUNLOCK(ifp); log(LOG_WARNING, "%s called more than once on %s\n", __func__, ifp->if_xname); return; } ifp->if_afdata_initialized = domain_init_status; - IF_AFDATA_UNLOCK(ifp); + IF_AFDATA_CFG_WUNLOCK(ifp); /* address family dependent data region */ bzero(ifp->if_afdata, sizeof(ifp->if_afdata)); @@ -961,10 +961,10 @@ if_detach_internal(struct ifnet *ifp, in * sleep, for example trying to drain a callout, thus open up the * theoretical race with re-attaching. */ - IF_AFDATA_LOCK(ifp); + IF_AFDATA_CFG_WLOCK(ifp); i = ifp->if_afdata_initialized; ifp->if_afdata_initialized = 0; - IF_AFDATA_UNLOCK(ifp); + IF_AFDATA_CFG_WUNLOCK(ifp); for (dp = domains; i > 0 && dp; dp = dp->dom_next) { if (dp->dom_ifdetach && ifp->if_afdata[dp->dom_family]) (*dp->dom_ifdetach)(ifp, @@ -3967,36 +3967,10 @@ if_afdata_cfg_wunlock(struct ifnet *ifp) rw_wunlock(&ifp->if_afdata_cfg_lock); } -void -if_afdata_cfg_lock_assert(struct ifnet *ifp, int what) -{ - - rw_assert(&ifp->if_afdata_cfg_lock, what); -} - -void -if_afdata_wlock(struct ifnet *ifp) -{ - - if_afdata_cfg_wlock(ifp); - IF_AFDATA_RUN_WLOCK(ifp); -} - -void -if_afdata_wunlock(struct ifnet *ifp) -{ - - if_afdata_cfg_wunlock(ifp); - IF_AFDATA_RUN_WUNLOCK(ifp); -} - int -if_afdata_try_wlock(struct ifnet *ifp) +if_afdata_cfg_try_wlock(struct ifnet *ifp) { - if (rw_try_wlock(&ifp->if_afdata_cfg_lock) == 0) - return (0); - IF_AFDATA_RUN_WLOCK(ifp); - return (1); + return (rw_try_wlock(&ifp->if_afdata_cfg_lock)); } Modified: projects/routing/sys/net/if_llatbl.c ============================================================================== --- projects/routing/sys/net/if_llatbl.c Sun Nov 23 12:15:28 2014 (r274916) +++ projects/routing/sys/net/if_llatbl.c Sun Nov 23 15:38:06 2014 (r274917) @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifdef DDB #include @@ -99,6 +100,11 @@ llentry_link(struct lltable *llt, struct struct llentries *lleh; uint32_t hashkey; + if ((lle->la_flags & LLE_LINKED) != 0) + return; + + IF_AFDATA_RUN_WLOCK_ASSERT(llt->llt_ifp); + hashkey = llt->llt_hash(lle); lleh = &llt->lle_head[LLATBL_HASH(hashkey, LLTBL_HASHMASK)]; @@ -112,10 +118,13 @@ void llentry_unlink(struct llentry *lle) { - LIST_REMOVE(lle, lle_next); - lle->la_flags &= ~(LLE_VALID | LLE_LINKED); - lle->lle_tbl = NULL; - lle->lle_head = NULL; + if ((lle->la_flags & LLE_LINKED) != 0) { + IF_AFDATA_RUN_WLOCK_ASSERT(lle->lle_tbl->llt_ifp); + LIST_REMOVE(lle, lle_next); + lle->la_flags &= ~(LLE_VALID | LLE_LINKED); + lle->lle_tbl = NULL; + lle->lle_head = NULL; + } } void @@ -143,12 +152,7 @@ llentry_free(struct llentry *lle) struct mbuf *next; LLE_WLOCK_ASSERT(lle); - - if ((lle->la_flags & LLE_LINKED) != 0) { - IF_AFDATA_WLOCK_ASSERT(lle->lle_tbl->llt_ifp); - LIST_REMOVE(lle, lle_next); - lle->la_flags &= ~(LLE_VALID | LLE_LINKED); - } + KASSERT((lle->la_flags & LLE_LINKED) == 0, ("Freeing linked lle")); pkts_dropped = 0; while ((lle->la_numheld > 0) && (lle->la_hold != NULL)) { @@ -172,6 +176,8 @@ llentry_free(struct llentry *lle) * (al)locate an llentry for address dst (equivalent to rtalloc for new-arp). * * If found the llentry * is returned referenced and unlocked. + * + * XXX: Remove after converting flowtable */ struct llentry * llentry_alloc(struct ifnet *ifp, struct lltable *lt, @@ -184,9 +190,14 @@ llentry_alloc(struct ifnet *ifp, struct IF_AFDATA_RUNLOCK(ifp); if ((la == NULL) && (ifp->if_flags & (IFF_NOARP | IFF_STATICARP)) == 0) { - IF_AFDATA_WLOCK(ifp); + IF_AFDATA_CFG_WLOCK(ifp); la = lla_create(lt, 0, (struct sockaddr *)dst); - IF_AFDATA_WUNLOCK(ifp); + if (la != NULL) { + IF_AFDATA_RUN_WLOCK(ifp); + llentry_link(lt, la); + IF_AFDATA_RUN_WUNLOCK(ifp); + } + IF_AFDATA_CFG_WUNLOCK(ifp); } if (la != NULL) { @@ -204,6 +215,7 @@ void lltable_free(struct lltable *llt) { struct llentry *lle, *next; + struct llentries dchain; int i; KASSERT(llt != NULL, ("%s: llt is NULL", __func__)); @@ -212,7 +224,8 @@ lltable_free(struct lltable *llt) SLIST_REMOVE(&V_lltables, llt, lltable, llt_link); LLTABLE_WUNLOCK(); - IF_AFDATA_WLOCK(llt->llt_ifp); + LIST_INIT(&dchain); + IF_AFDATA_CFG_WLOCK(llt->llt_ifp); for (i = 0; i < LLTBL_HASHTBL_SIZE; i++) { LIST_FOREACH_SAFE(lle, &llt->lle_head[i], lle_next, next) { LLE_WLOCK(lle); @@ -220,10 +233,15 @@ lltable_free(struct lltable *llt) LLE_REMREF(lle); lle->la_flags &= ~LLE_CALLOUTREF; } - llentry_free(lle); + LIST_INSERT_HEAD(&dchain, lle, lle_chain); } } - IF_AFDATA_WUNLOCK(llt->llt_ifp); + IF_AFDATA_RUN_WLOCK(llt->llt_ifp); + llentries_unlink(&dchain); + IF_AFDATA_RUN_WUNLOCK(llt->llt_ifp); + LIST_FOREACH_SAFE(lle, &dchain, lle_chain, next) + llentry_free(lle); + IF_AFDATA_CFG_WUNLOCK(llt->llt_ifp); free(llt, M_LLTABLE); } @@ -337,14 +355,15 @@ lla_rt_output(struct rt_msghdr *rtm, str switch (rtm->rtm_type) { case RTM_ADD: /* Add static LLE */ - IF_AFDATA_WLOCK(ifp); + IF_AFDATA_CFG_WLOCK(ifp); lle = lla_create(llt, 0, dst); if (lle == NULL) { - IF_AFDATA_WUNLOCK(ifp); + IF_AFDATA_CFG_WUNLOCK(ifp); return (ENOMEM); } + IF_AFDATA_RUN_WLOCK(ifp); bcopy(LLADDR(dl), &lle->ll_addr, ifp->if_addrlen); if ((rtm->rtm_flags & RTF_ANNOUNCE)) lle->la_flags |= LLE_PUB; @@ -366,9 +385,11 @@ lla_rt_output(struct rt_msghdr *rtm, str lle->la_expire = 0; } else lle->la_expire = rtm->rtm_rmx.rmx_expire; + llentry_link(llt, lle); + IF_AFDATA_RUN_WUNLOCK(ifp); laflags = lle->la_flags; LLE_WUNLOCK(lle); - IF_AFDATA_WUNLOCK(ifp); + IF_AFDATA_CFG_WUNLOCK(ifp); #ifdef INET /* gratuitous ARP */ if ((laflags & LLE_PUB) && dst->sa_family == AF_INET) @@ -381,9 +402,9 @@ lla_rt_output(struct rt_msghdr *rtm, str break; case RTM_DELETE: - IF_AFDATA_WLOCK(ifp); + IF_AFDATA_CFG_WLOCK(ifp); error = lla_delete(llt, 0, dst); - IF_AFDATA_WUNLOCK(ifp); + IF_AFDATA_CFG_WUNLOCK(ifp); return (error == 0 ? 0 : ENOENT); default: Modified: projects/routing/sys/net/if_var.h ============================================================================== --- projects/routing/sys/net/if_var.h Sun Nov 23 12:15:28 2014 (r274916) +++ projects/routing/sys/net/if_var.h Sun Nov 23 15:38:06 2014 (r274917) @@ -355,17 +355,26 @@ EVENTHANDLER_DECLARE(group_change_event, #define IF_AFDATA_CFG_RUNLOCK(ifp) if_afdata_cfg_runlock(ifp) #define IF_AFDATA_CFG_WLOCK(ifp) if_afdata_cfg_wlock(ifp) #define IF_AFDATA_CFG_WUNLOCK(ifp) if_afdata_cfg_wunlock(ifp) +#define IF_AFDATA_CFG_TRY_WLOCK(ifp) if_afdata_cfg_try_wlock(ifp) #define IF_AFDATA_CFG_LOCK_ASSERT(i) if_afdata_cfg_lock_assert(i, RA_LOCKED) #define IF_AFDATA_CFG_RLOCK_ASSERT(i) if_afdata_cfg_lock_assert(i, RA_RLOCKED) #define IF_AFDATA_CFG_WLOCK_ASSERT(i) if_afdata_cfg_lock_assert(i, RA_WLOCKED) #define IF_AFDATA_CFG_UNLOCK_ASSERT(i) if_afdata_cfg_lock_assert(i,RA_UNLOCKED) +#define if_afdata_cfg_lock_assert(ifp, what) \ + rw_assert(&(ifp)->if_afdata_cfg_lock, what) + void if_afdata_cfg_rlock(struct ifnet *ifp); void if_afdata_cfg_runlock(struct ifnet *ifp); void if_afdata_cfg_wlock(struct ifnet *ifp); void if_afdata_cfg_wunlock(struct ifnet *ifp); -void if_afdata_cfg_lock_assert(struct ifnet *ifp, int what); +int if_afdata_cfg_try_wlock(struct ifnet *ifp); + +/* Wrappers */ +#define IF_AFDATA_RLOCK IF_AFDATA_CFG_RLOCK +#define IF_AFDATA_RUNLOCK IF_AFDATA_CFG_RUNLOCK + /* if_afdata lock: fast path */ #define IF_AFDATA_RUN_WLOCK(ifp) rm_wlock(&(ifp)->if_afdata_run_lock) @@ -376,23 +385,8 @@ void if_afdata_cfg_lock_assert(struct if rm_runlock(&(ifp)->if_afdata_run_lock, &if_afdata_tracker) #define IF_AFDATA_RUN_TRACKER struct rm_priotracker if_afdata_tracker -/* Common wrappers */ -#define IF_AFDATA_RLOCK(ifp) IF_AFDATA_CFG_RLOCK(ifp) -#define IF_AFDATA_RUNLOCK(ifp) IF_AFDATA_CFG_RUNLOCK(ifp) -#define IF_AFDATA_WLOCK(ifp) if_afdata_wlock(ifp) -#define IF_AFDATA_WUNLOCK(ifp) if_afdata_wunlock(ifp) - -#define IF_AFDATA_TRY_WLOCK(ifp) if_afdata_try_wlock(ifp) -#define IF_AFDATA_LOCK(ifp) IF_AFDATA_WLOCK(ifp) -#define IF_AFDATA_UNLOCK(ifp) IF_AFDATA_WUNLOCK(ifp) -void if_afdata_wlock(struct ifnet *ifp); -void if_afdata_wunlock(struct ifnet *ifp); -int if_afdata_try_wlock(struct ifnet *ifp); - -#define IF_AFDATA_LOCK_ASSERT(ifp) IF_AFDATA_CFG_LOCK_ASSERT(ifp) -#define IF_AFDATA_RLOCK_ASSERT(ifp) IF_AFDATA_CFG_RLOCK_ASSERT(ifp) -#define IF_AFDATA_WLOCK_ASSERT(ifp) IF_AFDATA_CFG_WLOCK_ASSERT(ifp) -#define IF_AFDATA_UNLOCK_ASSERT(ifp) IF_AFDATA_CFG_UNLOCK_ASSERT(ifp) +#define IF_AFDATA_RUN_WLOCK_ASSERT(ifp) \ + rm_assert(&(ifp)->if_afdata_run_lock, RA_WLOCKED) /* * 72 was chosen below because it is the size of a TCP/IP Modified: projects/routing/sys/net/rt_nhops.c ============================================================================== --- projects/routing/sys/net/rt_nhops.c Sun Nov 23 12:15:28 2014 (r274916) +++ projects/routing/sys/net/rt_nhops.c Sun Nov 23 15:38:06 2014 (r274917) @@ -699,7 +699,7 @@ fib6_storelladdr(struct ifnet *ifp, stru * the entry should have been created in nd6_store_lladdr */ IF_AFDATA_RUN_RLOCK(ifp); - ln = lla_lookup(LLTABLE6(ifp), 0, (struct sockaddr *)&dst_sa); + ln = lla_lookup(LLTABLE6(ifp), LLE_UNLOCKED, (struct sockaddr *)&dst_sa); /* * Perform fast path for the following cases: Modified: projects/routing/sys/netinet/if_ether.c ============================================================================== --- projects/routing/sys/netinet/if_ether.c Sun Nov 23 12:15:28 2014 (r274916) +++ projects/routing/sys/netinet/if_ether.c Sun Nov 23 15:38:06 2014 (r274917) @@ -164,9 +164,9 @@ arp_ifscrub(struct ifnet *ifp, uint32_t addr4.sin_len = sizeof(addr4); addr4.sin_family = AF_INET; addr4.sin_addr.s_addr = addr; - IF_AFDATA_WLOCK(ifp); + IF_AFDATA_CFG_WLOCK(ifp); lla_delete(LLTABLE(ifp), LLE_IFADDR, (struct sockaddr *)&addr4); - IF_AFDATA_WUNLOCK(ifp); + IF_AFDATA_CFG_WUNLOCK(ifp); } #endif @@ -247,7 +247,7 @@ arptimer(void *arg) /* XXX: LOR avoidance. We still have ref on lle. */ LLE_WUNLOCK(lle); - IF_AFDATA_LOCK(ifp); + IF_AFDATA_CFG_WLOCK(ifp); LLE_WLOCK(lle); /* @@ -262,7 +262,7 @@ arptimer(void *arg) pkts_dropped = llentry_free(lle); ARPSTAT_ADD(dropped, pkts_dropped); - IF_AFDATA_UNLOCK(ifp); + IF_AFDATA_CFG_WUNLOCK(ifp); ARPSTAT_INC(timeouts); @@ -492,9 +492,14 @@ arpresolve_slow(struct ifnet *ifp, int i IF_AFDATA_RUNLOCK(ifp); if (la == NULL && (ifp->if_flags & (IFF_NOARP | IFF_STATICARP)) == 0) { create = 1; - IF_AFDATA_WLOCK(ifp); + IF_AFDATA_CFG_WLOCK(ifp); la = lla_create(LLTABLE(ifp), 0, dst); - IF_AFDATA_WUNLOCK(ifp); + if (la != NULL) { + IF_AFDATA_RUN_WLOCK(ifp); + llentry_link(LLTABLE(ifp), la); + IF_AFDATA_RUN_WUNLOCK(ifp); + } + IF_AFDATA_CFG_WUNLOCK(ifp); } if (la == NULL) { if (create != 0) @@ -508,6 +513,7 @@ arpresolve_slow(struct ifnet *ifp, int i if ((la->la_flags & LLE_VALID) && ((la->la_flags & LLE_STATIC) || la->la_expire > time_uptime)) { bcopy(&la->ll_addr, desten, ifp->if_addrlen); +#if 0 /* * If entry has an expiry time and it is approaching, * see if we need to send an ARP request within this @@ -518,7 +524,7 @@ arpresolve_slow(struct ifnet *ifp, int i arprequest(ifp, NULL, &SIN(dst)->sin_addr, NULL); la->la_preempt--; } - +#endif *lle = la; error = 0; goto done; @@ -851,15 +857,15 @@ match: sin.sin_addr = isaddr; create = (itaddr.s_addr == myaddr.s_addr) ? 1 : 0; flags = LLE_EXCLUSIVE; - IF_AFDATA_LOCK(ifp); - if (create != 0) + IF_AFDATA_CFG_WLOCK(ifp); + if (create != 0) { la = lla_create(LLTABLE(ifp), 0, (struct sockaddr *)&sin); - else + } else la = lla_lookup(LLTABLE(ifp), flags, (struct sockaddr *)&sin); - IF_AFDATA_UNLOCK(ifp); + IF_AFDATA_CFG_WUNLOCK(ifp); if (la != NULL) { /* the following is not an error when doing bridging */ - if (!bridged && la->lle_tbl->llt_ifp != ifp) { + if (!bridged && la->lle_tbl && la->lle_tbl->llt_ifp != ifp) { if (log_arp_wrong_iface) ARP_LOG(LOG_WARNING, "%s is on %s " "but got reply from %*D on %s\n", @@ -910,17 +916,20 @@ match: /* use afdata WLOCK to update fields */ LLE_ADDREF(la); LLE_WUNLOCK(la); - IF_AFDATA_WLOCK(ifp); + IF_AFDATA_CFG_WLOCK(ifp); LLE_WLOCK(la); /* Update data */ + IF_AFDATA_RUN_WLOCK(ifp); memcpy(&la->ll_addr, ar_sha(ah), ifp->if_addrlen); la->la_flags |= LLE_VALID; la->r_flags |= RLLE_VALID; if ((la->la_flags & LLE_STATIC) == 0) la->la_expire = time_uptime + V_arpt_keep; + llentry_link(LLTABLE(ifp), la); + IF_AFDATA_RUN_WUNLOCK(ifp); - IF_AFDATA_WUNLOCK(ifp); + IF_AFDATA_CFG_WUNLOCK(ifp); LLE_REMREF(la); } @@ -1084,12 +1093,18 @@ arp_ifinit(struct ifnet *ifp, struct ifa * because the output of the arp utility shows * that L2 entry as permanent */ - IF_AFDATA_LOCK(ifp); + IF_AFDATA_CFG_WLOCK(ifp); lle = lla_create(LLTABLE(ifp), LLE_IFADDR | LLE_STATIC, (struct sockaddr *)IA_SIN(ifa)); - if (lle != NULL) + if (lle != NULL) { + IF_AFDATA_RUN_WLOCK(ifp); + bcopy(IF_LLADDR(ifp), &lle->ll_addr, ifp->if_addrlen); + lle->la_flags |= (LLE_VALID | LLE_STATIC); lle->r_flags |= RLLE_VALID; - IF_AFDATA_UNLOCK(ifp); + llentry_link(LLTABLE(ifp), lle); + IF_AFDATA_RUN_WUNLOCK(ifp); + } + IF_AFDATA_CFG_WUNLOCK(ifp); if (lle == NULL) log(LOG_INFO, "arp_ifinit: cannot create arp " "entry for interface address\n"); Modified: projects/routing/sys/netinet/in.c ============================================================================== --- projects/routing/sys/netinet/in.c Sun Nov 23 12:15:28 2014 (r274916) +++ projects/routing/sys/netinet/in.c Sun Nov 23 15:38:06 2014 (r274917) @@ -1050,7 +1050,7 @@ in_lltable_prefix_free(struct lltable *l size_t pkts_dropped; LIST_INIT(&dchain); - IF_AFDATA_WLOCK(llt->llt_ifp); + IF_AFDATA_CFG_WLOCK(llt->llt_ifp); for (i = 0; i < LLTBL_HASHTBL_SIZE; i++) { LIST_FOREACH_SAFE(lle, &llt->lle_head[i], lle_next, next) { /* @@ -1070,12 +1070,14 @@ in_lltable_prefix_free(struct lltable *l } } /* Unlink chain */ + IF_AFDATA_RUN_WLOCK(llt->llt_ifp); llentries_unlink(&dchain); + IF_AFDATA_RUN_WUNLOCK(llt->llt_ifp); LIST_FOREACH_SAFE(lle, &dchain, lle_chain, next) { pkts_dropped = llentry_free(lle); ARPSTAT_ADD(dropped, pkts_dropped); } - IF_AFDATA_WUNLOCK(llt->llt_ifp); + IF_AFDATA_CFG_WUNLOCK(llt->llt_ifp); } @@ -1159,7 +1161,7 @@ in_lltable_delete(struct lltable *llt, u struct ifnet *ifp = llt->llt_ifp; struct llentry *lle; - IF_AFDATA_WLOCK_ASSERT(ifp); + IF_AFDATA_CFG_WLOCK_ASSERT(ifp); KASSERT(l3addr->sa_family == AF_INET, ("sin_family %d", l3addr->sa_family)); @@ -1175,7 +1177,9 @@ in_lltable_delete(struct lltable *llt, u LLE_WLOCK(lle); lle->la_flags |= LLE_DELETED; EVENTHANDLER_INVOKE(lle_event, lle, LLENTRY_DELETED); + IF_AFDATA_RUN_WLOCK(ifp); llentry_unlink(lle); + IF_AFDATA_RUN_WUNLOCK(ifp); #ifdef DIAGNOSTIC log(LOG_INFO, "ifaddr cache = %p is deleted\n", lle); #endif @@ -1195,7 +1199,7 @@ in_lltable_create(struct lltable *llt, u struct ifnet *ifp = llt->llt_ifp; struct llentry *lle; - IF_AFDATA_WLOCK_ASSERT(ifp); + IF_AFDATA_CFG_WLOCK_ASSERT(ifp); KASSERT(l3addr->sa_family == AF_INET, ("sin_family %d", l3addr->sa_family)); @@ -1223,12 +1227,6 @@ in_lltable_create(struct lltable *llt, u return (NULL); } lle->la_flags = flags; - if ((flags & LLE_IFADDR) == LLE_IFADDR) { - bcopy(IF_LLADDR(ifp), &lle->ll_addr, ifp->if_addrlen); - lle->la_flags |= (LLE_VALID | LLE_STATIC); - } - - llentry_link(llt, lle); LLE_WLOCK(lle); return (lle); Modified: projects/routing/sys/netinet/toecore.c ============================================================================== --- projects/routing/sys/netinet/toecore.c Sun Nov 23 12:15:28 2014 (r274916) +++ projects/routing/sys/netinet/toecore.c Sun Nov 23 15:38:06 2014 (r274917) @@ -462,9 +462,9 @@ restart: lle = lla_lookup(LLTABLE6(ifp), flags, sa); IF_AFDATA_RUNLOCK(ifp); if (lle == NULL) { - IF_AFDATA_LOCK(ifp); + IF_AFDATA_CFG_WLOCK(ifp); lle = nd6_create(&sin6->sin6_addr, 0, ifp); - IF_AFDATA_UNLOCK(ifp); + IF_AFDATA_CFG_WUNLOCK(ifp); if (lle == NULL) return (ENOMEM); /* Couldn't create entry in cache. */ lle->ln_state = ND6_LLINFO_INCOMPLETE; Modified: projects/routing/sys/netinet6/in6.c ============================================================================== --- projects/routing/sys/netinet6/in6.c Sun Nov 23 12:15:28 2014 (r274916) +++ projects/routing/sys/netinet6/in6.c Sun Nov 23 15:38:06 2014 (r274917) @@ -72,6 +72,8 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include +#include #include #include #include @@ -2100,7 +2102,7 @@ in6_lltable_prefix_free(struct lltable * * including static ND6 entries. */ LIST_INIT(&dchain); - IF_AFDATA_WLOCK(llt->llt_ifp); + IF_AFDATA_CFG_WLOCK(llt->llt_ifp); for (i = 0; i < LLTBL_HASHTBL_SIZE; i++) { LIST_FOREACH_SAFE(lle, &llt->lle_head[i], lle_next, next) { if (IN6_ARE_MASKED_ADDR_EQUAL( @@ -2117,10 +2119,12 @@ in6_lltable_prefix_free(struct lltable * } } } + IF_AFDATA_RUN_WLOCK(llt->llt_ifp); llentries_unlink(&dchain); + IF_AFDATA_RUN_WUNLOCK(llt->llt_ifp); LIST_FOREACH_SAFE(lle, &dchain, lle_chain, next) llentry_free(lle); - IF_AFDATA_WUNLOCK(llt->llt_ifp); + IF_AFDATA_CFG_WUNLOCK(llt->llt_ifp); } static int @@ -2198,7 +2202,7 @@ in6_lltable_delete(struct lltable *llt, const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6 *)l3addr; struct llentry *lle; - IF_AFDATA_LOCK_ASSERT(llt->llt_ifp); + IF_AFDATA_CFG_WLOCK_ASSERT(llt->llt_ifp); KASSERT(l3addr->sa_family == AF_INET6, ("sin_family %d", l3addr->sa_family)); @@ -2210,7 +2214,9 @@ in6_lltable_delete(struct lltable *llt, if (!(lle->la_flags & LLE_IFADDR) || (flags & LLE_IFADDR)) { LLE_WLOCK(lle); lle->la_flags |= LLE_DELETED; + IF_AFDATA_RUN_WLOCK(llt->llt_ifp); llentry_unlink(lle); + IF_AFDATA_RUN_WUNLOCK(llt->llt_ifp); #ifdef DIAGNOSTIC log(LOG_INFO, "ifaddr cache = %p is deleted\n", lle); #endif @@ -2231,7 +2237,7 @@ in6_lltable_create(struct lltable *llt, struct ifnet *ifp = llt->llt_ifp; struct llentry *lle; - IF_AFDATA_WLOCK_ASSERT(ifp); + IF_AFDATA_CFG_WLOCK_ASSERT(ifp); KASSERT(l3addr->sa_family == AF_INET6, ("sin_family %d", l3addr->sa_family)); @@ -2257,12 +2263,6 @@ in6_lltable_create(struct lltable *llt, return NULL; } lle->la_flags = flags; - if ((flags & LLE_IFADDR) == LLE_IFADDR) { - bcopy(IF_LLADDR(ifp), &lle->ll_addr, ifp->if_addrlen); - lle->la_flags |= (LLE_VALID | LLE_STATIC); - } - - llentry_link(llt, lle); LLE_WLOCK(lle); return (lle); @@ -2290,7 +2290,7 @@ in6_lltable_lookup(struct lltable *llt, if (flags & LLE_EXCLUSIVE) LLE_WLOCK(lle); - else + else if ((flags & LLE_UNLOCKED) == 0) LLE_RLOCK(lle); return (lle); } Modified: projects/routing/sys/netinet6/nd6.c ============================================================================== --- projects/routing/sys/netinet6/nd6.c Sun Nov 23 12:15:28 2014 (r274916) +++ projects/routing/sys/netinet6/nd6.c Sun Nov 23 15:38:06 2014 (r274917) @@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -854,7 +855,9 @@ nd6_lookup(struct in6_addr *addr6, int f sin6.sin6_family = AF_INET6; sin6.sin6_addr = *addr6; - IF_AFDATA_LOCK_ASSERT(ifp); + /* + * IF_AFDATA_LOCK_ASSERT(ifp); + */ llflags = (flags & ND6_EXCLUSIVE) ? LLE_EXCLUSIVE : 0; ln = lla_lookup(LLTABLE6(ifp), llflags, (struct sockaddr *)&sin6); @@ -877,11 +880,15 @@ nd6_create(struct in6_addr *addr6, int f sin6.sin6_family = AF_INET6; sin6.sin6_addr = *addr6; - IF_AFDATA_WLOCK_ASSERT(ifp); + IF_AFDATA_CFG_WLOCK_ASSERT(ifp); ln = lla_create(LLTABLE6(ifp), 0, (struct sockaddr *)&sin6); - if (ln != NULL) + if (ln != NULL) { + IF_AFDATA_RUN_WLOCK(ifp); ln->ln_state = ND6_LLINFO_NOSTATE; + llentry_link(LLTABLE6(ifp), ln); + IF_AFDATA_RUN_WUNLOCK(ifp); + } return (ln); } @@ -998,7 +1005,7 @@ nd6_is_addr_neighbor(struct sockaddr_in6 struct llentry *lle; int rc = 0; - IF_AFDATA_UNLOCK_ASSERT(ifp); + IF_AFDATA_CFG_UNLOCK_ASSERT(ifp); if (nd6_is_new_addr_neighbor(addr, ifp)) return (1); @@ -1137,7 +1144,7 @@ nd6_free(struct llentry *ln, int gc) * free(9) in llentry_free() if someone else holds one as well. */ LLE_WUNLOCK(ln); - IF_AFDATA_LOCK(ifp); + IF_AFDATA_CFG_WLOCK(ifp); LLE_WLOCK(ln); /* @@ -1149,9 +1156,13 @@ nd6_free(struct llentry *ln, int gc) ln->la_flags &= ~LLE_CALLOUTREF; } + IF_AFDATA_RUN_WLOCK(ifp); + llentry_unlink(ln); + IF_AFDATA_RUN_WUNLOCK(ifp); + llentry_free(ln); - IF_AFDATA_UNLOCK(ifp); + IF_AFDATA_CFG_WUNLOCK(ifp); return (next); } @@ -1579,7 +1590,7 @@ nd6_cache_lladdr(struct ifnet *ifp, stru struct mbuf *chain = NULL; int static_route = 0; - IF_AFDATA_UNLOCK_ASSERT(ifp); + IF_AFDATA_CFG_UNLOCK_ASSERT(ifp); KASSERT(ifp != NULL, ("%s: ifp == NULL", __func__)); KASSERT(from != NULL, ("%s: from == NULL", __func__)); @@ -1598,14 +1609,14 @@ nd6_cache_lladdr(struct ifnet *ifp, stru * description on it in NS section (RFC 2461 7.2.3). */ flags = lladdr ? ND6_EXCLUSIVE : 0; - IF_AFDATA_RLOCK(ifp); + IF_AFDATA_CFG_RLOCK(ifp); ln = nd6_lookup(from, flags, ifp); - IF_AFDATA_RUNLOCK(ifp); + IF_AFDATA_CFG_RUNLOCK(ifp); if (ln == NULL) { flags |= ND6_EXCLUSIVE; - IF_AFDATA_LOCK(ifp); + IF_AFDATA_CFG_WLOCK(ifp); ln = nd6_create(from, 0, ifp); - IF_AFDATA_UNLOCK(ifp); + IF_AFDATA_CFG_WUNLOCK(ifp); is_newentry = 1; } else { /* do nothing if static ndp is set */ @@ -2004,9 +2015,9 @@ nd6_output_lle(struct ifnet *ifp, struct * the condition below is not very efficient. But we believe * it is tolerable, because this should be a rare case. */ - IF_AFDATA_LOCK(ifp); + IF_AFDATA_CFG_WLOCK(ifp); lle = nd6_create(&dst->sin6_addr, 0, ifp); - IF_AFDATA_UNLOCK(ifp); + IF_AFDATA_CFG_WUNLOCK(ifp); } } if (lle == NULL) { @@ -2257,14 +2268,23 @@ nd6_add_ifa_lle(struct in6_ifaddr *ia) struct llentry *ln; ifp = ia->ia_ifa.ifa_ifp; - IF_AFDATA_LOCK(ifp); - ia->ia_ifa.ifa_rtrequest = nd6_rtrequest; + IF_AFDATA_CFG_WLOCK(ifp); ln = lla_create(LLTABLE6(ifp), LLE_IFADDR, (struct sockaddr *)&ia->ia_addr); - IF_AFDATA_UNLOCK(ifp); if (ln != NULL) { + IF_AFDATA_RUN_WLOCK(ifp); + bcopy(IF_LLADDR(ifp), &ln->ll_addr, ifp->if_addrlen); + ln->la_flags |= (LLE_VALID | LLE_STATIC); + ln->r_flags |= RLLE_VALID; ln->la_expire = 0; /* for IPv6 this means permanent */ ln->ln_state = ND6_LLINFO_REACHABLE; + llentry_link(LLTABLE6(ifp), ln); + IF_AFDATA_RUN_WUNLOCK(ifp); + } + + ia->ia_ifa.ifa_rtrequest = nd6_rtrequest; + IF_AFDATA_CFG_WUNLOCK(ifp); + if (ln != NULL) { LLE_WUNLOCK(ln); in6_newaddrmsg(ia, RTM_ADD); return (0); @@ -2306,7 +2326,7 @@ nd6_storelladdr(struct ifnet *ifp, struc struct llentry *ln; *lle = NULL; - IF_AFDATA_UNLOCK_ASSERT(ifp); + IF_AFDATA_CFG_UNLOCK_ASSERT(ifp); if (m != NULL && m->m_flags & M_MCAST) { int i; Modified: projects/routing/sys/netinet6/scope6.c ============================================================================== --- projects/routing/sys/netinet6/scope6.c Sun Nov 23 12:15:28 2014 (r274916) +++ projects/routing/sys/netinet6/scope6.c Sun Nov 23 15:38:06 2014 (r274917) @@ -148,11 +148,11 @@ scope6_set(struct ifnet *ifp, struct sco int error = 0; struct scope6_id *sid = NULL; - IF_AFDATA_WLOCK(ifp); + IF_AFDATA_CFG_WLOCK(ifp); sid = SID(ifp); if (!sid) { /* paranoid? */ - IF_AFDATA_WUNLOCK(ifp); + IF_AFDATA_CFG_WUNLOCK(ifp); return (EINVAL); } @@ -175,7 +175,7 @@ scope6_set(struct ifnet *ifp, struct sco */ if (i == IPV6_ADDR_SCOPE_INTFACELOCAL && idlist->s6id_list[i] != ifp->if_index) { - IF_AFDATA_WUNLOCK(ifp); + IF_AFDATA_CFG_WUNLOCK(ifp); return (EINVAL); } @@ -187,7 +187,7 @@ scope6_set(struct ifnet *ifp, struct sco * IDs, but we check the consistency for * safety in later use. */ - IF_AFDATA_WUNLOCK(ifp); + IF_AFDATA_CFG_WUNLOCK(ifp); return (EINVAL); } @@ -196,10 +196,11 @@ scope6_set(struct ifnet *ifp, struct sco * but we simply set the new value in this initial * implementation. */ + /* XXX: Use runtime lock? */ sid->s6id_list[i] = idlist->s6id_list[i]; } } - IF_AFDATA_WUNLOCK(ifp); + IF_AFDATA_CFG_WUNLOCK(ifp); return (error); } From owner-svn-src-projects@FreeBSD.ORG Sun Nov 23 16:40:34 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 472A86A5; Sun, 23 Nov 2014 16:40:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 340F1991; Sun, 23 Nov 2014 16:40:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sANGeY8T056765; Sun, 23 Nov 2014 16:40:34 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sANGeYZv056764; Sun, 23 Nov 2014 16:40:34 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411231640.sANGeYZv056764@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sun, 23 Nov 2014 16:40:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274919 - projects/routing/sys/netinet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Nov 2014 16:40:34 -0000 Author: melifaro Date: Sun Nov 23 16:40:33 2014 New Revision: 274919 URL: https://svnweb.freebsd.org/changeset/base/274919 Log: Fix r274855: use proper unlock method. Modified: projects/routing/sys/netinet/in.c Modified: projects/routing/sys/netinet/in.c ============================================================================== --- projects/routing/sys/netinet/in.c Sun Nov 23 16:27:31 2014 (r274918) +++ projects/routing/sys/netinet/in.c Sun Nov 23 16:40:33 2014 (r274919) @@ -160,7 +160,7 @@ in_localaddr(struct in_addr in) IN_IFADDR_RUN_RLOCK(); TAILQ_FOREACH(ia, &V_in_ifaddrhead, ia_link) { if ((i & ia->ia_subnetmask) == ia->ia_subnet) { - IN_IFADDR_RUNLOCK(); + IN_IFADDR_RUN_RUNLOCK(); return (1); } } @@ -181,7 +181,7 @@ in_localip(struct in_addr in) IN_IFADDR_RUN_RLOCK(); LIST_FOREACH(ia, INADDR_HASH(in.s_addr), ia_hash) { if (IA_SIN(ia)->sin_addr.s_addr == in.s_addr) { - IN_IFADDR_RUNLOCK(); + IN_IFADDR_RUN_RUNLOCK(); return (1); } } @@ -204,7 +204,7 @@ in_localip_more(struct in_ifaddr *ia) LIST_FOREACH(it, INADDR_HASH(in), ia_hash) { if (it != ia && IA_SIN(it)->sin_addr.s_addr == in) { ifa_ref(&it->ia_ifa); - IN_IFADDR_RUNLOCK(); + IN_IFADDR_RUN_RUNLOCK(); return (it); } } From owner-svn-src-projects@FreeBSD.ORG Sun Nov 23 17:45:50 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B62F0E3; Sun, 23 Nov 2014 17:45:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A2EE8F69; Sun, 23 Nov 2014 17:45:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sANHjoQc088620; Sun, 23 Nov 2014 17:45:50 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sANHjoCq088619; Sun, 23 Nov 2014 17:45:50 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411231745.sANHjoCq088619@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sun, 23 Nov 2014 17:45:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274920 - projects/routing/sys/net X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Nov 2014 17:45:50 -0000 Author: melifaro Date: Sun Nov 23 17:45:49 2014 New Revision: 274920 URL: https://svnweb.freebsd.org/changeset/base/274920 Log: Do not try to unlock lle which is not locked. This is not a proper fix, proper one is on the way. Modified: projects/routing/sys/net/rt_nhops.c Modified: projects/routing/sys/net/rt_nhops.c ============================================================================== --- projects/routing/sys/net/rt_nhops.c Sun Nov 23 16:40:33 2014 (r274919) +++ projects/routing/sys/net/rt_nhops.c Sun Nov 23 17:45:49 2014 (r274920) @@ -711,13 +711,10 @@ fib6_storelladdr(struct ifnet *ifp, stru */ if (ln == NULL || (ln->ln_state != ND6_LLINFO_REACHABLE && ln->ln_state != ND6_LLINFO_DELAY)) { - if (ln != NULL) - LLE_RUNLOCK(ln); IF_AFDATA_RUN_RUNLOCK(ifp); return (1); } bcopy(&ln->ll_addr, desten, ifp->if_addrlen); - LLE_RUNLOCK(ln); IF_AFDATA_RUN_RUNLOCK(ifp); return (0); From owner-svn-src-projects@FreeBSD.ORG Sun Nov 23 17:47:12 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E5F012B4; Sun, 23 Nov 2014 17:47:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D279CF82; Sun, 23 Nov 2014 17:47:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sANHlCZ1088841; Sun, 23 Nov 2014 17:47:12 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sANHlC9Y088840; Sun, 23 Nov 2014 17:47:12 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411231747.sANHlC9Y088840@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sun, 23 Nov 2014 17:47:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274921 - projects/routing/sys/net X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Nov 2014 17:47:13 -0000 Author: melifaro Date: Sun Nov 23 17:47:12 2014 New Revision: 274921 URL: https://svnweb.freebsd.org/changeset/base/274921 Log: Finish r274335#2: put RT_LOCK_DESTROY() back. Modified: projects/routing/sys/net/route.c Modified: projects/routing/sys/net/route.c ============================================================================== --- projects/routing/sys/net/route.c Sun Nov 23 17:45:49 2014 (r274920) +++ projects/routing/sys/net/route.c Sun Nov 23 17:47:12 2014 (r274921) @@ -1505,6 +1505,7 @@ rtrequest1_fib(int req, struct rt_addrin if (rn == NULL) { ifa_free(rt->rt_ifa); Free(rt_key(rt)); + RT_LOCK_DESTROY(rt); uma_zfree(V_rtzone, rt); #ifdef FLOWTABLE if (rt0 != NULL) From owner-svn-src-projects@FreeBSD.ORG Mon Nov 24 02:34:02 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 90A04B50; Mon, 24 Nov 2014 02:34:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7E1FB942; Mon, 24 Nov 2014 02:34:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAO2Y24N041269; Mon, 24 Nov 2014 02:34:02 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAO2Y2Sx041268; Mon, 24 Nov 2014 02:34:02 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201411240234.sAO2Y2Sx041268@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 24 Nov 2014 02:34:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274945 - projects/release-vmimage/release/tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Nov 2014 02:34:02 -0000 Author: gjb Date: Mon Nov 24 02:34:01 2014 New Revision: 274945 URL: https://svnweb.freebsd.org/changeset/base/274945 Log: In vm_extra_install_packages(), only bootstrap pkg(8) if VM_EXTRA_PACKAGES is empty. In vm_extra_pre_umount(), cleanup downloaded packages if pkg(8) was bootstrapped earlier. Inspired by: cperciva Sponsored by: The FreeBSD Foundation Modified: projects/release-vmimage/release/tools/vmimage.subr Modified: projects/release-vmimage/release/tools/vmimage.subr ============================================================================== --- projects/release-vmimage/release/tools/vmimage.subr Mon Nov 24 01:59:08 2014 (r274944) +++ projects/release-vmimage/release/tools/vmimage.subr Mon Nov 24 02:34:01 2014 (r274945) @@ -114,14 +114,15 @@ vm_extra_enable_services() { } vm_extra_install_packages() { + if [ -z "${VM_EXTRA_PACKAGES}" ]; then + return 0 + fi mkdir -p ${DESTDIR}/dev mount -t devfs devfs ${DESTDIR}/dev chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes \ /usr/sbin/pkg bootstrap -y - if [ ! -z "${VM_EXTRA_PACKAGES}" ]; then chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes \ /usr/sbin/pkg install -y ${VM_EXTRA_PACKAGES} - fi umount ${DESTDIR}/dev return 0 @@ -138,6 +139,10 @@ vm_extra_pre_umount() { # Prototype. When overridden, installs additional ports within the # virtual machine environment. + if [ -e ${DESTDIR}/usr/local/sbin/pkg ]; then + chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes \ + /usr/local/sbin/pkg clean -y -a + fi rm -f ${DESTDIR}/etc/resolv.conf return 0 From owner-svn-src-projects@FreeBSD.ORG Mon Nov 24 02:36:44 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4AF41C64; Mon, 24 Nov 2014 02:36:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 38E3A95D; Mon, 24 Nov 2014 02:36:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAO2aiWQ041667; Mon, 24 Nov 2014 02:36:44 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAO2aisF041666; Mon, 24 Nov 2014 02:36:44 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201411240236.sAO2aisF041666@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 24 Nov 2014 02:36:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274946 - projects/release-vmimage/release/tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Nov 2014 02:36:44 -0000 Author: gjb Date: Mon Nov 24 02:36:43 2014 New Revision: 274946 URL: https://svnweb.freebsd.org/changeset/base/274946 Log: Fix indentation nit. Sponsored by: The FreeBSD Foundation Modified: projects/release-vmimage/release/tools/vmimage.subr Modified: projects/release-vmimage/release/tools/vmimage.subr ============================================================================== --- projects/release-vmimage/release/tools/vmimage.subr Mon Nov 24 02:34:01 2014 (r274945) +++ projects/release-vmimage/release/tools/vmimage.subr Mon Nov 24 02:36:43 2014 (r274946) @@ -121,8 +121,8 @@ vm_extra_install_packages() { mount -t devfs devfs ${DESTDIR}/dev chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes \ /usr/sbin/pkg bootstrap -y - chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes \ - /usr/sbin/pkg install -y ${VM_EXTRA_PACKAGES} + chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes \ + /usr/sbin/pkg install -y ${VM_EXTRA_PACKAGES} umount ${DESTDIR}/dev return 0 From owner-svn-src-projects@FreeBSD.ORG Mon Nov 24 06:56:15 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 99C36328; Mon, 24 Nov 2014 06:56:15 +0000 (UTC) Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "cell.glebius.int.ru", Issuer "cell.glebius.int.ru" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 192D1356; Mon, 24 Nov 2014 06:56:13 +0000 (UTC) Received: from cell.glebius.int.ru (localhost [127.0.0.1]) by cell.glebius.int.ru (8.14.9/8.14.9) with ESMTP id sAO6pMV7077790 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 24 Nov 2014 09:51:22 +0300 (MSK) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebius.int.ru (8.14.9/8.14.9/Submit) id sAO6pMRR077789; Mon, 24 Nov 2014 09:51:22 +0300 (MSK) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Mon, 24 Nov 2014 09:51:22 +0300 From: Gleb Smirnoff To: "Alexander V. Chernikov" Subject: Re: svn commit: r274921 - projects/routing/sys/net Message-ID: <20141124065122.GE47144@FreeBSD.org> References: <201411231747.sANHlC9Y088840@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201411231747.sANHlC9Y088840@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Nov 2014 06:56:15 -0000 On Sun, Nov 23, 2014 at 05:47:12PM +0000, Alexander V. Chernikov wrote: A> Author: melifaro A> Date: Sun Nov 23 17:47:12 2014 A> New Revision: 274921 A> URL: https://svnweb.freebsd.org/changeset/base/274921 A> A> Log: A> Finish r274335#2: put RT_LOCK_DESTROY() back. A> A> Modified: A> projects/routing/sys/net/route.c A> A> Modified: projects/routing/sys/net/route.c A> ============================================================================== A> --- projects/routing/sys/net/route.c Sun Nov 23 17:45:49 2014 (r274920) A> +++ projects/routing/sys/net/route.c Sun Nov 23 17:47:12 2014 (r274921) A> @@ -1505,6 +1505,7 @@ rtrequest1_fib(int req, struct rt_addrin A> if (rn == NULL) { A> ifa_free(rt->rt_ifa); A> Free(rt_key(rt)); A> + RT_LOCK_DESTROY(rt); A> uma_zfree(V_rtzone, rt); A> #ifdef FLOWTABLE A> if (rt0 != NULL) Don't know about your branch, but in head RT_LOCK_DESTROY is done in V_rtzone finit method. So you are going to hit destroying of already destroyed mutex. btw, I see no good reason for virtualizing the zone. (Yep, I did that.) :) -- Totus tuus, Glebius. From owner-svn-src-projects@FreeBSD.ORG Mon Nov 24 07:48:47 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CFBA5AFB; Mon, 24 Nov 2014 07:48:47 +0000 (UTC) Received: from mail.fer.hr (mail.fer.hr [161.53.72.233]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client CN "mail.fer.hr", Issuer "TERENA SSL CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 63575A4B; Mon, 24 Nov 2014 07:48:46 +0000 (UTC) Received: from x23 (161.53.63.210) by MAIL.fer.hr (161.53.72.233) with Microsoft SMTP Server (TLS) id 14.2.342.3; Mon, 24 Nov 2014 08:48:37 +0100 Date: Mon, 24 Nov 2014 08:48:38 +0100 From: Marko Zec To: Gleb Smirnoff Subject: Re: svn commit: r274921 - projects/routing/sys/net Message-ID: <20141124084838.2af0f2cd@x23> In-Reply-To: <20141124065122.GE47144@FreeBSD.org> References: <201411231747.sANHlC9Y088840@svn.freebsd.org> <20141124065122.GE47144@FreeBSD.org> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.22; amd64-portbld-freebsd10.0) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [161.53.63.210] Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org, "Alexander V. Chernikov" X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Nov 2014 07:48:47 -0000 On Mon, 24 Nov 2014 09:51:22 +0300 Gleb Smirnoff wrote: > On Sun, Nov 23, 2014 at 05:47:12PM +0000, Alexander V. Chernikov > wrote: > A> Author: melifaro > A> Date: Sun Nov 23 17:47:12 2014 > A> New Revision: 274921 > A> URL: https://svnweb.freebsd.org/changeset/base/274921 > A> > A> Log: > A> Finish r274335#2: put RT_LOCK_DESTROY() back. > A> > A> Modified: > A> projects/routing/sys/net/route.c > A> > A> Modified: projects/routing/sys/net/route.c > A> ============================================================================== > A> --- projects/routing/sys/net/route.c Sun Nov 23 17:45:49 > A> 2014 (r274920) +++ projects/routing/sys/net/route.c > A> Sun Nov 23 17:47:12 2014 (r274921) @@ -1505,6 +1505,7 @@ > A> rtrequest1_fib(int req, struct rt_addrin if (rn == NULL) { > A> ifa_free(rt->rt_ifa); > A> Free(rt_key(rt)); > A> + RT_LOCK_DESTROY(rt); > A> uma_zfree(V_rtzone, rt); > A> #ifdef FLOWTABLE > A> if (rt0 != NULL) > > Don't know about your branch, but in head RT_LOCK_DESTROY is done > in V_rtzone finit method. So you are going to hit destroying of > already destroyed mutex. > > btw, I see no good reason for virtualizing the zone. (Yep, I did > that.) :) Having virtualized zones comes quite handy while hacking up new stuff to track VIMAGE memory leaks, but once the bugs get cleaned up and if the V_ stuff gets commited to head, it apparently becomes difficult to persuade people to de-virtualize... Marko From owner-svn-src-projects@FreeBSD.ORG Mon Nov 24 10:48:58 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0C85380E; Mon, 24 Nov 2014 10:48:58 +0000 (UTC) Received: from mail.ipfw.ru (mail.ipfw.ru [IPv6:2a01:4f8:120:6141::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C5D5DFC9; Mon, 24 Nov 2014 10:48:57 +0000 (UTC) Received: from [2a02:6b8:0:401:222:4dff:fe50:cd2f] (helo=ptichko.yndx.net) by mail.ipfw.ru with esmtpsa (TLSv1:DHE-RSA-AES128-SHA:128) (Exim 4.82 (FreeBSD)) (envelope-from ) id 1XsnBD-000EXj-13; Mon, 24 Nov 2014 10:31:23 +0400 Message-ID: <54730D08.3070201@FreeBSD.org> Date: Mon, 24 Nov 2014 14:48:40 +0400 From: "Alexander V. Chernikov" User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.1.2 MIME-Version: 1.0 To: Gleb Smirnoff Subject: Re: svn commit: r274921 - projects/routing/sys/net References: <201411231747.sANHlC9Y088840@svn.freebsd.org> <20141124065122.GE47144@FreeBSD.org> In-Reply-To: <20141124065122.GE47144@FreeBSD.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Nov 2014 10:48:58 -0000 On 24.11.2014 10:51, Gleb Smirnoff wrote: > On Sun, Nov 23, 2014 at 05:47:12PM +0000, Alexander V. Chernikov wrote: > A> Author: melifaro > A> Date: Sun Nov 23 17:47:12 2014 > A> New Revision: 274921 > A> URL: https://svnweb.freebsd.org/changeset/base/274921 > A> > A> Log: > A> Finish r274335#2: put RT_LOCK_DESTROY() back. > A> > A> Modified: > A> projects/routing/sys/net/route.c > A> > A> Modified: projects/routing/sys/net/route.c > A> ============================================================================== > A> --- projects/routing/sys/net/route.c Sun Nov 23 17:45:49 2014 (r274920) > A> +++ projects/routing/sys/net/route.c Sun Nov 23 17:47:12 2014 (r274921) > A> @@ -1505,6 +1505,7 @@ rtrequest1_fib(int req, struct rt_addrin > A> if (rn == NULL) { > A> ifa_free(rt->rt_ifa); > A> Free(rt_key(rt)); > A> + RT_LOCK_DESTROY(rt); > A> uma_zfree(V_rtzone, rt); > A> #ifdef FLOWTABLE > A> if (rt0 != NULL) > > Don't know about your branch, but in head RT_LOCK_DESTROY is done > in V_rtzone finit method. So you are going to hit destroying of Well, since there is no place to do rte accounting, I reverted r262763, so there is no init/fini UMA methods. > already destroyed mutex. > > btw, I see no good reason for virtualizing the zone. (Yep, I did that.) :) > From owner-svn-src-projects@FreeBSD.ORG Mon Nov 24 11:16:53 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 63753CF1; Mon, 24 Nov 2014 11:16:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 37E0B30C; Mon, 24 Nov 2014 11:16:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAOBGrp0087819; Mon, 24 Nov 2014 11:16:53 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAOBGrZs087817; Mon, 24 Nov 2014 11:16:53 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411241116.sAOBGrZs087817@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 24 Nov 2014 11:16:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274961 - projects/clang350-import X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Nov 2014 11:16:53 -0000 Author: dim Date: Mon Nov 24 11:16:52 2014 New Revision: 274961 URL: https://svnweb.freebsd.org/changeset/base/274961 Log: Create a branch for working on the clang 3.5.0 import. Added: projects/clang350-import/ - copied from r274960, head/ From owner-svn-src-projects@FreeBSD.ORG Mon Nov 24 12:39:51 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 948A7ED1; Mon, 24 Nov 2014 12:39:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 820B5DDF; Mon, 24 Nov 2014 12:39:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAOCdp8m025480; Mon, 24 Nov 2014 12:39:51 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAOCdpe0025479; Mon, 24 Nov 2014 12:39:51 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411241239.sAOCdpe0025479@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Mon, 24 Nov 2014 12:39:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274963 - projects/sendfile/sys/kern X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Nov 2014 12:39:51 -0000 Author: glebius Date: Mon Nov 24 12:39:50 2014 New Revision: 274963 URL: https://svnweb.freebsd.org/changeset/base/274963 Log: Even if application specified zero readahead, but current sendfile_swapin() run is limited by socket space, not by the "nbytes" argument, do readahead. Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/sendfile/sys/kern/uipc_syscalls.c Modified: projects/sendfile/sys/kern/uipc_syscalls.c ============================================================================== --- projects/sendfile/sys/kern/uipc_syscalls.c Mon Nov 24 11:37:27 2014 (r274962) +++ projects/sendfile/sys/kern/uipc_syscalls.c Mon Nov 24 12:39:50 2014 (r274963) @@ -2468,8 +2468,10 @@ retry_space: else npages = howmany(space, PAGE_SIZE); + rhpages = SF_READAHEAD(flags) ? + SF_READAHEAD(flags) : roundup2(rem - space, PAGE_SIZE); rhpages = min(howmany(obj_size - (off & ~PAGE_MASK) - - (npages * PAGE_SIZE), PAGE_SIZE), SF_READAHEAD(flags)); + (npages * PAGE_SIZE), PAGE_SIZE), rhpages); sfio = malloc(sizeof(struct sf_io) + (rhpages + npages) * sizeof(vm_page_t), M_TEMP, M_WAITOK); From owner-svn-src-projects@FreeBSD.ORG Mon Nov 24 17:02:31 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E4CA6E3; Mon, 24 Nov 2014 17:02:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CB584FB5; Mon, 24 Nov 2014 17:02:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAOH2VqU051968; Mon, 24 Nov 2014 17:02:31 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAOH2Rwn051948; Mon, 24 Nov 2014 17:02:27 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411241702.sAOH2Rwn051948@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 24 Nov 2014 17:02:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274968 - in projects/clang350-import/contrib/llvm: . include/llvm include/llvm-c include/llvm-c/Transforms include/llvm/ADT include/llvm/Analysis include/llvm/AsmParser include/llvm/As... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Nov 2014 17:02:32 -0000 Author: dim Date: Mon Nov 24 17:02:24 2014 New Revision: 274968 URL: https://svnweb.freebsd.org/changeset/base/274968 Log: Merge llvm 3.5.0 release from ^/vendor/llvm/dist, resolve conflicts, and preserve our customizations, where necessary. Added: projects/clang350-import/contrib/llvm/include/llvm-c/module.modulemap - copied unchanged from r274964, vendor/llvm/dist/include/llvm-c/module.modulemap projects/clang350-import/contrib/llvm/include/llvm/ADT/iterator.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/ADT/iterator.h projects/clang350-import/contrib/llvm/include/llvm/ADT/iterator_range.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/ADT/iterator_range.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/BlockFrequencyInfoImpl.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/Analysis/BlockFrequencyInfoImpl.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/CGSCCPassManager.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/Analysis/CGSCCPassManager.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/DominanceFrontierImpl.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/Analysis/DominanceFrontierImpl.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/JumpInstrTableInfo.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/Analysis/JumpInstrTableInfo.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/LazyCallGraph.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/Analysis/LazyCallGraph.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/RegionInfoImpl.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/Analysis/RegionInfoImpl.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/TargetFolder.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/Analysis/TargetFolder.h projects/clang350-import/contrib/llvm/include/llvm/AsmParser/ - copied from r274964, vendor/llvm/dist/include/llvm/AsmParser/ projects/clang350-import/contrib/llvm/include/llvm/Bitcode/BitcodeWriterPass.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/Bitcode/BitcodeWriterPass.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/JumpInstrTables.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/CodeGen/JumpInstrTables.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/LivePhysRegs.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/CodeGen/LivePhysRegs.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/MachineDominanceFrontier.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/CodeGen/MachineDominanceFrontier.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/MachineRegionInfo.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/CodeGen/MachineRegionInfo.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/MachineValueType.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/CodeGen/MachineValueType.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/PBQP/CostAllocator.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/CodeGen/PBQP/CostAllocator.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/PBQP/ReductionRules.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/CodeGen/PBQP/ReductionRules.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/PBQP/RegAllocSolver.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/CodeGen/PBQP/RegAllocSolver.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/StackMapLivenessAnalysis.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/CodeGen/StackMapLivenessAnalysis.h projects/clang350-import/contrib/llvm/include/llvm/ExecutionEngine/RuntimeDyldChecker.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/ExecutionEngine/RuntimeDyldChecker.h projects/clang350-import/contrib/llvm/include/llvm/IR/AssemblyAnnotationWriter.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/AssemblyAnnotationWriter.h projects/clang350-import/contrib/llvm/include/llvm/IR/AutoUpgrade.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/AutoUpgrade.h projects/clang350-import/contrib/llvm/include/llvm/IR/CFG.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/CFG.h projects/clang350-import/contrib/llvm/include/llvm/IR/CallSite.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/CallSite.h projects/clang350-import/contrib/llvm/include/llvm/IR/Comdat.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/Comdat.h projects/clang350-import/contrib/llvm/include/llvm/IR/ConstantFolder.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/ConstantFolder.h projects/clang350-import/contrib/llvm/include/llvm/IR/ConstantRange.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/ConstantRange.h projects/clang350-import/contrib/llvm/include/llvm/IR/DIBuilder.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/DIBuilder.h projects/clang350-import/contrib/llvm/include/llvm/IR/DebugInfo.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/DebugInfo.h projects/clang350-import/contrib/llvm/include/llvm/IR/DebugLoc.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/DebugLoc.h projects/clang350-import/contrib/llvm/include/llvm/IR/DiagnosticInfo.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/DiagnosticInfo.h projects/clang350-import/contrib/llvm/include/llvm/IR/DiagnosticPrinter.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/DiagnosticPrinter.h projects/clang350-import/contrib/llvm/include/llvm/IR/Dominators.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/Dominators.h projects/clang350-import/contrib/llvm/include/llvm/IR/GVMaterializer.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/GVMaterializer.h projects/clang350-import/contrib/llvm/include/llvm/IR/GetElementPtrTypeIterator.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/GetElementPtrTypeIterator.h projects/clang350-import/contrib/llvm/include/llvm/IR/GlobalObject.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/GlobalObject.h projects/clang350-import/contrib/llvm/include/llvm/IR/IRPrintingPasses.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/IRPrintingPasses.h projects/clang350-import/contrib/llvm/include/llvm/IR/InstIterator.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/InstIterator.h projects/clang350-import/contrib/llvm/include/llvm/IR/InstVisitor.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/InstVisitor.h projects/clang350-import/contrib/llvm/include/llvm/IR/LeakDetector.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/LeakDetector.h projects/clang350-import/contrib/llvm/include/llvm/IR/LegacyPassNameParser.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/LegacyPassNameParser.h projects/clang350-import/contrib/llvm/include/llvm/IR/Mangler.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/Mangler.h projects/clang350-import/contrib/llvm/include/llvm/IR/NoFolder.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/NoFolder.h projects/clang350-import/contrib/llvm/include/llvm/IR/PatternMatch.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/PatternMatch.h projects/clang350-import/contrib/llvm/include/llvm/IR/PredIteratorCache.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/PredIteratorCache.h projects/clang350-import/contrib/llvm/include/llvm/IR/ValueHandle.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/ValueHandle.h projects/clang350-import/contrib/llvm/include/llvm/IR/ValueMap.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/ValueMap.h projects/clang350-import/contrib/llvm/include/llvm/IR/Verifier.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/IR/Verifier.h projects/clang350-import/contrib/llvm/include/llvm/LineEditor/ - copied from r274964, vendor/llvm/dist/include/llvm/LineEditor/ projects/clang350-import/contrib/llvm/include/llvm/Linker/ - copied from r274964, vendor/llvm/dist/include/llvm/Linker/ projects/clang350-import/contrib/llvm/include/llvm/MC/ConstantPools.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/MC/ConstantPools.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCAnalysis/ - copied from r274964, vendor/llvm/dist/include/llvm/MC/MCAnalysis/ projects/clang350-import/contrib/llvm/include/llvm/MC/MCLinkerOptimizationHint.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/MC/MCLinkerOptimizationHint.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCTargetOptions.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/MC/MCTargetOptions.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCTargetOptionsCommandFlags.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/MC/MCTargetOptionsCommandFlags.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCWinCOFFStreamer.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/MC/MCWinCOFFStreamer.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCWinEH.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/MC/MCWinEH.h projects/clang350-import/contrib/llvm/include/llvm/MC/StringTableBuilder.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/MC/StringTableBuilder.h projects/clang350-import/contrib/llvm/include/llvm/MC/YAML.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/MC/YAML.h projects/clang350-import/contrib/llvm/include/llvm/Object/IRObjectFile.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/Object/IRObjectFile.h projects/clang350-import/contrib/llvm/include/llvm/Object/SymbolicFile.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/Object/SymbolicFile.h projects/clang350-import/contrib/llvm/include/llvm/PassInfo.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/PassInfo.h projects/clang350-import/contrib/llvm/include/llvm/ProfileData/ - copied from r274964, vendor/llvm/dist/include/llvm/ProfileData/ projects/clang350-import/contrib/llvm/include/llvm/Support/ARMBuildAttributes.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/Support/ARMBuildAttributes.h projects/clang350-import/contrib/llvm/include/llvm/Support/ARMEHABI.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/Support/ARMEHABI.h projects/clang350-import/contrib/llvm/include/llvm/Support/ARMWinEH.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/Support/ARMWinEH.h projects/clang350-import/contrib/llvm/include/llvm/Support/EndianStream.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/Support/EndianStream.h projects/clang350-import/contrib/llvm/include/llvm/Support/Errc.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/Support/Errc.h projects/clang350-import/contrib/llvm/include/llvm/Support/GenericDomTree.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/Support/GenericDomTree.h projects/clang350-import/contrib/llvm/include/llvm/Support/GenericDomTreeConstruction.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/Support/GenericDomTreeConstruction.h projects/clang350-import/contrib/llvm/include/llvm/Support/LineIterator.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/Support/LineIterator.h projects/clang350-import/contrib/llvm/include/llvm/Support/OnDiskHashTable.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/Support/OnDiskHashTable.h projects/clang350-import/contrib/llvm/include/llvm/Support/RandomNumberGenerator.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/Support/RandomNumberGenerator.h projects/clang350-import/contrib/llvm/include/llvm/Support/ScaledNumber.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/Support/ScaledNumber.h projects/clang350-import/contrib/llvm/include/llvm/Support/SpecialCaseList.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/Support/SpecialCaseList.h projects/clang350-import/contrib/llvm/include/llvm/Support/WindowsError.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/Support/WindowsError.h projects/clang350-import/contrib/llvm/include/llvm/TableGen/SetTheory.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/TableGen/SetTheory.h projects/clang350-import/contrib/llvm/include/llvm/Transforms/Utils/ASanStackFrameLayout.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/Transforms/Utils/ASanStackFrameLayout.h projects/clang350-import/contrib/llvm/include/llvm/Transforms/Utils/CtorUtils.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/Transforms/Utils/CtorUtils.h projects/clang350-import/contrib/llvm/include/llvm/Transforms/Utils/VectorUtils.h - copied unchanged from r274964, vendor/llvm/dist/include/llvm/Transforms/Utils/VectorUtils.h projects/clang350-import/contrib/llvm/include/llvm/module.modulemap - copied unchanged from r274964, vendor/llvm/dist/include/llvm/module.modulemap projects/clang350-import/contrib/llvm/include/llvm/module.modulemap.build - copied unchanged from r274964, vendor/llvm/dist/include/llvm/module.modulemap.build projects/clang350-import/contrib/llvm/lib/Analysis/BlockFrequencyInfoImpl.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Analysis/BlockFrequencyInfoImpl.cpp projects/clang350-import/contrib/llvm/lib/Analysis/CGSCCPassManager.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Analysis/CGSCCPassManager.cpp projects/clang350-import/contrib/llvm/lib/Analysis/JumpInstrTableInfo.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Analysis/JumpInstrTableInfo.cpp projects/clang350-import/contrib/llvm/lib/Analysis/LazyCallGraph.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Analysis/LazyCallGraph.cpp projects/clang350-import/contrib/llvm/lib/AsmParser/module.modulemap - copied unchanged from r274964, vendor/llvm/dist/lib/AsmParser/module.modulemap projects/clang350-import/contrib/llvm/lib/Bitcode/module.modulemap - copied unchanged from r274964, vendor/llvm/dist/lib/Bitcode/module.modulemap projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/AddressPool.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/CodeGen/AsmPrinter/AddressPool.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/AddressPool.h - copied unchanged from r274964, vendor/llvm/dist/lib/CodeGen/AsmPrinter/AddressPool.h projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterHandler.h - copied unchanged from r274964, vendor/llvm/dist/lib/CodeGen/AsmPrinter/AsmPrinterHandler.h projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/ByteStreamer.h - copied unchanged from r274964, vendor/llvm/dist/lib/CodeGen/AsmPrinter/ByteStreamer.h projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/DbgValueHistoryCalculator.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/CodeGen/AsmPrinter/DbgValueHistoryCalculator.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/DbgValueHistoryCalculator.h - copied unchanged from r274964, vendor/llvm/dist/lib/CodeGen/AsmPrinter/DbgValueHistoryCalculator.h projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/DebugLocEntry.h - copied unchanged from r274964, vendor/llvm/dist/lib/CodeGen/AsmPrinter/DebugLocEntry.h projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/DebugLocList.h - copied unchanged from r274964, vendor/llvm/dist/lib/CodeGen/AsmPrinter/DebugLocList.h projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfFile.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/CodeGen/AsmPrinter/DwarfFile.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfFile.h - copied unchanged from r274964, vendor/llvm/dist/lib/CodeGen/AsmPrinter/DwarfFile.h projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfStringPool.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/CodeGen/AsmPrinter/DwarfStringPool.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfStringPool.h - copied unchanged from r274964, vendor/llvm/dist/lib/CodeGen/AsmPrinter/DwarfStringPool.h projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/CodeGen/AsmPrinter/DwarfUnit.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.h - copied unchanged from r274964, vendor/llvm/dist/lib/CodeGen/AsmPrinter/DwarfUnit.h projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/EHStreamer.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/CodeGen/AsmPrinter/EHStreamer.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/EHStreamer.h - copied unchanged from r274964, vendor/llvm/dist/lib/CodeGen/AsmPrinter/EHStreamer.h projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/WinCodeViewLineTables.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/CodeGen/AsmPrinter/WinCodeViewLineTables.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/WinCodeViewLineTables.h - copied unchanged from r274964, vendor/llvm/dist/lib/CodeGen/AsmPrinter/WinCodeViewLineTables.h projects/clang350-import/contrib/llvm/lib/CodeGen/AtomicExpandLoadLinkedPass.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/CodeGen/AtomicExpandLoadLinkedPass.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/CodeGenPrepare.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/CodeGen/CodeGenPrepare.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/GlobalMerge.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/CodeGen/GlobalMerge.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/JumpInstrTables.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/CodeGen/JumpInstrTables.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/LivePhysRegs.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/CodeGen/LivePhysRegs.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/MachineDominanceFrontier.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/CodeGen/MachineDominanceFrontier.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/MachineRegionInfo.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/CodeGen/MachineRegionInfo.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/StackMapLivenessAnalysis.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/CodeGen/StackMapLivenessAnalysis.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/module.modulemap - copied unchanged from r274964, vendor/llvm/dist/lib/CodeGen/module.modulemap projects/clang350-import/contrib/llvm/lib/DebugInfo/module.modulemap - copied unchanged from r274964, vendor/llvm/dist/lib/DebugInfo/module.modulemap projects/clang350-import/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp projects/clang350-import/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/Targets/ - copied from r274964, vendor/llvm/dist/lib/ExecutionEngine/RuntimeDyld/Targets/ projects/clang350-import/contrib/llvm/lib/IR/Comdat.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/IR/Comdat.cpp projects/clang350-import/contrib/llvm/lib/IR/ConstantRange.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/IR/ConstantRange.cpp projects/clang350-import/contrib/llvm/lib/IR/DiagnosticInfo.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/IR/DiagnosticInfo.cpp projects/clang350-import/contrib/llvm/lib/IR/DiagnosticPrinter.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/IR/DiagnosticPrinter.cpp projects/clang350-import/contrib/llvm/lib/IR/IRPrintingPasses.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/IR/IRPrintingPasses.cpp projects/clang350-import/contrib/llvm/lib/IR/MDBuilder.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/IR/MDBuilder.cpp projects/clang350-import/contrib/llvm/lib/IR/Mangler.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/IR/Mangler.cpp projects/clang350-import/contrib/llvm/lib/IR/module.modulemap - copied unchanged from r274964, vendor/llvm/dist/lib/IR/module.modulemap projects/clang350-import/contrib/llvm/lib/LineEditor/ - copied from r274964, vendor/llvm/dist/lib/LineEditor/ projects/clang350-import/contrib/llvm/lib/MC/ConstantPools.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/MC/ConstantPools.cpp projects/clang350-import/contrib/llvm/lib/MC/MCAnalysis/ - copied from r274964, vendor/llvm/dist/lib/MC/MCAnalysis/ projects/clang350-import/contrib/llvm/lib/MC/MCLinkerOptimizationHint.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/MC/MCLinkerOptimizationHint.cpp projects/clang350-import/contrib/llvm/lib/MC/MCTargetOptions.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/MC/MCTargetOptions.cpp projects/clang350-import/contrib/llvm/lib/MC/StringTableBuilder.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/MC/StringTableBuilder.cpp projects/clang350-import/contrib/llvm/lib/MC/YAML.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/MC/YAML.cpp projects/clang350-import/contrib/llvm/lib/Object/IRObjectFile.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Object/IRObjectFile.cpp projects/clang350-import/contrib/llvm/lib/Object/RecordStreamer.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Object/RecordStreamer.cpp projects/clang350-import/contrib/llvm/lib/Object/RecordStreamer.h - copied unchanged from r274964, vendor/llvm/dist/lib/Object/RecordStreamer.h projects/clang350-import/contrib/llvm/lib/Object/SymbolicFile.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Object/SymbolicFile.cpp projects/clang350-import/contrib/llvm/lib/ProfileData/ - copied from r274964, vendor/llvm/dist/lib/ProfileData/ projects/clang350-import/contrib/llvm/lib/Support/ARMBuildAttrs.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Support/ARMBuildAttrs.cpp projects/clang350-import/contrib/llvm/lib/Support/ARMWinEH.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Support/ARMWinEH.cpp projects/clang350-import/contrib/llvm/lib/Support/LEB128.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Support/LEB128.cpp projects/clang350-import/contrib/llvm/lib/Support/LineIterator.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Support/LineIterator.cpp projects/clang350-import/contrib/llvm/lib/Support/RandomNumberGenerator.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Support/RandomNumberGenerator.cpp projects/clang350-import/contrib/llvm/lib/Support/ScaledNumber.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Support/ScaledNumber.cpp projects/clang350-import/contrib/llvm/lib/Support/SpecialCaseList.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Support/SpecialCaseList.cpp projects/clang350-import/contrib/llvm/lib/Support/Windows/WindowsSupport.h - copied unchanged from r274964, vendor/llvm/dist/lib/Support/Windows/WindowsSupport.h projects/clang350-import/contrib/llvm/lib/TableGen/SetTheory.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/TableGen/SetTheory.cpp projects/clang350-import/contrib/llvm/lib/TableGen/module.modulemap - copied unchanged from r274964, vendor/llvm/dist/lib/TableGen/module.modulemap projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64AddressTypePromotion.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/AArch64/AArch64AddressTypePromotion.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64AdvSIMDScalarPass.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/AArch64/AArch64AdvSIMDScalarPass.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64BranchRelaxation.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/AArch64/AArch64BranchRelaxation.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64CallingConvention.td - copied unchanged from r274964, vendor/llvm/dist/lib/Target/AArch64/AArch64CallingConvention.td projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64CleanupLocalDynamicTLSPass.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/AArch64/AArch64CleanupLocalDynamicTLSPass.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64CollectLOH.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/AArch64/AArch64CollectLOH.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64ConditionalCompares.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/AArch64/AArch64ConditionalCompares.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64DeadRegisterDefinitionsPass.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/AArch64/AArch64DeadRegisterDefinitionsPass.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64ExpandPseudoInsts.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/AArch64/AArch64ExpandPseudoInsts.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64FastISel.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/AArch64/AArch64FastISel.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64InstrAtomics.td - copied unchanged from r274964, vendor/llvm/dist/lib/Target/AArch64/AArch64InstrAtomics.td projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64LoadStoreOptimizer.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/AArch64/AArch64LoadStoreOptimizer.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64MCInstLower.h - copied unchanged from r274964, vendor/llvm/dist/lib/Target/AArch64/AArch64MCInstLower.h projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64PerfectShuffle.h - copied unchanged from r274964, vendor/llvm/dist/lib/Target/AArch64/AArch64PerfectShuffle.h projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64PromoteConstant.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/AArch64/AArch64PromoteConstant.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64SchedA53.td - copied unchanged from r274964, vendor/llvm/dist/lib/Target/AArch64/AArch64SchedA53.td projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64SchedA57.td - copied unchanged from r274964, vendor/llvm/dist/lib/Target/AArch64/AArch64SchedA57.td projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64SchedA57WriteRes.td - copied unchanged from r274964, vendor/llvm/dist/lib/Target/AArch64/AArch64SchedA57WriteRes.td projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64SchedCyclone.td - copied unchanged from r274964, vendor/llvm/dist/lib/Target/AArch64/AArch64SchedCyclone.td projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64StorePairSuppress.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/AArch64/AArch64StorePairSuppress.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64TargetTransformInfo.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/AArch64/AArch64TargetTransformInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/Disassembler/AArch64Disassembler.h - copied unchanged from r274964, vendor/llvm/dist/lib/Target/AArch64/Disassembler/AArch64Disassembler.h projects/clang350-import/contrib/llvm/lib/Target/AArch64/Disassembler/AArch64ExternalSymbolizer.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/AArch64/Disassembler/AArch64ExternalSymbolizer.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/Disassembler/AArch64ExternalSymbolizer.h - copied unchanged from r274964, vendor/llvm/dist/lib/Target/AArch64/Disassembler/AArch64ExternalSymbolizer.h projects/clang350-import/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64AddressingModes.h - copied unchanged from r274964, vendor/llvm/dist/lib/Target/AArch64/MCTargetDesc/AArch64AddressingModes.h projects/clang350-import/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MachObjectWriter.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/AArch64/MCTargetDesc/AArch64MachObjectWriter.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMOptimizeBarriersPass.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/ARM/ARMOptimizeBarriersPass.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMArchName.def - copied unchanged from r274964, vendor/llvm/dist/lib/Target/ARM/MCTargetDesc/ARMArchName.def projects/clang350-import/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMArchName.h - copied unchanged from r274964, vendor/llvm/dist/lib/Target/ARM/MCTargetDesc/ARMArchName.h projects/clang350-import/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMTargetStreamer.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/ARM/MCTargetDesc/ARMTargetStreamer.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMWinCOFFObjectWriter.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/ARM/MCTargetDesc/ARMWinCOFFObjectWriter.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMWinCOFFStreamer.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/ARM/MCTargetDesc/ARMWinCOFFStreamer.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsABIFlagsSection.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/Mips/MCTargetDesc/MipsABIFlagsSection.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsABIFlagsSection.h - copied unchanged from r274964, vendor/llvm/dist/lib/Target/Mips/MCTargetDesc/MipsABIFlagsSection.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsAsmBackend.h - copied unchanged from r274964, vendor/llvm/dist/lib/Target/Mips/MCTargetDesc/MipsAsmBackend.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.h - copied unchanged from r274964, vendor/llvm/dist/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.h - copied unchanged from r274964, vendor/llvm/dist/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCExpr.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/Mips/MCTargetDesc/MipsMCExpr.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCExpr.h - copied unchanged from r274964, vendor/llvm/dist/lib/Target/Mips/MCTargetDesc/MipsMCExpr.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCNaCl.h - copied unchanged from r274964, vendor/llvm/dist/lib/Target/Mips/MCTargetDesc/MipsMCNaCl.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsNaClELFStreamer.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/Mips/MCTargetDesc/MipsNaClELFStreamer.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsOptionRecord.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/Mips/MCTargetDesc/MipsOptionRecord.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MicroMipsInstrFPU.td - copied unchanged from r274964, vendor/llvm/dist/lib/Target/Mips/MicroMipsInstrFPU.td projects/clang350-import/contrib/llvm/lib/Target/Mips/Mips16HardFloatInfo.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/Mips/Mips16HardFloatInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/Mips16HardFloatInfo.h - copied unchanged from r274964, vendor/llvm/dist/lib/Target/Mips/Mips16HardFloatInfo.h projects/clang350-import/contrib/llvm/lib/Target/Mips/Mips32r6InstrFormats.td - copied unchanged from r274964, vendor/llvm/dist/lib/Target/Mips/Mips32r6InstrFormats.td projects/clang350-import/contrib/llvm/lib/Target/Mips/Mips32r6InstrInfo.td - copied unchanged from r274964, vendor/llvm/dist/lib/Target/Mips/Mips32r6InstrInfo.td projects/clang350-import/contrib/llvm/lib/Target/Mips/Mips64r6InstrInfo.td - copied unchanged from r274964, vendor/llvm/dist/lib/Target/Mips/Mips64r6InstrInfo.td projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsFastISel.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/Mips/MipsFastISel.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsOptimizePICCall.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/Mips/MipsOptimizePICCall.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsOptionRecord.h - copied unchanged from r274964, vendor/llvm/dist/lib/Target/Mips/MipsOptionRecord.h projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXAssignValidGlobalNames.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/NVPTX/NVPTXAssignValidGlobalNames.cpp projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXFavorNonGenericAddrSpaces.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/NVPTX/NVPTXFavorNonGenericAddrSpaces.cpp projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXImageOptimizer.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/NVPTX/NVPTXImageOptimizer.cpp projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXMachineFunctionInfo.h - copied unchanged from r274964, vendor/llvm/dist/lib/Target/NVPTX/NVPTXMachineFunctionInfo.h projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXReplaceImageHandles.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/NVPTX/NVPTXReplaceImageHandles.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/Disassembler/ - copied from r274964, vendor/llvm/dist/lib/Target/PowerPC/Disassembler/ projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCInstrVSX.td - copied unchanged from r274964, vendor/llvm/dist/lib/Target/PowerPC/PPCInstrVSX.td projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCScheduleP7.td - copied unchanged from r274964, vendor/llvm/dist/lib/Target/PowerPC/PPCScheduleP7.td projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPUIntrinsicInfo.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/R600/AMDGPUIntrinsicInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPUIntrinsicInfo.h - copied unchanged from r274964, vendor/llvm/dist/lib/Target/R600/AMDGPUIntrinsicInfo.h projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPUPromoteAlloca.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/R600/AMDGPUPromoteAlloca.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/CaymanInstructions.td - copied unchanged from r274964, vendor/llvm/dist/lib/Target/R600/CaymanInstructions.td projects/clang350-import/contrib/llvm/lib/Target/R600/EvergreenInstructions.td - copied unchanged from r274964, vendor/llvm/dist/lib/Target/R600/EvergreenInstructions.td projects/clang350-import/contrib/llvm/lib/Target/R600/MCTargetDesc/AMDGPUFixupKinds.h - copied unchanged from r274964, vendor/llvm/dist/lib/Target/R600/MCTargetDesc/AMDGPUFixupKinds.h projects/clang350-import/contrib/llvm/lib/Target/R600/R700Instructions.td - copied unchanged from r274964, vendor/llvm/dist/lib/Target/R600/R700Instructions.td projects/clang350-import/contrib/llvm/lib/Target/R600/SIFixSGPRLiveRanges.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/R600/SIFixSGPRLiveRanges.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/SILowerI1Copies.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/R600/SILowerI1Copies.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/SIShrinkInstructions.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/R600/SIShrinkInstructions.cpp projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcInstrVIS.td - copied unchanged from r274964, vendor/llvm/dist/lib/Target/Sparc/SparcInstrVIS.td projects/clang350-import/contrib/llvm/lib/Target/X86/AsmParser/X86AsmInstrumentation.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/X86/AsmParser/X86AsmInstrumentation.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/AsmParser/X86AsmInstrumentation.h - copied unchanged from r274964, vendor/llvm/dist/lib/Target/X86/AsmParser/X86AsmInstrumentation.h projects/clang350-import/contrib/llvm/lib/Target/X86/AsmParser/X86AsmParserCommon.h - copied unchanged from r274964, vendor/llvm/dist/lib/Target/X86/AsmParser/X86AsmParserCommon.h projects/clang350-import/contrib/llvm/lib/Target/X86/AsmParser/X86Operand.h - copied unchanged from r274964, vendor/llvm/dist/lib/Target/X86/AsmParser/X86Operand.h projects/clang350-import/contrib/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/MCTargetDesc/X86WinCOFFStreamer.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/X86/MCTargetDesc/X86WinCOFFStreamer.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/X86AtomicExpandPass.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/X86/X86AtomicExpandPass.cpp projects/clang350-import/contrib/llvm/lib/Target/XCore/XCoreFrameToArgsOffsetElim.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Target/XCore/XCoreFrameToArgsOffsetElim.cpp projects/clang350-import/contrib/llvm/lib/Target/XCore/XCoreTargetStreamer.h - copied unchanged from r274964, vendor/llvm/dist/lib/Target/XCore/XCoreTargetStreamer.h projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/ConstantHoisting.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Transforms/Scalar/ConstantHoisting.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/LoadCombine.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Transforms/Scalar/LoadCombine.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/MergedLoadStoreMotion.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Transforms/Scalar/MergedLoadStoreMotion.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/Scalarizer.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Transforms/Scalar/Scalarizer.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/SeparateConstOffsetFromGEP.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Transforms/Scalar/SeparateConstOffsetFromGEP.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/ASanStackFrameLayout.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Transforms/Utils/ASanStackFrameLayout.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/AddDiscriminators.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Transforms/Utils/AddDiscriminators.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/CtorUtils.cpp - copied unchanged from r274964, vendor/llvm/dist/lib/Transforms/Utils/CtorUtils.cpp projects/clang350-import/contrib/llvm/tools/lli/RPCChannel.h - copied unchanged from r274964, vendor/llvm/dist/tools/lli/RPCChannel.h projects/clang350-import/contrib/llvm/tools/lli/Unix/RPCChannel.inc - copied unchanged from r274964, vendor/llvm/dist/tools/lli/Unix/RPCChannel.inc projects/clang350-import/contrib/llvm/tools/lli/Windows/RPCChannel.inc - copied unchanged from r274964, vendor/llvm/dist/tools/lli/Windows/RPCChannel.inc projects/clang350-import/contrib/llvm/tools/llvm-readobj/ARMAttributeParser.cpp - copied unchanged from r274964, vendor/llvm/dist/tools/llvm-readobj/ARMAttributeParser.cpp projects/clang350-import/contrib/llvm/tools/llvm-readobj/ARMAttributeParser.h - copied unchanged from r274964, vendor/llvm/dist/tools/llvm-readobj/ARMAttributeParser.h projects/clang350-import/contrib/llvm/tools/llvm-readobj/ARMEHABIPrinter.h - copied unchanged from r274964, vendor/llvm/dist/tools/llvm-readobj/ARMEHABIPrinter.h projects/clang350-import/contrib/llvm/tools/llvm-readobj/ARMWinEHPrinter.cpp - copied unchanged from r274964, vendor/llvm/dist/tools/llvm-readobj/ARMWinEHPrinter.cpp projects/clang350-import/contrib/llvm/tools/llvm-readobj/ARMWinEHPrinter.h - copied unchanged from r274964, vendor/llvm/dist/tools/llvm-readobj/ARMWinEHPrinter.h projects/clang350-import/contrib/llvm/tools/llvm-readobj/Win64EHDumper.cpp - copied unchanged from r274964, vendor/llvm/dist/tools/llvm-readobj/Win64EHDumper.cpp projects/clang350-import/contrib/llvm/tools/llvm-readobj/Win64EHDumper.h - copied unchanged from r274964, vendor/llvm/dist/tools/llvm-readobj/Win64EHDumper.h projects/clang350-import/contrib/llvm/tools/opt/BreakpointPrinter.cpp - copied unchanged from r274964, vendor/llvm/dist/tools/opt/BreakpointPrinter.cpp projects/clang350-import/contrib/llvm/tools/opt/BreakpointPrinter.h - copied unchanged from r274964, vendor/llvm/dist/tools/opt/BreakpointPrinter.h projects/clang350-import/contrib/llvm/tools/opt/NewPMDriver.cpp - copied unchanged from r274964, vendor/llvm/dist/tools/opt/NewPMDriver.cpp projects/clang350-import/contrib/llvm/tools/opt/NewPMDriver.h - copied unchanged from r274964, vendor/llvm/dist/tools/opt/NewPMDriver.h projects/clang350-import/contrib/llvm/tools/opt/PassPrinters.cpp - copied unchanged from r274964, vendor/llvm/dist/tools/opt/PassPrinters.cpp projects/clang350-import/contrib/llvm/tools/opt/PassPrinters.h - copied unchanged from r274964, vendor/llvm/dist/tools/opt/PassPrinters.h projects/clang350-import/contrib/llvm/tools/opt/PassRegistry.def - copied unchanged from r274964, vendor/llvm/dist/tools/opt/PassRegistry.def projects/clang350-import/contrib/llvm/tools/opt/Passes.cpp - copied unchanged from r274964, vendor/llvm/dist/tools/opt/Passes.cpp projects/clang350-import/contrib/llvm/tools/opt/Passes.h - copied unchanged from r274964, vendor/llvm/dist/tools/opt/Passes.h projects/clang350-import/contrib/llvm/utils/TableGen/module.modulemap - copied unchanged from r274964, vendor/llvm/dist/utils/TableGen/module.modulemap Deleted: projects/clang350-import/contrib/llvm/include/llvm/ADT/ImmutableIntervalMap.h projects/clang350-import/contrib/llvm/include/llvm/ADT/OwningPtr.h projects/clang350-import/contrib/llvm/include/llvm/ADT/ValueMap.h projects/clang350-import/contrib/llvm/include/llvm/ADT/polymorphic_ptr.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/BlockFrequencyImpl.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/DominatorInternals.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/Dominators.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/Verifier.h projects/clang350-import/contrib/llvm/include/llvm/Assembly/ projects/clang350-import/contrib/llvm/include/llvm/AutoUpgrade.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/LiveRegUnits.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/PBQP/HeuristicBase.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/PBQP/HeuristicSolver.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/PBQP/Heuristics/ projects/clang350-import/contrib/llvm/include/llvm/DIBuilder.h projects/clang350-import/contrib/llvm/include/llvm/DebugInfo.h projects/clang350-import/contrib/llvm/include/llvm/GVMaterializer.h projects/clang350-import/contrib/llvm/include/llvm/InstVisitor.h projects/clang350-import/contrib/llvm/include/llvm/Linker.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCAtom.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCFunction.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCModule.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCModuleYAML.h projects/clang350-import/contrib/llvm/include/llvm/Object/YAML.h projects/clang350-import/contrib/llvm/include/llvm/Support/CFG.h projects/clang350-import/contrib/llvm/include/llvm/Support/CallSite.h projects/clang350-import/contrib/llvm/include/llvm/Support/ConstantFolder.h projects/clang350-import/contrib/llvm/include/llvm/Support/ConstantRange.h projects/clang350-import/contrib/llvm/include/llvm/Support/DataFlow.h projects/clang350-import/contrib/llvm/include/llvm/Support/DebugLoc.h projects/clang350-import/contrib/llvm/include/llvm/Support/Disassembler.h projects/clang350-import/contrib/llvm/include/llvm/Support/FEnv.h projects/clang350-import/contrib/llvm/include/llvm/Support/GetElementPtrTypeIterator.h projects/clang350-import/contrib/llvm/include/llvm/Support/InstIterator.h projects/clang350-import/contrib/llvm/include/llvm/Support/LeakDetector.h projects/clang350-import/contrib/llvm/include/llvm/Support/NoFolder.h projects/clang350-import/contrib/llvm/include/llvm/Support/PassNameParser.h projects/clang350-import/contrib/llvm/include/llvm/Support/PatternMatch.h projects/clang350-import/contrib/llvm/include/llvm/Support/PredIteratorCache.h projects/clang350-import/contrib/llvm/include/llvm/Support/TargetFolder.h projects/clang350-import/contrib/llvm/include/llvm/Support/ValueHandle.h projects/clang350-import/contrib/llvm/include/llvm/Support/system_error.h projects/clang350-import/contrib/llvm/include/llvm/Target/Mangler.h projects/clang350-import/contrib/llvm/include/llvm/Transforms/Utils/SpecialCaseList.h projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/LiveRegUnits.cpp projects/clang350-import/contrib/llvm/lib/IR/PrintModulePass.cpp projects/clang350-import/contrib/llvm/lib/MC/MCAtom.cpp projects/clang350-import/contrib/llvm/lib/MC/MCFunction.cpp projects/clang350-import/contrib/llvm/lib/MC/MCModule.cpp projects/clang350-import/contrib/llvm/lib/MC/MCModuleYAML.cpp projects/clang350-import/contrib/llvm/lib/MC/MCObjectDisassembler.cpp projects/clang350-import/contrib/llvm/lib/MC/MCObjectSymbolizer.cpp projects/clang350-import/contrib/llvm/lib/MC/MCPureStreamer.cpp projects/clang350-import/contrib/llvm/lib/Object/YAML.cpp projects/clang350-import/contrib/llvm/lib/Support/ConstantRange.cpp projects/clang350-import/contrib/llvm/lib/Support/Disassembler.cpp projects/clang350-import/contrib/llvm/lib/Support/Unix/system_error.inc projects/clang350-import/contrib/llvm/lib/Support/Windows/Windows.h projects/clang350-import/contrib/llvm/lib/Support/Windows/system_error.inc projects/clang350-import/contrib/llvm/lib/Support/system_error.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64AsmPrinter.h projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64BranchFixupPass.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64CallingConv.td projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64InstrNEON.td projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64MachineFunctionInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/README.txt projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMBuildAttrs.h projects/clang350-import/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMUnwindOp.h projects/clang350-import/contrib/llvm/lib/Target/Mangler.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsReginfo.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsReginfo.h projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXSplitBBatBar.cpp projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXSplitBBatBar.h projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPUConvertToISA.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/AMDILBase.td projects/clang350-import/contrib/llvm/lib/Target/R600/AMDILISelLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/AMDILInstrInfo.td projects/clang350-import/contrib/llvm/lib/Target/R600/AMDILIntrinsicInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/AMDILIntrinsicInfo.h projects/clang350-import/contrib/llvm/lib/Target/R600/AMDILIntrinsics.td projects/clang350-import/contrib/llvm/lib/Target/R600/AMDILRegisterInfo.td projects/clang350-import/contrib/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c projects/clang350-import/contrib/llvm/lib/Target/X86/X86COFFMachineModuleInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/X86COFFMachineModuleInfo.h projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/GlobalMerge.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/SpecialCaseList.cpp projects/clang350-import/contrib/llvm/tools/lli/ChildTarget/Unix/ projects/clang350-import/contrib/llvm/tools/lli/ChildTarget/Windows/ projects/clang350-import/contrib/llvm/tools/lli/Unix/RemoteTargetExternal.inc projects/clang350-import/contrib/llvm/tools/lli/Windows/RemoteTargetExternal.inc projects/clang350-import/contrib/llvm/utils/TableGen/SetTheory.cpp projects/clang350-import/contrib/llvm/utils/TableGen/SetTheory.h projects/clang350-import/contrib/llvm/utils/TableGen/TGValueTypes.cpp Modified: projects/clang350-import/contrib/llvm/LICENSE.TXT projects/clang350-import/contrib/llvm/include/llvm-c/Core.h projects/clang350-import/contrib/llvm/include/llvm-c/Disassembler.h projects/clang350-import/contrib/llvm/include/llvm-c/ExecutionEngine.h projects/clang350-import/contrib/llvm/include/llvm-c/IRReader.h projects/clang350-import/contrib/llvm/include/llvm-c/Object.h projects/clang350-import/contrib/llvm/include/llvm-c/Support.h projects/clang350-import/contrib/llvm/include/llvm-c/TargetMachine.h projects/clang350-import/contrib/llvm/include/llvm-c/Transforms/PassManagerBuilder.h projects/clang350-import/contrib/llvm/include/llvm-c/Transforms/Scalar.h projects/clang350-import/contrib/llvm/include/llvm-c/lto.h projects/clang350-import/contrib/llvm/include/llvm/ADT/APFloat.h projects/clang350-import/contrib/llvm/include/llvm/ADT/APInt.h projects/clang350-import/contrib/llvm/include/llvm/ADT/APSInt.h projects/clang350-import/contrib/llvm/include/llvm/ADT/ArrayRef.h projects/clang350-import/contrib/llvm/include/llvm/ADT/BitVector.h projects/clang350-import/contrib/llvm/include/llvm/ADT/DenseMap.h projects/clang350-import/contrib/llvm/include/llvm/ADT/DenseSet.h projects/clang350-import/contrib/llvm/include/llvm/ADT/DepthFirstIterator.h projects/clang350-import/contrib/llvm/include/llvm/ADT/EquivalenceClasses.h projects/clang350-import/contrib/llvm/include/llvm/ADT/FoldingSet.h projects/clang350-import/contrib/llvm/include/llvm/ADT/Hashing.h projects/clang350-import/contrib/llvm/include/llvm/ADT/ImmutableMap.h projects/clang350-import/contrib/llvm/include/llvm/ADT/ImmutableSet.h projects/clang350-import/contrib/llvm/include/llvm/ADT/IntervalMap.h projects/clang350-import/contrib/llvm/include/llvm/ADT/IntrusiveRefCntPtr.h projects/clang350-import/contrib/llvm/include/llvm/ADT/MapVector.h projects/clang350-import/contrib/llvm/include/llvm/ADT/Optional.h projects/clang350-import/contrib/llvm/include/llvm/ADT/PointerIntPair.h projects/clang350-import/contrib/llvm/include/llvm/ADT/PointerUnion.h projects/clang350-import/contrib/llvm/include/llvm/ADT/PostOrderIterator.h projects/clang350-import/contrib/llvm/include/llvm/ADT/SCCIterator.h projects/clang350-import/contrib/llvm/include/llvm/ADT/STLExtras.h projects/clang350-import/contrib/llvm/include/llvm/ADT/ScopedHashTable.h projects/clang350-import/contrib/llvm/include/llvm/ADT/SetVector.h projects/clang350-import/contrib/llvm/include/llvm/ADT/SmallBitVector.h projects/clang350-import/contrib/llvm/include/llvm/ADT/SmallPtrSet.h projects/clang350-import/contrib/llvm/include/llvm/ADT/SmallSet.h projects/clang350-import/contrib/llvm/include/llvm/ADT/SmallString.h projects/clang350-import/contrib/llvm/include/llvm/ADT/SmallVector.h projects/clang350-import/contrib/llvm/include/llvm/ADT/SparseBitVector.h projects/clang350-import/contrib/llvm/include/llvm/ADT/SparseMultiSet.h projects/clang350-import/contrib/llvm/include/llvm/ADT/SparseSet.h projects/clang350-import/contrib/llvm/include/llvm/ADT/Statistic.h projects/clang350-import/contrib/llvm/include/llvm/ADT/StringExtras.h projects/clang350-import/contrib/llvm/include/llvm/ADT/StringMap.h projects/clang350-import/contrib/llvm/include/llvm/ADT/StringRef.h projects/clang350-import/contrib/llvm/include/llvm/ADT/StringSwitch.h projects/clang350-import/contrib/llvm/include/llvm/ADT/TinyPtrVector.h projects/clang350-import/contrib/llvm/include/llvm/ADT/Triple.h projects/clang350-import/contrib/llvm/include/llvm/ADT/Twine.h projects/clang350-import/contrib/llvm/include/llvm/ADT/UniqueVector.h projects/clang350-import/contrib/llvm/include/llvm/ADT/edit_distance.h projects/clang350-import/contrib/llvm/include/llvm/ADT/ilist.h projects/clang350-import/contrib/llvm/include/llvm/ADT/ilist_node.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/AliasAnalysis.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/AliasSetTracker.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/BlockFrequencyInfo.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/BranchProbabilityInfo.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/CFG.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/CFGPrinter.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/CallGraph.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/CallGraphSCCPass.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/CaptureTracking.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/CodeMetrics.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/ConstantFolding.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/ConstantsScanner.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/DOTGraphTraitsPass.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/DependenceAnalysis.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/DominanceFrontier.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/FindUsedTypes.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/IVUsers.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/InlineCost.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/InstructionSimplify.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/Interval.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/IntervalIterator.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/IntervalPartition.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/LazyValueInfo.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/LibCallAliasAnalysis.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/LibCallSemantics.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/Loads.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/LoopInfo.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/LoopInfoImpl.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/LoopPass.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/MemoryBuiltins.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/MemoryDependenceAnalysis.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/PHITransAddr.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/Passes.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/PostDominators.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/PtrUseVisitor.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/RegionInfo.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/RegionIterator.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/RegionPass.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/ScalarEvolution.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpander.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/SparsePropagation.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/TargetTransformInfo.h projects/clang350-import/contrib/llvm/include/llvm/Analysis/ValueTracking.h projects/clang350-import/contrib/llvm/include/llvm/Bitcode/BitstreamReader.h projects/clang350-import/contrib/llvm/include/llvm/Bitcode/BitstreamWriter.h projects/clang350-import/contrib/llvm/include/llvm/Bitcode/LLVMBitCodes.h projects/clang350-import/contrib/llvm/include/llvm/Bitcode/ReaderWriter.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/Analysis.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/AsmPrinter.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/CallingConvLower.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/CommandFlags.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/EdgeBundles.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/FastISel.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/GCMetadata.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/GCStrategy.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/GCs.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/IntrinsicLowering.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/JITCodeEmitter.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/LatencyPriorityQueue.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/LexicalScopes.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/LinkAllCodegenComponents.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/LiveInterval.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/LiveIntervalUnion.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/LiveRangeEdit.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/LiveRegMatrix.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/LiveStackAnalysis.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/LiveVariables.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/MachineBasicBlock.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/MachineBlockFrequencyInfo.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/MachineBranchProbabilityInfo.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/MachineCodeEmitter.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/MachineCodeInfo.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/MachineConstantPool.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/MachineDominators.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/MachineFrameInfo.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/MachineFunction.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/MachineFunctionAnalysis.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/MachineFunctionPass.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/MachineInstr.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/MachineInstrBuilder.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/MachineInstrBundle.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/MachineLoopInfo.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/MachineMemOperand.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/MachineModuleInfo.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/MachineOperand.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/MachinePassRegistry.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/MachinePostDominators.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/MachineRegisterInfo.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/MachineSSAUpdater.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/MachineScheduler.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/MachineTraceMetrics.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/PBQP/Graph.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/PBQP/Math.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/PBQP/Solution.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/Passes.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/PseudoSourceValue.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/RegAllocPBQP.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/RegisterClassInfo.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/RegisterPressure.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/RegisterScavenging.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/ResourcePriorityQueue.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/RuntimeLibcalls.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/ScheduleDAG.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/ScheduleDAGInstrs.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/ScheduleDFS.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/ScheduleHazardRecognizer.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/ScoreboardHazardRecognizer.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/SelectionDAGISel.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/SlotIndexes.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/StackMaps.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/StackProtector.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/TargetSchedule.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/ValueTypes.h projects/clang350-import/contrib/llvm/include/llvm/CodeGen/VirtRegMap.h projects/clang350-import/contrib/llvm/include/llvm/DebugInfo/DIContext.h projects/clang350-import/contrib/llvm/include/llvm/DebugInfo/DWARFFormValue.h projects/clang350-import/contrib/llvm/include/llvm/ExecutionEngine/ExecutionEngine.h projects/clang350-import/contrib/llvm/include/llvm/ExecutionEngine/JITEventListener.h projects/clang350-import/contrib/llvm/include/llvm/ExecutionEngine/ObjectBuffer.h projects/clang350-import/contrib/llvm/include/llvm/ExecutionEngine/ObjectImage.h projects/clang350-import/contrib/llvm/include/llvm/ExecutionEngine/RTDyldMemoryManager.h projects/clang350-import/contrib/llvm/include/llvm/ExecutionEngine/RuntimeDyld.h projects/clang350-import/contrib/llvm/include/llvm/ExecutionEngine/SectionMemoryManager.h projects/clang350-import/contrib/llvm/include/llvm/IR/Argument.h projects/clang350-import/contrib/llvm/include/llvm/IR/Attributes.h projects/clang350-import/contrib/llvm/include/llvm/IR/BasicBlock.h projects/clang350-import/contrib/llvm/include/llvm/IR/CallingConv.h projects/clang350-import/contrib/llvm/include/llvm/IR/Constant.h projects/clang350-import/contrib/llvm/include/llvm/IR/Constants.h projects/clang350-import/contrib/llvm/include/llvm/IR/DataLayout.h projects/clang350-import/contrib/llvm/include/llvm/IR/DerivedTypes.h projects/clang350-import/contrib/llvm/include/llvm/IR/Function.h projects/clang350-import/contrib/llvm/include/llvm/IR/GlobalAlias.h projects/clang350-import/contrib/llvm/include/llvm/IR/GlobalValue.h projects/clang350-import/contrib/llvm/include/llvm/IR/GlobalVariable.h projects/clang350-import/contrib/llvm/include/llvm/IR/IRBuilder.h projects/clang350-import/contrib/llvm/include/llvm/IR/InlineAsm.h projects/clang350-import/contrib/llvm/include/llvm/IR/InstrTypes.h projects/clang350-import/contrib/llvm/include/llvm/IR/Instruction.h projects/clang350-import/contrib/llvm/include/llvm/IR/Instructions.h projects/clang350-import/contrib/llvm/include/llvm/IR/IntrinsicInst.h projects/clang350-import/contrib/llvm/include/llvm/IR/Intrinsics.h projects/clang350-import/contrib/llvm/include/llvm/IR/Intrinsics.td projects/clang350-import/contrib/llvm/include/llvm/IR/IntrinsicsAArch64.td projects/clang350-import/contrib/llvm/include/llvm/IR/IntrinsicsARM.td projects/clang350-import/contrib/llvm/include/llvm/IR/IntrinsicsMips.td projects/clang350-import/contrib/llvm/include/llvm/IR/IntrinsicsNVVM.td projects/clang350-import/contrib/llvm/include/llvm/IR/IntrinsicsR600.td projects/clang350-import/contrib/llvm/include/llvm/IR/IntrinsicsX86.td projects/clang350-import/contrib/llvm/include/llvm/IR/IntrinsicsXCore.td projects/clang350-import/contrib/llvm/include/llvm/IR/LLVMContext.h projects/clang350-import/contrib/llvm/include/llvm/IR/LegacyPassManager.h projects/clang350-import/contrib/llvm/include/llvm/IR/LegacyPassManagers.h projects/clang350-import/contrib/llvm/include/llvm/IR/MDBuilder.h projects/clang350-import/contrib/llvm/include/llvm/IR/Metadata.h projects/clang350-import/contrib/llvm/include/llvm/IR/Module.h projects/clang350-import/contrib/llvm/include/llvm/IR/Operator.h projects/clang350-import/contrib/llvm/include/llvm/IR/PassManager.h projects/clang350-import/contrib/llvm/include/llvm/IR/SymbolTableListTraits.h projects/clang350-import/contrib/llvm/include/llvm/IR/Type.h projects/clang350-import/contrib/llvm/include/llvm/IR/Use.h projects/clang350-import/contrib/llvm/include/llvm/IR/User.h projects/clang350-import/contrib/llvm/include/llvm/IR/Value.h projects/clang350-import/contrib/llvm/include/llvm/IRReader/IRReader.h projects/clang350-import/contrib/llvm/include/llvm/InitializePasses.h projects/clang350-import/contrib/llvm/include/llvm/LTO/LTOCodeGenerator.h projects/clang350-import/contrib/llvm/include/llvm/LTO/LTOModule.h projects/clang350-import/contrib/llvm/include/llvm/LinkAllIR.h projects/clang350-import/contrib/llvm/include/llvm/LinkAllPasses.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCAsmBackend.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCAsmInfo.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCAsmInfoCOFF.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCAsmLayout.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCAssembler.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCCodeEmitter.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCContext.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCDirectives.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCDisassembler.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCDwarf.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCELF.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCELFObjectWriter.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCELFStreamer.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCELFSymbolFlags.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCExpr.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCExternalSymbolizer.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCFixup.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCInst.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCInstPrinter.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCInstrAnalysis.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCInstrDesc.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCInstrItineraries.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCMachObjectWriter.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCObjectDisassembler.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCObjectFileInfo.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCObjectStreamer.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCObjectSymbolizer.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCObjectWriter.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCParser/AsmLexer.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCParser/MCAsmLexer.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCParser/MCAsmParser.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCParser/MCParsedAsmOperand.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCRegisterInfo.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCSchedule.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCSectionCOFF.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCSectionELF.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCSectionMachO.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCStreamer.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCSubtargetInfo.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCSymbol.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCSymbolizer.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCTargetAsmParser.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCValue.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCWin64EH.h projects/clang350-import/contrib/llvm/include/llvm/MC/MCWinCOFFObjectWriter.h projects/clang350-import/contrib/llvm/include/llvm/MC/MachineLocation.h projects/clang350-import/contrib/llvm/include/llvm/MC/SubtargetFeature.h projects/clang350-import/contrib/llvm/include/llvm/Object/Archive.h projects/clang350-import/contrib/llvm/include/llvm/Object/Binary.h projects/clang350-import/contrib/llvm/include/llvm/Object/COFF.h projects/clang350-import/contrib/llvm/include/llvm/Object/COFFYAML.h projects/clang350-import/contrib/llvm/include/llvm/Object/ELF.h projects/clang350-import/contrib/llvm/include/llvm/Object/ELFObjectFile.h projects/clang350-import/contrib/llvm/include/llvm/Object/ELFYAML.h projects/clang350-import/contrib/llvm/include/llvm/Object/Error.h projects/clang350-import/contrib/llvm/include/llvm/Object/MachO.h projects/clang350-import/contrib/llvm/include/llvm/Object/MachOUniversal.h projects/clang350-import/contrib/llvm/include/llvm/Object/ObjectFile.h projects/clang350-import/contrib/llvm/include/llvm/Object/RelocVisitor.h projects/clang350-import/contrib/llvm/include/llvm/Option/Arg.h projects/clang350-import/contrib/llvm/include/llvm/Option/ArgList.h projects/clang350-import/contrib/llvm/include/llvm/Option/OptParser.td projects/clang350-import/contrib/llvm/include/llvm/Option/OptSpecifier.h projects/clang350-import/contrib/llvm/include/llvm/Option/Option.h projects/clang350-import/contrib/llvm/include/llvm/Pass.h projects/clang350-import/contrib/llvm/include/llvm/PassAnalysisSupport.h projects/clang350-import/contrib/llvm/include/llvm/PassRegistry.h projects/clang350-import/contrib/llvm/include/llvm/PassSupport.h projects/clang350-import/contrib/llvm/include/llvm/Support/AlignOf.h projects/clang350-import/contrib/llvm/include/llvm/Support/Allocator.h projects/clang350-import/contrib/llvm/include/llvm/Support/ArrayRecycler.h projects/clang350-import/contrib/llvm/include/llvm/Support/BlockFrequency.h projects/clang350-import/contrib/llvm/include/llvm/Support/BranchProbability.h projects/clang350-import/contrib/llvm/include/llvm/Support/COFF.h projects/clang350-import/contrib/llvm/include/llvm/Support/Casting.h projects/clang350-import/contrib/llvm/include/llvm/Support/CommandLine.h projects/clang350-import/contrib/llvm/include/llvm/Support/Compiler.h projects/clang350-import/contrib/llvm/include/llvm/Support/Compression.h projects/clang350-import/contrib/llvm/include/llvm/Support/ConvertUTF.h projects/clang350-import/contrib/llvm/include/llvm/Support/CrashRecoveryContext.h projects/clang350-import/contrib/llvm/include/llvm/Support/DataTypes.h.in projects/clang350-import/contrib/llvm/include/llvm/Support/Debug.h projects/clang350-import/contrib/llvm/include/llvm/Support/Dwarf.h projects/clang350-import/contrib/llvm/include/llvm/Support/DynamicLibrary.h projects/clang350-import/contrib/llvm/include/llvm/Support/ELF.h projects/clang350-import/contrib/llvm/include/llvm/Support/Endian.h projects/clang350-import/contrib/llvm/include/llvm/Support/ErrorHandling.h projects/clang350-import/contrib/llvm/include/llvm/Support/ErrorOr.h projects/clang350-import/contrib/llvm/include/llvm/Support/FileOutputBuffer.h projects/clang350-import/contrib/llvm/include/llvm/Support/FileSystem.h projects/clang350-import/contrib/llvm/include/llvm/Support/FileUtilities.h projects/clang350-import/contrib/llvm/include/llvm/Support/Format.h projects/clang350-import/contrib/llvm/include/llvm/Support/FormattedStream.h projects/clang350-import/contrib/llvm/include/llvm/Support/GCOV.h projects/clang350-import/contrib/llvm/include/llvm/Support/GraphWriter.h projects/clang350-import/contrib/llvm/include/llvm/Support/Host.h projects/clang350-import/contrib/llvm/include/llvm/Support/LEB128.h projects/clang350-import/contrib/llvm/include/llvm/Support/LockFileManager.h projects/clang350-import/contrib/llvm/include/llvm/Support/MD5.h projects/clang350-import/contrib/llvm/include/llvm/Support/MachO.h projects/clang350-import/contrib/llvm/include/llvm/Support/ManagedStatic.h projects/clang350-import/contrib/llvm/include/llvm/Support/MathExtras.h projects/clang350-import/contrib/llvm/include/llvm/Support/Memory.h projects/clang350-import/contrib/llvm/include/llvm/Support/MemoryBuffer.h projects/clang350-import/contrib/llvm/include/llvm/Support/Path.h projects/clang350-import/contrib/llvm/include/llvm/Support/PrettyStackTrace.h projects/clang350-import/contrib/llvm/include/llvm/Support/Process.h projects/clang350-import/contrib/llvm/include/llvm/Support/Program.h projects/clang350-import/contrib/llvm/include/llvm/Support/Recycler.h projects/clang350-import/contrib/llvm/include/llvm/Support/Regex.h projects/clang350-import/contrib/llvm/include/llvm/Support/Registry.h projects/clang350-import/contrib/llvm/include/llvm/Support/SMLoc.h projects/clang350-import/contrib/llvm/include/llvm/Support/SaveAndRestore.h projects/clang350-import/contrib/llvm/include/llvm/Support/Signals.h projects/clang350-import/contrib/llvm/include/llvm/Support/SourceMgr.h projects/clang350-import/contrib/llvm/include/llvm/Support/StreamableMemoryObject.h projects/clang350-import/contrib/llvm/include/llvm/Support/StringPool.h projects/clang350-import/contrib/llvm/include/llvm/Support/StringRefMemoryObject.h projects/clang350-import/contrib/llvm/include/llvm/Support/SwapByteOrder.h projects/clang350-import/contrib/llvm/include/llvm/Support/TargetRegistry.h projects/clang350-import/contrib/llvm/include/llvm/Support/Threading.h projects/clang350-import/contrib/llvm/include/llvm/Support/TimeValue.h projects/clang350-import/contrib/llvm/include/llvm/Support/Timer.h projects/clang350-import/contrib/llvm/include/llvm/Support/ToolOutputFile.h projects/clang350-import/contrib/llvm/include/llvm/Support/Unicode.h projects/clang350-import/contrib/llvm/include/llvm/Support/UnicodeCharRanges.h projects/clang350-import/contrib/llvm/include/llvm/Support/Valgrind.h projects/clang350-import/contrib/llvm/include/llvm/Support/Win64EH.h projects/clang350-import/contrib/llvm/include/llvm/Support/YAMLParser.h projects/clang350-import/contrib/llvm/include/llvm/Support/YAMLTraits.h projects/clang350-import/contrib/llvm/include/llvm/Support/circular_raw_ostream.h projects/clang350-import/contrib/llvm/include/llvm/Support/raw_os_ostream.h projects/clang350-import/contrib/llvm/include/llvm/Support/raw_ostream.h projects/clang350-import/contrib/llvm/include/llvm/Support/type_traits.h projects/clang350-import/contrib/llvm/include/llvm/TableGen/Error.h projects/clang350-import/contrib/llvm/include/llvm/TableGen/Main.h projects/clang350-import/contrib/llvm/include/llvm/TableGen/Record.h projects/clang350-import/contrib/llvm/include/llvm/TableGen/StringMatcher.h projects/clang350-import/contrib/llvm/include/llvm/TableGen/StringToOffsetTable.h projects/clang350-import/contrib/llvm/include/llvm/Target/Target.td projects/clang350-import/contrib/llvm/include/llvm/Target/TargetCallingConv.h projects/clang350-import/contrib/llvm/include/llvm/Target/TargetCallingConv.td projects/clang350-import/contrib/llvm/include/llvm/Target/TargetFrameLowering.h projects/clang350-import/contrib/llvm/include/llvm/Target/TargetInstrInfo.h projects/clang350-import/contrib/llvm/include/llvm/Target/TargetIntrinsicInfo.h projects/clang350-import/contrib/llvm/include/llvm/Target/TargetLibraryInfo.h projects/clang350-import/contrib/llvm/include/llvm/Target/TargetLowering.h projects/clang350-import/contrib/llvm/include/llvm/Target/TargetLoweringObjectFile.h projects/clang350-import/contrib/llvm/include/llvm/Target/TargetMachine.h projects/clang350-import/contrib/llvm/include/llvm/Target/TargetOpcodes.h projects/clang350-import/contrib/llvm/include/llvm/Target/TargetOptions.h projects/clang350-import/contrib/llvm/include/llvm/Target/TargetRegisterInfo.h projects/clang350-import/contrib/llvm/include/llvm/Target/TargetSchedule.td projects/clang350-import/contrib/llvm/include/llvm/Target/TargetSelectionDAG.td projects/clang350-import/contrib/llvm/include/llvm/Target/TargetSelectionDAGInfo.h projects/clang350-import/contrib/llvm/include/llvm/Target/TargetSubtargetInfo.h projects/clang350-import/contrib/llvm/include/llvm/Transforms/IPO.h projects/clang350-import/contrib/llvm/include/llvm/Transforms/IPO/InlinerPass.h projects/clang350-import/contrib/llvm/include/llvm/Transforms/IPO/PassManagerBuilder.h projects/clang350-import/contrib/llvm/include/llvm/Transforms/Instrumentation.h projects/clang350-import/contrib/llvm/include/llvm/Transforms/ObjCARC.h projects/clang350-import/contrib/llvm/include/llvm/Transforms/Scalar.h projects/clang350-import/contrib/llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h projects/clang350-import/contrib/llvm/include/llvm/Transforms/Utils/BuildLibCalls.h projects/clang350-import/contrib/llvm/include/llvm/Transforms/Utils/Cloning.h projects/clang350-import/contrib/llvm/include/llvm/Transforms/Utils/CmpInstAnalysis.h projects/clang350-import/contrib/llvm/include/llvm/Transforms/Utils/CodeExtractor.h projects/clang350-import/contrib/llvm/include/llvm/Transforms/Utils/IntegerDivision.h projects/clang350-import/contrib/llvm/include/llvm/Transforms/Utils/Local.h projects/clang350-import/contrib/llvm/include/llvm/Transforms/Utils/LoopUtils.h projects/clang350-import/contrib/llvm/include/llvm/Transforms/Utils/PromoteMemToReg.h projects/clang350-import/contrib/llvm/include/llvm/Transforms/Utils/SSAUpdater.h projects/clang350-import/contrib/llvm/include/llvm/Transforms/Utils/SSAUpdaterImpl.h projects/clang350-import/contrib/llvm/include/llvm/Transforms/Utils/SimplifyIndVar.h projects/clang350-import/contrib/llvm/include/llvm/Transforms/Utils/SimplifyLibCalls.h projects/clang350-import/contrib/llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h projects/clang350-import/contrib/llvm/include/llvm/Transforms/Utils/UnrollLoop.h projects/clang350-import/contrib/llvm/include/llvm/Transforms/Utils/ValueMapper.h projects/clang350-import/contrib/llvm/include/llvm/Transforms/Vectorize.h projects/clang350-import/contrib/llvm/lib/Analysis/AliasAnalysis.cpp projects/clang350-import/contrib/llvm/lib/Analysis/AliasAnalysisCounter.cpp projects/clang350-import/contrib/llvm/lib/Analysis/AliasAnalysisEvaluator.cpp projects/clang350-import/contrib/llvm/lib/Analysis/AliasDebugger.cpp projects/clang350-import/contrib/llvm/lib/Analysis/AliasSetTracker.cpp projects/clang350-import/contrib/llvm/lib/Analysis/Analysis.cpp projects/clang350-import/contrib/llvm/lib/Analysis/BasicAliasAnalysis.cpp projects/clang350-import/contrib/llvm/lib/Analysis/BlockFrequencyInfo.cpp projects/clang350-import/contrib/llvm/lib/Analysis/BranchProbabilityInfo.cpp projects/clang350-import/contrib/llvm/lib/Analysis/CFG.cpp projects/clang350-import/contrib/llvm/lib/Analysis/CFGPrinter.cpp projects/clang350-import/contrib/llvm/lib/Analysis/CaptureTracking.cpp projects/clang350-import/contrib/llvm/lib/Analysis/CodeMetrics.cpp projects/clang350-import/contrib/llvm/lib/Analysis/ConstantFolding.cpp projects/clang350-import/contrib/llvm/lib/Analysis/CostModel.cpp projects/clang350-import/contrib/llvm/lib/Analysis/Delinearization.cpp projects/clang350-import/contrib/llvm/lib/Analysis/DependenceAnalysis.cpp projects/clang350-import/contrib/llvm/lib/Analysis/DomPrinter.cpp projects/clang350-import/contrib/llvm/lib/Analysis/DominanceFrontier.cpp projects/clang350-import/contrib/llvm/lib/Analysis/IPA/CallGraph.cpp projects/clang350-import/contrib/llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp projects/clang350-import/contrib/llvm/lib/Analysis/IPA/CallPrinter.cpp projects/clang350-import/contrib/llvm/lib/Analysis/IPA/FindUsedTypes.cpp projects/clang350-import/contrib/llvm/lib/Analysis/IPA/GlobalsModRef.cpp projects/clang350-import/contrib/llvm/lib/Analysis/IPA/IPA.cpp projects/clang350-import/contrib/llvm/lib/Analysis/IPA/InlineCost.cpp projects/clang350-import/contrib/llvm/lib/Analysis/IVUsers.cpp projects/clang350-import/contrib/llvm/lib/Analysis/InstCount.cpp projects/clang350-import/contrib/llvm/lib/Analysis/InstructionSimplify.cpp projects/clang350-import/contrib/llvm/lib/Analysis/Interval.cpp projects/clang350-import/contrib/llvm/lib/Analysis/IntervalPartition.cpp projects/clang350-import/contrib/llvm/lib/Analysis/LazyValueInfo.cpp projects/clang350-import/contrib/llvm/lib/Analysis/LibCallAliasAnalysis.cpp projects/clang350-import/contrib/llvm/lib/Analysis/LibCallSemantics.cpp projects/clang350-import/contrib/llvm/lib/Analysis/Lint.cpp projects/clang350-import/contrib/llvm/lib/Analysis/Loads.cpp projects/clang350-import/contrib/llvm/lib/Analysis/LoopInfo.cpp projects/clang350-import/contrib/llvm/lib/Analysis/LoopPass.cpp projects/clang350-import/contrib/llvm/lib/Analysis/MemDepPrinter.cpp projects/clang350-import/contrib/llvm/lib/Analysis/MemoryBuiltins.cpp projects/clang350-import/contrib/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp projects/clang350-import/contrib/llvm/lib/Analysis/ModuleDebugInfoPrinter.cpp projects/clang350-import/contrib/llvm/lib/Analysis/NoAliasAnalysis.cpp projects/clang350-import/contrib/llvm/lib/Analysis/PHITransAddr.cpp projects/clang350-import/contrib/llvm/lib/Analysis/PostDominators.cpp projects/clang350-import/contrib/llvm/lib/Analysis/PtrUseVisitor.cpp projects/clang350-import/contrib/llvm/lib/Analysis/RegionInfo.cpp projects/clang350-import/contrib/llvm/lib/Analysis/RegionPass.cpp projects/clang350-import/contrib/llvm/lib/Analysis/RegionPrinter.cpp projects/clang350-import/contrib/llvm/lib/Analysis/ScalarEvolution.cpp projects/clang350-import/contrib/llvm/lib/Analysis/ScalarEvolutionAliasAnalysis.cpp projects/clang350-import/contrib/llvm/lib/Analysis/ScalarEvolutionExpander.cpp projects/clang350-import/contrib/llvm/lib/Analysis/ScalarEvolutionNormalization.cpp projects/clang350-import/contrib/llvm/lib/Analysis/SparsePropagation.cpp projects/clang350-import/contrib/llvm/lib/Analysis/TargetTransformInfo.cpp projects/clang350-import/contrib/llvm/lib/Analysis/Trace.cpp projects/clang350-import/contrib/llvm/lib/Analysis/TypeBasedAliasAnalysis.cpp projects/clang350-import/contrib/llvm/lib/Analysis/ValueTracking.cpp projects/clang350-import/contrib/llvm/lib/AsmParser/LLLexer.cpp projects/clang350-import/contrib/llvm/lib/AsmParser/LLLexer.h projects/clang350-import/contrib/llvm/lib/AsmParser/LLParser.cpp projects/clang350-import/contrib/llvm/lib/AsmParser/LLParser.h projects/clang350-import/contrib/llvm/lib/AsmParser/LLToken.h projects/clang350-import/contrib/llvm/lib/AsmParser/Parser.cpp projects/clang350-import/contrib/llvm/lib/Bitcode/Reader/BitReader.cpp projects/clang350-import/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.cpp projects/clang350-import/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.h projects/clang350-import/contrib/llvm/lib/Bitcode/Reader/BitstreamReader.cpp projects/clang350-import/contrib/llvm/lib/Bitcode/Writer/BitWriter.cpp projects/clang350-import/contrib/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp projects/clang350-import/contrib/llvm/lib/Bitcode/Writer/BitcodeWriterPass.cpp projects/clang350-import/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.cpp projects/clang350-import/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.h projects/clang350-import/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.h projects/clang350-import/contrib/llvm/lib/CodeGen/AllocationOrder.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/AllocationOrder.h projects/clang350-import/contrib/llvm/lib/CodeGen/Analysis.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/ARMException.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/DIE.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/DIE.h projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/DIEHash.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/DIEHash.h projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfAccelTable.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfAccelTable.h projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfException.h projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/ErlangGCPrinter.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/AsmPrinter/Win64Exception.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/BasicTargetTransformInfo.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/BranchFolding.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/CalcSpillWeights.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/CallingConvLower.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/CodeGen.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.h projects/clang350-import/contrib/llvm/lib/CodeGen/DFAPacketizer.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/DeadMachineInstructionElim.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/DwarfEHPrepare.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/EarlyIfConversion.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/EdgeBundles.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/ErlangGC.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/ExecutionDepsFix.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/ExpandISelPseudos.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/ExpandPostRAPseudos.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/GCMetadata.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/GCStrategy.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/IfConversion.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/InlineSpiller.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/InterferenceCache.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/InterferenceCache.h projects/clang350-import/contrib/llvm/lib/CodeGen/IntrinsicLowering.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/LLVMTargetMachine.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/LatencyPriorityQueue.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/LexicalScopes.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/LiveDebugVariables.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/LiveDebugVariables.h projects/clang350-import/contrib/llvm/lib/CodeGen/LiveInterval.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/LiveIntervalUnion.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/LiveRangeCalc.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/LiveRangeCalc.h projects/clang350-import/contrib/llvm/lib/CodeGen/LiveRangeEdit.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/LiveRegMatrix.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/LiveStackAnalysis.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/LiveVariables.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/LocalStackSlotAllocation.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/MachineBasicBlock.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/MachineBlockFrequencyInfo.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/MachineBlockPlacement.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/MachineBranchProbabilityInfo.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/MachineCSE.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/MachineCopyPropagation.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/MachineFunction.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/MachineFunctionAnalysis.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/MachineFunctionPass.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/MachineFunctionPrinterPass.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/MachineInstr.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/MachineInstrBundle.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/MachineLICM.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/MachineLoopInfo.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/MachineModuleInfo.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/MachinePassRegistry.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/MachineRegisterInfo.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/MachineSSAUpdater.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/MachineScheduler.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/MachineSink.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/MachineTraceMetrics.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/MachineVerifier.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/OptimizePHIs.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/PHIElimination.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/PHIEliminationUtils.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/Passes.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/PeepholeOptimizer.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/PostRASchedulerList.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/ProcessImplicitDefs.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/PrologEpilogInserter.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/PrologEpilogInserter.h projects/clang350-import/contrib/llvm/lib/CodeGen/PseudoSourceValue.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/RegAllocBase.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/RegAllocBase.h projects/clang350-import/contrib/llvm/lib/CodeGen/RegAllocBasic.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/RegAllocFast.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/RegAllocGreedy.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/RegAllocPBQP.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/RegisterClassInfo.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/RegisterCoalescer.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/RegisterCoalescer.h projects/clang350-import/contrib/llvm/lib/CodeGen/RegisterPressure.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/RegisterScavenging.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/ScheduleDAG.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/ScheduleDAGPrinter.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/ScoreboardHazardRecognizer.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SelectionDAG/InstrEmitter.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h projects/clang350-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorOps.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SelectionDAG/ResourcePriorityQueue.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h projects/clang350-import/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.h projects/clang350-import/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGVLIW.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h projects/clang350-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SelectionDAG/TargetSelectionDAGInfo.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/ShadowStackGC.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SjLjEHPrepare.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SlotIndexes.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SpillPlacement.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SpillPlacement.h projects/clang350-import/contrib/llvm/lib/CodeGen/Spiller.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SplitKit.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/SplitKit.h projects/clang350-import/contrib/llvm/lib/CodeGen/StackColoring.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/StackMaps.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/StackProtector.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/StackSlotColoring.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/TailDuplication.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/TargetInstrInfo.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/TargetLoweringBase.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/TargetOptionsImpl.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/TargetRegisterInfo.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/UnreachableBlockElim.cpp projects/clang350-import/contrib/llvm/lib/CodeGen/VirtRegMap.cpp projects/clang350-import/contrib/llvm/lib/DebugInfo/DWARFAbbreviationDeclaration.cpp projects/clang350-import/contrib/llvm/lib/DebugInfo/DWARFAbbreviationDeclaration.h projects/clang350-import/contrib/llvm/lib/DebugInfo/DWARFCompileUnit.h projects/clang350-import/contrib/llvm/lib/DebugInfo/DWARFContext.cpp projects/clang350-import/contrib/llvm/lib/DebugInfo/DWARFContext.h projects/clang350-import/contrib/llvm/lib/DebugInfo/DWARFDebugAbbrev.cpp projects/clang350-import/contrib/llvm/lib/DebugInfo/DWARFDebugAbbrev.h projects/clang350-import/contrib/llvm/lib/DebugInfo/DWARFDebugArangeSet.cpp projects/clang350-import/contrib/llvm/lib/DebugInfo/DWARFDebugArangeSet.h projects/clang350-import/contrib/llvm/lib/DebugInfo/DWARFDebugAranges.cpp projects/clang350-import/contrib/llvm/lib/DebugInfo/DWARFDebugAranges.h projects/clang350-import/contrib/llvm/lib/DebugInfo/DWARFDebugFrame.cpp projects/clang350-import/contrib/llvm/lib/DebugInfo/DWARFDebugFrame.h projects/clang350-import/contrib/llvm/lib/DebugInfo/DWARFDebugInfoEntry.cpp projects/clang350-import/contrib/llvm/lib/DebugInfo/DWARFDebugInfoEntry.h projects/clang350-import/contrib/llvm/lib/DebugInfo/DWARFDebugLine.cpp projects/clang350-import/contrib/llvm/lib/DebugInfo/DWARFDebugLine.h projects/clang350-import/contrib/llvm/lib/DebugInfo/DWARFDebugLoc.cpp projects/clang350-import/contrib/llvm/lib/DebugInfo/DWARFDebugLoc.h projects/clang350-import/contrib/llvm/lib/DebugInfo/DWARFDebugRangeList.cpp projects/clang350-import/contrib/llvm/lib/DebugInfo/DWARFDebugRangeList.h projects/clang350-import/contrib/llvm/lib/DebugInfo/DWARFFormValue.cpp projects/clang350-import/contrib/llvm/lib/DebugInfo/DWARFTypeUnit.h projects/clang350-import/contrib/llvm/lib/DebugInfo/DWARFUnit.cpp projects/clang350-import/contrib/llvm/lib/DebugInfo/DWARFUnit.h projects/clang350-import/contrib/llvm/lib/ExecutionEngine/EventListenerCommon.h projects/clang350-import/contrib/llvm/lib/ExecutionEngine/ExecutionEngine.cpp projects/clang350-import/contrib/llvm/lib/ExecutionEngine/ExecutionEngineBindings.cpp projects/clang350-import/contrib/llvm/lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp projects/clang350-import/contrib/llvm/lib/ExecutionEngine/IntelJITEvents/jitprofiling.h projects/clang350-import/contrib/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp projects/clang350-import/contrib/llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp projects/clang350-import/contrib/llvm/lib/ExecutionEngine/Interpreter/Interpreter.cpp projects/clang350-import/contrib/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h projects/clang350-import/contrib/llvm/lib/ExecutionEngine/JIT/JIT.cpp projects/clang350-import/contrib/llvm/lib/ExecutionEngine/JIT/JIT.h projects/clang350-import/contrib/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp projects/clang350-import/contrib/llvm/lib/ExecutionEngine/JIT/JITMemoryManager.cpp projects/clang350-import/contrib/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp projects/clang350-import/contrib/llvm/lib/ExecutionEngine/MCJIT/MCJIT.h projects/clang350-import/contrib/llvm/lib/ExecutionEngine/MCJIT/SectionMemoryManager.cpp projects/clang350-import/contrib/llvm/lib/ExecutionEngine/OProfileJIT/OProfileJITEventListener.cpp projects/clang350-import/contrib/llvm/lib/ExecutionEngine/OProfileJIT/OProfileWrapper.cpp projects/clang350-import/contrib/llvm/lib/ExecutionEngine/RTDyldMemoryManager.cpp projects/clang350-import/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/GDBRegistrar.cpp projects/clang350-import/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/ObjectImageCommon.h projects/clang350-import/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp projects/clang350-import/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp projects/clang350-import/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h projects/clang350-import/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h projects/clang350-import/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp projects/clang350-import/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.h projects/clang350-import/contrib/llvm/lib/ExecutionEngine/TargetSelect.cpp projects/clang350-import/contrib/llvm/lib/IR/AsmWriter.cpp projects/clang350-import/contrib/llvm/lib/IR/AsmWriter.h projects/clang350-import/contrib/llvm/lib/IR/AttributeImpl.h projects/clang350-import/contrib/llvm/lib/IR/Attributes.cpp projects/clang350-import/contrib/llvm/lib/IR/AutoUpgrade.cpp projects/clang350-import/contrib/llvm/lib/IR/BasicBlock.cpp projects/clang350-import/contrib/llvm/lib/IR/ConstantFold.cpp projects/clang350-import/contrib/llvm/lib/IR/Constants.cpp projects/clang350-import/contrib/llvm/lib/IR/ConstantsContext.h projects/clang350-import/contrib/llvm/lib/IR/Core.cpp projects/clang350-import/contrib/llvm/lib/IR/DIBuilder.cpp projects/clang350-import/contrib/llvm/lib/IR/DataLayout.cpp projects/clang350-import/contrib/llvm/lib/IR/DebugInfo.cpp projects/clang350-import/contrib/llvm/lib/IR/DebugLoc.cpp projects/clang350-import/contrib/llvm/lib/IR/Dominators.cpp projects/clang350-import/contrib/llvm/lib/IR/Function.cpp projects/clang350-import/contrib/llvm/lib/IR/GCOV.cpp projects/clang350-import/contrib/llvm/lib/IR/GVMaterializer.cpp projects/clang350-import/contrib/llvm/lib/IR/Globals.cpp projects/clang350-import/contrib/llvm/lib/IR/InlineAsm.cpp projects/clang350-import/contrib/llvm/lib/IR/Instruction.cpp projects/clang350-import/contrib/llvm/lib/IR/Instructions.cpp projects/clang350-import/contrib/llvm/lib/IR/IntrinsicInst.cpp projects/clang350-import/contrib/llvm/lib/IR/LLVMContext.cpp projects/clang350-import/contrib/llvm/lib/IR/LLVMContextImpl.cpp projects/clang350-import/contrib/llvm/lib/IR/LLVMContextImpl.h projects/clang350-import/contrib/llvm/lib/IR/LeakDetector.cpp projects/clang350-import/contrib/llvm/lib/IR/LeaksContext.h projects/clang350-import/contrib/llvm/lib/IR/LegacyPassManager.cpp projects/clang350-import/contrib/llvm/lib/IR/Metadata.cpp projects/clang350-import/contrib/llvm/lib/IR/Module.cpp projects/clang350-import/contrib/llvm/lib/IR/Pass.cpp projects/clang350-import/contrib/llvm/lib/IR/PassManager.cpp projects/clang350-import/contrib/llvm/lib/IR/PassRegistry.cpp projects/clang350-import/contrib/llvm/lib/IR/SymbolTableListTraitsImpl.h projects/clang350-import/contrib/llvm/lib/IR/Type.cpp projects/clang350-import/contrib/llvm/lib/IR/Use.cpp projects/clang350-import/contrib/llvm/lib/IR/Value.cpp projects/clang350-import/contrib/llvm/lib/IR/ValueSymbolTable.cpp projects/clang350-import/contrib/llvm/lib/IR/Verifier.cpp projects/clang350-import/contrib/llvm/lib/IRReader/IRReader.cpp projects/clang350-import/contrib/llvm/lib/LTO/LTOCodeGenerator.cpp projects/clang350-import/contrib/llvm/lib/LTO/LTOModule.cpp projects/clang350-import/contrib/llvm/lib/Linker/LinkModules.cpp projects/clang350-import/contrib/llvm/lib/MC/ELFObjectWriter.cpp projects/clang350-import/contrib/llvm/lib/MC/MCAsmBackend.cpp projects/clang350-import/contrib/llvm/lib/MC/MCAsmInfo.cpp projects/clang350-import/contrib/llvm/lib/MC/MCAsmInfoCOFF.cpp projects/clang350-import/contrib/llvm/lib/MC/MCAsmInfoDarwin.cpp projects/clang350-import/contrib/llvm/lib/MC/MCAsmInfoELF.cpp projects/clang350-import/contrib/llvm/lib/MC/MCAsmStreamer.cpp projects/clang350-import/contrib/llvm/lib/MC/MCAssembler.cpp projects/clang350-import/contrib/llvm/lib/MC/MCContext.cpp projects/clang350-import/contrib/llvm/lib/MC/MCDisassembler.cpp projects/clang350-import/contrib/llvm/lib/MC/MCDisassembler/Disassembler.cpp projects/clang350-import/contrib/llvm/lib/MC/MCDisassembler/Disassembler.h projects/clang350-import/contrib/llvm/lib/MC/MCDwarf.cpp projects/clang350-import/contrib/llvm/lib/MC/MCELF.cpp projects/clang350-import/contrib/llvm/lib/MC/MCELFObjectTargetWriter.cpp projects/clang350-import/contrib/llvm/lib/MC/MCELFStreamer.cpp projects/clang350-import/contrib/llvm/lib/MC/MCExpr.cpp projects/clang350-import/contrib/llvm/lib/MC/MCExternalSymbolizer.cpp projects/clang350-import/contrib/llvm/lib/MC/MCInst.cpp projects/clang350-import/contrib/llvm/lib/MC/MCMachOStreamer.cpp projects/clang350-import/contrib/llvm/lib/MC/MCNullStreamer.cpp projects/clang350-import/contrib/llvm/lib/MC/MCObjectFileInfo.cpp projects/clang350-import/contrib/llvm/lib/MC/MCObjectStreamer.cpp projects/clang350-import/contrib/llvm/lib/MC/MCParser/AsmLexer.cpp projects/clang350-import/contrib/llvm/lib/MC/MCParser/AsmParser.cpp projects/clang350-import/contrib/llvm/lib/MC/MCParser/COFFAsmParser.cpp projects/clang350-import/contrib/llvm/lib/MC/MCParser/DarwinAsmParser.cpp projects/clang350-import/contrib/llvm/lib/MC/MCParser/ELFAsmParser.cpp projects/clang350-import/contrib/llvm/lib/MC/MCParser/MCAsmLexer.cpp projects/clang350-import/contrib/llvm/lib/MC/MCParser/MCAsmParser.cpp projects/clang350-import/contrib/llvm/lib/MC/MCRelocationInfo.cpp projects/clang350-import/contrib/llvm/lib/MC/MCSectionCOFF.cpp projects/clang350-import/contrib/llvm/lib/MC/MCSectionMachO.cpp projects/clang350-import/contrib/llvm/lib/MC/MCStreamer.cpp projects/clang350-import/contrib/llvm/lib/MC/MCSubtargetInfo.cpp projects/clang350-import/contrib/llvm/lib/MC/MCSymbolizer.cpp projects/clang350-import/contrib/llvm/lib/MC/MCValue.cpp projects/clang350-import/contrib/llvm/lib/MC/MCWin64EH.cpp projects/clang350-import/contrib/llvm/lib/MC/MachObjectWriter.cpp projects/clang350-import/contrib/llvm/lib/MC/SubtargetFeature.cpp projects/clang350-import/contrib/llvm/lib/MC/WinCOFFObjectWriter.cpp projects/clang350-import/contrib/llvm/lib/MC/WinCOFFStreamer.cpp projects/clang350-import/contrib/llvm/lib/Object/Archive.cpp projects/clang350-import/contrib/llvm/lib/Object/Binary.cpp projects/clang350-import/contrib/llvm/lib/Object/COFFObjectFile.cpp projects/clang350-import/contrib/llvm/lib/Object/COFFYAML.cpp projects/clang350-import/contrib/llvm/lib/Object/ELF.cpp projects/clang350-import/contrib/llvm/lib/Object/ELFObjectFile.cpp projects/clang350-import/contrib/llvm/lib/Object/ELFYAML.cpp projects/clang350-import/contrib/llvm/lib/Object/Error.cpp projects/clang350-import/contrib/llvm/lib/Object/MachOObjectFile.cpp projects/clang350-import/contrib/llvm/lib/Object/MachOUniversal.cpp projects/clang350-import/contrib/llvm/lib/Object/Object.cpp projects/clang350-import/contrib/llvm/lib/Object/ObjectFile.cpp projects/clang350-import/contrib/llvm/lib/Option/ArgList.cpp projects/clang350-import/contrib/llvm/lib/Option/OptTable.cpp projects/clang350-import/contrib/llvm/lib/Option/Option.cpp projects/clang350-import/contrib/llvm/lib/Support/APFloat.cpp projects/clang350-import/contrib/llvm/lib/Support/APInt.cpp projects/clang350-import/contrib/llvm/lib/Support/Allocator.cpp projects/clang350-import/contrib/llvm/lib/Support/Atomic.cpp projects/clang350-import/contrib/llvm/lib/Support/BlockFrequency.cpp projects/clang350-import/contrib/llvm/lib/Support/BranchProbability.cpp projects/clang350-import/contrib/llvm/lib/Support/CommandLine.cpp projects/clang350-import/contrib/llvm/lib/Support/Compression.cpp projects/clang350-import/contrib/llvm/lib/Support/ConvertUTF.c projects/clang350-import/contrib/llvm/lib/Support/CrashRecoveryContext.cpp projects/clang350-import/contrib/llvm/lib/Support/DAGDeltaAlgorithm.cpp projects/clang350-import/contrib/llvm/lib/Support/DataExtractor.cpp projects/clang350-import/contrib/llvm/lib/Support/DataStream.cpp projects/clang350-import/contrib/llvm/lib/Support/Debug.cpp projects/clang350-import/contrib/llvm/lib/Support/Dwarf.cpp projects/clang350-import/contrib/llvm/lib/Support/DynamicLibrary.cpp projects/clang350-import/contrib/llvm/lib/Support/ErrorHandling.cpp projects/clang350-import/contrib/llvm/lib/Support/FileOutputBuffer.cpp projects/clang350-import/contrib/llvm/lib/Support/FileUtilities.cpp projects/clang350-import/contrib/llvm/lib/Support/FoldingSet.cpp projects/clang350-import/contrib/llvm/lib/Support/FormattedStream.cpp projects/clang350-import/contrib/llvm/lib/Support/GraphWriter.cpp projects/clang350-import/contrib/llvm/lib/Support/Host.cpp projects/clang350-import/contrib/llvm/lib/Support/IntervalMap.cpp projects/clang350-import/contrib/llvm/lib/Support/LockFileManager.cpp projects/clang350-import/contrib/llvm/lib/Support/ManagedStatic.cpp projects/clang350-import/contrib/llvm/lib/Support/MemoryBuffer.cpp projects/clang350-import/contrib/llvm/lib/Support/Mutex.cpp projects/clang350-import/contrib/llvm/lib/Support/Path.cpp projects/clang350-import/contrib/llvm/lib/Support/PrettyStackTrace.cpp projects/clang350-import/contrib/llvm/lib/Support/Process.cpp projects/clang350-import/contrib/llvm/lib/Support/Program.cpp projects/clang350-import/contrib/llvm/lib/Support/RWMutex.cpp projects/clang350-import/contrib/llvm/lib/Support/Regex.cpp projects/clang350-import/contrib/llvm/lib/Support/SearchForAddressOfSpecialSymbol.cpp projects/clang350-import/contrib/llvm/lib/Support/SmallPtrSet.cpp projects/clang350-import/contrib/llvm/lib/Support/SourceMgr.cpp projects/clang350-import/contrib/llvm/lib/Support/Statistic.cpp projects/clang350-import/contrib/llvm/lib/Support/StreamableMemoryObject.cpp projects/clang350-import/contrib/llvm/lib/Support/StringMap.cpp projects/clang350-import/contrib/llvm/lib/Support/StringPool.cpp projects/clang350-import/contrib/llvm/lib/Support/StringRef.cpp projects/clang350-import/contrib/llvm/lib/Support/TargetRegistry.cpp projects/clang350-import/contrib/llvm/lib/Support/ThreadLocal.cpp projects/clang350-import/contrib/llvm/lib/Support/Threading.cpp projects/clang350-import/contrib/llvm/lib/Support/TimeValue.cpp projects/clang350-import/contrib/llvm/lib/Support/Timer.cpp projects/clang350-import/contrib/llvm/lib/Support/ToolOutputFile.cpp projects/clang350-import/contrib/llvm/lib/Support/Triple.cpp projects/clang350-import/contrib/llvm/lib/Support/Twine.cpp projects/clang350-import/contrib/llvm/lib/Support/Unix/Host.inc projects/clang350-import/contrib/llvm/lib/Support/Unix/Memory.inc projects/clang350-import/contrib/llvm/lib/Support/Unix/Path.inc projects/clang350-import/contrib/llvm/lib/Support/Unix/Process.inc projects/clang350-import/contrib/llvm/lib/Support/Unix/Program.inc projects/clang350-import/contrib/llvm/lib/Support/Unix/RWMutex.inc projects/clang350-import/contrib/llvm/lib/Support/Unix/Signals.inc projects/clang350-import/contrib/llvm/lib/Support/Unix/TimeValue.inc projects/clang350-import/contrib/llvm/lib/Support/Valgrind.cpp projects/clang350-import/contrib/llvm/lib/Support/Windows/DynamicLibrary.inc projects/clang350-import/contrib/llvm/lib/Support/Windows/Host.inc projects/clang350-import/contrib/llvm/lib/Support/Windows/Memory.inc projects/clang350-import/contrib/llvm/lib/Support/Windows/Mutex.inc projects/clang350-import/contrib/llvm/lib/Support/Windows/Path.inc projects/clang350-import/contrib/llvm/lib/Support/Windows/Process.inc projects/clang350-import/contrib/llvm/lib/Support/Windows/Program.inc projects/clang350-import/contrib/llvm/lib/Support/Windows/RWMutex.inc projects/clang350-import/contrib/llvm/lib/Support/Windows/Signals.inc projects/clang350-import/contrib/llvm/lib/Support/Windows/ThreadLocal.inc projects/clang350-import/contrib/llvm/lib/Support/Windows/TimeValue.inc projects/clang350-import/contrib/llvm/lib/Support/YAMLParser.cpp projects/clang350-import/contrib/llvm/lib/Support/YAMLTraits.cpp projects/clang350-import/contrib/llvm/lib/Support/raw_ostream.cpp projects/clang350-import/contrib/llvm/lib/Support/regcclass.h projects/clang350-import/contrib/llvm/lib/Support/regcname.h projects/clang350-import/contrib/llvm/lib/Support/regcomp.c projects/clang350-import/contrib/llvm/lib/Support/regengine.inc projects/clang350-import/contrib/llvm/lib/Support/regex2.h projects/clang350-import/contrib/llvm/lib/Support/regutils.h projects/clang350-import/contrib/llvm/lib/TableGen/Error.cpp projects/clang350-import/contrib/llvm/lib/TableGen/Main.cpp projects/clang350-import/contrib/llvm/lib/TableGen/Record.cpp projects/clang350-import/contrib/llvm/lib/TableGen/TGLexer.cpp projects/clang350-import/contrib/llvm/lib/TableGen/TGLexer.h projects/clang350-import/contrib/llvm/lib/TableGen/TGParser.cpp projects/clang350-import/contrib/llvm/lib/TableGen/TGParser.h projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64.h projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64.td projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64AsmPrinter.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64FrameLowering.h projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.h projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64InstrFormats.td projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64InstrInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64InstrInfo.h projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64InstrInfo.td projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64MCInstLower.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64MachineFunctionInfo.h projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64RegisterInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64RegisterInfo.h projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64RegisterInfo.td projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64Schedule.td projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64SelectionDAGInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64SelectionDAGInfo.h projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64Subtarget.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64Subtarget.h projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64TargetMachine.h projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64TargetObjectFile.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/AArch64TargetObjectFile.h projects/clang350-import/contrib/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/Disassembler/AArch64Disassembler.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/InstPrinter/AArch64InstPrinter.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/InstPrinter/AArch64InstPrinter.h projects/clang350-import/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64AsmBackend.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.h projects/clang350-import/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64FixupKinds.h projects/clang350-import/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.h projects/clang350-import/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCCodeEmitter.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCExpr.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCExpr.h projects/clang350-import/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.h projects/clang350-import/contrib/llvm/lib/Target/AArch64/TargetInfo/AArch64TargetInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/Utils/AArch64BaseInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/AArch64/Utils/AArch64BaseInfo.h projects/clang350-import/contrib/llvm/lib/Target/ARM/A15SDOptimizer.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/ARM.h projects/clang350-import/contrib/llvm/lib/Target/ARM/ARM.td projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMAsmPrinter.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMAsmPrinter.h projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.h projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.h projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMCallingConv.h projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMCallingConv.td projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMCodeEmitter.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMConstantIslandPass.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMConstantPoolValue.h projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMExpandPseudoInsts.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMFPUName.def projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMFastISel.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMFeatures.h projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMFrameLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMFrameLowering.h projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMHazardRecognizer.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMHazardRecognizer.h projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMISelLowering.h projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMInstrFormats.td projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMInstrInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMInstrInfo.h projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMInstrNEON.td projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMInstrThumb.td projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMInstrThumb2.td projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMInstrVFP.td projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMJITInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMJITInfo.h projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMMCInstLower.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMMachineFunctionInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMMachineFunctionInfo.h projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMRegisterInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMRegisterInfo.h projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMRegisterInfo.td projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMScheduleA9.td projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMScheduleSwift.td projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMScheduleV6.td projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMSelectionDAGInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMSelectionDAGInfo.h projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMSubtarget.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMSubtarget.h projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMTargetMachine.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMTargetMachine.h projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMTargetObjectFile.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMTargetObjectFile.h projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMTargetTransformInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/InstPrinter/ARMInstPrinter.h projects/clang350-import/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMBaseInfo.h projects/clang350-import/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMFixupKinds.h projects/clang350-import/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.h projects/clang350-import/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCExpr.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCExpr.h projects/clang350-import/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.h projects/clang350-import/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMachORelocationInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMUnwindOpAsm.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMUnwindOpAsm.h projects/clang350-import/contrib/llvm/lib/Target/ARM/MLxExpansionPass.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/TargetInfo/ARMTargetInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/Thumb1FrameLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/Thumb1FrameLowering.h projects/clang350-import/contrib/llvm/lib/Target/ARM/Thumb1InstrInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/Thumb1InstrInfo.h projects/clang350-import/contrib/llvm/lib/Target/ARM/Thumb1RegisterInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/Thumb1RegisterInfo.h projects/clang350-import/contrib/llvm/lib/Target/ARM/Thumb2ITBlockPass.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/Thumb2InstrInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/Thumb2InstrInfo.h projects/clang350-import/contrib/llvm/lib/Target/ARM/Thumb2RegisterInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/ARM/Thumb2RegisterInfo.h projects/clang350-import/contrib/llvm/lib/Target/ARM/Thumb2SizeReduction.cpp projects/clang350-import/contrib/llvm/lib/Target/CppBackend/CPPBackend.cpp projects/clang350-import/contrib/llvm/lib/Target/CppBackend/CPPTargetMachine.h projects/clang350-import/contrib/llvm/lib/Target/CppBackend/TargetInfo/CppBackendTargetInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/Hexagon/Hexagon.td projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonAsmPrinter.cpp projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonAsmPrinter.h projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonCFGOptimizer.cpp projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonCallingConvLower.h projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonCopyToCombine.cpp projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonExpandPredSpillCode.cpp projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonFixupHwLoops.cpp projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonFrameLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonFrameLowering.h projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonHardwareLoops.cpp projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonISelDAGToDAG.cpp projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonISelLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonISelLowering.h projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonInstrFormats.td projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonInstrFormatsV4.td projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonInstrInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonInstrInfo.h projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonInstrInfo.td projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonInstrInfoV4.td projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonMCInstLower.cpp projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonMachineFunctionInfo.h projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonMachineScheduler.cpp projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonMachineScheduler.h projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonNewValueJump.cpp projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonPeephole.cpp projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonRegisterInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonRegisterInfo.h projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonRemoveSZExtArgs.cpp projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonSchedule.td projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonScheduleV4.td projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonSelectionDAGInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonSelectionDAGInfo.h projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonSplitConst32AndConst64.cpp projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonSplitTFRCondSets.cpp projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonSubtarget.cpp projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonSubtarget.h projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonTargetMachine.cpp projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonTargetMachine.h projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonTargetObjectFile.cpp projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonTargetObjectFile.h projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonVLIWPacketizer.cpp projects/clang350-import/contrib/llvm/lib/Target/Hexagon/HexagonVarargsCallingConvention.h projects/clang350-import/contrib/llvm/lib/Target/Hexagon/InstPrinter/HexagonInstPrinter.cpp projects/clang350-import/contrib/llvm/lib/Target/Hexagon/InstPrinter/HexagonInstPrinter.h projects/clang350-import/contrib/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonBaseInfo.h projects/clang350-import/contrib/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCAsmInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCAsmInfo.h projects/clang350-import/contrib/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCInst.h projects/clang350-import/contrib/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCTargetDesc.cpp projects/clang350-import/contrib/llvm/lib/Target/MSP430/InstPrinter/MSP430InstPrinter.cpp projects/clang350-import/contrib/llvm/lib/Target/MSP430/InstPrinter/MSP430InstPrinter.h projects/clang350-import/contrib/llvm/lib/Target/MSP430/MCTargetDesc/MSP430MCAsmInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/MSP430/MCTargetDesc/MSP430MCAsmInfo.h projects/clang350-import/contrib/llvm/lib/Target/MSP430/MCTargetDesc/MSP430MCTargetDesc.cpp projects/clang350-import/contrib/llvm/lib/Target/MSP430/MSP430.td projects/clang350-import/contrib/llvm/lib/Target/MSP430/MSP430AsmPrinter.cpp projects/clang350-import/contrib/llvm/lib/Target/MSP430/MSP430BranchSelector.cpp projects/clang350-import/contrib/llvm/lib/Target/MSP430/MSP430FrameLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/MSP430/MSP430FrameLowering.h projects/clang350-import/contrib/llvm/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp projects/clang350-import/contrib/llvm/lib/Target/MSP430/MSP430ISelLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/MSP430/MSP430ISelLowering.h projects/clang350-import/contrib/llvm/lib/Target/MSP430/MSP430InstrInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/MSP430/MSP430InstrInfo.h projects/clang350-import/contrib/llvm/lib/Target/MSP430/MSP430MCInstLower.cpp projects/clang350-import/contrib/llvm/lib/Target/MSP430/MSP430RegisterInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/MSP430/MSP430RegisterInfo.h projects/clang350-import/contrib/llvm/lib/Target/MSP430/MSP430SelectionDAGInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/MSP430/MSP430SelectionDAGInfo.h projects/clang350-import/contrib/llvm/lib/Target/MSP430/MSP430Subtarget.cpp projects/clang350-import/contrib/llvm/lib/Target/MSP430/MSP430Subtarget.h projects/clang350-import/contrib/llvm/lib/Target/MSP430/MSP430TargetMachine.cpp projects/clang350-import/contrib/llvm/lib/Target/MSP430/MSP430TargetMachine.h projects/clang350-import/contrib/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/Disassembler/MipsDisassembler.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/InstPrinter/MipsInstPrinter.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsBaseInfo.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsFixupKinds.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCAsmInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCAsmInfo.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsTargetStreamer.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MSA.txt projects/clang350-import/contrib/llvm/lib/Target/Mips/MicroMipsInstrFormats.td projects/clang350-import/contrib/llvm/lib/Target/Mips/MicroMipsInstrInfo.td projects/clang350-import/contrib/llvm/lib/Target/Mips/Mips.h projects/clang350-import/contrib/llvm/lib/Target/Mips/Mips.td projects/clang350-import/contrib/llvm/lib/Target/Mips/Mips16FrameLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/Mips16FrameLowering.h projects/clang350-import/contrib/llvm/lib/Target/Mips/Mips16HardFloat.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/Mips16HardFloat.h projects/clang350-import/contrib/llvm/lib/Target/Mips/Mips16ISelDAGToDAG.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/Mips16ISelDAGToDAG.h projects/clang350-import/contrib/llvm/lib/Target/Mips/Mips16ISelLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/Mips16ISelLowering.h projects/clang350-import/contrib/llvm/lib/Target/Mips/Mips16InstrInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/Mips16InstrInfo.h projects/clang350-import/contrib/llvm/lib/Target/Mips/Mips16InstrInfo.td projects/clang350-import/contrib/llvm/lib/Target/Mips/Mips16RegisterInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/Mips16RegisterInfo.h projects/clang350-import/contrib/llvm/lib/Target/Mips/Mips64InstrInfo.td projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsAsmPrinter.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsAsmPrinter.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsCallingConv.td projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsCodeEmitter.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsCondMov.td projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsConstantIslandPass.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsDSPInstrFormats.td projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsDelaySlotFiller.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsFrameLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsFrameLowering.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsISelLowering.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsInstrFPU.td projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsInstrFormats.td projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsInstrInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsInstrInfo.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsInstrInfo.td projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsJITInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsJITInfo.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsLongBranch.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsMCInstLower.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsMCInstLower.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsMSAInstrFormats.td projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsMSAInstrInfo.td projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsMachineFunction.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsMachineFunction.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsModuleISelDAGToDAG.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsModuleISelDAGToDAG.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsOs16.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsOs16.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.td projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsSEFrameLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsSEFrameLowering.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsSEISelLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsSEISelLowering.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsSEInstrInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsSEInstrInfo.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsSERegisterInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsSERegisterInfo.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsSchedule.td projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsSelectionDAGInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsSelectionDAGInfo.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsSubtarget.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsSubtarget.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsTargetMachine.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsTargetMachine.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsTargetObjectFile.cpp projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsTargetObjectFile.h projects/clang350-import/contrib/llvm/lib/Target/Mips/MipsTargetStreamer.h projects/clang350-import/contrib/llvm/lib/Target/NVPTX/InstPrinter/NVPTXInstPrinter.cpp projects/clang350-import/contrib/llvm/lib/Target/NVPTX/InstPrinter/NVPTXInstPrinter.h projects/clang350-import/contrib/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXBaseInfo.h projects/clang350-import/contrib/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXMCAsmInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXMCTargetDesc.cpp projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTX.h projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTX.td projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXAllocaHoisting.h projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXFrameLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXFrameLowering.h projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXGenericToNVVM.cpp projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.h projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXISelLowering.h projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXInstrFormats.td projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXInstrInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXInstrInfo.h projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXInstrInfo.td projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXIntrinsics.td projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXLowerAggrCopies.cpp projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXLowerAggrCopies.h projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXMCExpr.cpp projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXMCExpr.h projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXPrologEpilogPass.cpp projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXRegisterInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXRegisterInfo.h projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXRegisterInfo.td projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXSection.h projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXSubtarget.cpp projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXSubtarget.h projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXTargetMachine.h projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXTargetObjectFile.h projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXUtilities.cpp projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVPTXUtilities.h projects/clang350-import/contrib/llvm/lib/Target/NVPTX/NVVMReflect.cpp projects/clang350-import/contrib/llvm/lib/Target/NVPTX/cl_common_defines.h projects/clang350-import/contrib/llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.h projects/clang350-import/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.h projects/clang350-import/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCCodeEmitter.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.h projects/clang350-import/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h projects/clang350-import/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMachObjectWriter.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPC.h projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPC.td projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCBranchSelector.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCCTRLoops.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCCallingConv.td projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCFastISel.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.h projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCHazardRecognizers.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCHazardRecognizers.h projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCInstr64Bit.td projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCInstrAltivec.td projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCInstrFormats.td projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.h projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.td projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCJITInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCJITInfo.h projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCMCInstLower.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCMachineFunctionInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.h projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.td projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCSchedule.td projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCSchedule440.td projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCScheduleA2.td projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCScheduleE500mc.td projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCScheduleE5500.td projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCScheduleG3.td projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCScheduleG4.td projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCScheduleG4Plus.td projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCScheduleG5.td projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCSelectionDAGInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCSelectionDAGInfo.h projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCSubtarget.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCSubtarget.h projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCTargetMachine.h projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCTargetObjectFile.cpp projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCTargetObjectFile.h projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCTargetStreamer.h projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCTargetTransformInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPU.h projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPU.td projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPUAsmPrinter.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPUAsmPrinter.h projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPUCallingConv.td projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPUFrameLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPUFrameLowering.h projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPUISelDAGToDAG.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPUISelLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPUISelLowering.h projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPUInstrInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPUInstrInfo.h projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPUInstrInfo.td projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPUInstructions.td projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPUIntrinsics.td projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPUMCInstLower.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPUMCInstLower.h projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPUMachineFunction.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPUMachineFunction.h projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPURegisterInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPURegisterInfo.h projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPUSubtarget.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPUSubtarget.h projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPUTargetMachine.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPUTargetMachine.h projects/clang350-import/contrib/llvm/lib/Target/R600/AMDGPUTargetTransformInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/AMDILCFGStructurizer.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/InstPrinter/AMDGPUInstPrinter.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/InstPrinter/AMDGPUInstPrinter.h projects/clang350-import/contrib/llvm/lib/Target/R600/MCTargetDesc/AMDGPUAsmBackend.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/MCTargetDesc/AMDGPUELFObjectWriter.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCAsmInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCAsmInfo.h projects/clang350-import/contrib/llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCCodeEmitter.h projects/clang350-import/contrib/llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/MCTargetDesc/SIMCCodeEmitter.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/Processors.td projects/clang350-import/contrib/llvm/lib/Target/R600/R600ClauseMergePass.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/R600ControlFlowFinalizer.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/R600Defines.h projects/clang350-import/contrib/llvm/lib/Target/R600/R600EmitClauseMarkers.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/R600ExpandSpecialInstrs.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/R600ISelLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/R600ISelLowering.h projects/clang350-import/contrib/llvm/lib/Target/R600/R600InstrInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/R600InstrInfo.h projects/clang350-import/contrib/llvm/lib/Target/R600/R600Instructions.td projects/clang350-import/contrib/llvm/lib/Target/R600/R600MachineFunctionInfo.h projects/clang350-import/contrib/llvm/lib/Target/R600/R600MachineScheduler.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/R600MachineScheduler.h projects/clang350-import/contrib/llvm/lib/Target/R600/R600OptimizeVectorRegisters.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/R600Packetizer.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/R600RegisterInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/R600RegisterInfo.h projects/clang350-import/contrib/llvm/lib/Target/R600/R600RegisterInfo.td projects/clang350-import/contrib/llvm/lib/Target/R600/R600TextureIntrinsicsReplacer.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/SIAnnotateControlFlow.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/SIDefines.h projects/clang350-import/contrib/llvm/lib/Target/R600/SIFixSGPRCopies.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/SIISelLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/SIISelLowering.h projects/clang350-import/contrib/llvm/lib/Target/R600/SIInsertWaits.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/SIInstrFormats.td projects/clang350-import/contrib/llvm/lib/Target/R600/SIInstrInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/SIInstrInfo.h projects/clang350-import/contrib/llvm/lib/Target/R600/SIInstrInfo.td projects/clang350-import/contrib/llvm/lib/Target/R600/SIInstructions.td projects/clang350-import/contrib/llvm/lib/Target/R600/SIIntrinsics.td projects/clang350-import/contrib/llvm/lib/Target/R600/SILowerControlFlow.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/SIMachineFunctionInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/SIMachineFunctionInfo.h projects/clang350-import/contrib/llvm/lib/Target/R600/SIRegisterInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/R600/SIRegisterInfo.h projects/clang350-import/contrib/llvm/lib/Target/R600/SIRegisterInfo.td projects/clang350-import/contrib/llvm/lib/Target/R600/SITypeRewriter.cpp projects/clang350-import/contrib/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp (contents, props changed) projects/clang350-import/contrib/llvm/lib/Target/Sparc/DelaySlotFiller.cpp projects/clang350-import/contrib/llvm/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp (contents, props changed) projects/clang350-import/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.cpp (contents, props changed) projects/clang350-import/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.h (contents, props changed) projects/clang350-import/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcAsmBackend.cpp projects/clang350-import/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcELFObjectWriter.cpp projects/clang350-import/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcFixupKinds.h projects/clang350-import/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCAsmInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCAsmInfo.h projects/clang350-import/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCCodeEmitter.cpp projects/clang350-import/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCExpr.cpp projects/clang350-import/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCExpr.h projects/clang350-import/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCTargetDesc.cpp projects/clang350-import/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcTargetStreamer.cpp projects/clang350-import/contrib/llvm/lib/Target/Sparc/Sparc.h projects/clang350-import/contrib/llvm/lib/Target/Sparc/Sparc.td projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcCodeEmitter.cpp projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcFrameLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcFrameLowering.h projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcISelDAGToDAG.cpp projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcISelLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcISelLowering.h projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcInstr64Bit.td projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcInstrAliases.td projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcInstrFormats.td projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.h projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.td projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcJITInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcJITInfo.h projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcMCInstLower.cpp projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcRegisterInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcRegisterInfo.h projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcRegisterInfo.td projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcSelectionDAGInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcSelectionDAGInfo.h projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcSubtarget.cpp projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcSubtarget.h projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcTargetMachine.cpp projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcTargetMachine.h projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcTargetObjectFile.cpp projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcTargetObjectFile.h projects/clang350-import/contrib/llvm/lib/Target/Sparc/SparcTargetStreamer.h projects/clang350-import/contrib/llvm/lib/Target/SystemZ/AsmParser/SystemZAsmParser.cpp projects/clang350-import/contrib/llvm/lib/Target/SystemZ/Disassembler/SystemZDisassembler.cpp projects/clang350-import/contrib/llvm/lib/Target/SystemZ/InstPrinter/SystemZInstPrinter.cpp projects/clang350-import/contrib/llvm/lib/Target/SystemZ/InstPrinter/SystemZInstPrinter.h projects/clang350-import/contrib/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmBackend.cpp projects/clang350-import/contrib/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.h projects/clang350-import/contrib/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCCodeEmitter.cpp projects/clang350-import/contrib/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCFixups.h projects/clang350-import/contrib/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCObjectWriter.cpp projects/clang350-import/contrib/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCTargetDesc.cpp projects/clang350-import/contrib/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCTargetDesc.h projects/clang350-import/contrib/llvm/lib/Target/SystemZ/README.txt projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZ.h projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZ.td projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZAsmPrinter.cpp projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZAsmPrinter.h projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZCallingConv.h projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZCallingConv.td projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZConstantPoolValue.cpp projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZConstantPoolValue.h projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZElimCompare.cpp projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZFrameLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZFrameLowering.h projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZISelLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZISelLowering.h projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZInstrBuilder.h projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZInstrFP.td projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZInstrFormats.td projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZInstrInfo.h projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZInstrInfo.td projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZLongBranch.cpp projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZMCInstLower.cpp projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZMCInstLower.h projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZMachineFunctionInfo.h projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZOperands.td projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZOperators.td projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZPatterns.td projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZProcessors.td projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZRegisterInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZRegisterInfo.h projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZRegisterInfo.td projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZSelectionDAGInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZSelectionDAGInfo.h projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZShortenInst.cpp projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZSubtarget.cpp projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZSubtarget.h projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZTargetMachine.cpp projects/clang350-import/contrib/llvm/lib/Target/SystemZ/SystemZTargetMachine.h projects/clang350-import/contrib/llvm/lib/Target/Target.cpp projects/clang350-import/contrib/llvm/lib/Target/TargetLibraryInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/TargetLoweringObjectFile.cpp projects/clang350-import/contrib/llvm/lib/Target/TargetMachine.cpp projects/clang350-import/contrib/llvm/lib/Target/TargetMachineC.cpp projects/clang350-import/contrib/llvm/lib/Target/TargetSubtargetInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/Disassembler/X86Disassembler.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/Disassembler/X86Disassembler.h projects/clang350-import/contrib/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h projects/clang350-import/contrib/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoderCommon.h projects/clang350-import/contrib/llvm/lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/InstPrinter/X86ATTInstPrinter.h projects/clang350-import/contrib/llvm/lib/Target/X86/InstPrinter/X86InstComments.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/InstPrinter/X86IntelInstPrinter.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/InstPrinter/X86IntelInstPrinter.h projects/clang350-import/contrib/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/MCTargetDesc/X86BaseInfo.h projects/clang350-import/contrib/llvm/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/MCTargetDesc/X86ELFRelocationInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/MCTargetDesc/X86FixupKinds.h projects/clang350-import/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.h projects/clang350-import/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h projects/clang350-import/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MachORelocationInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/MCTargetDesc/X86WinCOFFObjectWriter.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/TargetInfo/X86TargetInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/Utils/X86ShuffleDecode.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/Utils/X86ShuffleDecode.h projects/clang350-import/contrib/llvm/lib/Target/X86/X86.h projects/clang350-import/contrib/llvm/lib/Target/X86/X86.td projects/clang350-import/contrib/llvm/lib/Target/X86/X86AsmPrinter.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/X86AsmPrinter.h projects/clang350-import/contrib/llvm/lib/Target/X86/X86CallingConv.td projects/clang350-import/contrib/llvm/lib/Target/X86/X86CodeEmitter.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/X86FastISel.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/X86FixupLEAs.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/X86FloatingPoint.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/X86FrameLowering.h projects/clang350-import/contrib/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/X86ISelLowering.h projects/clang350-import/contrib/llvm/lib/Target/X86/X86InstrAVX512.td projects/clang350-import/contrib/llvm/lib/Target/X86/X86InstrArithmetic.td projects/clang350-import/contrib/llvm/lib/Target/X86/X86InstrBuilder.h projects/clang350-import/contrib/llvm/lib/Target/X86/X86InstrCMovSetCC.td projects/clang350-import/contrib/llvm/lib/Target/X86/X86InstrCompiler.td projects/clang350-import/contrib/llvm/lib/Target/X86/X86InstrControl.td projects/clang350-import/contrib/llvm/lib/Target/X86/X86InstrExtension.td projects/clang350-import/contrib/llvm/lib/Target/X86/X86InstrFMA.td projects/clang350-import/contrib/llvm/lib/Target/X86/X86InstrFPStack.td projects/clang350-import/contrib/llvm/lib/Target/X86/X86InstrFormats.td projects/clang350-import/contrib/llvm/lib/Target/X86/X86InstrFragmentsSIMD.td projects/clang350-import/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/X86InstrInfo.h projects/clang350-import/contrib/llvm/lib/Target/X86/X86InstrInfo.td projects/clang350-import/contrib/llvm/lib/Target/X86/X86InstrMMX.td projects/clang350-import/contrib/llvm/lib/Target/X86/X86InstrSSE.td projects/clang350-import/contrib/llvm/lib/Target/X86/X86InstrSVM.td projects/clang350-import/contrib/llvm/lib/Target/X86/X86InstrShiftRotate.td projects/clang350-import/contrib/llvm/lib/Target/X86/X86InstrSystem.td projects/clang350-import/contrib/llvm/lib/Target/X86/X86InstrTSX.td projects/clang350-import/contrib/llvm/lib/Target/X86/X86InstrVMX.td projects/clang350-import/contrib/llvm/lib/Target/X86/X86InstrXOP.td projects/clang350-import/contrib/llvm/lib/Target/X86/X86JITInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/X86JITInfo.h projects/clang350-import/contrib/llvm/lib/Target/X86/X86MCInstLower.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/X86PadShortFunction.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/X86RegisterInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/X86RegisterInfo.h projects/clang350-import/contrib/llvm/lib/Target/X86/X86RegisterInfo.td projects/clang350-import/contrib/llvm/lib/Target/X86/X86SchedHaswell.td projects/clang350-import/contrib/llvm/lib/Target/X86/X86SchedSandyBridge.td projects/clang350-import/contrib/llvm/lib/Target/X86/X86Schedule.td projects/clang350-import/contrib/llvm/lib/Target/X86/X86ScheduleAtom.td projects/clang350-import/contrib/llvm/lib/Target/X86/X86ScheduleSLM.td projects/clang350-import/contrib/llvm/lib/Target/X86/X86SelectionDAGInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/X86SelectionDAGInfo.h projects/clang350-import/contrib/llvm/lib/Target/X86/X86Subtarget.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/X86Subtarget.h projects/clang350-import/contrib/llvm/lib/Target/X86/X86TargetMachine.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/X86TargetMachine.h projects/clang350-import/contrib/llvm/lib/Target/X86/X86TargetObjectFile.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/X86TargetObjectFile.h projects/clang350-import/contrib/llvm/lib/Target/X86/X86TargetTransformInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/X86/X86VZeroUpper.cpp projects/clang350-import/contrib/llvm/lib/Target/XCore/Disassembler/XCoreDisassembler.cpp projects/clang350-import/contrib/llvm/lib/Target/XCore/InstPrinter/XCoreInstPrinter.cpp projects/clang350-import/contrib/llvm/lib/Target/XCore/InstPrinter/XCoreInstPrinter.h projects/clang350-import/contrib/llvm/lib/Target/XCore/MCTargetDesc/XCoreMCAsmInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/XCore/MCTargetDesc/XCoreMCAsmInfo.h projects/clang350-import/contrib/llvm/lib/Target/XCore/MCTargetDesc/XCoreMCTargetDesc.cpp projects/clang350-import/contrib/llvm/lib/Target/XCore/XCore.h projects/clang350-import/contrib/llvm/lib/Target/XCore/XCore.td projects/clang350-import/contrib/llvm/lib/Target/XCore/XCoreAsmPrinter.cpp projects/clang350-import/contrib/llvm/lib/Target/XCore/XCoreCallingConv.td projects/clang350-import/contrib/llvm/lib/Target/XCore/XCoreFrameLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/XCore/XCoreFrameLowering.h projects/clang350-import/contrib/llvm/lib/Target/XCore/XCoreISelDAGToDAG.cpp projects/clang350-import/contrib/llvm/lib/Target/XCore/XCoreISelLowering.cpp projects/clang350-import/contrib/llvm/lib/Target/XCore/XCoreISelLowering.h projects/clang350-import/contrib/llvm/lib/Target/XCore/XCoreInstrInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/XCore/XCoreInstrInfo.h projects/clang350-import/contrib/llvm/lib/Target/XCore/XCoreInstrInfo.td projects/clang350-import/contrib/llvm/lib/Target/XCore/XCoreLowerThreadLocal.cpp projects/clang350-import/contrib/llvm/lib/Target/XCore/XCoreMCInstLower.cpp projects/clang350-import/contrib/llvm/lib/Target/XCore/XCoreMachineFunctionInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/XCore/XCoreMachineFunctionInfo.h projects/clang350-import/contrib/llvm/lib/Target/XCore/XCoreRegisterInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/XCore/XCoreRegisterInfo.h projects/clang350-import/contrib/llvm/lib/Target/XCore/XCoreSelectionDAGInfo.cpp projects/clang350-import/contrib/llvm/lib/Target/XCore/XCoreSelectionDAGInfo.h projects/clang350-import/contrib/llvm/lib/Target/XCore/XCoreSubtarget.cpp projects/clang350-import/contrib/llvm/lib/Target/XCore/XCoreSubtarget.h projects/clang350-import/contrib/llvm/lib/Target/XCore/XCoreTargetMachine.cpp projects/clang350-import/contrib/llvm/lib/Target/XCore/XCoreTargetMachine.h projects/clang350-import/contrib/llvm/lib/Target/XCore/XCoreTargetObjectFile.cpp projects/clang350-import/contrib/llvm/lib/Target/XCore/XCoreTargetObjectFile.h projects/clang350-import/contrib/llvm/lib/Target/XCore/XCoreTargetTransformInfo.cpp projects/clang350-import/contrib/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp projects/clang350-import/contrib/llvm/lib/Transforms/IPO/BarrierNoopPass.cpp projects/clang350-import/contrib/llvm/lib/Transforms/IPO/ConstantMerge.cpp projects/clang350-import/contrib/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp projects/clang350-import/contrib/llvm/lib/Transforms/IPO/ExtractGV.cpp projects/clang350-import/contrib/llvm/lib/Transforms/IPO/FunctionAttrs.cpp projects/clang350-import/contrib/llvm/lib/Transforms/IPO/GlobalDCE.cpp projects/clang350-import/contrib/llvm/lib/Transforms/IPO/GlobalOpt.cpp projects/clang350-import/contrib/llvm/lib/Transforms/IPO/IPConstantPropagation.cpp projects/clang350-import/contrib/llvm/lib/Transforms/IPO/IPO.cpp projects/clang350-import/contrib/llvm/lib/Transforms/IPO/InlineAlways.cpp projects/clang350-import/contrib/llvm/lib/Transforms/IPO/InlineSimple.cpp projects/clang350-import/contrib/llvm/lib/Transforms/IPO/Inliner.cpp projects/clang350-import/contrib/llvm/lib/Transforms/IPO/Internalize.cpp projects/clang350-import/contrib/llvm/lib/Transforms/IPO/LoopExtractor.cpp projects/clang350-import/contrib/llvm/lib/Transforms/IPO/MergeFunctions.cpp projects/clang350-import/contrib/llvm/lib/Transforms/IPO/PartialInlining.cpp projects/clang350-import/contrib/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp projects/clang350-import/contrib/llvm/lib/Transforms/IPO/PruneEH.cpp projects/clang350-import/contrib/llvm/lib/Transforms/IPO/StripDeadPrototypes.cpp projects/clang350-import/contrib/llvm/lib/Transforms/IPO/StripSymbols.cpp projects/clang350-import/contrib/llvm/lib/Transforms/InstCombine/InstCombine.h projects/clang350-import/contrib/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp projects/clang350-import/contrib/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp projects/clang350-import/contrib/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp projects/clang350-import/contrib/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp projects/clang350-import/contrib/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp projects/clang350-import/contrib/llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp projects/clang350-import/contrib/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp projects/clang350-import/contrib/llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp projects/clang350-import/contrib/llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp projects/clang350-import/contrib/llvm/lib/Transforms/InstCombine/InstCombineShifts.cpp projects/clang350-import/contrib/llvm/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp projects/clang350-import/contrib/llvm/lib/Transforms/InstCombine/InstCombineVectorOps.cpp projects/clang350-import/contrib/llvm/lib/Transforms/InstCombine/InstCombineWorklist.h projects/clang350-import/contrib/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Instrumentation/BoundsChecking.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Instrumentation/DebugIR.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Instrumentation/DebugIR.h projects/clang350-import/contrib/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Instrumentation/Instrumentation.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Instrumentation/ThreadSanitizer.cpp projects/clang350-import/contrib/llvm/lib/Transforms/ObjCARC/ARCRuntimeEntryPoints.h projects/clang350-import/contrib/llvm/lib/Transforms/ObjCARC/DependencyAnalysis.cpp projects/clang350-import/contrib/llvm/lib/Transforms/ObjCARC/ObjCARC.h projects/clang350-import/contrib/llvm/lib/Transforms/ObjCARC/ObjCARCAPElim.cpp projects/clang350-import/contrib/llvm/lib/Transforms/ObjCARC/ObjCARCAliasAnalysis.cpp projects/clang350-import/contrib/llvm/lib/Transforms/ObjCARC/ObjCARCAliasAnalysis.h projects/clang350-import/contrib/llvm/lib/Transforms/ObjCARC/ObjCARCContract.cpp projects/clang350-import/contrib/llvm/lib/Transforms/ObjCARC/ObjCARCExpand.cpp projects/clang350-import/contrib/llvm/lib/Transforms/ObjCARC/ObjCARCOpts.cpp projects/clang350-import/contrib/llvm/lib/Transforms/ObjCARC/ProvenanceAnalysis.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/ADCE.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/ConstantProp.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/CorrelatedValuePropagation.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/DCE.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/EarlyCSE.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/FlattenCFGPass.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/GVN.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/JumpThreading.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/LICM.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/LoopDeletion.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/LoopIdiomRecognize.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/LoopInstSimplify.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/LoopRerollPass.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/LoopRotation.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/LoopUnrollPass.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/LowerAtomic.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/MemCpyOptimizer.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/PartiallyInlineLibCalls.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/Reassociate.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/Reg2Mem.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/SCCP.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/SROA.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/SampleProfile.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/Scalar.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/Sink.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/StructurizeCFG.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/BuildLibCalls.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/BypassSlowDivision.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/CloneFunction.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/CloneModule.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/CmpInstAnalysis.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/CodeExtractor.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/DemoteRegToStack.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/FlattenCFG.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/GlobalStatus.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/InlineFunction.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/InstructionNamer.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/IntegerDivision.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/LCSSA.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/Local.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/LoopSimplify.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/LoopUnroll.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/LoopUnrollRuntime.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/LowerExpectIntrinsic.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/LowerInvoke.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/LowerSwitch.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/Mem2Reg.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/MetaRenamer.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/ModuleUtils.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/SSAUpdater.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/SimplifyCFG.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/SimplifyIndVar.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/SimplifyInstructions.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/Utils.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Utils/ValueMapper.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Vectorize/BBVectorize.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp projects/clang350-import/contrib/llvm/lib/Transforms/Vectorize/Vectorize.cpp projects/clang350-import/contrib/llvm/tools/bugpoint/BugDriver.cpp projects/clang350-import/contrib/llvm/tools/bugpoint/BugDriver.h projects/clang350-import/contrib/llvm/tools/bugpoint/CrashDebugger.cpp projects/clang350-import/contrib/llvm/tools/bugpoint/ExecutionDriver.cpp projects/clang350-import/contrib/llvm/tools/bugpoint/ExtractFunction.cpp projects/clang350-import/contrib/llvm/tools/bugpoint/FindBugs.cpp projects/clang350-import/contrib/llvm/tools/bugpoint/Miscompilation.cpp projects/clang350-import/contrib/llvm/tools/bugpoint/OptimizerDriver.cpp projects/clang350-import/contrib/llvm/tools/bugpoint/ToolRunner.cpp projects/clang350-import/contrib/llvm/tools/bugpoint/ToolRunner.h projects/clang350-import/contrib/llvm/tools/bugpoint/bugpoint.cpp projects/clang350-import/contrib/llvm/tools/llc/llc.cpp projects/clang350-import/contrib/llvm/tools/lli/ChildTarget/ChildTarget.cpp projects/clang350-import/contrib/llvm/tools/lli/RemoteMemoryManager.cpp projects/clang350-import/contrib/llvm/tools/lli/RemoteMemoryManager.h projects/clang350-import/contrib/llvm/tools/lli/RemoteTarget.cpp projects/clang350-import/contrib/llvm/tools/lli/RemoteTarget.h projects/clang350-import/contrib/llvm/tools/lli/RemoteTargetExternal.cpp projects/clang350-import/contrib/llvm/tools/lli/RemoteTargetExternal.h projects/clang350-import/contrib/llvm/tools/lli/RemoteTargetMessage.h projects/clang350-import/contrib/llvm/tools/lli/lli.cpp projects/clang350-import/contrib/llvm/tools/llvm-ar/llvm-ar.cpp projects/clang350-import/contrib/llvm/tools/llvm-as/llvm-as.cpp projects/clang350-import/contrib/llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp projects/clang350-import/contrib/llvm/tools/llvm-diff/DiffConsumer.h projects/clang350-import/contrib/llvm/tools/llvm-diff/DiffLog.cpp projects/clang350-import/contrib/llvm/tools/llvm-diff/DifferenceEngine.cpp projects/clang350-import/contrib/llvm/tools/llvm-diff/DifferenceEngine.h projects/clang350-import/contrib/llvm/tools/llvm-dis/llvm-dis.cpp projects/clang350-import/contrib/llvm/tools/llvm-extract/llvm-extract.cpp projects/clang350-import/contrib/llvm/tools/llvm-link/llvm-link.cpp projects/clang350-import/contrib/llvm/tools/llvm-mc/Disassembler.cpp projects/clang350-import/contrib/llvm/tools/llvm-mc/llvm-mc.cpp projects/clang350-import/contrib/llvm/tools/llvm-nm/llvm-nm.cpp projects/clang350-import/contrib/llvm/tools/llvm-objdump/COFFDump.cpp projects/clang350-import/contrib/llvm/tools/llvm-objdump/MachODump.cpp projects/clang350-import/contrib/llvm/tools/llvm-objdump/llvm-objdump.cpp projects/clang350-import/contrib/llvm/tools/llvm-objdump/llvm-objdump.h projects/clang350-import/contrib/llvm/tools/llvm-readobj/COFFDumper.cpp projects/clang350-import/contrib/llvm/tools/llvm-readobj/ELFDumper.cpp projects/clang350-import/contrib/llvm/tools/llvm-readobj/Error.cpp projects/clang350-import/contrib/llvm/tools/llvm-readobj/Error.h projects/clang350-import/contrib/llvm/tools/llvm-readobj/MachODumper.cpp projects/clang350-import/contrib/llvm/tools/llvm-readobj/ObjDumper.cpp projects/clang350-import/contrib/llvm/tools/llvm-readobj/ObjDumper.h projects/clang350-import/contrib/llvm/tools/llvm-readobj/StreamWriter.h projects/clang350-import/contrib/llvm/tools/llvm-readobj/llvm-readobj.cpp projects/clang350-import/contrib/llvm/tools/llvm-readobj/llvm-readobj.h projects/clang350-import/contrib/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp projects/clang350-import/contrib/llvm/tools/llvm-stress/llvm-stress.cpp projects/clang350-import/contrib/llvm/tools/llvm-symbolizer/LLVMSymbolize.cpp projects/clang350-import/contrib/llvm/tools/llvm-symbolizer/LLVMSymbolize.h projects/clang350-import/contrib/llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp projects/clang350-import/contrib/llvm/tools/macho-dump/macho-dump.cpp projects/clang350-import/contrib/llvm/tools/opt/AnalysisWrappers.cpp projects/clang350-import/contrib/llvm/tools/opt/GraphPrinters.cpp projects/clang350-import/contrib/llvm/tools/opt/PrintSCC.cpp projects/clang350-import/contrib/llvm/tools/opt/opt.cpp projects/clang350-import/contrib/llvm/utils/TableGen/AsmMatcherEmitter.cpp projects/clang350-import/contrib/llvm/utils/TableGen/AsmWriterEmitter.cpp projects/clang350-import/contrib/llvm/utils/TableGen/AsmWriterInst.cpp projects/clang350-import/contrib/llvm/utils/TableGen/AsmWriterInst.h projects/clang350-import/contrib/llvm/utils/TableGen/CTagsEmitter.cpp projects/clang350-import/contrib/llvm/utils/TableGen/CallingConvEmitter.cpp projects/clang350-import/contrib/llvm/utils/TableGen/CodeEmitterGen.cpp projects/clang350-import/contrib/llvm/utils/TableGen/CodeGenDAGPatterns.cpp projects/clang350-import/contrib/llvm/utils/TableGen/CodeGenDAGPatterns.h projects/clang350-import/contrib/llvm/utils/TableGen/CodeGenInstruction.cpp projects/clang350-import/contrib/llvm/utils/TableGen/CodeGenInstruction.h projects/clang350-import/contrib/llvm/utils/TableGen/CodeGenIntrinsics.h projects/clang350-import/contrib/llvm/utils/TableGen/CodeGenMapTable.cpp projects/clang350-import/contrib/llvm/utils/TableGen/CodeGenRegisters.cpp projects/clang350-import/contrib/llvm/utils/TableGen/CodeGenRegisters.h projects/clang350-import/contrib/llvm/utils/TableGen/CodeGenSchedule.cpp projects/clang350-import/contrib/llvm/utils/TableGen/CodeGenSchedule.h projects/clang350-import/contrib/llvm/utils/TableGen/CodeGenTarget.cpp projects/clang350-import/contrib/llvm/utils/TableGen/CodeGenTarget.h projects/clang350-import/contrib/llvm/utils/TableGen/DAGISelEmitter.cpp projects/clang350-import/contrib/llvm/utils/TableGen/DAGISelMatcher.cpp projects/clang350-import/contrib/llvm/utils/TableGen/DAGISelMatcher.h projects/clang350-import/contrib/llvm/utils/TableGen/DAGISelMatcherEmitter.cpp projects/clang350-import/contrib/llvm/utils/TableGen/DAGISelMatcherGen.cpp projects/clang350-import/contrib/llvm/utils/TableGen/DAGISelMatcherOpt.cpp projects/clang350-import/contrib/llvm/utils/TableGen/DFAPacketizerEmitter.cpp projects/clang350-import/contrib/llvm/utils/TableGen/DisassemblerEmitter.cpp projects/clang350-import/contrib/llvm/utils/TableGen/FastISelEmitter.cpp projects/clang350-import/contrib/llvm/utils/TableGen/FixedLenDecoderEmitter.cpp projects/clang350-import/contrib/llvm/utils/TableGen/InstrInfoEmitter.cpp projects/clang350-import/contrib/llvm/utils/TableGen/IntrinsicEmitter.cpp projects/clang350-import/contrib/llvm/utils/TableGen/OptParserEmitter.cpp projects/clang350-import/contrib/llvm/utils/TableGen/PseudoLoweringEmitter.cpp projects/clang350-import/contrib/llvm/utils/TableGen/RegisterInfoEmitter.cpp projects/clang350-import/contrib/llvm/utils/TableGen/SubtargetEmitter.cpp projects/clang350-import/contrib/llvm/utils/TableGen/TableGen.cpp projects/clang350-import/contrib/llvm/utils/TableGen/X86DisassemblerShared.h projects/clang350-import/contrib/llvm/utils/TableGen/X86DisassemblerTables.cpp projects/clang350-import/contrib/llvm/utils/TableGen/X86DisassemblerTables.h projects/clang350-import/contrib/llvm/utils/TableGen/X86ModRMFilters.cpp projects/clang350-import/contrib/llvm/utils/TableGen/X86ModRMFilters.h projects/clang350-import/contrib/llvm/utils/TableGen/X86RecognizableInstr.cpp projects/clang350-import/contrib/llvm/utils/TableGen/X86RecognizableInstr.h Directory Properties: projects/clang350-import/contrib/llvm/ (props changed) Modified: projects/clang350-import/contrib/llvm/LICENSE.TXT ============================================================================== --- projects/clang350-import/contrib/llvm/LICENSE.TXT Mon Nov 24 16:12:11 2014 (r274967) +++ projects/clang350-import/contrib/llvm/LICENSE.TXT Mon Nov 24 17:02:24 2014 (r274968) @@ -4,7 +4,7 @@ LLVM Release License University of Illinois/NCSA Open Source License -Copyright (c) 2003-2013 University of Illinois at Urbana-Champaign. +Copyright (c) 2003-2014 University of Illinois at Urbana-Champaign. All rights reserved. Developed by: @@ -63,7 +63,6 @@ Program Directory ------- --------- Autoconf llvm/autoconf llvm/projects/ModuleMaker/autoconf - llvm/projects/sample/autoconf Google Test llvm/utils/unittest/googletest OpenBSD regex llvm/lib/Support/{reg*, COPYRIGHT.regex} pyyaml tests llvm/test/YAMLParser/{*.data, LICENSE.TXT} Modified: projects/clang350-import/contrib/llvm/include/llvm-c/Core.h ============================================================================== --- projects/clang350-import/contrib/llvm/include/llvm-c/Core.h Mon Nov 24 16:12:11 2014 (r274967) +++ projects/clang350-import/contrib/llvm/include/llvm-c/Core.h Mon Nov 24 17:02:24 2014 (r274968) @@ -15,7 +15,7 @@ #ifndef LLVM_C_CORE_H #define LLVM_C_CORE_H -#include "llvm/Support/DataTypes.h" +#include "llvm-c/Support.h" #ifdef __cplusplus extern "C" { @@ -62,8 +62,6 @@ extern "C" { * @{ */ -typedef int LLVMBool; - /* Opaque types. */ /** @@ -114,13 +112,6 @@ typedef struct LLVMOpaqueBuilder *LLVMBu */ typedef struct LLVMOpaqueModuleProvider *LLVMModuleProviderRef; -/** - * Used to provide a module to JIT or interpreter. - * - * @see llvm::MemoryBuffer - */ -typedef struct LLVMOpaqueMemoryBuffer *LLVMMemoryBufferRef; - /** @see llvm::PassManagerBase */ typedef struct LLVMOpaquePassManager *LLVMPassManagerRef; @@ -133,6 +124,12 @@ typedef struct LLVMOpaquePassRegistry *L * @see llvm::Use */ typedef struct LLVMOpaqueUse *LLVMUseRef; + +/** + * @see llvm::DiagnosticInfo + */ +typedef struct LLVMOpaqueDiagnosticInfo *LLVMDiagnosticInfoRef; + typedef enum { LLVMZExtAttribute = 1<<0, LLVMSExtAttribute = 1<<1, @@ -167,7 +164,11 @@ typedef enum { LLVMAddressSafety = 1ULL << 32, LLVMStackProtectStrongAttribute = 1ULL<<33, LLVMCold = 1ULL << 34, - LLVMOptimizeNone = 1ULL << 35 + LLVMOptimizeNone = 1ULL << 35, + LLVMInAllocaAttribute = 1ULL << 36, + LLVMNonNullAttribute = 1ULL << 37, + LLVMJumpTableAttribute = 1ULL << 38, + LLVMDereferenceableAttribute = 1ULL << 39, */ } LLVMAttribute; @@ -283,8 +284,8 @@ typedef enum { LLVMInternalLinkage, /**< Rename collisions when linking (static functions) */ LLVMPrivateLinkage, /**< Like Internal, but omit from symbol table */ - LLVMDLLImportLinkage, /**< Function to be imported from DLL */ - LLVMDLLExportLinkage, /**< Function to be accessible from DLL */ + LLVMDLLImportLinkage, /**< Obsolete */ + LLVMDLLExportLinkage, /**< Obsolete */ LLVMExternalWeakLinkage,/**< ExternalWeak linkage description */ LLVMGhostLinkage, /**< Obsolete */ LLVMCommonLinkage, /**< Tentative definitions */ @@ -299,6 +300,12 @@ typedef enum { } LLVMVisibility; typedef enum { + LLVMDefaultStorageClass = 0, + LLVMDLLImportStorageClass = 1, /**< Function to be imported from DLL. */ + LLVMDLLExportStorageClass = 2 /**< Function to be accessible from DLL. */ +} LLVMDLLStorageClass; + +typedef enum { LLVMCCallConv = 0, LLVMFastCallConv = 8, LLVMColdCallConv = 9, @@ -402,6 +409,13 @@ typedef enum { the old one */ } LLVMAtomicRMWBinOp; +typedef enum { + LLVMDSError, + LLVMDSWarning, + LLVMDSRemark, + LLVMDSNote +} LLVMDiagnosticSeverity; + /** * @} */ @@ -455,6 +469,9 @@ void LLVMEnablePrettyStackTrace(void); * @{ */ +typedef void (*LLVMDiagnosticHandler)(LLVMDiagnosticInfoRef, void *); +typedef void (*LLVMYieldCallback)(LLVMContextRef, void *); + /** * Create a new context. * @@ -469,6 +486,21 @@ LLVMContextRef LLVMContextCreate(void); LLVMContextRef LLVMGetGlobalContext(void); /** + * Set the diagnostic handler for this context. + */ +void LLVMContextSetDiagnosticHandler(LLVMContextRef C, + LLVMDiagnosticHandler Handler, + void *DiagnosticContext); + +/** + * Set the yield callback function for this context. + * + * @see LLVMContext::setYieldCallback() + */ +void LLVMContextSetYieldCallback(LLVMContextRef C, LLVMYieldCallback Callback, + void *OpaqueHandle); + +/** * Destroy a context instance. * * This should be called for every call to LLVMContextCreate() or memory @@ -476,6 +508,21 @@ LLVMContextRef LLVMGetGlobalContext(void */ void LLVMContextDispose(LLVMContextRef C); +/** + * Return a string representation of the DiagnosticInfo. Use + * LLVMDisposeMessage to free the string. + * + * @see DiagnosticInfo::print() + */ +char *LLVMGetDiagInfoDescription(LLVMDiagnosticInfoRef DI); + +/** + * Return an enum LLVMDiagnosticSeverity. + * + * @see DiagnosticInfo::getSeverity() + */ +LLVMDiagnosticSeverity LLVMGetDiagInfoSeverity(LLVMDiagnosticInfoRef DI); + unsigned LLVMGetMDKindIDInContext(LLVMContextRef C, const char* Name, unsigned SLen); unsigned LLVMGetMDKindID(const char* Name, unsigned SLen); @@ -1123,9 +1170,10 @@ LLVMTypeRef LLVMX86MMXType(void); macro(ConstantStruct) \ macro(ConstantVector) \ macro(GlobalValue) \ - macro(Function) \ macro(GlobalAlias) \ - macro(GlobalVariable) \ + macro(GlobalObject) \ + macro(Function) \ + macro(GlobalVariable) \ macro(UndefValue) \ macro(Instruction) \ macro(BinaryOperator) \ @@ -1688,6 +1736,10 @@ const char *LLVMGetSection(LLVMValueRef void LLVMSetSection(LLVMValueRef Global, const char *Section); LLVMVisibility LLVMGetVisibility(LLVMValueRef Global); void LLVMSetVisibility(LLVMValueRef Global, LLVMVisibility Viz); +LLVMDLLStorageClass LLVMGetDLLStorageClass(LLVMValueRef Global); +void LLVMSetDLLStorageClass(LLVMValueRef Global, LLVMDLLStorageClass Class); +LLVMBool LLVMHasUnnamedAddr(LLVMValueRef Global); +void LLVMSetUnnamedAddr(LLVMValueRef Global, LLVMBool HasUnnamedAddr); /** * @defgroup LLVMCCoreValueWithAlignment Values with alignment @@ -1698,6 +1750,7 @@ void LLVMSetVisibility(LLVMValueRef Glob /** * Obtain the preferred alignment of the value. + * @see llvm::AllocaInst::getAlignment() * @see llvm::LoadInst::getAlignment() * @see llvm::StoreInst::getAlignment() * @see llvm::GlobalValue::getAlignment() @@ -1706,6 +1759,7 @@ unsigned LLVMGetAlignment(LLVMValueRef V /** * Set the preferred alignment of the value. + * @see llvm::AllocaInst::setAlignment() * @see llvm::LoadInst::setAlignment() * @see llvm::StoreInst::setAlignment() * @see llvm::GlobalValue::setAlignment() @@ -2663,7 +2717,9 @@ LLVMValueRef LLVMBuildIsNotNull(LLVMBuil const char *Name); LLVMValueRef LLVMBuildPtrDiff(LLVMBuilderRef, LLVMValueRef LHS, LLVMValueRef RHS, const char *Name); -LLVMValueRef LLVMBuildAtomicRMW(LLVMBuilderRef B,LLVMAtomicRMWBinOp op, +LLVMValueRef LLVMBuildFence(LLVMBuilderRef B, LLVMAtomicOrdering ordering, + LLVMBool singleThread, const char *Name); +LLVMValueRef LLVMBuildAtomicRMW(LLVMBuilderRef B, LLVMAtomicRMWBinOp op, LLVMValueRef PTR, LLVMValueRef Val, LLVMAtomicOrdering ordering, LLVMBool singleThread); @@ -2793,16 +2849,13 @@ void LLVMDisposePassManager(LLVMPassMana * @{ */ -/** Allocate and initialize structures needed to make LLVM safe for - multithreading. The return value indicates whether multithreaded - initialization succeeded. Must be executed in isolation from all - other LLVM api calls. - @see llvm::llvm_start_multithreaded */ +/** Deprecated: Multi-threading can only be enabled/disabled with the compile + time define LLVM_ENABLE_THREADS. This function always returns + LLVMIsMultithreaded(). */ LLVMBool LLVMStartMultithreaded(void); -/** Deallocate structures necessary to make LLVM safe for multithreading. - Must be executed in isolation from all other LLVM api calls. - @see llvm::llvm_stop_multithreaded */ +/** Deprecated: Multi-threading can only be enabled/disabled with the compile + time define LLVM_ENABLE_THREADS. */ void LLVMStopMultithreaded(void); /** Check whether LLVM is executing in thread-safe mode or not. Modified: projects/clang350-import/contrib/llvm/include/llvm-c/Disassembler.h ============================================================================== --- projects/clang350-import/contrib/llvm/include/llvm-c/Disassembler.h Mon Nov 24 16:12:11 2014 (r274967) +++ projects/clang350-import/contrib/llvm/include/llvm-c/Disassembler.h Mon Nov 24 17:02:24 2014 (r274968) @@ -96,6 +96,16 @@ struct LLVMOpInfo1 { #define LLVMDisassembler_VariantKind_ARM_LO16 2 /* :lower16: */ /** + * The ARM64 target VariantKinds. + */ +#define LLVMDisassembler_VariantKind_ARM64_PAGE 1 /* @page */ +#define LLVMDisassembler_VariantKind_ARM64_PAGEOFF 2 /* @pageoff */ +#define LLVMDisassembler_VariantKind_ARM64_GOTPAGE 3 /* @gotpage */ +#define LLVMDisassembler_VariantKind_ARM64_GOTPAGEOFF 4 /* @gotpageoff */ +#define LLVMDisassembler_VariantKind_ARM64_TLVP 5 /* @tvlppage */ +#define LLVMDisassembler_VariantKind_ARM64_TLVOFF 6 /* @tvlppageoff */ + +/** * The type for the symbol lookup function. This may be called by the * disassembler for things like adding a comment for a PC plus a constant * offset load instruction to use a symbol name instead of a load address value. @@ -123,6 +133,17 @@ typedef const char *(*LLVMSymbolLookupCa /* The input reference is from a PC relative load instruction. */ #define LLVMDisassembler_ReferenceType_In_PCrel_Load 2 +/* The input reference is from an ARM64::ADRP instruction. */ +#define LLVMDisassembler_ReferenceType_In_ARM64_ADRP 0x100000001 +/* The input reference is from an ARM64::ADDXri instruction. */ +#define LLVMDisassembler_ReferenceType_In_ARM64_ADDXri 0x100000002 +/* The input reference is from an ARM64::LDRXui instruction. */ +#define LLVMDisassembler_ReferenceType_In_ARM64_LDRXui 0x100000003 +/* The input reference is from an ARM64::LDRXl instruction. */ +#define LLVMDisassembler_ReferenceType_In_ARM64_LDRXl 0x100000004 +/* The input reference is from an ARM64::ADR instruction. */ +#define LLVMDisassembler_ReferenceType_In_ARM64_ADR 0x100000005 + /* The output reference is to as symbol stub. */ #define LLVMDisassembler_ReferenceType_Out_SymbolStub 1 /* The output reference is to a symbol address in a literal pool. */ @@ -141,6 +162,9 @@ typedef const char *(*LLVMSymbolLookupCa /* The output reference is to a Objective-C class ref. */ #define LLVMDisassembler_ReferenceType_Out_Objc_Class_Ref 8 +/* The output reference is to a C++ symbol name. */ +#define LLVMDisassembler_ReferenceType_DeMangled_Name 9 + #ifdef __cplusplus extern "C" { #endif /* !defined(__cplusplus) */ Modified: projects/clang350-import/contrib/llvm/include/llvm-c/ExecutionEngine.h ============================================================================== --- projects/clang350-import/contrib/llvm/include/llvm-c/ExecutionEngine.h Mon Nov 24 16:12:11 2014 (r274967) +++ projects/clang350-import/contrib/llvm/include/llvm-c/ExecutionEngine.h Mon Nov 24 17:02:24 2014 (r274968) @@ -163,6 +163,8 @@ void *LLVMRecompileAndRelinkFunction(LLV LLVMValueRef Fn); LLVMTargetDataRef LLVMGetExecutionEngineTargetData(LLVMExecutionEngineRef EE); +LLVMTargetMachineRef +LLVMGetExecutionEngineTargetMachine(LLVMExecutionEngineRef EE); void LLVMAddGlobalMapping(LLVMExecutionEngineRef EE, LLVMValueRef Global, void* Addr); Modified: projects/clang350-import/contrib/llvm/include/llvm-c/IRReader.h ============================================================================== --- projects/clang350-import/contrib/llvm/include/llvm-c/IRReader.h Mon Nov 24 16:12:11 2014 (r274967) +++ projects/clang350-import/contrib/llvm/include/llvm-c/IRReader.h Mon Nov 24 17:02:24 2014 (r274968) @@ -24,7 +24,7 @@ extern "C" { * Read LLVM IR from a memory buffer and convert it into an in-memory Module * object. Returns 0 on success. * Optionally returns a human-readable description of any errors that - * occured during parsing IR. OutMessage must be disposed with + * occurred during parsing IR. OutMessage must be disposed with * LLVMDisposeMessage. * * @see llvm::ParseIR() Modified: projects/clang350-import/contrib/llvm/include/llvm-c/Object.h ============================================================================== --- projects/clang350-import/contrib/llvm/include/llvm-c/Object.h Mon Nov 24 16:12:11 2014 (r274967) +++ projects/clang350-import/contrib/llvm/include/llvm-c/Object.h Mon Nov 24 17:02:24 2014 (r274968) @@ -78,7 +78,6 @@ void LLVMMoveToNextRelocation(LLVMReloca // SymbolRef accessors const char *LLVMGetSymbolName(LLVMSymbolIteratorRef SI); uint64_t LLVMGetSymbolAddress(LLVMSymbolIteratorRef SI); -uint64_t LLVMGetSymbolFileOffset(LLVMSymbolIteratorRef SI); uint64_t LLVMGetSymbolSize(LLVMSymbolIteratorRef SI); // RelocationRef accessors Modified: projects/clang350-import/contrib/llvm/include/llvm-c/Support.h ============================================================================== --- projects/clang350-import/contrib/llvm/include/llvm-c/Support.h Mon Nov 24 16:12:11 2014 (r274967) +++ projects/clang350-import/contrib/llvm/include/llvm-c/Support.h Mon Nov 24 17:02:24 2014 (r274968) @@ -14,13 +14,32 @@ #ifndef LLVM_C_SUPPORT_H #define LLVM_C_SUPPORT_H -#include "llvm-c/Core.h" +#include "llvm/Support/DataTypes.h" #ifdef __cplusplus extern "C" { #endif /** + * @defgroup LLVMCSupportTypes Types and Enumerations + * + * @{ + */ + +typedef int LLVMBool; + +/** + * Used to pass regions of memory through LLVM interfaces. + * + * @see llvm::MemoryBuffer + */ +typedef struct LLVMOpaqueMemoryBuffer *LLVMMemoryBufferRef; + +/** + * @} + */ + +/** * This function permanently loads the dynamic library at the given path. * It is safe to call this function multiple times for the same library. * Modified: projects/clang350-import/contrib/llvm/include/llvm-c/TargetMachine.h ============================================================================== --- projects/clang350-import/contrib/llvm/include/llvm-c/TargetMachine.h Mon Nov 24 16:12:11 2014 (r274967) +++ projects/clang350-import/contrib/llvm/include/llvm-c/TargetMachine.h Mon Nov 24 17:02:24 2014 (r274968) @@ -62,7 +62,7 @@ LLVMTargetRef LLVMGetFirstTarget(void); LLVMTargetRef LLVMGetNextTarget(LLVMTargetRef T); /*===-- Target ------------------------------------------------------------===*/ -/** Finds the target corresponding to the given name and stores it in \p T. +/** Finds the target corresponding to the given name and stores it in \p T. Returns 0 on success. */ LLVMTargetRef LLVMGetTargetFromName(const char *Name); @@ -137,6 +137,9 @@ LLVMBool LLVMTargetMachineEmitToMemoryBu disposed with LLVMDisposeMessage. */ char* LLVMGetDefaultTargetTriple(void); +/** Adds the target-specific analysis passes to the pass manager. */ +void LLVMAddAnalysisPasses(LLVMTargetMachineRef T, LLVMPassManagerRef PM); + #ifdef __cplusplus } #endif Modified: projects/clang350-import/contrib/llvm/include/llvm-c/Transforms/PassManagerBuilder.h ============================================================================== --- projects/clang350-import/contrib/llvm/include/llvm-c/Transforms/PassManagerBuilder.h Mon Nov 24 16:12:11 2014 (r274967) +++ projects/clang350-import/contrib/llvm/include/llvm-c/Transforms/PassManagerBuilder.h Mon Nov 24 17:02:24 2014 (r274968) @@ -19,7 +19,6 @@ typedef struct LLVMOpaquePassManagerBuilder *LLVMPassManagerBuilderRef; #ifdef __cplusplus -#include "llvm/Transforms/IPO/PassManagerBuilder.h" extern "C" { #endif Modified: projects/clang350-import/contrib/llvm/include/llvm-c/Transforms/Scalar.h ============================================================================== --- projects/clang350-import/contrib/llvm/include/llvm-c/Transforms/Scalar.h Mon Nov 24 16:12:11 2014 (r274967) +++ projects/clang350-import/contrib/llvm/include/llvm-c/Transforms/Scalar.h Mon Nov 24 17:02:24 2014 (r274968) @@ -41,6 +41,12 @@ void LLVMAddCFGSimplificationPass(LLVMPa /** See llvm::createDeadStoreEliminationPass function. */ void LLVMAddDeadStoreEliminationPass(LLVMPassManagerRef PM); +/** See llvm::createScalarizerPass function. */ +void LLVMAddScalarizerPass(LLVMPassManagerRef PM); + +/** See llvm::createMergedLoadStoreMotionPass function. */ +void LLVMAddMergedLoadStoreMotionPass(LLVMPassManagerRef PM); + /** See llvm::createGVNPass function. */ void LLVMAddGVNPass(LLVMPassManagerRef PM); Modified: projects/clang350-import/contrib/llvm/include/llvm-c/lto.h ============================================================================== --- projects/clang350-import/contrib/llvm/include/llvm-c/lto.h Mon Nov 24 16:12:11 2014 (r274967) +++ projects/clang350-import/contrib/llvm/include/llvm-c/lto.h Mon Nov 24 17:02:24 2014 (r274968) @@ -40,8 +40,11 @@ typedef bool lto_bool_t; * @{ */ -#define LTO_API_VERSION 5 +#define LTO_API_VERSION 10 +/** + * \since prior to LTO_API_VERSION=3 + */ typedef enum { LTO_SYMBOL_ALIGNMENT_MASK = 0x0000001F, /* log2 of alignment */ LTO_SYMBOL_PERMISSIONS_MASK = 0x000000E0, @@ -62,23 +65,29 @@ typedef enum { LTO_SYMBOL_SCOPE_DEFAULT_CAN_BE_HIDDEN = 0x00002800 } lto_symbol_attributes; +/** + * \since prior to LTO_API_VERSION=3 + */ typedef enum { LTO_DEBUG_MODEL_NONE = 0, LTO_DEBUG_MODEL_DWARF = 1 } lto_debug_model; +/** + * \since prior to LTO_API_VERSION=3 + */ typedef enum { LTO_CODEGEN_PIC_MODEL_STATIC = 0, LTO_CODEGEN_PIC_MODEL_DYNAMIC = 1, - LTO_CODEGEN_PIC_MODEL_DYNAMIC_NO_PIC = 2 + LTO_CODEGEN_PIC_MODEL_DYNAMIC_NO_PIC = 2, + LTO_CODEGEN_PIC_MODEL_DEFAULT = 3 } lto_codegen_model; - /** opaque reference to a loaded object module */ -typedef struct LTOModule* lto_module_t; +typedef struct LLVMOpaqueLTOModule *lto_module_t; /** opaque reference to a code generator */ -typedef struct LTOCodeGenerator* lto_code_gen_t; +typedef struct LLVMOpaqueLTOCodeGenerator *lto_code_gen_t; #ifdef __cplusplus extern "C" { @@ -86,6 +95,8 @@ extern "C" { /** * Returns a printable string. + * + * \since prior to LTO_API_VERSION=3 */ extern const char* lto_get_version(void); @@ -93,12 +104,16 @@ lto_get_version(void); /** * Returns the last error string or NULL if last operation was successful. + * + * \since prior to LTO_API_VERSION=3 */ extern const char* lto_get_error_message(void); /** * Checks if a file is a loadable object file. + * + * \since prior to LTO_API_VERSION=3 */ extern lto_bool_t lto_module_is_object_file(const char* path); @@ -106,6 +121,8 @@ lto_module_is_object_file(const char* pa /** * Checks if a file is a loadable object compiled for requested target. + * + * \since prior to LTO_API_VERSION=3 */ extern lto_bool_t lto_module_is_object_file_for_target(const char* path, @@ -114,6 +131,8 @@ lto_module_is_object_file_for_target(con /** * Checks if a buffer is a loadable object file. + * + * \since prior to LTO_API_VERSION=3 */ extern lto_bool_t lto_module_is_object_file_in_memory(const void* mem, size_t length); @@ -121,6 +140,8 @@ lto_module_is_object_file_in_memory(cons /** * Checks if a buffer is a loadable object compiled for requested target. + * + * \since prior to LTO_API_VERSION=3 */ extern lto_bool_t lto_module_is_object_file_in_memory_for_target(const void* mem, size_t length, @@ -130,6 +151,8 @@ lto_module_is_object_file_in_memory_for_ /** * Loads an object file from disk. * Returns NULL on error (check lto_get_error_message() for details). + * + * \since prior to LTO_API_VERSION=3 */ extern lto_module_t lto_module_create(const char* path); @@ -138,13 +161,27 @@ lto_module_create(const char* path); /** * Loads an object file from memory. * Returns NULL on error (check lto_get_error_message() for details). + * + * \since prior to LTO_API_VERSION=3 */ extern lto_module_t lto_module_create_from_memory(const void* mem, size_t length); /** + * Loads an object file from memory with an extra path argument. + * Returns NULL on error (check lto_get_error_message() for details). + * + * \since prior to LTO_API_VERSION=9 + */ +extern lto_module_t +lto_module_create_from_memory_with_path(const void* mem, size_t length, + const char *path); + +/** * Loads an object file from disk. The seek point of fd is not preserved. * Returns NULL on error (check lto_get_error_message() for details). + * + * \since LTO_API_VERSION=5 */ extern lto_module_t lto_module_create_from_fd(int fd, const char *path, size_t file_size); @@ -152,28 +189,34 @@ lto_module_create_from_fd(int fd, const /** * Loads an object file from disk. The seek point of fd is not preserved. * Returns NULL on error (check lto_get_error_message() for details). + * + * \since LTO_API_VERSION=5 */ extern lto_module_t lto_module_create_from_fd_at_offset(int fd, const char *path, size_t file_size, size_t map_size, off_t offset); - /** * Frees all memory internally allocated by the module. * Upon return the lto_module_t is no longer valid. + * + * \since prior to LTO_API_VERSION=3 */ extern void lto_module_dispose(lto_module_t mod); - /** * Returns triple string which the object module was compiled under. + * + * \since prior to LTO_API_VERSION=3 */ extern const char* lto_module_get_target_triple(lto_module_t mod); /** * Sets triple string with which the object will be codegened. + * + * \since LTO_API_VERSION=4 */ extern void lto_module_set_target_triple(lto_module_t mod, const char *triple); @@ -181,6 +224,8 @@ lto_module_set_target_triple(lto_module_ /** * Returns the number of symbols in the object module. + * + * \since prior to LTO_API_VERSION=3 */ extern unsigned int lto_module_get_num_symbols(lto_module_t mod); @@ -188,6 +233,8 @@ lto_module_get_num_symbols(lto_module_t /** * Returns the name of the ith symbol in the object module. + * + * \since prior to LTO_API_VERSION=3 */ extern const char* lto_module_get_symbol_name(lto_module_t mod, unsigned int index); @@ -195,40 +242,116 @@ lto_module_get_symbol_name(lto_module_t /** * Returns the attributes of the ith symbol in the object module. + * + * \since prior to LTO_API_VERSION=3 */ extern lto_symbol_attributes lto_module_get_symbol_attribute(lto_module_t mod, unsigned int index); /** + * Returns the number of dependent libraries in the object module. + * + * \since LTO_API_VERSION=8 + */ +extern unsigned int +lto_module_get_num_deplibs(lto_module_t mod); + + +/** + * Returns the ith dependent library in the module. + * + * \since LTO_API_VERSION=8 + */ +extern const char* +lto_module_get_deplib(lto_module_t mod, unsigned int index); + + +/** + * Returns the number of linker options in the object module. + * + * \since LTO_API_VERSION=8 + */ +extern unsigned int +lto_module_get_num_linkeropts(lto_module_t mod); + + +/** + * Returns the ith linker option in the module. + * + * \since LTO_API_VERSION=8 + */ +extern const char* +lto_module_get_linkeropt(lto_module_t mod, unsigned int index); + + +/** + * Diagnostic severity. + * + * \since LTO_API_VERSION=7 + */ +typedef enum { + LTO_DS_ERROR = 0, + LTO_DS_WARNING = 1, + LTO_DS_REMARK = 3, // Added in LTO_API_VERSION=10. + LTO_DS_NOTE = 2 +} lto_codegen_diagnostic_severity_t; + +/** + * Diagnostic handler type. + * \p severity defines the severity. + * \p diag is the actual diagnostic. + * The diagnostic is not prefixed by any of severity keyword, e.g., 'error: '. + * \p ctxt is used to pass the context set with the diagnostic handler. + * + * \since LTO_API_VERSION=7 + */ +typedef void (*lto_diagnostic_handler_t)( + lto_codegen_diagnostic_severity_t severity, const char *diag, void *ctxt); + +/** + * Set a diagnostic handler and the related context (void *). + * This is more general than lto_get_error_message, as the diagnostic handler + * can be called at anytime within lto. + * + * \since LTO_API_VERSION=7 + */ +extern void lto_codegen_set_diagnostic_handler(lto_code_gen_t, + lto_diagnostic_handler_t, + void *); + +/** * Instantiates a code generator. * Returns NULL on error (check lto_get_error_message() for details). + * + * \since prior to LTO_API_VERSION=3 */ extern lto_code_gen_t lto_codegen_create(void); - /** * Frees all code generator and all memory it internally allocated. * Upon return the lto_code_gen_t is no longer valid. + * + * \since prior to LTO_API_VERSION=3 */ extern void lto_codegen_dispose(lto_code_gen_t); - - /** * Add an object module to the set of modules for which code will be generated. * Returns true on error (check lto_get_error_message() for details). + * + * \since prior to LTO_API_VERSION=3 */ extern lto_bool_t lto_codegen_add_module(lto_code_gen_t cg, lto_module_t mod); - - /** * Sets if debug info should be generated. * Returns true on error (check lto_get_error_message() for details). + * + * \since prior to LTO_API_VERSION=3 */ extern lto_bool_t lto_codegen_set_debug_model(lto_code_gen_t cg, lto_debug_model); @@ -237,6 +360,8 @@ lto_codegen_set_debug_model(lto_code_gen /** * Sets which PIC code model to generated. * Returns true on error (check lto_get_error_message() for details). + * + * \since prior to LTO_API_VERSION=3 */ extern lto_bool_t lto_codegen_set_pic_model(lto_code_gen_t cg, lto_codegen_model); @@ -244,6 +369,8 @@ lto_codegen_set_pic_model(lto_code_gen_t /** * Sets the cpu to generate code for. + * + * \since LTO_API_VERSION=4 */ extern void lto_codegen_set_cpu(lto_code_gen_t cg, const char *cpu); @@ -252,20 +379,27 @@ lto_codegen_set_cpu(lto_code_gen_t cg, c /** * Sets the location of the assembler tool to run. If not set, libLTO * will use gcc to invoke the assembler. + * + * \since LTO_API_VERSION=3 */ extern void lto_codegen_set_assembler_path(lto_code_gen_t cg, const char* path); /** * Sets extra arguments that libLTO should pass to the assembler. + * + * \since LTO_API_VERSION=4 */ extern void lto_codegen_set_assembler_args(lto_code_gen_t cg, const char **args, int nargs); /** - * Tells LTO optimization passes that this symbol must be preserved - * because it is referenced by native code or a command line option. + * Adds to a list of all global symbols that must exist in the final generated + * code. If a function is not listed there, it might be inlined into every usage + * and optimized away. + * + * \since prior to LTO_API_VERSION=3 */ extern void lto_codegen_add_must_preserve_symbol(lto_code_gen_t cg, const char* symbol); @@ -274,6 +408,8 @@ lto_codegen_add_must_preserve_symbol(lto * Writes a new object file at the specified path that contains the * merged contents of all modules added so far. * Returns true on error (check lto_get_error_message() for details). + * + * \since LTO_API_VERSION=5 */ extern lto_bool_t lto_codegen_write_merged_modules(lto_code_gen_t cg, const char* path); @@ -285,6 +421,8 @@ lto_codegen_write_merged_modules(lto_cod * lto_code_gen_t and will be freed when lto_codegen_dispose() * is called, or lto_codegen_compile() is called again. * On failure, returns NULL (check lto_get_error_message() for details). + * + * \since prior to LTO_API_VERSION=3 */ extern const void* lto_codegen_compile(lto_code_gen_t cg, size_t* length); @@ -292,6 +430,8 @@ lto_codegen_compile(lto_code_gen_t cg, s /** * Generates code for all added modules into one native object file. * The name of the file is written to name. Returns true on error. + * + * \since LTO_API_VERSION=5 */ extern lto_bool_t lto_codegen_compile_to_file(lto_code_gen_t cg, const char** name); @@ -299,6 +439,8 @@ lto_codegen_compile_to_file(lto_code_gen /** * Sets options to help debug codegen bugs. + * + * \since prior to LTO_API_VERSION=3 */ extern void lto_codegen_debug_options(lto_code_gen_t cg, const char *); @@ -306,6 +448,8 @@ lto_codegen_debug_options(lto_code_gen_t /** * Initializes LLVM disassemblers. * FIXME: This doesn't really belong here. + * + * \since LTO_API_VERSION=5 */ extern void lto_initialize_disassembler(void); Copied: projects/clang350-import/contrib/llvm/include/llvm-c/module.modulemap (from r274964, vendor/llvm/dist/include/llvm-c/module.modulemap) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/contrib/llvm/include/llvm-c/module.modulemap Mon Nov 24 17:02:24 2014 (r274968, copy of r274964, vendor/llvm/dist/include/llvm-c/module.modulemap) @@ -0,0 +1,4 @@ +module LLVM_C { + umbrella "." + module * { export * } +} Modified: projects/clang350-import/contrib/llvm/include/llvm/ADT/APFloat.h ============================================================================== --- projects/clang350-import/contrib/llvm/include/llvm/ADT/APFloat.h Mon Nov 24 16:12:11 2014 (r274967) +++ projects/clang350-import/contrib/llvm/include/llvm/ADT/APFloat.h Mon Nov 24 17:02:24 2014 (r274968) @@ -1,4 +1,4 @@ -//== llvm/Support/APFloat.h - Arbitrary Precision Floating Point -*- C++ -*-==// +//===- llvm/ADT/APFloat.h - Arbitrary Precision Floating Point ---*- C++ -*-==// // // The LLVM Compiler Infrastructure // @@ -196,6 +196,7 @@ public: explicit APFloat(double d); explicit APFloat(float f); APFloat(const APFloat &); + APFloat(APFloat &&); ~APFloat(); /// @} @@ -235,19 +236,19 @@ public: APInt fill(64, type); return getQNaN(Sem, Negative, &fill); } else { - return getQNaN(Sem, Negative, 0); + return getQNaN(Sem, Negative, nullptr); } } /// Factory for QNaN values. static APFloat getQNaN(const fltSemantics &Sem, bool Negative = false, - const APInt *payload = 0) { + const APInt *payload = nullptr) { return makeNaN(Sem, false, Negative, payload); } /// Factory for SNaN values. static APFloat getSNaN(const fltSemantics &Sem, bool Negative = false, - const APInt *payload = 0) { + const APInt *payload = nullptr) { return makeNaN(Sem, true, Negative, payload); } @@ -411,6 +412,7 @@ public: /// @} APFloat &operator=(const APFloat &); + APFloat &operator=(APFloat &&); /// \brief Overload to compute a hash code for an APFloat value. /// @@ -498,7 +500,8 @@ private: void makeLargest(bool Neg = false); void makeSmallest(bool Neg = false); - void makeNaN(bool SNaN = false, bool Neg = false, const APInt *fill = 0); + void makeNaN(bool SNaN = false, bool Neg = false, + const APInt *fill = nullptr); static APFloat makeNaN(const fltSemantics &Sem, bool SNaN, bool Negative, const APInt *fill); void makeInf(bool Neg = false); Modified: projects/clang350-import/contrib/llvm/include/llvm/ADT/APInt.h ============================================================================== --- projects/clang350-import/contrib/llvm/include/llvm/ADT/APInt.h Mon Nov 24 16:12:11 2014 (r274967) +++ projects/clang350-import/contrib/llvm/include/llvm/ADT/APInt.h Mon Nov 24 17:02:24 2014 (r274968) @@ -284,12 +284,10 @@ public: initSlowCase(that); } -#if LLVM_HAS_RVALUE_REFERENCES /// \brief Move Constructor. APInt(APInt &&that) : BitWidth(that.BitWidth), VAL(that.VAL) { that.BitWidth = 0; } -#endif /// \brief Destructor. ~APInt() { @@ -656,7 +654,6 @@ public: return AssignSlowCase(RHS); } -#if LLVM_HAS_RVALUE_REFERENCES /// @brief Move assignment operator. APInt &operator=(APInt &&that) { if (!isSingleWord()) @@ -669,7 +666,6 @@ public: return *this; } -#endif /// \brief Assignment operator. /// @@ -1265,7 +1261,7 @@ public: /// \returns the number of words to hold the integer value with a given bit /// width. static unsigned getNumWords(unsigned BitWidth) { - return (BitWidth + APINT_BITS_PER_WORD - 1) / APINT_BITS_PER_WORD; + return ((uint64_t)BitWidth + APINT_BITS_PER_WORD - 1) / APINT_BITS_PER_WORD; } /// \brief Compute the number of active bits in the value @@ -1504,6 +1500,35 @@ public: return BitWidth - (*this - 1).countLeadingZeros(); } + /// \returns the nearest log base 2 of this APInt. Ties round up. + /// + /// NOTE: When we have a BitWidth of 1, we define: + /// + /// log2(0) = UINT32_MAX + /// log2(1) = 0 + /// + /// to get around any mathematical concerns resulting from + /// referencing 2 in a space where 2 does no exist. + unsigned nearestLogBase2() const { + // Special case when we have a bitwidth of 1. If VAL is 1, then we + // get 0. If VAL is 0, we get UINT64_MAX which gets truncated to + // UINT32_MAX. + if (BitWidth == 1) + return VAL - 1; + + // Handle the zero case. + if (!getBoolValue()) + return UINT32_MAX; + + // The non-zero case is handled by computing: + // + // nearestLogBase2(x) = logBase2(x) + x[logBase2(x)-1]. + // + // where x[i] is referring to the value of the ith bit of x. + unsigned lg = logBase2(); + return lg + unsigned((*this)[lg - 1]); + } + /// \returns the log base 2 of this APInt if its an exact power of two, -1 /// otherwise int32_t exactLogBase2() const { Modified: projects/clang350-import/contrib/llvm/include/llvm/ADT/APSInt.h ============================================================================== --- projects/clang350-import/contrib/llvm/include/llvm/ADT/APSInt.h Mon Nov 24 16:12:11 2014 (r274967) +++ projects/clang350-import/contrib/llvm/include/llvm/ADT/APSInt.h Mon Nov 24 17:02:24 2014 (r274968) @@ -30,18 +30,12 @@ public: explicit APSInt(uint32_t BitWidth, bool isUnsigned = true) : APInt(BitWidth, 0), IsUnsigned(isUnsigned) {} - explicit APSInt(const APInt &I, bool isUnsigned = true) - : APInt(I), IsUnsigned(isUnsigned) {} + explicit APSInt(APInt I, bool isUnsigned = true) + : APInt(std::move(I)), IsUnsigned(isUnsigned) {} - APSInt &operator=(const APSInt &RHS) { - APInt::operator=(RHS); - IsUnsigned = RHS.IsUnsigned; - return *this; - } - - APSInt &operator=(const APInt &RHS) { + APSInt &operator=(APInt RHS) { // Retain our current sign. - APInt::operator=(RHS); + APInt::operator=(std::move(RHS)); return *this; } @@ -62,7 +56,7 @@ public: APInt::toString(Str, Radix, isSigned()); } /// toString - Converts an APInt to a std::string. This is an inefficient - /// method, your should prefer passing in a SmallString instead. + /// method; you should prefer passing in a SmallString instead. std::string toString(unsigned Radix) const { return APInt::toString(Radix, isSigned()); } Modified: projects/clang350-import/contrib/llvm/include/llvm/ADT/ArrayRef.h ============================================================================== --- projects/clang350-import/contrib/llvm/include/llvm/ADT/ArrayRef.h Mon Nov 24 16:12:11 2014 (r274967) +++ projects/clang350-import/contrib/llvm/include/llvm/ADT/ArrayRef.h Mon Nov 24 17:02:24 2014 (r274968) @@ -48,10 +48,10 @@ namespace llvm { /// @{ /// Construct an empty ArrayRef. - /*implicit*/ ArrayRef() : Data(0), Length(0) {} + /*implicit*/ ArrayRef() : Data(nullptr), Length(0) {} /// Construct an empty ArrayRef from None. - /*implicit*/ ArrayRef(NoneType) : Data(0), Length(0) {} + /*implicit*/ ArrayRef(NoneType) : Data(nullptr), Length(0) {} *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Mon Nov 24 18:11:19 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3802990E; Mon, 24 Nov 2014 18:11:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1E1A3A41; Mon, 24 Nov 2014 18:11:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAOIBJR1085786; Mon, 24 Nov 2014 18:11:19 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAOIBHlN085770; Mon, 24 Nov 2014 18:11:17 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411241811.sAOIBHlN085770@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 24 Nov 2014 18:11:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274969 - in projects/clang350-import/contrib/llvm/tools/clang: . include/clang include/clang-c include/clang/ARCMigrate include/clang/AST include/clang/ASTMatchers include/clang/ASTMat... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Nov 2014 18:11:19 -0000 Author: dim Date: Mon Nov 24 18:11:16 2014 New Revision: 274969 URL: https://svnweb.freebsd.org/changeset/base/274969 Log: Merge clang 3.5.0 release from ^/vendor/clang/dist, resolve conflicts, and preserve our customizations, where necessary. Added: projects/clang350-import/contrib/llvm/tools/clang/include/clang-c/BuildSystem.h - copied unchanged from r274968, vendor/clang/dist/include/clang-c/BuildSystem.h projects/clang350-import/contrib/llvm/tools/clang/include/clang-c/CXErrorCode.h - copied unchanged from r274968, vendor/clang/dist/include/clang-c/CXErrorCode.h projects/clang350-import/contrib/llvm/tools/clang/include/clang-c/Documentation.h - copied unchanged from r274968, vendor/clang/dist/include/clang-c/Documentation.h projects/clang350-import/contrib/llvm/tools/clang/include/clang-c/module.modulemap - copied unchanged from r274968, vendor/clang/dist/include/clang-c/module.modulemap projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/DataRecursiveASTVisitor.h - copied unchanged from r274968, vendor/clang/dist/include/clang/AST/DataRecursiveASTVisitor.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/LambdaCapture.h - copied unchanged from r274968, vendor/clang/dist/include/clang/AST/LambdaCapture.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/OpenMPClause.h - copied unchanged from r274968, vendor/clang/dist/include/clang/AST/OpenMPClause.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/ThreadSafetyCommon.h - copied unchanged from r274968, vendor/clang/dist/include/clang/Analysis/Analyses/ThreadSafetyCommon.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/ThreadSafetyLogical.h - copied unchanged from r274968, vendor/clang/dist/include/clang/Analysis/Analyses/ThreadSafetyLogical.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/ThreadSafetyOps.def - copied unchanged from r274968, vendor/clang/dist/include/clang/Analysis/Analyses/ThreadSafetyOps.def projects/clang350-import/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/ThreadSafetyTIL.h - copied unchanged from r274968, vendor/clang/dist/include/clang/Analysis/Analyses/ThreadSafetyTIL.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/ThreadSafetyTraverse.h - copied unchanged from r274968, vendor/clang/dist/include/clang/Analysis/Analyses/ThreadSafetyTraverse.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/ThreadSafetyUtil.h - copied unchanged from r274968, vendor/clang/dist/include/clang/Analysis/Analyses/ThreadSafetyUtil.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/AttrDocs.td - copied unchanged from r274968, vendor/clang/dist/include/clang/Basic/AttrDocs.td projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/Attributes.h - copied unchanged from r274968, vendor/clang/dist/include/clang/Basic/Attributes.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsNEON.def - copied unchanged from r274968, vendor/clang/dist/include/clang/Basic/BuiltinsNEON.def projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsR600.def - copied unchanged from r274968, vendor/clang/dist/include/clang/Basic/BuiltinsR600.def projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/PlistSupport.h - copied unchanged from r274968, vendor/clang/dist/include/clang/Basic/PlistSupport.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/VirtualFileSystem.h - copied unchanged from r274968, vendor/clang/dist/include/clang/Basic/VirtualFileSystem.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Driver/Multilib.h - copied unchanged from r274968, vendor/clang/dist/include/clang/Driver/Multilib.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Sema/LoopHint.h - copied unchanged from r274968, vendor/clang/dist/include/clang/Sema/LoopHint.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Frontend/AnalysisConsumer.h - copied unchanged from r274968, vendor/clang/dist/include/clang/StaticAnalyzer/Frontend/AnalysisConsumer.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/module.modulemap - copied unchanged from r274968, vendor/clang/dist/include/clang/module.modulemap projects/clang350-import/contrib/llvm/tools/clang/lib/Analysis/ThreadSafetyCommon.cpp - copied unchanged from r274968, vendor/clang/dist/lib/Analysis/ThreadSafetyCommon.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Analysis/ThreadSafetyLogical.cpp - copied unchanged from r274968, vendor/clang/dist/lib/Analysis/ThreadSafetyLogical.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Analysis/ThreadSafetyTIL.cpp - copied unchanged from r274968, vendor/clang/dist/lib/Analysis/ThreadSafetyTIL.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Basic/Attributes.cpp - copied unchanged from r274968, vendor/clang/dist/lib/Basic/Attributes.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Basic/VirtualFileSystem.cpp - copied unchanged from r274968, vendor/clang/dist/lib/Basic/VirtualFileSystem.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Basic/Warnings.cpp - copied unchanged from r274968, vendor/clang/dist/lib/Basic/Warnings.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGLoopInfo.cpp - copied unchanged from r274968, vendor/clang/dist/lib/CodeGen/CGLoopInfo.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGLoopInfo.h - copied unchanged from r274968, vendor/clang/dist/lib/CodeGen/CGLoopInfo.h projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGOpenMPRuntime.cpp - copied unchanged from r274968, vendor/clang/dist/lib/CodeGen/CGOpenMPRuntime.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGOpenMPRuntime.h - copied unchanged from r274968, vendor/clang/dist/lib/CodeGen/CGOpenMPRuntime.h projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGStmtOpenMP.cpp - copied unchanged from r274968, vendor/clang/dist/lib/CodeGen/CGStmtOpenMP.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CodeGenPGO.cpp - copied unchanged from r274968, vendor/clang/dist/lib/CodeGen/CodeGenPGO.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CodeGenPGO.h - copied unchanged from r274968, vendor/clang/dist/lib/CodeGen/CodeGenPGO.h projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/SanitizerBlacklist.cpp - copied unchanged from r274968, vendor/clang/dist/lib/CodeGen/SanitizerBlacklist.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/SanitizerBlacklist.h - copied unchanged from r274968, vendor/clang/dist/lib/CodeGen/SanitizerBlacklist.h projects/clang350-import/contrib/llvm/tools/clang/lib/Driver/Multilib.cpp - copied unchanged from r274968, vendor/clang/dist/lib/Driver/Multilib.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/ModuleDependencyCollector.cpp - copied unchanged from r274968, vendor/clang/dist/lib/Frontend/ModuleDependencyCollector.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/Rewrite/ - copied from r274968, vendor/clang/dist/lib/Frontend/Rewrite/ projects/clang350-import/contrib/llvm/tools/clang/lib/Headers/arm_acle.h - copied unchanged from r274968, vendor/clang/dist/lib/Headers/arm_acle.h projects/clang350-import/contrib/llvm/tools/clang/lib/Headers/ia32intrin.h - copied unchanged from r274968, vendor/clang/dist/lib/Headers/ia32intrin.h projects/clang350-import/contrib/llvm/tools/clang/lib/Headers/module.modulemap - copied unchanged from r274968, vendor/clang/dist/lib/Headers/module.modulemap projects/clang350-import/contrib/llvm/tools/clang/lib/Parse/ParseStmtAsm.cpp - copied unchanged from r274968, vendor/clang/dist/lib/Parse/ParseStmtAsm.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Rewrite/DeltaTree.cpp - copied unchanged from r274968, vendor/clang/dist/lib/Rewrite/DeltaTree.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Rewrite/HTMLRewrite.cpp - copied unchanged from r274968, vendor/clang/dist/lib/Rewrite/HTMLRewrite.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Rewrite/RewriteRope.cpp - copied unchanged from r274968, vendor/clang/dist/lib/Rewrite/RewriteRope.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Rewrite/Rewriter.cpp - copied unchanged from r274968, vendor/clang/dist/lib/Rewrite/Rewriter.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Rewrite/TokenRewriter.cpp - copied unchanged from r274968, vendor/clang/dist/lib/Rewrite/TokenRewriter.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/SelectorExtras.h - copied unchanged from r274968, vendor/clang/dist/lib/StaticAnalyzer/Checkers/SelectorExtras.h projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/TestAfterDivZeroChecker.cpp - copied unchanged from r274968, vendor/clang/dist/lib/StaticAnalyzer/Checkers/TestAfterDivZeroChecker.cpp Deleted: projects/clang350-import/contrib/llvm/tools/clang/include/clang/Analysis/FlowSensitive/DataflowSolver.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/OnDiskHashTable.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/OpenCL.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Driver/CC1AsOptions.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Driver/CC1AsOptions.td projects/clang350-import/contrib/llvm/tools/clang/include/clang/Driver/CC1Options.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Frontend/ChainedIncludesSource.h projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGRTTI.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/MicrosoftVBTables.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/MicrosoftVBTables.h projects/clang350-import/contrib/llvm/tools/clang/lib/Driver/CC1AsOptions.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/Warnings.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Headers/module.map projects/clang350-import/contrib/llvm/tools/clang/lib/Parse/ParsePragma.h projects/clang350-import/contrib/llvm/tools/clang/lib/Rewrite/Core/ projects/clang350-import/contrib/llvm/tools/clang/lib/Rewrite/Frontend/ projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/TargetAttributesSema.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/TargetAttributesSema.h projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/IdempotentOperationChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Frontend/AnalysisConsumer.h Modified: projects/clang350-import/contrib/llvm/tools/clang/LICENSE.TXT projects/clang350-import/contrib/llvm/tools/clang/include/clang-c/CXString.h projects/clang350-import/contrib/llvm/tools/clang/include/clang-c/Index.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/ARCMigrate/ARCMT.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/ARCMigrate/ARCMTActions.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/ARCMigrate/FileRemapper.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/APValue.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/ASTConsumer.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/ASTContext.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/ASTDiagnostic.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/ASTImporter.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/ASTLambda.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/ASTMutationListener.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/ASTTypeTraits.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/ASTUnresolvedSet.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/ASTVector.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/Attr.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/AttrIterator.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/CXXInheritance.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/CanonicalType.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/CharUnits.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/Comment.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/CommentCommands.td projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/CommentHTMLTags.td projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/CommentLexer.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/CommentSema.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/Decl.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/DeclBase.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/DeclCXX.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/DeclContextInternals.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/DeclFriend.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/DeclGroup.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/DeclLookups.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/DeclObjC.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/DeclOpenMP.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/DeclTemplate.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/DeclarationName.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/DependentDiagnostic.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/Expr.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/ExprCXX.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/ExprObjC.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/ExternalASTSource.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/Mangle.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/MangleNumberingContext.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/NestedNameSpecifier.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/OperationKinds.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/ParentMap.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/PrettyPrinter.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/RawCommentList.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/RecordLayout.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/RecursiveASTVisitor.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/Redeclarable.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/Stmt.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/StmtCXX.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/StmtIterator.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/StmtObjC.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/StmtOpenMP.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/TemplateBase.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/TemplateName.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/Type.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/TypeLoc.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/TypeNodes.def projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/UnresolvedSet.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/AST/VTableBuilder.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/ASTMatchers/ASTMatchFinder.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/ASTMatchers/ASTMatchers.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/ASTMatchers/ASTMatchersInternal.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/ASTMatchers/ASTMatchersMacros.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/ASTMatchers/Dynamic/Diagnostics.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/ASTMatchers/Dynamic/Parser.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/ASTMatchers/Dynamic/Registry.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/ASTMatchers/Dynamic/VariantValue.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/Consumed.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/Dominators.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/FormatString.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/LiveVariables.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/PostOrderCFGView.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/ReachableCode.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/ThreadSafety.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Analysis/AnalysisContext.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Analysis/CFG.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Analysis/ProgramPoint.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Analysis/Support/BumpVector.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/ABI.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/Attr.td projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/AttrKinds.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/Builtins.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsAArch64.def projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsARM.def projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsMips.def projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsX86.def projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/Diagnostic.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/Diagnostic.td projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticASTKinds.td projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticCategories.td projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticCommentKinds.td projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticCommonKinds.td projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticDriverKinds.td projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticFrontendKinds.td projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticGroups.td projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticIDs.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticLexKinds.td projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticOptions.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticParseKinds.td projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSerializationKinds.td projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/FileManager.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/FileSystemStatCache.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/IdentifierTable.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/LLVM.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/LangOptions.def projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/LangOptions.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/Linkage.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/Module.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/ObjCRuntime.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/OpenMPKinds.def projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/OpenMPKinds.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/OperatorKinds.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/PartialDiagnostic.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/PrettyStackTrace.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/Sanitizers.def projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/SourceLocation.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/SourceManager.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/Specifiers.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/StmtNodes.td projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/TargetBuiltins.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/TargetCXXABI.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/TargetInfo.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/TargetOptions.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/TemplateKinds.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/TokenKinds.def projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/TokenKinds.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/TypeTraits.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/Version.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/VersionTuple.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Basic/arm_neon.td projects/clang350-import/contrib/llvm/tools/clang/include/clang/CodeGen/BackendUtil.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/CodeGen/CGFunctionInfo.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/CodeGen/CodeGenABITypes.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/CodeGen/CodeGenAction.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/CodeGen/ModuleBuilder.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Driver/Action.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Driver/CC1Options.td projects/clang350-import/contrib/llvm/tools/clang/include/clang/Driver/CLCompatOptions.td projects/clang350-import/contrib/llvm/tools/clang/include/clang/Driver/Compilation.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Driver/Driver.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Driver/Job.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Driver/Options.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Driver/Options.td projects/clang350-import/contrib/llvm/tools/clang/include/clang/Driver/SanitizerArgs.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Driver/ToolChain.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Driver/Types.def projects/clang350-import/contrib/llvm/tools/clang/include/clang/Edit/Commit.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Edit/EditedSource.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Edit/FileOffset.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Format/Format.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Frontend/ASTUnit.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Frontend/ChainedDiagnosticConsumer.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.def projects/clang350-import/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Frontend/CompilerInstance.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Frontend/CompilerInvocation.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Frontend/DependencyOutputOptions.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Frontend/DiagnosticRenderer.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Frontend/FrontendAction.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Frontend/FrontendActions.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Frontend/FrontendOptions.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Frontend/FrontendPluginRegistry.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Frontend/LangStandard.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Frontend/LangStandards.def projects/clang350-import/contrib/llvm/tools/clang/include/clang/Frontend/LayoutOverrideSource.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Frontend/LogDiagnosticPrinter.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Frontend/MultiplexConsumer.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Frontend/SerializedDiagnosticPrinter.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Frontend/TextDiagnostic.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Frontend/TextDiagnosticBuffer.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Frontend/TextDiagnosticPrinter.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Frontend/Utils.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Frontend/VerifyDiagnosticConsumer.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Index/CommentToXML.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Index/USRGeneration.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Lex/DirectoryLookup.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Lex/HeaderMap.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Lex/HeaderSearch.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Lex/HeaderSearchOptions.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Lex/Lexer.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Lex/LiteralSupport.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Lex/MacroArgs.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Lex/MacroInfo.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Lex/ModuleLoader.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Lex/ModuleMap.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Lex/MultipleIncludeOpt.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Lex/PPCallbacks.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Lex/PPConditionalDirectiveRecord.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Lex/PTHLexer.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Lex/PTHManager.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Lex/Pragma.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Lex/PreprocessingRecord.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Lex/Preprocessor.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Lex/PreprocessorLexer.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Lex/PreprocessorOptions.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Lex/Token.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Lex/TokenLexer.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Parse/ParseAST.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Parse/Parser.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Rewrite/Core/HTMLRewrite.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Rewrite/Core/RewriteRope.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Rewrite/Core/Rewriter.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Rewrite/Core/TokenRewriter.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Rewrite/Frontend/FixItRewriter.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Rewrite/Frontend/FrontendActions.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Sema/AttributeList.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Sema/CodeCompleteConsumer.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Sema/DeclSpec.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Sema/DelayedDiagnostic.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Sema/IdentifierResolver.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Sema/Initialization.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Sema/Lookup.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Sema/MultiplexExternalSemaSource.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Sema/ObjCMethodList.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Sema/Overload.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Sema/Ownership.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Sema/ParsedTemplate.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Sema/PrettyDeclStackTrace.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Sema/Scope.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Sema/ScopeInfo.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Sema/Sema.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Sema/SemaInternal.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Sema/SemaLambda.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Sema/Template.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Sema/TemplateDeduction.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Sema/TypoCorrection.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Sema/Weak.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Serialization/ASTBitCodes.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Serialization/ASTDeserializationListener.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Serialization/ASTReader.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Serialization/ASTWriter.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Serialization/GlobalModuleIndex.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Serialization/Module.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Serialization/ModuleManager.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Checkers/ObjCRetainCount.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitor.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/BugReporter/BugType.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/Checker.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/CheckerManager.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/APSIntType.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/BasicValueFactory.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/BlockCounter.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramStateTrait.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SubEngine.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/WorkList.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Frontend/FrontendActions.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Tooling/ArgumentsAdjusters.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Tooling/CommonOptionsParser.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Tooling/CompilationDatabase.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Tooling/FileMatchTrie.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Tooling/JSONCompilationDatabase.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Tooling/Refactoring.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Tooling/RefactoringCallbacks.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Tooling/ReplacementsYaml.h projects/clang350-import/contrib/llvm/tools/clang/include/clang/Tooling/Tooling.h projects/clang350-import/contrib/llvm/tools/clang/lib/ARCMigrate/ARCMT.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/ARCMigrate/FileRemapper.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/ARCMigrate/Internals.h projects/clang350-import/contrib/llvm/tools/clang/lib/ARCMigrate/ObjCMT.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/ARCMigrate/PlistReporter.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/ARCMigrate/TransAPIUses.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/ARCMigrate/TransAutoreleasePool.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/ARCMigrate/TransBlockObjCVariable.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/ARCMigrate/TransEmptyStatementsAndDealloc.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/ARCMigrate/TransGCAttrs.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/ARCMigrate/TransGCCalls.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/ARCMigrate/TransProperties.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/ARCMigrate/TransProtectedScope.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/ARCMigrate/TransRetainReleaseDealloc.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/ARCMigrate/TransUnbridgedCasts.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/ARCMigrate/TransUnusedInitDelegate.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/ARCMigrate/TransZeroOutPropsInDealloc.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/ARCMigrate/TransformActions.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/ARCMigrate/Transforms.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/ARCMigrate/Transforms.h projects/clang350-import/contrib/llvm/tools/clang/lib/AST/APValue.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/ASTContext.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/ASTDiagnostic.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/ASTDumper.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/ASTImporter.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/ASTTypeTraits.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/AttrImpl.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/CXXABI.h projects/clang350-import/contrib/llvm/tools/clang/lib/AST/CXXInheritance.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/Comment.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/CommentCommandTraits.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/CommentLexer.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/CommentParser.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/CommentSema.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/Decl.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/DeclBase.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/DeclCXX.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/DeclFriend.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/DeclObjC.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/DeclOpenMP.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/DeclPrinter.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/DeclTemplate.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/DeclarationName.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/Expr.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/ExprCXX.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/ExprClassification.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/ExprConstant.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/ExternalASTSource.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/InheritViz.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/ItaniumCXXABI.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/ItaniumMangle.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/Mangle.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/MangleNumberingContext.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/MicrosoftCXXABI.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/MicrosoftMangle.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/NSAPI.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/NestedNameSpecifier.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/ParentMap.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/RawCommentList.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/RecordLayout.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/RecordLayoutBuilder.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/Stmt.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/StmtIterator.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/StmtPrinter.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/StmtProfile.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/TemplateBase.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/TemplateName.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/Type.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/TypeLoc.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/TypePrinter.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/VTTBuilder.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/AST/VTableBuilder.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/ASTMatchers/ASTMatchFinder.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/ASTMatchers/ASTMatchersInternal.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/ASTMatchers/Dynamic/Diagnostics.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/ASTMatchers/Dynamic/Marshallers.h projects/clang350-import/contrib/llvm/tools/clang/lib/ASTMatchers/Dynamic/Parser.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/ASTMatchers/Dynamic/Registry.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/ASTMatchers/Dynamic/VariantValue.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Analysis/AnalysisDeclContext.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Analysis/BodyFarm.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Analysis/BodyFarm.h projects/clang350-import/contrib/llvm/tools/clang/lib/Analysis/CFG.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Analysis/CFGReachabilityAnalysis.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Analysis/CFGStmtMap.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Analysis/CallGraph.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Analysis/Consumed.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Analysis/FormatString.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Analysis/FormatStringParsing.h projects/clang350-import/contrib/llvm/tools/clang/lib/Analysis/LiveVariables.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Analysis/PostOrderCFGView.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Analysis/PrintfFormatString.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Analysis/ProgramPoint.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Analysis/PseudoConstantAnalysis.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Analysis/ReachableCode.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Analysis/ScanfFormatString.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Analysis/ThreadSafety.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Analysis/UninitializedValues.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Basic/Builtins.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Basic/Diagnostic.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Basic/DiagnosticIDs.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Basic/FileManager.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Basic/FileSystemStatCache.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Basic/IdentifierTable.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Basic/Module.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Basic/OpenMPKinds.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Basic/SourceLocation.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Basic/SourceManager.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Basic/TargetInfo.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Basic/Targets.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Basic/TokenKinds.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Basic/Version.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/ABIInfo.h projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/BackendUtil.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGAtomic.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGBlocks.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGBlocks.h projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGBuilder.h projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGBuiltin.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGCUDANV.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGCUDARuntime.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGCXX.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGCXXABI.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGCXXABI.h projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGCall.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGCall.h projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGClass.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGCleanup.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGCleanup.h projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.h projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGDecl.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGDeclCXX.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGException.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGExpr.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGExprAgg.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGExprCXX.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGExprComplex.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGExprConstant.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGExprScalar.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGObjC.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGObjCGNU.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGObjCMac.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGObjCRuntime.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGObjCRuntime.h projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGOpenCLRuntime.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGRecordLayout.h projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGStmt.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGVTT.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.h projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CGValue.h projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CodeGenABITypes.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CodeGenAction.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.h projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.h projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTBAA.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.h projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/EHScopeStack.h projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/ItaniumCXXABI.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/MicrosoftCXXABI.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/ModuleBuilder.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.h projects/clang350-import/contrib/llvm/tools/clang/lib/Driver/Action.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Driver/Compilation.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Driver/Driver.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Driver/Job.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Driver/SanitizerArgs.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Driver/ToolChains.h projects/clang350-import/contrib/llvm/tools/clang/lib/Driver/Tools.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Driver/Tools.h projects/clang350-import/contrib/llvm/tools/clang/lib/Driver/Types.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Driver/WindowsToolChain.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Edit/Commit.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Edit/EditedSource.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Edit/RewriteObjCFoundationAPI.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Format/BreakableToken.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Format/BreakableToken.h projects/clang350-import/contrib/llvm/tools/clang/lib/Format/ContinuationIndenter.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Format/ContinuationIndenter.h projects/clang350-import/contrib/llvm/tools/clang/lib/Format/Encoding.h projects/clang350-import/contrib/llvm/tools/clang/lib/Format/Format.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Format/FormatToken.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Format/FormatToken.h projects/clang350-import/contrib/llvm/tools/clang/lib/Format/TokenAnnotator.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Format/TokenAnnotator.h projects/clang350-import/contrib/llvm/tools/clang/lib/Format/UnwrappedLineParser.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Format/UnwrappedLineParser.h projects/clang350-import/contrib/llvm/tools/clang/lib/Format/WhitespaceManager.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Format/WhitespaceManager.h projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/ASTConsumers.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/ASTMerge.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/ASTUnit.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/CacheTokens.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/ChainedIncludesSource.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/CompilerInstance.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/CreateInvocationFromCommandLine.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/DependencyFile.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/DependencyGraph.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/DiagnosticRenderer.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/FrontendAction.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/FrontendActions.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/HeaderIncludeGen.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/InitPreprocessor.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/LangStandards.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/LogDiagnosticPrinter.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/MultiplexConsumer.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/PrintPreprocessedOutput.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/SerializedDiagnosticPrinter.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/TextDiagnostic.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/TextDiagnosticBuffer.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/TextDiagnosticPrinter.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Headers/Intrin.h projects/clang350-import/contrib/llvm/tools/clang/lib/Headers/altivec.h projects/clang350-import/contrib/llvm/tools/clang/lib/Headers/avx2intrin.h projects/clang350-import/contrib/llvm/tools/clang/lib/Headers/avxintrin.h projects/clang350-import/contrib/llvm/tools/clang/lib/Headers/bmiintrin.h projects/clang350-import/contrib/llvm/tools/clang/lib/Headers/float.h projects/clang350-import/contrib/llvm/tools/clang/lib/Headers/immintrin.h projects/clang350-import/contrib/llvm/tools/clang/lib/Headers/limits.h projects/clang350-import/contrib/llvm/tools/clang/lib/Headers/smmintrin.h projects/clang350-import/contrib/llvm/tools/clang/lib/Headers/stdarg.h projects/clang350-import/contrib/llvm/tools/clang/lib/Headers/stddef.h projects/clang350-import/contrib/llvm/tools/clang/lib/Headers/stdint.h projects/clang350-import/contrib/llvm/tools/clang/lib/Headers/x86intrin.h projects/clang350-import/contrib/llvm/tools/clang/lib/Headers/xmmintrin.h projects/clang350-import/contrib/llvm/tools/clang/lib/Index/CommentToXML.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Index/SimpleFormatContext.h projects/clang350-import/contrib/llvm/tools/clang/lib/Index/USRGeneration.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Lex/HeaderMap.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Lex/HeaderSearch.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Lex/Lexer.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Lex/LiteralSupport.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Lex/MacroArgs.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Lex/MacroInfo.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Lex/ModuleMap.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Lex/PPCaching.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Lex/PPConditionalDirectiveRecord.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Lex/PPDirectives.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Lex/PPExpressions.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Lex/PPLexerChange.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Lex/PPMacroExpansion.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Lex/PTHLexer.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Lex/Pragma.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Lex/PreprocessingRecord.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Lex/Preprocessor.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Lex/ScratchBuffer.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Lex/TokenLexer.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Lex/UnicodeCharSets.h projects/clang350-import/contrib/llvm/tools/clang/lib/Parse/ParseAST.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Parse/ParseCXXInlineMethods.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Parse/ParseDecl.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Parse/ParseDeclCXX.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Parse/ParseExpr.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Parse/ParseExprCXX.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Parse/ParseInit.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Parse/ParseObjc.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Parse/ParseOpenMP.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Parse/ParsePragma.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Parse/ParseTemplate.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Parse/ParseTentative.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Parse/Parser.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Parse/RAIIObjectsForParser.h projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/AnalysisBasedWarnings.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/AttributeList.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/CodeCompleteConsumer.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/DeclSpec.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/DelayedDiagnostic.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/IdentifierResolver.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/JumpDiagnostics.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/MultiplexExternalSemaSource.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/Scope.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/ScopeInfo.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/Sema.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaAccess.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaAttr.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaCXXScopeSpec.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaCast.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaCodeComplete.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaDeclAttr.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaDeclObjC.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaExceptionSpec.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaExprCXX.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaExprMember.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaExprObjC.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaLambda.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaLookup.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaObjCProperty.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaOpenMP.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaOverload.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaPseudoObject.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaStmt.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaStmtAsm.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaStmtAttr.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaTemplate.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaTemplateDeduction.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaTemplateInstantiate.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaTemplateVariadic.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/SemaType.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/TreeTransform.h projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/TypeLocBuilder.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Sema/TypeLocBuilder.h projects/clang350-import/contrib/llvm/tools/clang/lib/Serialization/ASTCommon.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Serialization/ASTCommon.h projects/clang350-import/contrib/llvm/tools/clang/lib/Serialization/ASTReader.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Serialization/ASTReaderDecl.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Serialization/ASTReaderInternals.h projects/clang350-import/contrib/llvm/tools/clang/lib/Serialization/ASTReaderStmt.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Serialization/ASTWriter.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Serialization/ASTWriterDecl.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Serialization/ASTWriterStmt.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Serialization/GeneratePCH.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Serialization/GlobalModuleIndex.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Serialization/Module.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Serialization/ModuleManager.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/AnalyzerStatsChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ArrayBoundChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ArrayBoundCheckerV2.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/BasicObjCFoundationChecks.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/BoolAssignmentChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CStringChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CStringSyntaxChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CastSizeChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CastToStructChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CheckObjCDealloc.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CheckObjCInstMethSignature.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CheckSecuritySyntaxOnly.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CheckSizeofPointer.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/Checkers.td projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ChrootChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DeadStoresChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DebugCheckers.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DereferenceChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DirectIvarAssignment.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DivZeroChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DynamicTypePropagation.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ExprInspectionChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/FixedAddressChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/IdenticalExprChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/IvarInvalidationChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/LLVMConventionsChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MacOSKeychainAPIChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MacOSXAPIChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MallocChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MallocOverflowSecurityChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MallocSizeofChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/NSAutoreleasePoolChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/NSErrorChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/NoReturnFunctionChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/NonNullParamChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ObjCAtSyncChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ObjCContainersASTChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ObjCContainersChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ObjCMissingSuperCallChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ObjCSelfInitChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ObjCUnusedIVarsChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/PointerArithChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/PointerSubChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/PthreadLockChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ReturnPointerRangeChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ReturnUndefChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/SimpleStreamChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/StackAddrEscapeChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/StreamChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/TaintTesterChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/TraversalChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UndefBranchChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UndefCapturedBlockVarChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UndefResultChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UndefinedArraySubscriptChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UndefinedAssignmentChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UnixAPIChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UnreachableCodeChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/VLASizeChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/VirtualCallChecker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/AnalyzerOptions.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/BasicValueFactory.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/BlockCounter.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/BugReporter.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/CallEvent.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/Checker.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/CheckerManager.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/CheckerRegistry.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/CoreEngine.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/Environment.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExplodedGraph.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngine.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngineC.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngineCXX.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngineObjC.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/MemRegion.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/PathDiagnostic.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/PrettyStackTraceLocationContext.h projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ProgramState.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/RegionStore.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SValBuilder.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SVals.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SimpleConstraintManager.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SimpleConstraintManager.h projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SimpleSValBuilder.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/Store.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SymbolManager.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Frontend/CheckerRegistration.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/StaticAnalyzer/Frontend/FrontendActions.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Tooling/CommonOptionsParser.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Tooling/CompilationDatabase.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Tooling/FileMatchTrie.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Tooling/JSONCompilationDatabase.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Tooling/Refactoring.cpp projects/clang350-import/contrib/llvm/tools/clang/lib/Tooling/Tooling.cpp projects/clang350-import/contrib/llvm/tools/clang/tools/driver/cc1_main.cpp projects/clang350-import/contrib/llvm/tools/clang/tools/driver/cc1as_main.cpp projects/clang350-import/contrib/llvm/tools/clang/tools/driver/driver.cpp projects/clang350-import/contrib/llvm/tools/clang/utils/TableGen/ClangASTNodesEmitter.cpp projects/clang350-import/contrib/llvm/tools/clang/utils/TableGen/ClangAttrEmitter.cpp projects/clang350-import/contrib/llvm/tools/clang/utils/TableGen/ClangCommentHTMLTagsEmitter.cpp projects/clang350-import/contrib/llvm/tools/clang/utils/TableGen/ClangDiagnosticsEmitter.cpp projects/clang350-import/contrib/llvm/tools/clang/utils/TableGen/ClangSACheckersEmitter.cpp projects/clang350-import/contrib/llvm/tools/clang/utils/TableGen/NeonEmitter.cpp projects/clang350-import/contrib/llvm/tools/clang/utils/TableGen/TableGen.cpp projects/clang350-import/contrib/llvm/tools/clang/utils/TableGen/TableGenBackends.h Directory Properties: projects/clang350-import/contrib/llvm/tools/clang/ (props changed) Modified: projects/clang350-import/contrib/llvm/tools/clang/LICENSE.TXT ============================================================================== --- projects/clang350-import/contrib/llvm/tools/clang/LICENSE.TXT Mon Nov 24 17:02:24 2014 (r274968) +++ projects/clang350-import/contrib/llvm/tools/clang/LICENSE.TXT Mon Nov 24 18:11:16 2014 (r274969) @@ -4,7 +4,7 @@ LLVM Release License University of Illinois/NCSA Open Source License -Copyright (c) 2007-2013 University of Illinois at Urbana-Champaign. +Copyright (c) 2007-2014 University of Illinois at Urbana-Champaign. All rights reserved. Developed by: Copied: projects/clang350-import/contrib/llvm/tools/clang/include/clang-c/BuildSystem.h (from r274968, vendor/clang/dist/include/clang-c/BuildSystem.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/contrib/llvm/tools/clang/include/clang-c/BuildSystem.h Mon Nov 24 18:11:16 2014 (r274969, copy of r274968, vendor/clang/dist/include/clang-c/BuildSystem.h) @@ -0,0 +1,148 @@ +/*==-- clang-c/BuildSystem.h - Utilities for use by build systems -*- C -*-===*\ +|* *| +|* The LLVM Compiler Infrastructure *| +|* *| +|* This file is distributed under the University of Illinois Open Source *| +|* License. See LICENSE.TXT for details. *| +|* *| +|*===----------------------------------------------------------------------===*| +|* *| +|* This header provides various utilities for use by build systems. *| +|* *| +\*===----------------------------------------------------------------------===*/ + +#ifndef CLANG_C_BUILD_SYSTEM_H +#define CLANG_C_BUILD_SYSTEM_H + +#include "clang-c/Platform.h" +#include "clang-c/CXErrorCode.h" +#include "clang-c/CXString.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * \defgroup BUILD_SYSTEM Build system utilities + * @{ + */ + +/** + * \brief Return the timestamp for use with Clang's + * \c -fbuild-session-timestamp= option. + */ +CINDEX_LINKAGE unsigned long long clang_getBuildSessionTimestamp(void); + +/** + * \brief Object encapsulating information about overlaying virtual + * file/directories over the real file system. + */ +typedef struct CXVirtualFileOverlayImpl *CXVirtualFileOverlay; + +/** + * \brief Create a \c CXVirtualFileOverlay object. + * Must be disposed with \c clang_VirtualFileOverlay_dispose(). + * + * \param options is reserved, always pass 0. + */ +CINDEX_LINKAGE CXVirtualFileOverlay +clang_VirtualFileOverlay_create(unsigned options); + +/** + * \brief Map an absolute virtual file path to an absolute real one. + * The virtual path must be canonicalized (not contain "."/".."). + * \returns 0 for success, non-zero to indicate an error. + */ +CINDEX_LINKAGE enum CXErrorCode +clang_VirtualFileOverlay_addFileMapping(CXVirtualFileOverlay, + const char *virtualPath, + const char *realPath); + +/** + * \brief Set the case sensitivity for the \c CXVirtualFileOverlay object. + * The \c CXVirtualFileOverlay object is case-sensitive by default, this + * option can be used to override the default. + * \returns 0 for success, non-zero to indicate an error. + */ +CINDEX_LINKAGE enum CXErrorCode +clang_VirtualFileOverlay_setCaseSensitivity(CXVirtualFileOverlay, + int caseSensitive); + +/** + * \brief Write out the \c CXVirtualFileOverlay object to a char buffer. + * + * \param options is reserved, always pass 0. + * \param out_buffer_ptr pointer to receive the buffer pointer, which should be + * disposed using \c free(). + * \param out_buffer_size pointer to receive the buffer size. + * \returns 0 for success, non-zero to indicate an error. + */ +CINDEX_LINKAGE enum CXErrorCode +clang_VirtualFileOverlay_writeToBuffer(CXVirtualFileOverlay, unsigned options, + char **out_buffer_ptr, + unsigned *out_buffer_size); + +/** + * \brief Dispose a \c CXVirtualFileOverlay object. + */ +CINDEX_LINKAGE void clang_VirtualFileOverlay_dispose(CXVirtualFileOverlay); + +/** + * \brief Object encapsulating information about a module.map file. + */ +typedef struct CXModuleMapDescriptorImpl *CXModuleMapDescriptor; + +/** + * \brief Create a \c CXModuleMapDescriptor object. + * Must be disposed with \c clang_ModuleMapDescriptor_dispose(). + * + * \param options is reserved, always pass 0. + */ +CINDEX_LINKAGE CXModuleMapDescriptor +clang_ModuleMapDescriptor_create(unsigned options); + +/** + * \brief Sets the framework module name that the module.map describes. + * \returns 0 for success, non-zero to indicate an error. + */ +CINDEX_LINKAGE enum CXErrorCode +clang_ModuleMapDescriptor_setFrameworkModuleName(CXModuleMapDescriptor, + const char *name); + +/** + * \brief Sets the umbrealla header name that the module.map describes. + * \returns 0 for success, non-zero to indicate an error. + */ +CINDEX_LINKAGE enum CXErrorCode +clang_ModuleMapDescriptor_setUmbrellaHeader(CXModuleMapDescriptor, + const char *name); + +/** + * \brief Write out the \c CXModuleMapDescriptor object to a char buffer. + * + * \param options is reserved, always pass 0. + * \param out_buffer_ptr pointer to receive the buffer pointer, which should be + * disposed using \c free(). + * \param out_buffer_size pointer to receive the buffer size. + * \returns 0 for success, non-zero to indicate an error. + */ +CINDEX_LINKAGE enum CXErrorCode +clang_ModuleMapDescriptor_writeToBuffer(CXModuleMapDescriptor, unsigned options, + char **out_buffer_ptr, + unsigned *out_buffer_size); + +/** + * \brief Dispose a \c CXModuleMapDescriptor object. + */ +CINDEX_LINKAGE void clang_ModuleMapDescriptor_dispose(CXModuleMapDescriptor); + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif /* CLANG_C_BUILD_SYSTEM_H */ + Copied: projects/clang350-import/contrib/llvm/tools/clang/include/clang-c/CXErrorCode.h (from r274968, vendor/clang/dist/include/clang-c/CXErrorCode.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/contrib/llvm/tools/clang/include/clang-c/CXErrorCode.h Mon Nov 24 18:11:16 2014 (r274969, copy of r274968, vendor/clang/dist/include/clang-c/CXErrorCode.h) @@ -0,0 +1,64 @@ +/*===-- clang-c/CXErrorCode.h - C Index Error Codes --------------*- C -*-===*\ +|* *| +|* The LLVM Compiler Infrastructure *| +|* *| +|* This file is distributed under the University of Illinois Open Source *| +|* License. See LICENSE.TXT for details. *| +|* *| +|*===----------------------------------------------------------------------===*| +|* *| +|* This header provides the CXErrorCode enumerators. *| +|* *| +\*===----------------------------------------------------------------------===*/ + +#ifndef CLANG_C_CXERRORCODE_H +#define CLANG_C_CXERRORCODE_H + +#include "clang-c/Platform.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * \brief Error codes returned by libclang routines. + * + * Zero (\c CXError_Success) is the only error code indicating success. Other + * error codes, including not yet assigned non-zero values, indicate errors. + */ +enum CXErrorCode { + /** + * \brief No error. + */ + CXError_Success = 0, + + /** + * \brief A generic error code, no further details are available. + * + * Errors of this kind can get their own specific error codes in future + * libclang versions. + */ + CXError_Failure = 1, + + /** + * \brief libclang crashed while performing the requested operation. + */ + CXError_Crashed = 2, + + /** + * \brief The function detected that the arguments violate the function + * contract. + */ + CXError_InvalidArguments = 3, + + /** + * \brief An AST deserialization error has occurred. + */ + CXError_ASTReadError = 4 +}; + +#ifdef __cplusplus +} +#endif +#endif + Modified: projects/clang350-import/contrib/llvm/tools/clang/include/clang-c/CXString.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/clang/include/clang-c/CXString.h Mon Nov 24 17:02:24 2014 (r274968) +++ projects/clang350-import/contrib/llvm/tools/clang/include/clang-c/CXString.h Mon Nov 24 18:11:16 2014 (r274969) @@ -31,7 +31,7 @@ extern "C" { * \brief A character string. * * The \c CXString type is used to return strings from the interface when - * the ownership of that string might different from one call to the next. + * the ownership of that string might differ from one call to the next. * Use \c clang_getCString() to retrieve the string data and, once finished * with the string data, call \c clang_disposeString() to free the string. */ Copied: projects/clang350-import/contrib/llvm/tools/clang/include/clang-c/Documentation.h (from r274968, vendor/clang/dist/include/clang-c/Documentation.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/contrib/llvm/tools/clang/include/clang-c/Documentation.h Mon Nov 24 18:11:16 2014 (r274969, copy of r274968, vendor/clang/dist/include/clang-c/Documentation.h) @@ -0,0 +1,554 @@ +/*==-- clang-c/Documentation.h - Utilities for comment processing -*- C -*-===*\ +|* *| +|* The LLVM Compiler Infrastructure *| +|* *| +|* This file is distributed under the University of Illinois Open Source *| +|* License. See LICENSE.TXT for details. *| +|* *| +|*===----------------------------------------------------------------------===*| +|* *| +|* This header provides a supplementary interface for inspecting *| +|* documentation comments. *| +|* *| +\*===----------------------------------------------------------------------===*/ + +#ifndef CLANG_C_DOCUMENTATION_H +#define CLANG_C_DOCUMENTATION_H + +#include "clang-c/Index.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * \defgroup CINDEX_COMMENT Comment introspection + * + * The routines in this group provide access to information in documentation + * comments. These facilities are distinct from the core and may be subject to + * their own schedule of stability and deprecation. + * + * @{ + */ + +/** + * \brief A parsed comment. + */ +typedef struct { + const void *ASTNode; + CXTranslationUnit TranslationUnit; +} CXComment; + +/** + * \brief Given a cursor that represents a documentable entity (e.g., + * declaration), return the associated parsed comment as a + * \c CXComment_FullComment AST node. + */ +CINDEX_LINKAGE CXComment clang_Cursor_getParsedComment(CXCursor C); + +/** + * \brief Describes the type of the comment AST node (\c CXComment). A comment + * node can be considered block content (e. g., paragraph), inline content + * (plain text) or neither (the root AST node). + */ +enum CXCommentKind { + /** + * \brief Null comment. No AST node is constructed at the requested location + * because there is no text or a syntax error. + */ + CXComment_Null = 0, + + /** + * \brief Plain text. Inline content. + */ + CXComment_Text = 1, + + /** + * \brief A command with word-like arguments that is considered inline content. + * + * For example: \\c command. + */ + CXComment_InlineCommand = 2, + + /** + * \brief HTML start tag with attributes (name-value pairs). Considered + * inline content. + * + * For example: + * \verbatim + *

+ * \endverbatim + */ + CXComment_HTMLStartTag = 3, + + /** + * \brief HTML end tag. Considered inline content. + * + * For example: + * \verbatim + * + * \endverbatim + */ + CXComment_HTMLEndTag = 4, + + /** + * \brief A paragraph, contains inline comment. The paragraph itself is + * block content. + */ + CXComment_Paragraph = 5, + + /** + * \brief A command that has zero or more word-like arguments (number of + * word-like arguments depends on command name) and a paragraph as an + * argument. Block command is block content. + * + * Paragraph argument is also a child of the block command. + * + * For example: \\brief has 0 word-like arguments and a paragraph argument. + * + * AST nodes of special kinds that parser knows about (e. g., \\param + * command) have their own node kinds. + */ + CXComment_BlockCommand = 6, + + /** + * \brief A \\param or \\arg command that describes the function parameter + * (name, passing direction, description). + * + * For example: \\param [in] ParamName description. + */ + CXComment_ParamCommand = 7, + + /** + * \brief A \\tparam command that describes a template parameter (name and + * description). + * + * For example: \\tparam T description. + */ + CXComment_TParamCommand = 8, + + /** + * \brief A verbatim block command (e. g., preformatted code). Verbatim + * block has an opening and a closing command and contains multiple lines of + * text (\c CXComment_VerbatimBlockLine child nodes). + * + * For example: + * \\verbatim + * aaa + * \\endverbatim + */ + CXComment_VerbatimBlockCommand = 9, + + /** + * \brief A line of text that is contained within a + * CXComment_VerbatimBlockCommand node. + */ + CXComment_VerbatimBlockLine = 10, + + /** + * \brief A verbatim line command. Verbatim line has an opening command, + * a single line of text (up to the newline after the opening command) and + * has no closing command. + */ + CXComment_VerbatimLine = 11, + + /** + * \brief A full comment attached to a declaration, contains block content. + */ + CXComment_FullComment = 12 +}; + +/** + * \brief The most appropriate rendering mode for an inline command, chosen on + * command semantics in Doxygen. + */ +enum CXCommentInlineCommandRenderKind { + /** + * \brief Command argument should be rendered in a normal font. + */ + CXCommentInlineCommandRenderKind_Normal, + + /** + * \brief Command argument should be rendered in a bold font. + */ + CXCommentInlineCommandRenderKind_Bold, + + /** + * \brief Command argument should be rendered in a monospaced font. + */ + CXCommentInlineCommandRenderKind_Monospaced, + + /** + * \brief Command argument should be rendered emphasized (typically italic + * font). + */ + CXCommentInlineCommandRenderKind_Emphasized +}; + +/** + * \brief Describes parameter passing direction for \\param or \\arg command. + */ +enum CXCommentParamPassDirection { + /** + * \brief The parameter is an input parameter. + */ + CXCommentParamPassDirection_In, + + /** + * \brief The parameter is an output parameter. + */ + CXCommentParamPassDirection_Out, + + /** + * \brief The parameter is an input and output parameter. + */ + CXCommentParamPassDirection_InOut +}; + +/** + * \param Comment AST node of any kind. + * + * \returns the type of the AST node. + */ +CINDEX_LINKAGE enum CXCommentKind clang_Comment_getKind(CXComment Comment); + +/** + * \param Comment AST node of any kind. + * + * \returns number of children of the AST node. + */ +CINDEX_LINKAGE unsigned clang_Comment_getNumChildren(CXComment Comment); + +/** + * \param Comment AST node of any kind. + * + * \param ChildIdx child index (zero-based). + * + * \returns the specified child of the AST node. + */ +CINDEX_LINKAGE +CXComment clang_Comment_getChild(CXComment Comment, unsigned ChildIdx); + +/** + * \brief A \c CXComment_Paragraph node is considered whitespace if it contains + * only \c CXComment_Text nodes that are empty or whitespace. + * + * Other AST nodes (except \c CXComment_Paragraph and \c CXComment_Text) are + * never considered whitespace. + * + * \returns non-zero if \c Comment is whitespace. + */ +CINDEX_LINKAGE unsigned clang_Comment_isWhitespace(CXComment Comment); + +/** + * \returns non-zero if \c Comment is inline content and has a newline + * immediately following it in the comment text. Newlines between paragraphs + * do not count. + */ +CINDEX_LINKAGE +unsigned clang_InlineContentComment_hasTrailingNewline(CXComment Comment); + +/** + * \param Comment a \c CXComment_Text AST node. + * + * \returns text contained in the AST node. + */ +CINDEX_LINKAGE CXString clang_TextComment_getText(CXComment Comment); + +/** + * \param Comment a \c CXComment_InlineCommand AST node. + * + * \returns name of the inline command. + */ +CINDEX_LINKAGE +CXString clang_InlineCommandComment_getCommandName(CXComment Comment); + +/** + * \param Comment a \c CXComment_InlineCommand AST node. + * + * \returns the most appropriate rendering mode, chosen on command + * semantics in Doxygen. + */ +CINDEX_LINKAGE enum CXCommentInlineCommandRenderKind +clang_InlineCommandComment_getRenderKind(CXComment Comment); + +/** + * \param Comment a \c CXComment_InlineCommand AST node. + * + * \returns number of command arguments. + */ +CINDEX_LINKAGE +unsigned clang_InlineCommandComment_getNumArgs(CXComment Comment); + +/** + * \param Comment a \c CXComment_InlineCommand AST node. + * + * \param ArgIdx argument index (zero-based). + * + * \returns text of the specified argument. + */ +CINDEX_LINKAGE +CXString clang_InlineCommandComment_getArgText(CXComment Comment, + unsigned ArgIdx); + +/** + * \param Comment a \c CXComment_HTMLStartTag or \c CXComment_HTMLEndTag AST + * node. + * + * \returns HTML tag name. + */ +CINDEX_LINKAGE CXString clang_HTMLTagComment_getTagName(CXComment Comment); + +/** + * \param Comment a \c CXComment_HTMLStartTag AST node. + * + * \returns non-zero if tag is self-closing (for example, <br />). + */ +CINDEX_LINKAGE +unsigned clang_HTMLStartTagComment_isSelfClosing(CXComment Comment); + +/** + * \param Comment a \c CXComment_HTMLStartTag AST node. + * + * \returns number of attributes (name-value pairs) attached to the start tag. + */ +CINDEX_LINKAGE unsigned clang_HTMLStartTag_getNumAttrs(CXComment Comment); + +/** + * \param Comment a \c CXComment_HTMLStartTag AST node. + * + * \param AttrIdx attribute index (zero-based). + * + * \returns name of the specified attribute. + */ +CINDEX_LINKAGE +CXString clang_HTMLStartTag_getAttrName(CXComment Comment, unsigned AttrIdx); + +/** + * \param Comment a \c CXComment_HTMLStartTag AST node. + * + * \param AttrIdx attribute index (zero-based). + * + * \returns value of the specified attribute. + */ +CINDEX_LINKAGE +CXString clang_HTMLStartTag_getAttrValue(CXComment Comment, unsigned AttrIdx); + +/** + * \param Comment a \c CXComment_BlockCommand AST node. + * + * \returns name of the block command. + */ +CINDEX_LINKAGE +CXString clang_BlockCommandComment_getCommandName(CXComment Comment); + +/** + * \param Comment a \c CXComment_BlockCommand AST node. + * + * \returns number of word-like arguments. + */ +CINDEX_LINKAGE +unsigned clang_BlockCommandComment_getNumArgs(CXComment Comment); + +/** + * \param Comment a \c CXComment_BlockCommand AST node. + * + * \param ArgIdx argument index (zero-based). + * + * \returns text of the specified word-like argument. + */ +CINDEX_LINKAGE +CXString clang_BlockCommandComment_getArgText(CXComment Comment, + unsigned ArgIdx); + +/** + * \param Comment a \c CXComment_BlockCommand or + * \c CXComment_VerbatimBlockCommand AST node. + * + * \returns paragraph argument of the block command. + */ +CINDEX_LINKAGE +CXComment clang_BlockCommandComment_getParagraph(CXComment Comment); + +/** + * \param Comment a \c CXComment_ParamCommand AST node. + * + * \returns parameter name. + */ +CINDEX_LINKAGE +CXString clang_ParamCommandComment_getParamName(CXComment Comment); + +/** + * \param Comment a \c CXComment_ParamCommand AST node. + * + * \returns non-zero if the parameter that this AST node represents was found + * in the function prototype and \c clang_ParamCommandComment_getParamIndex + * function will return a meaningful value. + */ +CINDEX_LINKAGE +unsigned clang_ParamCommandComment_isParamIndexValid(CXComment Comment); + +/** + * \param Comment a \c CXComment_ParamCommand AST node. + * + * \returns zero-based parameter index in function prototype. + */ +CINDEX_LINKAGE +unsigned clang_ParamCommandComment_getParamIndex(CXComment Comment); + +/** + * \param Comment a \c CXComment_ParamCommand AST node. + * + * \returns non-zero if parameter passing direction was specified explicitly in + * the comment. + */ +CINDEX_LINKAGE +unsigned clang_ParamCommandComment_isDirectionExplicit(CXComment Comment); + +/** + * \param Comment a \c CXComment_ParamCommand AST node. + * + * \returns parameter passing direction. + */ +CINDEX_LINKAGE +enum CXCommentParamPassDirection clang_ParamCommandComment_getDirection( + CXComment Comment); + +/** + * \param Comment a \c CXComment_TParamCommand AST node. + * + * \returns template parameter name. + */ +CINDEX_LINKAGE +CXString clang_TParamCommandComment_getParamName(CXComment Comment); + +/** + * \param Comment a \c CXComment_TParamCommand AST node. + * + * \returns non-zero if the parameter that this AST node represents was found + * in the template parameter list and + * \c clang_TParamCommandComment_getDepth and + * \c clang_TParamCommandComment_getIndex functions will return a meaningful + * value. + */ +CINDEX_LINKAGE +unsigned clang_TParamCommandComment_isParamPositionValid(CXComment Comment); + +/** + * \param Comment a \c CXComment_TParamCommand AST node. + * + * \returns zero-based nesting depth of this parameter in the template parameter list. + * + * For example, + * \verbatim + * template class TT> + * void test(TT aaa); + * \endverbatim + * for C and TT nesting depth is 0, + * for T nesting depth is 1. + */ +CINDEX_LINKAGE +unsigned clang_TParamCommandComment_getDepth(CXComment Comment); + +/** + * \param Comment a \c CXComment_TParamCommand AST node. + * + * \returns zero-based parameter index in the template parameter list at a + * given nesting depth. + * + * For example, + * \verbatim + * template class TT> + * void test(TT aaa); + * \endverbatim + * for C and TT nesting depth is 0, so we can ask for index at depth 0: + * at depth 0 C's index is 0, TT's index is 1. + * + * For T nesting depth is 1, so we can ask for index at depth 0 and 1: + * at depth 0 T's index is 1 (same as TT's), + * at depth 1 T's index is 0. + */ +CINDEX_LINKAGE +unsigned clang_TParamCommandComment_getIndex(CXComment Comment, unsigned Depth); + +/** + * \param Comment a \c CXComment_VerbatimBlockLine AST node. + * + * \returns text contained in the AST node. + */ +CINDEX_LINKAGE +CXString clang_VerbatimBlockLineComment_getText(CXComment Comment); + +/** + * \param Comment a \c CXComment_VerbatimLine AST node. + * + * \returns text contained in the AST node. + */ +CINDEX_LINKAGE CXString clang_VerbatimLineComment_getText(CXComment Comment); + +/** + * \brief Convert an HTML tag AST node to string. + * + * \param Comment a \c CXComment_HTMLStartTag or \c CXComment_HTMLEndTag AST + * node. + * + * \returns string containing an HTML tag. + */ +CINDEX_LINKAGE CXString clang_HTMLTagComment_getAsString(CXComment Comment); + +/** + * \brief Convert a given full parsed comment to an HTML fragment. + * + * Specific details of HTML layout are subject to change. Don't try to parse + * this HTML back into an AST, use other APIs instead. + * + * Currently the following CSS classes are used: + * \li "para-brief" for \\brief paragraph and equivalent commands; + * \li "para-returns" for \\returns paragraph and equivalent commands; + * \li "word-returns" for the "Returns" word in \\returns paragraph. + * + * Function argument documentation is rendered as a \ list with arguments + * sorted in function prototype order. CSS classes used: + * \li "param-name-index-NUMBER" for parameter name (\); + * \li "param-descr-index-NUMBER" for parameter description (\); + * \li "param-name-index-invalid" and "param-descr-index-invalid" are used if + * parameter index is invalid. + * + * Template parameter documentation is rendered as a \ list with + * parameters sorted in template parameter list order. CSS classes used: + * \li "tparam-name-index-NUMBER" for parameter name (\); + * \li "tparam-descr-index-NUMBER" for parameter description (\); + * \li "tparam-name-index-other" and "tparam-descr-index-other" are used for + * names inside template template parameters; + * \li "tparam-name-index-invalid" and "tparam-descr-index-invalid" are used if + * parameter position is invalid. + * + * \param Comment a \c CXComment_FullComment AST node. + * + * \returns string containing an HTML fragment. + */ +CINDEX_LINKAGE CXString clang_FullComment_getAsHTML(CXComment Comment); + +/** + * \brief Convert a given full parsed comment to an XML document. + * + * A Relax NG schema for the XML can be found in comment-xml-schema.rng file + * inside clang source tree. + * + * \param Comment a \c CXComment_FullComment AST node. + * + * \returns string containing an XML document. + */ +CINDEX_LINKAGE CXString clang_FullComment_getAsXML(CXComment Comment); + +/** + * @} + */ + + +#ifdef __cplusplus +} +#endif + +#endif /* CLANG_C_DOCUMENTATION_H */ + Modified: projects/clang350-import/contrib/llvm/tools/clang/include/clang-c/Index.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/clang/include/clang-c/Index.h Mon Nov 24 17:02:24 2014 (r274968) +++ projects/clang350-import/contrib/llvm/tools/clang/include/clang-c/Index.h Mon Nov 24 18:11:16 2014 (r274969) @@ -19,7 +19,9 @@ #include #include "clang-c/Platform.h" +#include "clang-c/CXErrorCode.h" #include "clang-c/CXString.h" +#include "clang-c/BuildSystem.h" /** * \brief The version constants for the libclang API. @@ -30,7 +32,7 @@ * compatible, thus CINDEX_VERSION_MAJOR is expected to remain stable. */ #define CINDEX_VERSION_MAJOR 0 -#define CINDEX_VERSION_MINOR 20 +#define CINDEX_VERSION_MINOR 27 #define CINDEX_VERSION_ENCODE(major, minor) ( \ ((major) * 10000) \ @@ -599,6 +601,32 @@ CINDEX_LINKAGE CXSourceLocation clang_ge CINDEX_LINKAGE CXSourceLocation clang_getRangeEnd(CXSourceRange range); /** + * \brief Identifies an array of ranges. + */ +typedef struct { + /** \brief The number of ranges in the \c ranges array. */ + unsigned count; + /** + * \brief An array of \c CXSourceRanges. + */ + CXSourceRange *ranges; +} CXSourceRangeList; + +/** + * \brief Retrieve all ranges that were skipped by the preprocessor. + * + * The preprocessor will skip lines when they are surrounded by an + * if/ifdef/ifndef directive whose condition does not evaluate to true. + */ +CINDEX_LINKAGE CXSourceRangeList *clang_getSkippedRanges(CXTranslationUnit tu, + CXFile file); + +/** + * \brief Destroy the given \c CXSourceRangeList. + */ +CINDEX_LINKAGE void clang_disposeSourceRangeList(CXSourceRangeList *ranges); + +/** * @} */ @@ -1050,10 +1078,27 @@ CINDEX_LINKAGE CXTranslationUnit clang_c struct CXUnsavedFile *unsaved_files); /** - * \brief Create a translation unit from an AST file (-emit-ast). + * \brief Same as \c clang_createTranslationUnit2, but returns + * the \c CXTranslationUnit instead of an error code. In case of an error this + * routine returns a \c NULL \c CXTranslationUnit, without further detailed + * error codes. */ -CINDEX_LINKAGE CXTranslationUnit clang_createTranslationUnit(CXIndex, - const char *ast_filename); +CINDEX_LINKAGE CXTranslationUnit clang_createTranslationUnit( + CXIndex CIdx, + const char *ast_filename); + +/** + * \brief Create a translation unit from an AST file (\c -emit-ast). + * + * \param[out] out_TU A non-NULL pointer to store the created + * \c CXTranslationUnit. + * + * \returns Zero on success, otherwise returns an error code. + */ +CINDEX_LINKAGE enum CXErrorCode clang_createTranslationUnit2( + CXIndex CIdx, + const char *ast_filename, + CXTranslationUnit *out_TU); /** * \brief Flags that control the creation of translation units. @@ -1167,7 +1212,22 @@ enum CXTranslationUnit_Flags { * set of optimizations enabled may change from one version to the next. */ CINDEX_LINKAGE unsigned clang_defaultEditingTranslationUnitOptions(void); - + +/** + * \brief Same as \c clang_parseTranslationUnit2, but returns + * the \c CXTranslationUnit instead of an error code. In case of an error this + * routine returns a \c NULL \c CXTranslationUnit, without further detailed + * error codes. + */ +CINDEX_LINKAGE CXTranslationUnit +clang_parseTranslationUnit(CXIndex CIdx, + const char *source_filename, + const char *const *command_line_args, + int num_command_line_args, + struct CXUnsavedFile *unsaved_files, + unsigned num_unsaved_files, + unsigned options); + /** * \brief Parse the given source file and the translation unit corresponding * to that file. @@ -1182,7 +1242,7 @@ CINDEX_LINKAGE unsigned clang_defaultEdi * associated. * * \param source_filename The name of the source file to load, or NULL if the - * source file is included in \p command_line_args. + * source file is included in \c command_line_args. * * \param command_line_args The command-line arguments that would be * passed to the \c clang executable if it were being invoked out-of-process. @@ -1191,7 +1251,7 @@ CINDEX_LINKAGE unsigned clang_defaultEdi * '-emit-ast', '-fsyntax-only' (which is the default), and '-o \'. * * \param num_command_line_args The number of command-line arguments in - * \p command_line_args. + * \c command_line_args. * * \param unsaved_files the files that have not yet been saved to disk * but may be required for parsing, including the contents of @@ -1206,18 +1266,22 @@ CINDEX_LINKAGE unsigned clang_defaultEdi * is managed but not its compilation. This should be a bitwise OR of the * CXTranslationUnit_XXX flags. * - * \returns A new translation unit describing the parsed code and containing - * any diagnostics produced by the compiler. If there is a failure from which - * the compiler cannot recover, returns NULL. - */ -CINDEX_LINKAGE CXTranslationUnit clang_parseTranslationUnit(CXIndex CIdx, - const char *source_filename, - const char * const *command_line_args, - int num_command_line_args, - struct CXUnsavedFile *unsaved_files, - unsigned num_unsaved_files, - unsigned options); - + * \param[out] out_TU A non-NULL pointer to store the created + * \c CXTranslationUnit, describing the parsed code and containing any + * diagnostics produced by the compiler. + * + * \returns Zero on success, otherwise returns an error code. + */ +CINDEX_LINKAGE enum CXErrorCode +clang_parseTranslationUnit2(CXIndex CIdx, + const char *source_filename, + const char *const *command_line_args, + int num_command_line_args, + struct CXUnsavedFile *unsaved_files, + unsigned num_unsaved_files, + unsigned options, + CXTranslationUnit *out_TU); + /** * \brief Flags that control how translation units are saved. * @@ -1369,10 +1433,11 @@ CINDEX_LINKAGE unsigned clang_defaultRep * The function \c clang_defaultReparseOptions() produces a default set of * options recommended for most uses, based on the translation unit. * - * \returns 0 if the sources could be reparsed. A non-zero value will be + * \returns 0 if the sources could be reparsed. A non-zero error code will be * returned if reparsing was impossible, such that the translation unit is - * invalid. In such cases, the only valid call for \p TU is - * \c clang_disposeTranslationUnit(TU). + * invalid. In such cases, the only valid call for \c TU is + * \c clang_disposeTranslationUnit(TU). The error codes returned by this + * routine are described by the \c CXErrorCode enum. */ CINDEX_LINKAGE int clang_reparseTranslationUnit(CXTranslationUnit TU, unsigned num_unsaved_files, @@ -1669,7 +1734,7 @@ enum CXCursorKind { /** * \brief An expression that refers to some value declaration, such - * as a function, varible, or enumerator. + * as a function, variable, or enumerator. */ CXCursor_DeclRefExpr = 101, @@ -1907,7 +1972,7 @@ enum CXCursorKind { */ CXCursor_ObjCBoolLiteralExpr = 145, - /** \brief Represents the "self" expression in a ObjC method. + /** \brief Represents the "self" expression in an Objective-C method. */ CXCursor_ObjCSelfExpr = 146, @@ -2070,7 +2135,67 @@ enum CXCursorKind { */ CXCursor_OMPParallelDirective = 232, - CXCursor_LastStmt = CXCursor_OMPParallelDirective, + /** \brief OpenMP simd directive. + */ + CXCursor_OMPSimdDirective = 233, *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Mon Nov 24 18:43:40 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D0978B99; Mon, 24 Nov 2014 18:43:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BA6E0EB3; Mon, 24 Nov 2014 18:43:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAOIheQA015497; Mon, 24 Nov 2014 18:43:40 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAOIhbR9015482; Mon, 24 Nov 2014 18:43:37 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411241843.sAOIhbR9015482@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 24 Nov 2014 18:43:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274971 - projects/clang350-import/contrib/llvm/patches X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Nov 2014 18:43:40 -0000 Author: dim Date: Mon Nov 24 18:43:37 2014 New Revision: 274971 URL: https://svnweb.freebsd.org/changeset/base/274971 Log: Cleanup patch set, and update README.TXT. Add three new patches. Added: projects/clang350-import/contrib/llvm/patches/patch-01-clang-version-include.diff - copied, changed from r274969, projects/clang350-import/contrib/llvm/patches/patch-r208961-clang-version-include.diff projects/clang350-import/contrib/llvm/patches/patch-02-format-extensions.diff - copied, changed from r274969, projects/clang350-import/contrib/llvm/patches/patch-r208987-format-extensions.diff projects/clang350-import/contrib/llvm/patches/patch-03-clang-vendor-suffix.diff - copied, changed from r274969, projects/clang350-import/contrib/llvm/patches/patch-r209107-clang-vendor-suffix.diff projects/clang350-import/contrib/llvm/patches/patch-04-default-target-triple.diff - copied, changed from r274969, projects/clang350-import/contrib/llvm/patches/patch-r221503-default-target-triple.diff projects/clang350-import/contrib/llvm/patches/patch-05-add-CC-aliases.diff - copied, changed from r274969, projects/clang350-import/contrib/llvm/patches/patch-r257109-add-CC-aliases.diff projects/clang350-import/contrib/llvm/patches/patch-06-clang-arm-target-cpu.diff - copied, changed from r274969, projects/clang350-import/contrib/llvm/patches/patch-r269387-clang-arm-target-cpu.diff projects/clang350-import/contrib/llvm/patches/patch-07-llvm-r213960-ppc32-tls.diff projects/clang350-import/contrib/llvm/patches/patch-08-llvm-r216989-r216990-fix-movw-armv6.diff - copied, changed from r274969, projects/clang350-import/contrib/llvm/patches/patch-r271024-llvm-r216989-r216990-fix-movw-armv6.diff projects/clang350-import/contrib/llvm/patches/patch-09-clang-r217410-i386-garbage-float.diff - copied, changed from r274969, projects/clang350-import/contrib/llvm/patches/patch-r271597-clang-r217410-i386-garbage-float.diff projects/clang350-import/contrib/llvm/patches/patch-10-llvm-r221709-debug-oom.diff - copied, changed from r274969, projects/clang350-import/contrib/llvm/patches/patch-r274442-llvm-r221709-debug-oom.diff projects/clang350-import/contrib/llvm/patches/patch-11-llvm-r222562-loop-rotate.diff projects/clang350-import/contrib/llvm/patches/patch-12-add-llvm-gvn-option.diff projects/clang350-import/contrib/llvm/patches/patch-13-llvm-r218241-dwarf2-warning.diff Deleted: projects/clang350-import/contrib/llvm/patches/patch-r208961-clang-version-include.diff projects/clang350-import/contrib/llvm/patches/patch-r208987-format-extensions.diff projects/clang350-import/contrib/llvm/patches/patch-r209107-clang-vendor-suffix.diff projects/clang350-import/contrib/llvm/patches/patch-r213492-amd64-multi-os-dot.diff projects/clang350-import/contrib/llvm/patches/patch-r221503-default-target-triple.diff projects/clang350-import/contrib/llvm/patches/patch-r243830-arm-disable-clear-cache.diff projects/clang350-import/contrib/llvm/patches/patch-r252503-arm-transient-stack-alignment.diff projects/clang350-import/contrib/llvm/patches/patch-r257109-add-CC-aliases.diff projects/clang350-import/contrib/llvm/patches/patch-r259053-gcc-installation-detector.diff projects/clang350-import/contrib/llvm/patches/patch-r259498-add-fxsave.diff projects/clang350-import/contrib/llvm/patches/patch-r261680-clang-r200899-fix-security-quantis.diff projects/clang350-import/contrib/llvm/patches/patch-r261991-llvm-r195391-fix-dwarf2.diff projects/clang350-import/contrib/llvm/patches/patch-r261991-llvm-r198385-fix-dwarf2.diff projects/clang350-import/contrib/llvm/patches/patch-r261991-llvm-r198389-fix-dwarf2.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r198028-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r198029-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r198030-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r198145-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r198149-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r198157-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r198280-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r198281-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r198286-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r198480-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r198484-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r198533-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r198565-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r198567-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r198580-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r198591-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r198592-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r198658-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r198681-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r198738-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r198739-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r198740-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r198893-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r198909-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r198910-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r199014-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r199024-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r199028-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r199031-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r199033-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r199061-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r199186-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r199187-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r199775-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r199781-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r199786-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r199940-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r199974-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r199975-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r199977-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r200103-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r200104-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r200112-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r200130-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r200131-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r200141-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r200282-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r200368-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r200373-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r200376-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r200509-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r200617-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r200960-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r200961-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r200962-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r200963-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262261-llvm-r200965-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262262-clang-r198311-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262262-clang-r198312-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262262-clang-r198911-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262262-clang-r198912-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262262-clang-r198918-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262262-clang-r198923-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262262-clang-r199012-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262262-clang-r199034-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262262-clang-r199037-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262262-clang-r199188-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262262-clang-r199399-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262262-clang-r200452-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262264-llvm-r200453-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262265-llvm-r201718-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262303-enable-ppc-integrated-as.diff projects/clang350-import/contrib/llvm/patches/patch-r262415-llvm-r201994-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262460-llvm-r202059-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262535-clang-r202177-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262536-clang-r202179-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262582-llvm-r202422-sparc.diff projects/clang350-import/contrib/llvm/patches/patch-r262611-llvm-r196874-fix-invalid-pwd-crash.diff projects/clang350-import/contrib/llvm/patches/patch-r263048-clang-r203624-fix-CC-aliases.diff projects/clang350-import/contrib/llvm/patches/patch-r263312-llvm-r169939-inline-asm-with-realign.diff projects/clang350-import/contrib/llvm/patches/patch-r263312-llvm-r196940-update-inline-asm-test.diff projects/clang350-import/contrib/llvm/patches/patch-r263312-llvm-r196986-allow-realign-alloca.diff projects/clang350-import/contrib/llvm/patches/patch-r263312-llvm-r202930-fix-alloca-esi-clobber.diff projects/clang350-import/contrib/llvm/patches/patch-r263313-llvm-r203311-fix-sse1-oom.diff projects/clang350-import/contrib/llvm/patches/patch-r263619-clang-r201662-arm-gnueabihf.diff projects/clang350-import/contrib/llvm/patches/patch-r264345-dwarf2-freebsd10.diff projects/clang350-import/contrib/llvm/patches/patch-r264826-llvm-r202188-variadic-fn-debug-info.diff projects/clang350-import/contrib/llvm/patches/patch-r264827-clang-r202185-variadic-fn-debug-info.diff projects/clang350-import/contrib/llvm/patches/patch-r265477-clang-r198655-standalone-debug.diff projects/clang350-import/contrib/llvm/patches/patch-r266674-clang-r209489-fix-xmmintrin.diff projects/clang350-import/contrib/llvm/patches/patch-r267704-llvm-r211435-fix-avx-backend.diff projects/clang350-import/contrib/llvm/patches/patch-r267981-llvm-r211435-fix-ppc-fctiduz.diff projects/clang350-import/contrib/llvm/patches/patch-r269387-clang-arm-target-cpu.diff projects/clang350-import/contrib/llvm/patches/patch-r270147-llvm-r197824-r213427-r213960.diff projects/clang350-import/contrib/llvm/patches/patch-r271024-llvm-r216989-r216990-fix-movw-armv6.diff projects/clang350-import/contrib/llvm/patches/patch-r271282-clang-r200797-r200798-r200805-debug-info-crash.diff projects/clang350-import/contrib/llvm/patches/patch-r271432-clang-r205331-debug-info-crash.diff projects/clang350-import/contrib/llvm/patches/patch-r271597-clang-r217410-i386-garbage-float.diff projects/clang350-import/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff projects/clang350-import/contrib/llvm/patches/patch-r274442-llvm-r221709-debug-oom.diff Modified: projects/clang350-import/contrib/llvm/patches/README.TXT Modified: projects/clang350-import/contrib/llvm/patches/README.TXT ============================================================================== --- projects/clang350-import/contrib/llvm/patches/README.TXT Mon Nov 24 18:34:11 2014 (r274970) +++ projects/clang350-import/contrib/llvm/patches/README.TXT Mon Nov 24 18:43:37 2014 (r274971) @@ -1,11 +1,11 @@ This is a set of individual patches, which contain all the customizations to llvm/clang currently in the FreeBSD base system. These can be applied in -alphabetical order to a pristine llvm/clang 3.4 release source tree, for example -by doing: +alphabetical order to a pristine llvm/clang 3.5.0 release source tree, for +example by doing: -svn co https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_34/final llvm-3.4-final -svn co https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_34/final llvm-3.4-final/tools/clang -cd llvm-3.4-final +svn co https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_350/final llvm-3.5.0-final +svn co https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_350/final llvm-3.5.0-final/tools/clang +cd llvm-3.5.0-final for p in /usr/src/contrib/llvm/patches/patch-*.diff; do patch -p0 -f -F0 -E -i $p -s || break done Copied and modified: projects/clang350-import/contrib/llvm/patches/patch-01-clang-version-include.diff (from r274969, projects/clang350-import/contrib/llvm/patches/patch-r208961-clang-version-include.diff) ============================================================================== --- projects/clang350-import/contrib/llvm/patches/patch-r208961-clang-version-include.diff Mon Nov 24 18:11:16 2014 (r274969, copy source) +++ projects/clang350-import/contrib/llvm/patches/patch-01-clang-version-include.diff Mon Nov 24 18:43:37 2014 (r274971) @@ -1,5 +1,5 @@ -This patch adjusts clang's default include paths to add FreeBSD-specific -directories. +This patch adjusts clang's default include path add a FreeBSD base system +specific directory. Introduced here: http://svnweb.freebsd.org/changeset/base/208961 @@ -15,25 +15,13 @@ Index: tools/clang/lib/Frontend/InitHead #include "clang/Config/config.h" // C_INCLUDE_DIRS #include "clang/Lex/HeaderSearch.h" #include "clang/Lex/HeaderSearchOptions.h" -@@ -333,6 +334,9 @@ void InitHeaderSearch::AddDefaultCIncludePaths(con - #endif +@@ -336,6 +337,9 @@ void InitHeaderSearch::AddDefaultCIncludePaths(con + break; } break; + case llvm::Triple::FreeBSD: + AddPath("/usr/include/clang/" CLANG_VERSION_STRING, System, false); + break; - default: break; -@@ -423,11 +427,6 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple - else - AddPath("/usr/include/c++/4.4", CXXSystem, false); - break; -- case llvm::Triple::FreeBSD: -- // FreeBSD 8.0 -- // FreeBSD 7.3 -- AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2", "", "", "", triple); -- break; - case llvm::Triple::OpenBSD: { - std::string t = triple.getTriple(); - if (t.substr(0, 6) == "x86_64") + } Copied and modified: projects/clang350-import/contrib/llvm/patches/patch-02-format-extensions.diff (from r274969, projects/clang350-import/contrib/llvm/patches/patch-r208987-format-extensions.diff) ============================================================================== --- projects/clang350-import/contrib/llvm/patches/patch-r208987-format-extensions.diff Mon Nov 24 18:11:16 2014 (r274969, copy source) +++ projects/clang350-import/contrib/llvm/patches/patch-02-format-extensions.diff Mon Nov 24 18:43:37 2014 (r274971) @@ -3,12 +3,110 @@ which enables additional printf modifier Introduced here: http://svnweb.freebsd.org/changeset/base/208987 +Index: tools/clang/include/clang/Driver/Options.td +=================================================================== +--- tools/clang/include/clang/Driver/Options.td ++++ tools/clang/include/clang/Driver/Options.td +@@ -563,6 +563,8 @@ def fno_rewrite_includes : Flag<["-"], "fno-rewrit + + def ffreestanding : Flag<["-"], "ffreestanding">, Group, Flags<[CC1Option]>, + HelpText<"Assert that the compilation takes place in a freestanding environment">; ++def fformat_extensions: Flag<["-"], "fformat-extensions">, Group, Flags<[CC1Option]>, ++ HelpText<"Enable FreeBSD kernel specific format string extensions">; + def fgnu_keywords : Flag<["-"], "fgnu-keywords">, Group, Flags<[CC1Option]>, + HelpText<"Allow GNU-extension keywords regardless of language standard">; + def fgnu89_inline : Flag<["-"], "fgnu89-inline">, Group, Flags<[CC1Option]>, +Index: tools/clang/include/clang/Basic/LangOptions.def +=================================================================== +--- tools/clang/include/clang/Basic/LangOptions.def ++++ tools/clang/include/clang/Basic/LangOptions.def +@@ -87,6 +87,7 @@ LANGOPT(RTTI , 1, 1, "run-time type i + LANGOPT(RTTIData , 1, 1, "emit run-time type information data") + LANGOPT(MSBitfields , 1, 0, "Microsoft-compatible structure layout") + LANGOPT(Freestanding, 1, 0, "freestanding implementation") ++LANGOPT(FormatExtensions , 1, 0, "FreeBSD format extensions") + LANGOPT(NoBuiltin , 1, 0, "disable builtin functions") + LANGOPT(NoMathBuiltin , 1, 0, "disable math builtin functions") + +Index: tools/clang/include/clang/Analysis/Analyses/FormatString.h +=================================================================== +--- tools/clang/include/clang/Analysis/Analyses/FormatString.h ++++ tools/clang/include/clang/Analysis/Analyses/FormatString.h +@@ -158,6 +158,11 @@ class ConversionSpecifier { + ObjCObjArg, // '@' + ObjCBeg = ObjCObjArg, ObjCEnd = ObjCObjArg, + ++ // FreeBSD specific specifiers ++ FreeBSDbArg, ++ FreeBSDDArg, ++ FreeBSDrArg, ++ + // GlibC specific specifiers. + PrintErrno, // 'm' + +Index: tools/clang/lib/Sema/SemaChecking.cpp +=================================================================== +--- tools/clang/lib/Sema/SemaChecking.cpp ++++ tools/clang/lib/Sema/SemaChecking.cpp +@@ -3074,6 +3074,40 @@ CheckPrintfHandler::HandlePrintfSpecifier(const an + CoveredArgs.set(argIndex); + } + ++ // FreeBSD extensions ++ if (CS.getKind() == ConversionSpecifier::FreeBSDbArg || ++ CS.getKind() == ConversionSpecifier::FreeBSDDArg) { ++ // claim the second argument ++ CoveredArgs.set(argIndex + 1); ++ ++ // Now type check the data expression that matches the ++ // format specifier. ++ const Expr *Ex = getDataArg(argIndex); ++ const analyze_printf::ArgType &AT = ++ (CS.getKind() == ConversionSpecifier::FreeBSDbArg) ? ++ ArgType(S.Context.IntTy) : ArgType::CStrTy; ++ if (AT.isValid() && !AT.matchesType(S.Context, Ex->getType())) ++ S.Diag(getLocationOfByte(CS.getStart()), ++ diag::warn_format_conversion_argument_type_mismatch) ++ << AT.getRepresentativeType(S.Context) << Ex->getType() ++ << getSpecifierRange(startSpecifier, specifierLen) ++ << Ex->getSourceRange(); ++ ++ // Now type check the data expression that matches the ++ // format specifier. ++ Ex = getDataArg(argIndex + 1); ++ const analyze_printf::ArgType &AT2 = ArgType::CStrTy; ++ if (AT2.isValid() && !AT2.matchesType(S.Context, Ex->getType())) ++ S.Diag(getLocationOfByte(CS.getStart()), ++ diag::warn_format_conversion_argument_type_mismatch) ++ << AT2.getRepresentativeType(S.Context) << Ex->getType() ++ << getSpecifierRange(startSpecifier, specifierLen) ++ << Ex->getSourceRange(); ++ ++ return true; ++ } ++ // END OF FREEBSD EXTENSIONS ++ + // Check for using an Objective-C specific conversion specifier + // in a non-ObjC literal. + if (!ObjCContext && CS.isObjCArg()) { +Index: tools/clang/lib/Driver/Tools.cpp +=================================================================== +--- tools/clang/lib/Driver/Tools.cpp ++++ tools/clang/lib/Driver/Tools.cpp +@@ -3517,6 +3517,7 @@ void Clang::ConstructJob(Compilation &C, const Job + + // Forward -f (flag) options which we can pass directly. + Args.AddLastArg(CmdArgs, options::OPT_femit_all_decls); ++ Args.AddLastArg(CmdArgs, options::OPT_fformat_extensions); + Args.AddLastArg(CmdArgs, options::OPT_fheinous_gnu_extensions); + Args.AddLastArg(CmdArgs, options::OPT_fstandalone_debug); + Args.AddLastArg(CmdArgs, options::OPT_fno_standalone_debug); Index: tools/clang/lib/Frontend/CompilerInvocation.cpp =================================================================== --- tools/clang/lib/Frontend/CompilerInvocation.cpp +++ tools/clang/lib/Frontend/CompilerInvocation.cpp -@@ -1319,6 +1319,7 @@ static void ParseLangArgs(LangOptions &Opts, ArgLi - Opts.ShortWChar = Args.hasArg(OPT_fshort_wchar); +@@ -1443,6 +1443,7 @@ static void ParseLangArgs(LangOptions &Opts, ArgLi + Opts.ShortWChar = Args.hasFlag(OPT_fshort_wchar, OPT_fno_short_wchar, false); Opts.ShortEnums = Args.hasArg(OPT_fshort_enums); Opts.Freestanding = Args.hasArg(OPT_ffreestanding); + Opts.FormatExtensions = Args.hasArg(OPT_fformat_extensions); @@ -114,101 +212,3 @@ Index: tools/clang/lib/Analysis/PrintfFo return true; default: -Index: tools/clang/lib/Sema/SemaChecking.cpp -=================================================================== ---- tools/clang/lib/Sema/SemaChecking.cpp -+++ tools/clang/lib/Sema/SemaChecking.cpp -@@ -2980,6 +2980,40 @@ CheckPrintfHandler::HandlePrintfSpecifier(const an - CoveredArgs.set(argIndex); - } - -+ // FreeBSD extensions -+ if (CS.getKind() == ConversionSpecifier::FreeBSDbArg || -+ CS.getKind() == ConversionSpecifier::FreeBSDDArg) { -+ // claim the second argument -+ CoveredArgs.set(argIndex + 1); -+ -+ // Now type check the data expression that matches the -+ // format specifier. -+ const Expr *Ex = getDataArg(argIndex); -+ const analyze_printf::ArgType &AT = -+ (CS.getKind() == ConversionSpecifier::FreeBSDbArg) ? -+ ArgType(S.Context.IntTy) : ArgType::CStrTy; -+ if (AT.isValid() && !AT.matchesType(S.Context, Ex->getType())) -+ S.Diag(getLocationOfByte(CS.getStart()), -+ diag::warn_printf_conversion_argument_type_mismatch) -+ << AT.getRepresentativeType(S.Context) << Ex->getType() -+ << getSpecifierRange(startSpecifier, specifierLen) -+ << Ex->getSourceRange(); -+ -+ // Now type check the data expression that matches the -+ // format specifier. -+ Ex = getDataArg(argIndex + 1); -+ const analyze_printf::ArgType &AT2 = ArgType::CStrTy; -+ if (AT2.isValid() && !AT2.matchesType(S.Context, Ex->getType())) -+ S.Diag(getLocationOfByte(CS.getStart()), -+ diag::warn_printf_conversion_argument_type_mismatch) -+ << AT2.getRepresentativeType(S.Context) << Ex->getType() -+ << getSpecifierRange(startSpecifier, specifierLen) -+ << Ex->getSourceRange(); -+ -+ return true; -+ } -+ // END OF FREEBSD EXTENSIONS -+ - // Check for using an Objective-C specific conversion specifier - // in a non-ObjC literal. - if (!ObjCContext && CS.isObjCArg()) { -Index: tools/clang/lib/Driver/Tools.cpp -=================================================================== ---- tools/clang/lib/Driver/Tools.cpp -+++ tools/clang/lib/Driver/Tools.cpp -@@ -2991,6 +2991,7 @@ void Clang::ConstructJob(Compilation &C, const Job - - // Forward -f (flag) options which we can pass directly. - Args.AddLastArg(CmdArgs, options::OPT_femit_all_decls); -+ Args.AddLastArg(CmdArgs, options::OPT_fformat_extensions); - Args.AddLastArg(CmdArgs, options::OPT_fheinous_gnu_extensions); - Args.AddLastArg(CmdArgs, options::OPT_flimit_debug_info); - Args.AddLastArg(CmdArgs, options::OPT_fno_limit_debug_info); -Index: tools/clang/include/clang/Basic/LangOptions.def -=================================================================== ---- tools/clang/include/clang/Basic/LangOptions.def -+++ tools/clang/include/clang/Basic/LangOptions.def -@@ -84,6 +84,7 @@ LANGOPT(TraditionalCPP , 1, 0, "traditional CPP - LANGOPT(RTTI , 1, 1, "run-time type information") - LANGOPT(MSBitfields , 1, 0, "Microsoft-compatible structure layout") - LANGOPT(Freestanding, 1, 0, "freestanding implementation") -+LANGOPT(FormatExtensions , 1, 0, "FreeBSD format extensions") - LANGOPT(NoBuiltin , 1, 0, "disable builtin functions") - LANGOPT(NoMathBuiltin , 1, 0, "disable math builtin functions") - -Index: tools/clang/include/clang/Analysis/Analyses/FormatString.h -=================================================================== ---- tools/clang/include/clang/Analysis/Analyses/FormatString.h -+++ tools/clang/include/clang/Analysis/Analyses/FormatString.h -@@ -158,6 +158,11 @@ class ConversionSpecifier { - ObjCObjArg, // '@' - ObjCBeg = ObjCObjArg, ObjCEnd = ObjCObjArg, - -+ // FreeBSD specific specifiers -+ FreeBSDbArg, -+ FreeBSDDArg, -+ FreeBSDrArg, -+ - // GlibC specific specifiers. - PrintErrno, // 'm' - -Index: tools/clang/include/clang/Driver/Options.td -=================================================================== ---- tools/clang/include/clang/Driver/Options.td -+++ tools/clang/include/clang/Driver/Options.td -@@ -530,6 +530,8 @@ def fno_rewrite_includes : Flag<["-"], "fno-rewrit - - def ffreestanding : Flag<["-"], "ffreestanding">, Group, Flags<[CC1Option]>, - HelpText<"Assert that the compilation takes place in a freestanding environment">; -+def fformat_extensions: Flag<["-"], "fformat-extensions">, Group, Flags<[CC1Option]>, -+ HelpText<"Enable FreeBSD kernel specific format string extensions">; - def fgnu_keywords : Flag<["-"], "fgnu-keywords">, Group, Flags<[CC1Option]>, - HelpText<"Allow GNU-extension keywords regardless of language standard">; - def fgnu89_inline : Flag<["-"], "fgnu89-inline">, Group, Flags<[CC1Option]>, Copied and modified: projects/clang350-import/contrib/llvm/patches/patch-03-clang-vendor-suffix.diff (from r274969, projects/clang350-import/contrib/llvm/patches/patch-r209107-clang-vendor-suffix.diff) ============================================================================== --- projects/clang350-import/contrib/llvm/patches/patch-r209107-clang-vendor-suffix.diff Mon Nov 24 18:11:16 2014 (r274969, copy source) +++ projects/clang350-import/contrib/llvm/patches/patch-03-clang-vendor-suffix.diff Mon Nov 24 18:43:37 2014 (r274971) @@ -8,8 +8,8 @@ Index: tools/clang/lib/Basic/Version.cpp =================================================================== --- tools/clang/lib/Basic/Version.cpp +++ tools/clang/lib/Basic/Version.cpp -@@ -124,8 +124,10 @@ std::string getClangFullVersion() { - OS << "clang version " CLANG_VERSION_STRING " " +@@ -128,8 +128,10 @@ std::string getClangToolFullVersion(StringRef Tool + OS << ToolName << " version " CLANG_VERSION_STRING " " << getClangFullRepositoryVersion(); +#ifdef CLANG_VENDOR_SUFFIX @@ -17,6 +17,6 @@ Index: tools/clang/lib/Basic/Version.cpp +#elif defined(CLANG_VENDOR) // If vendor supplied, include the base LLVM version as well. -#ifdef CLANG_VENDOR - OS << " (based on LLVM " << PACKAGE_VERSION << ")"; + OS << " (based on " << BACKEND_PACKAGE_STRING << ")"; #endif Copied and modified: projects/clang350-import/contrib/llvm/patches/patch-04-default-target-triple.diff (from r274969, projects/clang350-import/contrib/llvm/patches/patch-r221503-default-target-triple.diff) ============================================================================== --- projects/clang350-import/contrib/llvm/patches/patch-r221503-default-target-triple.diff Mon Nov 24 18:11:16 2014 (r274969, copy source) +++ projects/clang350-import/contrib/llvm/patches/patch-04-default-target-triple.diff Mon Nov 24 18:43:37 2014 (r274971) @@ -21,6 +21,6 @@ Index: lib/Support/Unix/Host.inc @@ -61,3 +66,4 @@ std::string sys::getDefaultTargetTriple() { - return Triple; + return Triple::normalize(Triple); } +#endif // __FreeBSD__ Copied and modified: projects/clang350-import/contrib/llvm/patches/patch-05-add-CC-aliases.diff (from r274969, projects/clang350-import/contrib/llvm/patches/patch-r257109-add-CC-aliases.diff) ============================================================================== --- projects/clang350-import/contrib/llvm/patches/patch-r257109-add-CC-aliases.diff Mon Nov 24 18:11:16 2014 (r274969, copy source) +++ projects/clang350-import/contrib/llvm/patches/patch-05-add-CC-aliases.diff Mon Nov 24 18:43:37 2014 (r274971) @@ -7,19 +7,17 @@ Index: tools/clang/tools/driver/driver.c =================================================================== --- tools/clang/tools/driver/driver.cpp +++ tools/clang/tools/driver/driver.cpp -@@ -215,6 +215,7 @@ static void ParseProgName(SmallVectorImplgetOperand(OpNo); ++ const MCSymbolRefExpr &refExp = cast(*Op.getExpr()); ++ O << refExp.getSymbol().getName(); + O << '('; + printOperand(MI, OpNo+1, O); + O << ')'; ++ if (refExp.getKind() != MCSymbolRefExpr::VK_None) ++ O << '@' << MCSymbolRefExpr::getVariantKindName(refExp.getKind()); + } + + +Index: lib/Target/PowerPC/PPCInstrInfo.td +=================================================================== +--- lib/Target/PowerPC/PPCInstrInfo.td ++++ lib/Target/PowerPC/PPCInstrInfo.td +@@ -588,6 +588,12 @@ def tlsreg32 : Operand { + let EncoderMethod = "getTLSRegEncoding"; + let ParserMatchClass = PPCTLSRegOperand; + } ++def tlsgd32 : Operand {} ++def tlscall32 : Operand { ++ let PrintMethod = "printTLSCall"; ++ let MIOperandInfo = (ops calltarget:$func, tlsgd32:$sym); ++ let EncoderMethod = "getTLSCallEncoding"; ++} + + // PowerPC Predicate operand. + def pred : Operand { +@@ -1071,6 +1077,8 @@ let isCall = 1, PPC970_Unit = 7, Defs = [LR] in { + "bla $func", IIC_BrB, [(PPCcall (i32 imm:$func))]>; + + let isCodeGenOnly = 1 in { ++ def BL_TLS : IForm<18, 0, 1, (outs), (ins tlscall32:$func), ++ "bl $func", IIC_BrB, []>; + def BCCL : BForm<16, 0, 1, (outs), (ins pred:$cond, condbrtarget:$dst), + "b${cond:cc}l${cond:pm} ${cond:reg}, $dst">; + def BCCLA : BForm<16, 1, 1, (outs), (ins pred:$cond, abscondbrtarget:$dst), +@@ -2396,13 +2404,45 @@ def : Pat<(add i32:$in, (PPChi tblockaddress:$g, 0 + def PPC32GOT: Pseudo<(outs gprc:$rD), (ins), "#PPC32GOT", + [(set i32:$rD, (PPCppc32GOT))]>; + ++// Get the _GLOBAL_OFFSET_TABLE_ in PIC mode. ++// This uses two output registers, the first as the real output, the second as a ++// temporary register, used internally in code generation. ++def PPC32PICGOT: Pseudo<(outs gprc:$rD, gprc:$rT), (ins), "#PPC32PICGOT", ++ []>, NoEncode<"$rT">; ++ + def LDgotTprelL32: Pseudo<(outs gprc:$rD), (ins s16imm:$disp, gprc_nor0:$reg), +- "#LDgotTprelL32", +- [(set i32:$rD, +- (PPCldGotTprelL tglobaltlsaddr:$disp, i32:$reg))]>; ++ "#LDgotTprelL32", ++ [(set i32:$rD, ++ (PPCldGotTprelL tglobaltlsaddr:$disp, i32:$reg))]>; + def : Pat<(PPCaddTls i32:$in, tglobaltlsaddr:$g), + (ADD4TLS $in, tglobaltlsaddr:$g)>; + ++def ADDItlsgdL32 : Pseudo<(outs gprc:$rD), (ins gprc_nor0:$reg, s16imm:$disp), ++ "#ADDItlsgdL32", ++ [(set i32:$rD, ++ (PPCaddiTlsgdL i32:$reg, tglobaltlsaddr:$disp))]>; ++def GETtlsADDR32 : Pseudo<(outs gprc:$rD), (ins gprc:$reg, tlsgd32:$sym), ++ "#GETtlsADDR32", ++ [(set i32:$rD, ++ (PPCgetTlsAddr i32:$reg, tglobaltlsaddr:$sym))]>; ++def ADDItlsldL32 : Pseudo<(outs gprc:$rD), (ins gprc_nor0:$reg, s16imm:$disp), ++ "#ADDItlsldL32", ++ [(set i32:$rD, ++ (PPCaddiTlsldL i32:$reg, tglobaltlsaddr:$disp))]>; ++def GETtlsldADDR32 : Pseudo<(outs gprc:$rD), (ins gprc:$reg, tlsgd32:$sym), ++ "#GETtlsldADDR32", ++ [(set i32:$rD, ++ (PPCgetTlsldAddr i32:$reg, tglobaltlsaddr:$sym))]>; ++def ADDIdtprelL32 : Pseudo<(outs gprc:$rD), (ins gprc_nor0:$reg, s16imm:$disp), ++ "#ADDIdtprelL32", ++ [(set i32:$rD, ++ (PPCaddiDtprelL i32:$reg, tglobaltlsaddr:$disp))]>; ++def ADDISdtprelHA32 : Pseudo<(outs gprc:$rD), (ins gprc_nor0:$reg, s16imm:$disp), ++ "#ADDISdtprelHA32", ++ [(set i32:$rD, ++ (PPCaddisDtprelHA i32:$reg, ++ tglobaltlsaddr:$disp))]>; ++ + // Support for Position-independent code + def LWZtoc: Pseudo<(outs gprc:$rD), (ins tocentry32:$disp, gprc:$reg), + "#LWZtoc", +Index: lib/Target/PowerPC/PPCISelLowering.cpp +=================================================================== +--- lib/Target/PowerPC/PPCISelLowering.cpp ++++ lib/Target/PowerPC/PPCISelLowering.cpp +@@ -1685,47 +1685,61 @@ SDValue PPCTargetLowering::LowerGlobalTLSAddress(S + + if (Model == TLSModel::GeneralDynamic) { + SDValue TGA = DAG.getTargetGlobalAddress(GV, dl, PtrVT, 0, 0); +- SDValue GOTReg = DAG.getRegister(PPC::X2, MVT::i64); +- SDValue GOTEntryHi = DAG.getNode(PPCISD::ADDIS_TLSGD_HA, dl, PtrVT, +- GOTReg, TGA); ++ SDValue GOTPtr; ++ if (is64bit) { ++ SDValue GOTReg = DAG.getRegister(PPC::X2, MVT::i64); ++ GOTPtr = DAG.getNode(PPCISD::ADDIS_TLSGD_HA, dl, PtrVT, ++ GOTReg, TGA); ++ } else { ++ GOTPtr = DAG.getNode(PPCISD::PPC32_PICGOT, dl, PtrVT); ++ } + SDValue GOTEntry = DAG.getNode(PPCISD::ADDI_TLSGD_L, dl, PtrVT, +- GOTEntryHi, TGA); ++ GOTPtr, TGA); + + // We need a chain node, and don't have one handy. The underlying + // call has no side effects, so using the function entry node + // suffices. + SDValue Chain = DAG.getEntryNode(); +- Chain = DAG.getCopyToReg(Chain, dl, PPC::X3, GOTEntry); +- SDValue ParmReg = DAG.getRegister(PPC::X3, MVT::i64); ++ Chain = DAG.getCopyToReg(Chain, dl, ++ is64bit ? PPC::X3 : PPC::R3, GOTEntry); ++ SDValue ParmReg = DAG.getRegister(is64bit ? PPC::X3 : PPC::R3, ++ is64bit ? MVT::i64 : MVT::i32); + SDValue TLSAddr = DAG.getNode(PPCISD::GET_TLS_ADDR, dl, + PtrVT, ParmReg, TGA); + // The return value from GET_TLS_ADDR really is in X3 already, but + // some hacks are needed here to tie everything together. The extra + // copies dissolve during subsequent transforms. +- Chain = DAG.getCopyToReg(Chain, dl, PPC::X3, TLSAddr); +- return DAG.getCopyFromReg(Chain, dl, PPC::X3, PtrVT); ++ Chain = DAG.getCopyToReg(Chain, dl, is64bit ? PPC::X3 : PPC::R3, TLSAddr); ++ return DAG.getCopyFromReg(Chain, dl, is64bit ? PPC::X3 : PPC::R3, PtrVT); + } + + if (Model == TLSModel::LocalDynamic) { + SDValue TGA = DAG.getTargetGlobalAddress(GV, dl, PtrVT, 0, 0); +- SDValue GOTReg = DAG.getRegister(PPC::X2, MVT::i64); +- SDValue GOTEntryHi = DAG.getNode(PPCISD::ADDIS_TLSLD_HA, dl, PtrVT, +- GOTReg, TGA); ++ SDValue GOTPtr; ++ if (is64bit) { ++ SDValue GOTReg = DAG.getRegister(PPC::X2, MVT::i64); ++ GOTPtr = DAG.getNode(PPCISD::ADDIS_TLSLD_HA, dl, PtrVT, ++ GOTReg, TGA); ++ } else { ++ GOTPtr = DAG.getNode(PPCISD::PPC32_PICGOT, dl, PtrVT); ++ } + SDValue GOTEntry = DAG.getNode(PPCISD::ADDI_TLSLD_L, dl, PtrVT, +- GOTEntryHi, TGA); ++ GOTPtr, TGA); + + // We need a chain node, and don't have one handy. The underlying + // call has no side effects, so using the function entry node + // suffices. + SDValue Chain = DAG.getEntryNode(); +- Chain = DAG.getCopyToReg(Chain, dl, PPC::X3, GOTEntry); +- SDValue ParmReg = DAG.getRegister(PPC::X3, MVT::i64); ++ Chain = DAG.getCopyToReg(Chain, dl, ++ is64bit ? PPC::X3 : PPC::R3, GOTEntry); ++ SDValue ParmReg = DAG.getRegister(is64bit ? PPC::X3 : PPC::R3, ++ is64bit ? MVT::i64 : MVT::i32); + SDValue TLSAddr = DAG.getNode(PPCISD::GET_TLSLD_ADDR, dl, + PtrVT, ParmReg, TGA); + // The return value from GET_TLSLD_ADDR really is in X3 already, but + // some hacks are needed here to tie everything together. The extra + // copies dissolve during subsequent transforms. +- Chain = DAG.getCopyToReg(Chain, dl, PPC::X3, TLSAddr); ++ Chain = DAG.getCopyToReg(Chain, dl, is64bit ? PPC::X3 : PPC::R3, TLSAddr); + SDValue DtvOffsetHi = DAG.getNode(PPCISD::ADDIS_DTPREL_HA, dl, PtrVT, + Chain, ParmReg, TGA); + return DAG.getNode(PPCISD::ADDI_DTPREL_L, dl, PtrVT, DtvOffsetHi, TGA); +Index: lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp +=================================================================== +--- lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp ++++ lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp +@@ -236,7 +236,10 @@ unsigned PPCELFObjectWriter::getRelocTypeInner(con + Type = ELF::R_PPC64_DTPREL16_HIGHESTA; + break; + case MCSymbolRefExpr::VK_PPC_GOT_TLSGD: +- Type = ELF::R_PPC64_GOT_TLSGD16; ++ if (is64Bit()) ++ Type = ELF::R_PPC64_GOT_TLSGD16; ++ else ++ Type = ELF::R_PPC_GOT_TLSGD16; + break; + case MCSymbolRefExpr::VK_PPC_GOT_TLSGD_LO: + Type = ELF::R_PPC64_GOT_TLSGD16_LO; +@@ -248,7 +251,10 @@ unsigned PPCELFObjectWriter::getRelocTypeInner(con + Type = ELF::R_PPC64_GOT_TLSGD16_HA; + break; + case MCSymbolRefExpr::VK_PPC_GOT_TLSLD: +- Type = ELF::R_PPC64_GOT_TLSLD16; ++ if (is64Bit()) ++ Type = ELF::R_PPC64_GOT_TLSLD16; ++ else ++ Type = ELF::R_PPC_GOT_TLSLD16; + break; + case MCSymbolRefExpr::VK_PPC_GOT_TLSLD_LO: + Type = ELF::R_PPC64_GOT_TLSLD16_LO; +@@ -344,13 +350,22 @@ unsigned PPCELFObjectWriter::getRelocTypeInner(con + switch (Modifier) { + default: llvm_unreachable("Unsupported Modifier"); + case MCSymbolRefExpr::VK_PPC_TLSGD: +- Type = ELF::R_PPC64_TLSGD; ++ if (is64Bit()) ++ Type = ELF::R_PPC64_TLSGD; ++ else ++ Type = ELF::R_PPC_TLSGD; + break; + case MCSymbolRefExpr::VK_PPC_TLSLD: +- Type = ELF::R_PPC64_TLSLD; ++ if (is64Bit()) ++ Type = ELF::R_PPC64_TLSLD; ++ else ++ Type = ELF::R_PPC_TLSLD; + break; + case MCSymbolRefExpr::VK_PPC_TLS: +- Type = ELF::R_PPC64_TLS; ++ if (is64Bit()) ++ Type = ELF::R_PPC64_TLS; ++ else ++ Type = ELF::R_PPC_TLS; + break; + } + break; +Index: lib/Target/PowerPC/PPCAsmPrinter.cpp +=================================================================== +--- lib/Target/PowerPC/PPCAsmPrinter.cpp ++++ lib/Target/PowerPC/PPCAsmPrinter.cpp +@@ -573,6 +573,34 @@ void PPCAsmPrinter::EmitInstruction(const MachineI + return; + } + ++ case PPC::PPC32PICGOT: { ++ MCSymbol *GOTSymbol = OutContext.GetOrCreateSymbol(StringRef("_GLOBAL_OFFSET_TABLE_")); ++ MCSymbol *GOTRef = OutContext.CreateTempSymbol(); ++ MCSymbol *NextInstr = OutContext.CreateTempSymbol(); ++ ++ EmitToStreamer(OutStreamer, MCInstBuilder(PPC::BL) ++ // FIXME: We would like an efficient form for this, so we don't have to do ++ // a lot of extra uniquing. ++ .addExpr(MCSymbolRefExpr::Create(NextInstr, OutContext))); ++ const MCExpr *OffsExpr = ++ MCBinaryExpr::CreateSub(MCSymbolRefExpr::Create(GOTSymbol, OutContext), ++ MCSymbolRefExpr::Create(GOTRef, OutContext), ++ OutContext); ++ OutStreamer.EmitLabel(GOTRef); ++ OutStreamer.EmitValue(OffsExpr, 4); ++ OutStreamer.EmitLabel(NextInstr); ++ EmitToStreamer(OutStreamer, MCInstBuilder(PPC::MFLR) ++ .addReg(MI->getOperand(0).getReg())); ++ EmitToStreamer(OutStreamer, MCInstBuilder(PPC::LWZ) ++ .addReg(MI->getOperand(1).getReg()) ++ .addImm(0) ++ .addReg(MI->getOperand(0).getReg())); ++ EmitToStreamer(OutStreamer, MCInstBuilder(PPC::ADD4) ++ .addReg(MI->getOperand(0).getReg()) ++ .addReg(MI->getOperand(1).getReg()) ++ .addReg(MI->getOperand(0).getReg())); ++ return; ++ } + case PPC::PPC32GOT: { + MCSymbol *GOTSymbol = OutContext.GetOrCreateSymbol(StringRef("_GLOBAL_OFFSET_TABLE_")); + const MCExpr *SymGotTlsL = +@@ -606,31 +634,43 @@ void PPCAsmPrinter::EmitInstruction(const MachineI + .addExpr(SymGotTlsGD)); + return; + } +- case PPC::ADDItlsgdL: { ++ case PPC::ADDItlsgdL: + // Transform: %Xd = ADDItlsgdL %Xs, + // Into: %Xd = ADDI8 %Xs, sym@got@tlsgd@l +- assert(Subtarget.isPPC64() && "Not supported for 32-bit PowerPC"); ++ case PPC::ADDItlsgdL32: { ++ // Transform: %Rd = ADDItlsgdL32 %Rs, ++ // Into: %Rd = ADDI %Rs, sym@got@tlsgd + const MachineOperand &MO = MI->getOperand(2); + const GlobalValue *GValue = MO.getGlobal(); + MCSymbol *MOSymbol = getSymbol(GValue); + const MCExpr *SymGotTlsGD = +- MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_GOT_TLSGD_LO, ++ MCSymbolRefExpr::Create(MOSymbol, Subtarget.isPPC64() ? ++ MCSymbolRefExpr::VK_PPC_GOT_TLSGD_LO : ++ MCSymbolRefExpr::VK_PPC_GOT_TLSGD, + OutContext); +- EmitToStreamer(OutStreamer, MCInstBuilder(PPC::ADDI8) +- .addReg(MI->getOperand(0).getReg()) +- .addReg(MI->getOperand(1).getReg()) +- .addExpr(SymGotTlsGD)); ++ EmitToStreamer(OutStreamer, ++ MCInstBuilder(Subtarget.isPPC64() ? PPC::ADDI8 : PPC::ADDI) ++ .addReg(MI->getOperand(0).getReg()) ++ .addReg(MI->getOperand(1).getReg()) ++ .addExpr(SymGotTlsGD)); + return; + } +- case PPC::GETtlsADDR: { ++ case PPC::GETtlsADDR: + // Transform: %X3 = GETtlsADDR %X3, + // Into: BL8_NOP_TLS __tls_get_addr(sym@tlsgd) +- assert(Subtarget.isPPC64() && "Not supported for 32-bit PowerPC"); ++ case PPC::GETtlsADDR32: { ++ // Transform: %R3 = GETtlsADDR32 %R3, ++ // Into: BL_TLS __tls_get_addr(sym@tlsgd)@PLT + + StringRef Name = "__tls_get_addr"; + MCSymbol *TlsGetAddr = OutContext.GetOrCreateSymbol(Name); ++ MCSymbolRefExpr::VariantKind Kind = MCSymbolRefExpr::VK_None; ++ ++ if (!Subtarget.isPPC64() && !Subtarget.isDarwin() && ++ TM.getRelocationModel() == Reloc::PIC_) ++ Kind = MCSymbolRefExpr::VK_PLT; + const MCSymbolRefExpr *TlsRef = +- MCSymbolRefExpr::Create(TlsGetAddr, MCSymbolRefExpr::VK_None, OutContext); ++ MCSymbolRefExpr::Create(TlsGetAddr, Kind, OutContext); + const MachineOperand &MO = MI->getOperand(2); + const GlobalValue *GValue = MO.getGlobal(); + MCSymbol *MOSymbol = getSymbol(GValue); +@@ -637,9 +677,11 @@ void PPCAsmPrinter::EmitInstruction(const MachineI + const MCExpr *SymVar = + MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_TLSGD, + OutContext); +- EmitToStreamer(OutStreamer, MCInstBuilder(PPC::BL8_NOP_TLS) +- .addExpr(TlsRef) +- .addExpr(SymVar)); ++ EmitToStreamer(OutStreamer, ++ MCInstBuilder(Subtarget.isPPC64() ? ++ PPC::BL8_NOP_TLS : PPC::BL_TLS) ++ .addExpr(TlsRef) ++ .addExpr(SymVar)); + return; + } + case PPC::ADDIStlsldHA: { +@@ -658,31 +700,44 @@ void PPCAsmPrinter::EmitInstruction(const MachineI + .addExpr(SymGotTlsLD)); + return; + } +- case PPC::ADDItlsldL: { ++ case PPC::ADDItlsldL: + // Transform: %Xd = ADDItlsldL %Xs, + // Into: %Xd = ADDI8 %Xs, sym@got@tlsld@l +- assert(Subtarget.isPPC64() && "Not supported for 32-bit PowerPC"); ++ case PPC::ADDItlsldL32: { ++ // Transform: %Rd = ADDItlsldL32 %Rs, ++ // Into: %Rd = ADDI %Rs, sym@got@tlsld + const MachineOperand &MO = MI->getOperand(2); + const GlobalValue *GValue = MO.getGlobal(); + MCSymbol *MOSymbol = getSymbol(GValue); + const MCExpr *SymGotTlsLD = +- MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_GOT_TLSLD_LO, ++ MCSymbolRefExpr::Create(MOSymbol, Subtarget.isPPC64() ? ++ MCSymbolRefExpr::VK_PPC_GOT_TLSLD_LO : ++ MCSymbolRefExpr::VK_PPC_GOT_TLSLD, + OutContext); +- EmitToStreamer(OutStreamer, MCInstBuilder(PPC::ADDI8) +- .addReg(MI->getOperand(0).getReg()) +- .addReg(MI->getOperand(1).getReg()) +- .addExpr(SymGotTlsLD)); ++ EmitToStreamer(OutStreamer, ++ MCInstBuilder(Subtarget.isPPC64() ? PPC::ADDI8 : PPC::ADDI) ++ .addReg(MI->getOperand(0).getReg()) ++ .addReg(MI->getOperand(1).getReg()) ++ .addExpr(SymGotTlsLD)); + return; + } +- case PPC::GETtlsldADDR: { ++ case PPC::GETtlsldADDR: + // Transform: %X3 = GETtlsldADDR %X3, + // Into: BL8_NOP_TLS __tls_get_addr(sym@tlsld) +- assert(Subtarget.isPPC64() && "Not supported for 32-bit PowerPC"); ++ case PPC::GETtlsldADDR32: { ++ // Transform: %R3 = GETtlsldADDR32 %R3, ++ // Into: BL_TLS __tls_get_addr(sym@tlsld)@PLT + + StringRef Name = "__tls_get_addr"; + MCSymbol *TlsGetAddr = OutContext.GetOrCreateSymbol(Name); ++ MCSymbolRefExpr::VariantKind Kind = MCSymbolRefExpr::VK_None; ++ ++ if (!Subtarget.isPPC64() && !Subtarget.isDarwin() && ++ TM.getRelocationModel() == Reloc::PIC_) ++ Kind = MCSymbolRefExpr::VK_PLT; ++ + const MCSymbolRefExpr *TlsRef = +- MCSymbolRefExpr::Create(TlsGetAddr, MCSymbolRefExpr::VK_None, OutContext); ++ MCSymbolRefExpr::Create(TlsGetAddr, Kind, OutContext); + const MachineOperand &MO = MI->getOperand(2); + const GlobalValue *GValue = MO.getGlobal(); + MCSymbol *MOSymbol = getSymbol(GValue); +@@ -689,15 +744,19 @@ void PPCAsmPrinter::EmitInstruction(const MachineI + const MCExpr *SymVar = + MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_TLSLD, + OutContext); +- EmitToStreamer(OutStreamer, MCInstBuilder(PPC::BL8_NOP_TLS) +- .addExpr(TlsRef) +- .addExpr(SymVar)); ++ EmitToStreamer(OutStreamer, ++ MCInstBuilder(Subtarget.isPPC64() ? ++ PPC::BL8_NOP_TLS : PPC::BL_TLS) ++ .addExpr(TlsRef) ++ .addExpr(SymVar)); + return; + } +- case PPC::ADDISdtprelHA: { ++ case PPC::ADDISdtprelHA: + // Transform: %Xd = ADDISdtprelHA %X3, + // Into: %Xd = ADDIS8 %X3, sym@dtprel@ha +- assert(Subtarget.isPPC64() && "Not supported for 32-bit PowerPC"); ++ case PPC::ADDISdtprelHA32: { ++ // Transform: %Rd = ADDISdtprelHA32 %R3, ++ // Into: %Rd = ADDIS %R3, sym@dtprel@ha + const MachineOperand &MO = MI->getOperand(2); + const GlobalValue *GValue = MO.getGlobal(); + MCSymbol *MOSymbol = getSymbol(GValue); +@@ -704,16 +763,19 @@ void PPCAsmPrinter::EmitInstruction(const MachineI + const MCExpr *SymDtprel = + MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_DTPREL_HA, + OutContext); +- EmitToStreamer(OutStreamer, MCInstBuilder(PPC::ADDIS8) +- .addReg(MI->getOperand(0).getReg()) +- .addReg(PPC::X3) +- .addExpr(SymDtprel)); ++ EmitToStreamer(OutStreamer, ++ MCInstBuilder(Subtarget.isPPC64() ? PPC::ADDIS8 : PPC::ADDIS) ++ .addReg(MI->getOperand(0).getReg()) ++ .addReg(Subtarget.isPPC64() ? PPC::X3 : PPC::R3) ++ .addExpr(SymDtprel)); + return; + } +- case PPC::ADDIdtprelL: { ++ case PPC::ADDIdtprelL: + // Transform: %Xd = ADDIdtprelL %Xs, + // Into: %Xd = ADDI8 %Xs, sym@dtprel@l +- assert(Subtarget.isPPC64() && "Not supported for 32-bit PowerPC"); ++ case PPC::ADDIdtprelL32: { ++ // Transform: %Rd = ADDIdtprelL32 %Rs, ++ // Into: %Rd = ADDI %Rs, sym@dtprel@l + const MachineOperand &MO = MI->getOperand(2); + const GlobalValue *GValue = MO.getGlobal(); + MCSymbol *MOSymbol = getSymbol(GValue); +@@ -720,10 +782,11 @@ void PPCAsmPrinter::EmitInstruction(const MachineI + const MCExpr *SymDtprel = + MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_DTPREL_LO, + OutContext); +- EmitToStreamer(OutStreamer, MCInstBuilder(PPC::ADDI8) +- .addReg(MI->getOperand(0).getReg()) +- .addReg(MI->getOperand(1).getReg()) +- .addExpr(SymDtprel)); ++ EmitToStreamer(OutStreamer, ++ MCInstBuilder(Subtarget.isPPC64() ? PPC::ADDI8 : PPC::ADDI) ++ .addReg(MI->getOperand(0).getReg()) ++ .addReg(MI->getOperand(1).getReg()) ++ .addExpr(SymDtprel)); + return; + } + case PPC::MFOCRF: +Index: lib/Target/PowerPC/PPCISelDAGToDAG.cpp +=================================================================== +--- lib/Target/PowerPC/PPCISelDAGToDAG.cpp ++++ lib/Target/PowerPC/PPCISelDAGToDAG.cpp +@@ -1473,6 +1473,12 @@ SDNode *PPCDAGToDAGISel::Select(SDNode *N) { + return CurDAG->getMachineNode(PPC::ADDItocL, dl, MVT::i64, + SDValue(Tmp, 0), GA); + } ++ case PPCISD::PPC32_PICGOT: { ++ // Generate a PIC-safe GOT reference. ++ assert(!PPCSubTarget->isPPC64() && PPCSubTarget->isSVR4ABI() && ++ "PPCISD::PPC32_PICGOT is only supported for 32-bit SVR4"); ++ return CurDAG->SelectNodeTo(N, PPC::PPC32PICGOT, PPCLowering->getPointerTy(), MVT::i32); ++ } + case PPCISD::VADD_SPLAT: { + // This expands into one of three sequences, depending on whether + // the first operand is odd or even, positive or negative. +Index: test/CodeGen/PowerPC/tls-pic.ll +=================================================================== +--- test/CodeGen/PowerPC/tls-pic.ll ++++ test/CodeGen/PowerPC/tls-pic.ll +@@ -1,5 +1,7 @@ + ; RUN: llc -march=ppc64 -mcpu=pwr7 -O0 -relocation-model=pic < %s | FileCheck -check-prefix=OPT0 %s + ; RUN: llc -march=ppc64 -mcpu=pwr7 -O1 -relocation-model=pic < %s | FileCheck -check-prefix=OPT1 %s ++; RUN: llc -march=ppc32 -O0 -relocation-model=pic < %s | FileCheck -check-prefix=OPT0-32 %s ++; RUN: llc -march=ppc32 -O1 -relocation-model=pic < %s | FileCheck -check-prefix=OPT1-32 %s + + target triple = "powerpc64-unknown-linux-gnu" + ; Test correct assembly code generation for thread-local storage using +@@ -22,6 +24,16 @@ entry: + ; OPT0-NEXT: nop + ; OPT0: addis [[REG2:[0-9]+]], 3, a@dtprel@ha + ; OPT0-NEXT: addi {{[0-9]+}}, [[REG2]], a@dtprel@l ++; OPT0-32-LABEL: main ++; OPT0-32: addi {{[0-9]+}}, {{[0-9]+}}, a@got@tlsld ++; OPT0-32: bl __tls_get_addr(a@tlsld)@PLT ++; OPT0-32: addis [[REG:[0-9]+]], 3, a@dtprel@ha ++; OPT0-32-NEXT: addi {{[0-9]+}}, [[REG]], a@dtprel@l ++; OPT1-32-LABEL: main ++; OPT1-32: addi 3, {{[0-9]+}}, a@got@tlsld ++; OPT1-32: bl __tls_get_addr(a@tlsld)@PLT ++; OPT1-32: addis [[REG:[0-9]+]], 3, a@dtprel@ha ++; OPT1-32-NEXT: addi {{[0-9]+}}, [[REG]], a@dtprel@l + + ; Test peephole optimization for thread-local storage using the + ; local dynamic model. +@@ -52,4 +64,6 @@ entry: + ; OPT1-NEXT: addi 3, [[REG]], a2@got@tlsgd@l + ; OPT1: bl __tls_get_addr(a2@tlsgd) + ; OPT1-NEXT: nop +- ++; OPT1-32-LABEL: main2 ++; OPT1-32: addi 3, {{[0-9]+}}, a2@got@tlsgd ++; OPT1-32: bl __tls_get_addr(a2@tlsgd)@PLT Copied and modified: projects/clang350-import/contrib/llvm/patches/patch-08-llvm-r216989-r216990-fix-movw-armv6.diff (from r274969, projects/clang350-import/contrib/llvm/patches/patch-r271024-llvm-r216989-r216990-fix-movw-armv6.diff) ============================================================================== --- projects/clang350-import/contrib/llvm/patches/patch-r271024-llvm-r216989-r216990-fix-movw-armv6.diff Mon Nov 24 18:11:16 2014 (r274969, copy source) +++ projects/clang350-import/contrib/llvm/patches/patch-08-llvm-r216989-r216990-fix-movw-armv6.diff Mon Nov 24 18:43:37 2014 (r274971) @@ -17,7 +17,7 @@ Index: lib/Target/ARM/ARMInstrInfo.td =================================================================== --- lib/Target/ARM/ARMInstrInfo.td +++ lib/Target/ARM/ARMInstrInfo.td -@@ -3248,7 +3248,8 @@ +@@ -3419,7 +3419,8 @@ def : ARMPat<(ARMaddc GPR:$src, imm0_65535_neg:$im def : ARMPat<(ARMadde GPR:$src, so_imm_not:$imm, CPSR), (SBCri GPR:$src, so_imm_not:$imm)>; def : ARMPat<(ARMadde GPR:$src, imm0_65535_neg:$imm, CPSR), @@ -32,7 +32,7 @@ Index: test/CodeGen/ARM/carry.ll --- test/CodeGen/ARM/carry.ll +++ test/CodeGen/ARM/carry.ll @@ -1,4 +1,4 @@ --; RUN: llc < %s -march=arm | FileCheck %s +-; RUN: llc -mtriple=arm-eabi %s -o - | FileCheck %s +; RUN: llc < %s -mtriple=armv6t2-eabi | FileCheck %s define i64 @f1(i64 %a, i64 %b) { Copied and modified: projects/clang350-import/contrib/llvm/patches/patch-09-clang-r217410-i386-garbage-float.diff (from r274969, projects/clang350-import/contrib/llvm/patches/patch-r271597-clang-r217410-i386-garbage-float.diff) ============================================================================== --- projects/clang350-import/contrib/llvm/patches/patch-r271597-clang-r217410-i386-garbage-float.diff Mon Nov 24 18:11:16 2014 (r274969, copy source) +++ projects/clang350-import/contrib/llvm/patches/patch-09-clang-r217410-i386-garbage-float.diff Mon Nov 24 18:43:37 2014 (r274971) @@ -17,9 +17,9 @@ Introduced here: http://svnweb.freebsd.o Index: lib/Target/X86/X86ISelLowering.cpp =================================================================== ---- lib/Target/X86/X86ISelLowering.cpp (revision 208032) -+++ lib/Target/X86/X86ISelLowering.cpp (working copy) -@@ -300,6 +300,8 @@ void X86TargetLowering::resetOperationActions() { +--- lib/Target/X86/X86ISelLowering.cpp ++++ lib/Target/X86/X86ISelLowering.cpp +@@ -316,6 +316,8 @@ void X86TargetLowering::resetOperationActions() { setTruncStoreAction(MVT::i32, MVT::i8 , Expand); setTruncStoreAction(MVT::i16, MVT::i8, Expand); @@ -28,7 +28,7 @@ Index: lib/Target/X86/X86ISelLowering.cp // SETOEQ and SETUNE require checking two conditions. setCondCodeAction(ISD::SETOEQ, MVT::f32, Expand); setCondCodeAction(ISD::SETOEQ, MVT::f64, Expand); -@@ -1011,8 +1013,6 @@ void X86TargetLowering::resetOperationActions() { +@@ -1043,8 +1045,6 @@ void X86TargetLowering::resetOperationActions() { AddPromotedToType (ISD::SELECT, VT, MVT::v2i64); } @@ -39,8 +39,8 @@ Index: lib/Target/X86/X86ISelLowering.cp setOperationAction(ISD::LOAD, MVT::v2i64, Legal); Index: test/CodeGen/X86/dont-trunc-store-double-to-float.ll =================================================================== ---- test/CodeGen/X86/dont-trunc-store-double-to-float.ll (revision 0) -+++ test/CodeGen/X86/dont-trunc-store-double-to-float.ll (working copy) +--- test/CodeGen/X86/dont-trunc-store-double-to-float.ll ++++ test/CodeGen/X86/dont-trunc-store-double-to-float.ll @@ -0,0 +1,20 @@ +; RUN: llc -march=x86 < %s | FileCheck %s + Copied and modified: projects/clang350-import/contrib/llvm/patches/patch-10-llvm-r221709-debug-oom.diff (from r274969, projects/clang350-import/contrib/llvm/patches/patch-r274442-llvm-r221709-debug-oom.diff) ============================================================================== --- projects/clang350-import/contrib/llvm/patches/patch-r274442-llvm-r221709-debug-oom.diff Mon Nov 24 18:11:16 2014 (r274969, copy source) +++ projects/clang350-import/contrib/llvm/patches/patch-10-llvm-r221709-debug-oom.diff Mon Nov 24 18:43:37 2014 (r274971) @@ -1,4 +1,4 @@ -Pull in r221709 from upstream llvm trunk (by Frédéric Riss): +Pull in r221709 from upstream llvm trunk (by Frédéric Riss): Totally forget deallocated SDNodes in SDDbgInfo. @@ -24,9 +24,9 @@ Introduced here: http://svnweb.freebsd.o Index: include/llvm/CodeGen/SelectionDAG.h *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Mon Nov 24 19:37:15 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0BA2CFD8; Mon, 24 Nov 2014 19:37:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E9F9D791; Mon, 24 Nov 2014 19:37:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAOJbEp9042535; Mon, 24 Nov 2014 19:37:14 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAOJbCQI042511; Mon, 24 Nov 2014 19:37:12 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411241937.sAOJbCQI042511@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 24 Nov 2014 19:37:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274972 - in projects/clang350-import/lib/clang/include: . clang/AST clang/Basic clang/Config clang/Driver clang/Lex clang/Parse llvm/Config X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Nov 2014 19:37:15 -0000 Author: dim Date: Mon Nov 24 19:37:11 2014 New Revision: 274972 URL: https://svnweb.freebsd.org/changeset/base/274972 Log: Update llvm and clang include files. Added: projects/clang350-import/lib/clang/include/MipsGenFastISel.inc (contents, props changed) projects/clang350-import/lib/clang/include/PPCGenDisassemblerTables.inc (contents, props changed) projects/clang350-import/lib/clang/include/clang/AST/AttrVisitor.inc (contents, props changed) projects/clang350-import/lib/clang/include/clang/Basic/AttrHasAttributeImpl.inc (contents, props changed) projects/clang350-import/lib/clang/include/clang/Parse/AttrParserStringSwitches.inc (contents, props changed) Deleted: projects/clang350-import/lib/clang/include/clang/Driver/CC1AsOptions.inc projects/clang350-import/lib/clang/include/clang/Lex/ projects/clang350-import/lib/clang/include/clang/Parse/AttrIdentifierArg.inc projects/clang350-import/lib/clang/include/clang/Parse/AttrLateParsed.inc projects/clang350-import/lib/clang/include/clang/Parse/AttrTypeArg.inc Modified: projects/clang350-import/lib/clang/include/Makefile projects/clang350-import/lib/clang/include/clang/Basic/Version.inc projects/clang350-import/lib/clang/include/clang/Config/config.h projects/clang350-import/lib/clang/include/llvm/Config/Disassemblers.def projects/clang350-import/lib/clang/include/llvm/Config/config.h projects/clang350-import/lib/clang/include/llvm/Config/llvm-config.h Modified: projects/clang350-import/lib/clang/include/Makefile ============================================================================== --- projects/clang350-import/lib/clang/include/Makefile Mon Nov 24 18:43:37 2014 (r274971) +++ projects/clang350-import/lib/clang/include/Makefile Mon Nov 24 19:37:11 2014 (r274972) @@ -8,12 +8,13 @@ LLVM_SRCS= ${.CURDIR}/../../../contrib/l .PATH: ${LLVM_SRCS}/tools/clang/lib/Headers -INCSDIR=${INCLUDEDIR}/clang/3.4.1 +INCSDIR=${INCLUDEDIR}/clang/3.5.0 INCS= __wmmintrin_aes.h \ __wmmintrin_pclmul.h \ altivec.h \ ammintrin.h \ + arm_acle.h \ avx2intrin.h \ avxintrin.h \ bmi2intrin.h \ @@ -23,12 +24,13 @@ INCS= __wmmintrin_aes.h \ f16cintrin.h \ fma4intrin.h \ fmaintrin.h \ + ia32intrin.h \ immintrin.h \ lzcntintrin.h \ mm3dnow.h \ mm_malloc.h \ mmintrin.h \ - module.map \ + module.modulemap \ nmmintrin.h \ pmmintrin.h \ popcntintrin.h \ Added: projects/clang350-import/lib/clang/include/MipsGenFastISel.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/lib/clang/include/MipsGenFastISel.inc Mon Nov 24 19:37:11 2014 (r274972) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "MipsGenFastISel.inc.h" Added: projects/clang350-import/lib/clang/include/PPCGenDisassemblerTables.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/lib/clang/include/PPCGenDisassemblerTables.inc Mon Nov 24 19:37:11 2014 (r274972) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "PPCGenDisassemblerTables.inc.h" Added: projects/clang350-import/lib/clang/include/clang/AST/AttrVisitor.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/lib/clang/include/clang/AST/AttrVisitor.inc Mon Nov 24 19:37:11 2014 (r274972) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "AttrVisitor.inc.h" Added: projects/clang350-import/lib/clang/include/clang/Basic/AttrHasAttributeImpl.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/lib/clang/include/clang/Basic/AttrHasAttributeImpl.inc Mon Nov 24 19:37:11 2014 (r274972) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "AttrHasAttributeImpl.inc.h" Modified: projects/clang350-import/lib/clang/include/clang/Basic/Version.inc ============================================================================== --- projects/clang350-import/lib/clang/include/clang/Basic/Version.inc Mon Nov 24 18:43:37 2014 (r274971) +++ projects/clang350-import/lib/clang/include/clang/Basic/Version.inc Mon Nov 24 19:37:11 2014 (r274972) @@ -1,11 +1,11 @@ /* $FreeBSD$ */ -#define CLANG_VERSION 3.4.1 +#define CLANG_VERSION 3.5.0 #define CLANG_VERSION_MAJOR 3 -#define CLANG_VERSION_MINOR 4 -#define CLANG_VERSION_PATCHLEVEL 1 +#define CLANG_VERSION_MINOR 5 +#define CLANG_VERSION_PATCHLEVEL 0 #define CLANG_VENDOR "FreeBSD " -#define CLANG_VENDOR_SUFFIX " 20140512" +#define CLANG_VENDOR_SUFFIX " 20141124" -#define SVN_REVISION "208032" +#define SVN_REVISION "216957" Modified: projects/clang350-import/lib/clang/include/clang/Config/config.h ============================================================================== --- projects/clang350-import/lib/clang/include/clang/Config/config.h Mon Nov 24 18:43:37 2014 (r274971) +++ projects/clang350-import/lib/clang/include/clang/Config/config.h Mon Nov 24 19:37:11 2014 (r274972) @@ -1,8 +1,10 @@ /* $FreeBSD$ */ /* tools/clang/include/clang/Config/config.h. Generated from config.h.in by configure. */ -/* include/clang/Config/config.h.in. */ +/* This generated file is for internal use. Do not include it from headers. */ -#ifndef CONFIG_H +#ifdef CONFIG_H +#error config.h can only be included once +#else #define CONFIG_H /* Bug report URL. */ @@ -23,4 +25,12 @@ /* Directory where gcc is installed. */ #define GCC_INSTALL_PREFIX "" +/* Define if we have libxml2 */ +/* #undef CLANG_HAVE_LIBXML */ + +#define PACKAGE_STRING "LLVM 3.5.0" + +/* The LLVM product name and version */ +#define BACKEND_PACKAGE_STRING PACKAGE_STRING + #endif Added: projects/clang350-import/lib/clang/include/clang/Parse/AttrParserStringSwitches.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/lib/clang/include/clang/Parse/AttrParserStringSwitches.inc Mon Nov 24 19:37:11 2014 (r274972) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "AttrParserStringSwitches.inc.h" Modified: projects/clang350-import/lib/clang/include/llvm/Config/Disassemblers.def ============================================================================== --- projects/clang350-import/lib/clang/include/llvm/Config/Disassemblers.def Mon Nov 24 18:43:37 2014 (r274971) +++ projects/clang350-import/lib/clang/include/llvm/Config/Disassemblers.def Mon Nov 24 19:37:11 2014 (r274972) @@ -2,6 +2,7 @@ LLVM_DISASSEMBLER(ARM) LLVM_DISASSEMBLER(Mips) +LLVM_DISASSEMBLER(PowerPC) LLVM_DISASSEMBLER(Sparc) LLVM_DISASSEMBLER(X86) Modified: projects/clang350-import/lib/clang/include/llvm/Config/config.h ============================================================================== --- projects/clang350-import/lib/clang/include/llvm/Config/config.h Mon Nov 24 18:43:37 2014 (r274971) +++ projects/clang350-import/lib/clang/include/llvm/Config/config.h Mon Nov 24 19:37:11 2014 (r274972) @@ -38,39 +38,12 @@ /* Directory where gcc is installed. */ #define GCC_INSTALL_PREFIX "" -/* Define to 1 if you have the `arc4random' function. */ -#define HAVE_ARC4RANDOM 1 - -/* Define to 1 if you have the `argz_append' function. */ -/* #undef HAVE_ARGZ_APPEND */ - -/* Define to 1 if you have the `argz_create_sep' function. */ -/* #undef HAVE_ARGZ_CREATE_SEP */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_ARGZ_H */ - -/* Define to 1 if you have the `argz_insert' function. */ -/* #undef HAVE_ARGZ_INSERT */ - -/* Define to 1 if you have the `argz_next' function. */ -/* #undef HAVE_ARGZ_NEXT */ - -/* Define to 1 if you have the `argz_stringify' function. */ -/* #undef HAVE_ARGZ_STRINGIFY */ - /* Define to 1 if you have the `backtrace' function. */ /* #undef HAVE_BACKTRACE */ /* Define to 1 if you have the `ceilf' function. */ #define HAVE_CEILF 1 -/* Define if the neat program is available */ -/* #undef HAVE_CIRCO */ - -/* Define to 1 if you have the `closedir' function. */ -#define HAVE_CLOSEDIR 1 - /* Define to 1 if you have the header file. */ /* #undef HAVE_CRASHREPORTERCLIENT_H */ @@ -80,6 +53,10 @@ /* Define to 1 if you have the header file. */ #define HAVE_CXXABI_H 1 +/* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +#define HAVE_DECL_ARC4RANDOM 1 + /* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you don't. */ #define HAVE_DECL_FE_ALL_EXCEPT 1 @@ -96,12 +73,6 @@ */ #define HAVE_DIRENT_H 1 -/* Define if you have the GNU dld library. */ -/* #undef HAVE_DLD */ - -/* Define to 1 if you have the `dlerror' function. */ -#define HAVE_DLERROR 1 - /* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1 @@ -111,18 +82,9 @@ /* Define if the dot program is available */ /* #undef HAVE_DOT */ -/* Define if the dotty program is available */ -/* #undef HAVE_DOTTY */ - -/* Define if you have the _dyld_func_lookup function. */ -/* #undef HAVE_DYLD */ - /* Define to 1 if you have the header file. */ #define HAVE_ERRNO_H 1 -/* Define to 1 if the system has the type `error_t'. */ -/* #undef HAVE_ERROR_T */ - /* Define to 1 if you have the header file. */ /* #undef HAVE_EXECINFO_H */ @@ -135,9 +97,6 @@ /* Define to 1 if you have the header file. */ #define HAVE_FCNTL_H 1 -/* Define if the neat program is available */ -/* #undef HAVE_FDP */ - /* Define to 1 if you have the header file. */ #define HAVE_FENV_H 1 @@ -180,12 +139,6 @@ /* Define to 1 if you have the `gettimeofday' function. */ #define HAVE_GETTIMEOFDAY 1 -/* Define if the Graphviz program is available */ -/* #undef HAVE_GRAPHVIZ */ - -/* Define if the gv program is available */ -/* #undef HAVE_GV */ - /* Define to 1 if the system has the type `int64_t'. */ #define HAVE_INT64_T 1 @@ -207,8 +160,8 @@ /* Set to 1 if the isnan function is found in */ #define HAVE_ISNAN_IN_MATH_H 1 -/* Define if you have the libdl library or equivalent. */ -#define HAVE_LIBDL 1 +/* Define if libedit is available on this platform. */ +#define HAVE_LIBEDIT 1 /* Define to 1 if you have the `imagehlp' library (-limagehlp). */ /* #undef HAVE_LIBIMAGEHLP */ @@ -225,9 +178,6 @@ /* Define to 1 if you have the `shell32' library (-lshell32). */ /* #undef HAVE_LIBSHELL32 */ -/* Define to 1 if you have the `udis86' library (-ludis86). */ -/* #undef HAVE_LIBUDIS86 */ - /* Define to 1 if you have the `z' library (-lz). */ #define HAVE_LIBZ 1 @@ -258,9 +208,6 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_MACH_MACH_H */ -/* Define to 1 if you have the header file. */ -/* #undef HAVE_MACH_O_DYLD_H */ - /* Define if mallinfo() is available on this platform. */ /* #undef HAVE_MALLINFO */ @@ -301,12 +248,6 @@ /* Define to 1 if you have the `nearbyintf' function. */ #define HAVE_NEARBYINTF 1 -/* Define if the neat program is available */ -/* #undef HAVE_NEATO */ - -/* Define to 1 if you have the `opendir' function. */ -#define HAVE_OPENDIR 1 - /* Define to 1 if you have the `posix_spawn' function. */ /* #undef HAVE_POSIX_SPAWN */ @@ -316,9 +257,6 @@ /* Define to 1 if you have the `pread' function. */ #define HAVE_PREAD 1 -/* Define if libtool can extract symbol lists from object files. */ -#define HAVE_PRELOADED_SYMBOLS 1 - /* Define to have the %a format string */ #define HAVE_PRINTF_A 1 @@ -337,9 +275,6 @@ /* Define to 1 if srand48/lrand48/drand48 exist in */ #define HAVE_RAND48 1 -/* Define to 1 if you have the `readdir' function. */ -#define HAVE_READDIR 1 - /* Define to 1 if you have the `realpath' function. */ #define HAVE_REALPATH 1 @@ -367,9 +302,6 @@ /* Define to 1 if you have the `setrlimit' function. */ #define HAVE_SETRLIMIT 1 -/* Define if you have the shl_load function. */ -/* #undef HAVE_SHL_LOAD */ - /* Define to 1 if you have the `siglongjmp' function. */ #define HAVE_SIGLONGJMP 1 @@ -456,9 +388,6 @@ /* Define to 1 if you have the header file. */ #define HAVE_TERMIOS_H 1 -/* Define if the neat program is available */ -/* #undef HAVE_TWOPI */ - /* Define to 1 if the system has the type `uint64_t'. */ #define HAVE_UINT64_T 1 @@ -477,9 +406,6 @@ /* Define to 1 if you have the `writev' function. */ #define HAVE_WRITEV 1 -/* Define if the xdot program is available */ -/* #undef HAVE_XDOT */ - /* Define to 1 if you have the header file. */ #define HAVE_ZLIB_H 1 @@ -603,33 +529,9 @@ /* Define if this is Win32ish platform */ /* #undef LLVM_ON_WIN32 */ -/* Define to path to circo program if found or 'echo circo' otherwise */ -/* #undef LLVM_PATH_CIRCO */ - /* Define to path to dot program if found or 'echo dot' otherwise */ /* #undef LLVM_PATH_DOT */ -/* Define to path to dotty program if found or 'echo dotty' otherwise */ -/* #undef LLVM_PATH_DOTTY */ - -/* Define to path to fdp program if found or 'echo fdp' otherwise */ -/* #undef LLVM_PATH_FDP */ - -/* Define to path to Graphviz program if found or 'echo Graphviz' otherwise */ -/* #undef LLVM_PATH_GRAPHVIZ */ - -/* Define to path to gv program if found or 'echo gv' otherwise */ -/* #undef LLVM_PATH_GV */ - -/* Define to path to neato program if found or 'echo neato' otherwise */ -/* #undef LLVM_PATH_NEATO */ - -/* Define to path to twopi program if found or 'echo twopi' otherwise */ -/* #undef LLVM_PATH_TWOPI */ - -/* Define to path to xdot program if found or 'echo xdot' otherwise */ -/* #undef LLVM_PATH_XDOT */ - /* Installation prefix directory */ #define LLVM_PREFIX "/usr" @@ -643,45 +545,32 @@ #define LLVM_VERSION_MAJOR 3 /* Minor version of the LLVM API */ -#define LLVM_VERSION_MINOR 4 +#define LLVM_VERSION_MINOR 5 /* Patch version of the LLVM API */ -#define LLVM_VERSION_PATCH 1 - -/* Define if the OS needs help to load dependent libraries for dlopen(). */ -#define LTDL_DLOPEN_DEPLIBS 1 - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#define LTDL_OBJDIR ".libs/" +#define LLVM_VERSION_PATCH 0 -/* Define to the extension used for shared libraries, say, ".so". */ +/* The shared library extension */ #define LTDL_SHLIB_EXT ".so" -/* Define to the system default library search path. */ -#define LTDL_SYSSEARCHPATH "/lib:/usr/lib" - /* Define if /dev/zero should be used when mapping RWX memory, or undefine if its not necessary */ /* #undef NEED_DEV_ZERO_FOR_MMAP */ -/* Define if dlsym() requires a leading underscore in symbol names. */ -/* #undef NEED_USCORE */ - /* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "http://llvm.org/bugs/" +#define PACKAGE_BUGREPORT "https://bugs.freebsd.org/submit/" /* Define to the full name of this package. */ #define PACKAGE_NAME "LLVM" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "LLVM 3.4.1" +#define PACKAGE_STRING "LLVM 3.5.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "llvm" /* Define to the version of this package. */ -#define PACKAGE_VERSION "3.4.1" +#define PACKAGE_VERSION "3.5.0" /* Define as the return type of signal handlers (`int' or `void'). */ #define RETSIGTYPE void @@ -698,18 +587,9 @@ /* Define to 1 if your declares `struct tm'. */ /* #undef TM_IN_SYS_TIME */ -/* Define if use udis86 library */ -#define USE_UDIS86 0 - /* Type of 1st arg on ELM Callback */ /* #undef WIN32_ELMCB_PCSTR */ -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* Define to a type to use for `error_t' if it is not otherwise available. */ -#define error_t int - /* Define to `int' if does not define. */ /* #undef pid_t */ Modified: projects/clang350-import/lib/clang/include/llvm/Config/llvm-config.h ============================================================================== --- projects/clang350-import/lib/clang/include/llvm/Config/llvm-config.h Mon Nov 24 18:43:37 2014 (r274971) +++ projects/clang350-import/lib/clang/include/llvm/Config/llvm-config.h Mon Nov 24 19:37:11 2014 (r274972) @@ -1,6 +1,6 @@ /* $FreeBSD$ */ /* include/llvm/Config/llvm-config.h. Generated from llvm-config.h.in by configure. */ -/*===-- llvm/config/llvm-config.h - llvm configure variable -------*- C -*-===*/ +/*===------- llvm/Config/llvm-config.h - llvm configuration -------*- C -*-===*/ /* */ /* The LLVM Compiler Infrastructure */ /* */ @@ -9,14 +9,12 @@ /* */ /*===----------------------------------------------------------------------===*/ -/* This file enumerates all of the llvm variables from configure so that - they can be in exported headers and won't override package specific - directives. This is a C file so we can include it in the llvm-c headers. */ - -/* To avoid multiple inclusions of these variables when we include the exported - headers and config.h, conditionally include these. */ -/* TODO: This is a bit of a hack. */ -#ifndef CONFIG_H +/* This file enumerates variables from the LLVM configuration so that they + can be in exported headers and won't override package specific directives. + This is a C header that can be included in the llvm-c headers. */ + +#ifndef LLVM_CONFIG_H +#define LLVM_CONFIG_H /* Installation directory for binary executables */ /* #undef LLVM_BINDIR */ @@ -81,33 +79,6 @@ /* Define if this is Win32ish platform */ /* #undef LLVM_ON_WIN32 */ -/* Define to path to circo program if found or 'echo circo' otherwise */ -/* #undef LLVM_PATH_CIRCO */ - -/* Define to path to dot program if found or 'echo dot' otherwise */ -/* #undef LLVM_PATH_DOT */ - -/* Define to path to dotty program if found or 'echo dotty' otherwise */ -/* #undef LLVM_PATH_DOTTY */ - -/* Define to path to fdp program if found or 'echo fdp' otherwise */ -/* #undef LLVM_PATH_FDP */ - -/* Define to path to Graphviz program if found or 'echo Graphviz' otherwise */ -/* #undef LLVM_PATH_GRAPHVIZ */ - -/* Define to path to gv program if found or 'echo gv' otherwise */ -/* #undef LLVM_PATH_GV */ - -/* Define to path to neato program if found or 'echo neato' otherwise */ -/* #undef LLVM_PATH_NEATO */ - -/* Define to path to twopi program if found or 'echo twopi' otherwise */ -/* #undef LLVM_PATH_TWOPI */ - -/* Define to path to xdot.py program if found or 'echo xdot.py' otherwise */ -/* #undef LLVM_PATH_XDOT_PY */ - /* Installation prefix directory */ #define LLVM_PREFIX "/usr" @@ -121,6 +92,6 @@ #define LLVM_VERSION_MAJOR 3 /* Minor version of the LLVM API */ -#define LLVM_VERSION_MINOR 4 +#define LLVM_VERSION_MINOR 5 #endif From owner-svn-src-projects@FreeBSD.ORG Mon Nov 24 19:46:46 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B09F8792; Mon, 24 Nov 2014 19:46:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9AE548AA; Mon, 24 Nov 2014 19:46:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAOJkkkr047675; Mon, 24 Nov 2014 19:46:46 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAOJkZfY047618; Mon, 24 Nov 2014 19:46:35 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411241946.sAOJkZfY047618@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 24 Nov 2014 19:46:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274973 - in projects/clang350-import/lib/clang: . libclanganalysis libclangarcmigrate libclangast libclangbasic libclangcodegen libclangdriver libclangfrontend libclanglex libclangpars... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Nov 2014 19:46:46 -0000 Author: dim Date: Mon Nov 24 19:46:35 2014 New Revision: 274973 URL: https://svnweb.freebsd.org/changeset/base/274973 Log: Update llvm and clang library Makefiles. Added: projects/clang350-import/lib/clang/libclangrewrite/ - copied from r274971, projects/clang350-import/lib/clang/libclangrewritecore/ projects/clang350-import/lib/clang/libllvmmcanalysis/ projects/clang350-import/lib/clang/libllvmmcanalysis/Makefile (contents, props changed) projects/clang350-import/lib/clang/libllvmpowerpcdisassembler/ projects/clang350-import/lib/clang/libllvmpowerpcdisassembler/Makefile (contents, props changed) projects/clang350-import/lib/clang/libllvmprofiledata/ projects/clang350-import/lib/clang/libllvmprofiledata/Makefile (contents, props changed) Deleted: projects/clang350-import/lib/clang/libclangrewritecore/ Modified: projects/clang350-import/lib/clang/Makefile projects/clang350-import/lib/clang/clang.build.mk projects/clang350-import/lib/clang/libclanganalysis/Makefile projects/clang350-import/lib/clang/libclangarcmigrate/Makefile projects/clang350-import/lib/clang/libclangast/Makefile projects/clang350-import/lib/clang/libclangbasic/Makefile projects/clang350-import/lib/clang/libclangcodegen/Makefile projects/clang350-import/lib/clang/libclangdriver/Makefile projects/clang350-import/lib/clang/libclangfrontend/Makefile projects/clang350-import/lib/clang/libclanglex/Makefile projects/clang350-import/lib/clang/libclangparse/Makefile projects/clang350-import/lib/clang/libclangrewrite/Makefile projects/clang350-import/lib/clang/libclangrewritefrontend/Makefile projects/clang350-import/lib/clang/libclangsema/Makefile projects/clang350-import/lib/clang/libclangstaticanalyzercheckers/Makefile projects/clang350-import/lib/clang/libclangstaticanalyzerfrontend/Makefile projects/clang350-import/lib/clang/libllvmanalysis/Makefile projects/clang350-import/lib/clang/libllvmarmcodegen/Makefile projects/clang350-import/lib/clang/libllvmarmdesc/Makefile projects/clang350-import/lib/clang/libllvmasmprinter/Makefile projects/clang350-import/lib/clang/libllvmcodegen/Makefile projects/clang350-import/lib/clang/libllvmcore/Makefile projects/clang350-import/lib/clang/libllvmmc/Makefile projects/clang350-import/lib/clang/libllvmmipscodegen/Makefile projects/clang350-import/lib/clang/libllvmmipsdesc/Makefile projects/clang350-import/lib/clang/libllvmobject/Makefile projects/clang350-import/lib/clang/libllvmruntimedyld/Makefile projects/clang350-import/lib/clang/libllvmscalaropts/Makefile projects/clang350-import/lib/clang/libllvmsupport/Makefile projects/clang350-import/lib/clang/libllvmtablegen/Makefile projects/clang350-import/lib/clang/libllvmtarget/Makefile projects/clang350-import/lib/clang/libllvmtransformutils/Makefile projects/clang350-import/lib/clang/libllvmx86asmparser/Makefile projects/clang350-import/lib/clang/libllvmx86codegen/Makefile projects/clang350-import/lib/clang/libllvmx86desc/Makefile projects/clang350-import/lib/clang/libllvmx86disassembler/Makefile Directory Properties: projects/clang350-import/lib/clang/libllvmoption/Makefile (props changed) projects/clang350-import/lib/clang/libllvmsparcasmparser/Makefile (props changed) projects/clang350-import/lib/clang/libllvmsparccodegen/Makefile (props changed) projects/clang350-import/lib/clang/libllvmsparcdesc/Makefile (props changed) projects/clang350-import/lib/clang/libllvmsparcdisassembler/Makefile (props changed) projects/clang350-import/lib/clang/libllvmsparcinfo/Makefile (props changed) projects/clang350-import/lib/clang/libllvmsparcinstprinter/Makefile (props changed) Modified: projects/clang350-import/lib/clang/Makefile ============================================================================== --- projects/clang350-import/lib/clang/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -11,11 +11,6 @@ _libclangstaticanalyzer= \ _libclangarcmigrate= \ libclangarcmigrate .endif # MK_CLANG_FULL -.if ${MK_CLANG_FULL} != "no" || ${MK_LLDB} != "no" -_libclangrewriter= \ - libclangrewritecore \ - libclangrewritefrontend -.endif # (MK_CLANG_FULL || MK_LLDB) SUBDIR= libclanganalysis \ ${_libclangarcmigrate} \ @@ -28,7 +23,8 @@ SUBDIR= libclanganalysis \ libclangfrontendtool \ libclanglex \ libclangparse \ - ${_libclangrewriter} \ + libclangrewritefrontend \ + libclangrewrite \ libclangsema \ libclangserialization \ ${_libclangstaticanalyzer} \ @@ -51,6 +47,7 @@ SUBDIR= libclanganalysis \ libllvmobjcarcopts \ libllvmobject \ libllvmoption \ + libllvmprofiledata \ libllvmscalaropts \ libllvmselectiondag \ libllvmsupport \ @@ -74,6 +71,7 @@ SUBDIR= libclanganalysis \ libllvmpowerpcasmparser \ libllvmpowerpccodegen \ libllvmpowerpcdesc \ + libllvmpowerpcdisassembler \ libllvmpowerpcinfo \ libllvmpowerpcinstprinter \ libllvmsparcasmparser \ @@ -91,7 +89,8 @@ SUBDIR= libclanganalysis \ libllvmx86utils .if ${MK_CLANG_EXTRAS} != "no" -SUBDIR+=libllvmdebuginfo +SUBDIR+=libllvmdebuginfo \ + libllvmmcanalysis .endif # MK_CLANG_EXTRAS .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no" SUBDIR+=libllvmexecutionengine \ Modified: projects/clang350-import/lib/clang/clang.build.mk ============================================================================== --- projects/clang350-import/lib/clang/clang.build.mk Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/clang.build.mk Mon Nov 24 19:46:35 2014 (r274973) @@ -12,7 +12,7 @@ CFLAGS+= -I${LLVM_SRCS}/include -I${CLAN .if ${MK_CLANG_FULL} != "no" CFLAGS+= -DCLANG_ENABLE_ARCMT \ - -DCLANG_ENABLE_REWRITER \ + -DCLANG_ENABLE_OBJC_REWRITER \ -DCLANG_ENABLE_STATIC_ANALYZER .endif # MK_CLANG_FULL @@ -35,7 +35,7 @@ BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_ CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \ -DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" \ -DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\" -CXXFLAGS+= -fno-exceptions -fno-rtti +CXXFLAGS+= -std=c++11 -fno-exceptions -fno-rtti .PATH: ${LLVM_SRCS}/${SRCDIR} @@ -80,8 +80,8 @@ AttrDump.inc.h: ${CLANG_SRCS}/include/cl -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \ ${CLANG_SRCS}/include/clang/Basic/Attr.td -AttrIdentifierArg.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} -gen-clang-attr-identifier-arg-list \ +AttrHasAttributeImpl.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td + ${CLANG_TBLGEN} -gen-clang-attr-has-attribute-impl \ -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \ ${CLANG_SRCS}/include/clang/Basic/Attr.td @@ -90,11 +90,6 @@ AttrImpl.inc.h: ${CLANG_SRCS}/include/cl -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \ ${CLANG_SRCS}/include/clang/Basic/Attr.td -AttrLateParsed.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} -gen-clang-attr-late-parsed-list \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Basic/Attr.td - AttrList.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td ${CLANG_TBLGEN} -gen-clang-attr-list \ -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \ @@ -115,6 +110,11 @@ AttrParsedAttrList.inc.h: ${CLANG_SRCS}/ -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \ ${CLANG_SRCS}/include/clang/Basic/Attr.td +AttrParserStringSwitches.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td + ${CLANG_TBLGEN} -gen-clang-attr-parser-string-switches \ + -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/Basic/Attr.td + AttrPCHRead.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td ${CLANG_TBLGEN} -gen-clang-attr-pch-read \ -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \ @@ -125,11 +125,6 @@ AttrPCHWrite.inc.h: ${CLANG_SRCS}/includ -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \ ${CLANG_SRCS}/include/clang/Basic/Attr.td -AttrSpellings.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} -gen-clang-attr-spelling-list \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Basic/Attr.td - AttrSpellingListIndex.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td ${CLANG_TBLGEN} -gen-clang-attr-spelling-index \ -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \ @@ -140,8 +135,8 @@ AttrTemplateInstantiate.inc.h: ${CLANG_S -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \ ${CLANG_SRCS}/include/clang/Basic/Attr.td -AttrTypeArg.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} -gen-clang-attr-type-arg-list \ +AttrVisitor.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td + ${CLANG_TBLGEN} -gen-clang-attr-ast-visitor \ -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \ ${CLANG_SRCS}/include/clang/Basic/Attr.td @@ -220,12 +215,6 @@ Options.inc.h: ${CLANG_SRCS}/include/cla -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \ ${CLANG_SRCS}/include/clang/Driver/Options.td -CC1AsOptions.inc.h: ${CLANG_SRCS}/include/clang/Driver/CC1AsOptions.td - ${TBLGEN} -gen-opt-parser-defs \ - -I ${LLVM_SRCS}/include -I ${CLANG_SRCS}/include/clang/Driver \ - -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Driver/CC1AsOptions.td - Checkers.inc.h: ${CLANG_SRCS}/lib/StaticAnalyzer/Checkers/Checkers.td ${CLANG_TBLGEN} -gen-clang-sa-checkers \ -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \ Modified: projects/clang350-import/lib/clang/libclanganalysis/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libclanganalysis/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libclanganalysis/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -24,9 +24,13 @@ SRCS= AnalysisDeclContext.cpp \ ReachableCode.cpp \ ScanfFormatString.cpp \ ThreadSafety.cpp \ + ThreadSafetyCommon.cpp \ + ThreadSafetyLogical.cpp \ + ThreadSafetyTIL.cpp \ UninitializedValues.cpp TGHDRS= AttrList \ + AttrVisitor \ Attrs \ CommentCommandList \ CommentNodes \ Modified: projects/clang350-import/lib/clang/libclangarcmigrate/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libclangarcmigrate/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libclangarcmigrate/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -28,6 +28,7 @@ SRCS= ARCMT.cpp \ TGHDRS= AttrList \ AttrParsedAttrList \ + AttrVisitor \ Attrs \ CommentCommandList \ CommentNodes \ Modified: projects/clang350-import/lib/clang/libclangast/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libclangast/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libclangast/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -65,6 +65,7 @@ SRCS= APValue.cpp \ TGHDRS= AttrDump \ AttrImpl \ AttrList \ + AttrVisitor \ Attrs \ CommentCommandInfo \ CommentCommandList \ Modified: projects/clang350-import/lib/clang/libclangbasic/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libclangbasic/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libclangbasic/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -5,7 +5,8 @@ LIB= clangbasic SRCDIR= tools/clang/lib/Basic -SRCS= Builtins.cpp \ +SRCS= Attributes.cpp \ + Builtins.cpp \ CharInfo.cpp \ Diagnostic.cpp \ DiagnosticIDs.cpp \ @@ -23,9 +24,12 @@ SRCS= Builtins.cpp \ Targets.cpp \ TokenKinds.cpp \ Version.cpp \ - VersionTuple.cpp + VersionTuple.cpp \ + VirtualFileSystem.cpp \ + Warnings.cpp -TGHDRS= DiagnosticAnalysisKinds \ +TGHDRS= AttrHasAttributeImpl \ + DiagnosticAnalysisKinds \ DiagnosticASTKinds \ DiagnosticCommentKinds \ DiagnosticCommonKinds \ Modified: projects/clang350-import/lib/clang/libclangcodegen/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libclangcodegen/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libclangcodegen/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -26,29 +26,34 @@ SRCS= BackendUtil.cpp \ CGExprComplex.cpp \ CGExprConstant.cpp \ CGExprScalar.cpp \ + CGLoopInfo.cpp \ CGObjC.cpp \ CGObjCGNU.cpp \ CGObjCMac.cpp \ CGObjCRuntime.cpp \ CGOpenCLRuntime.cpp \ - CGRTTI.cpp \ + CGOpenMPRuntime.cpp \ CGRecordLayoutBuilder.cpp \ CGStmt.cpp \ + CGStmtOpenMP.cpp \ CGVTT.cpp \ CGVTables.cpp \ CodeGenABITypes.cpp \ CodeGenAction.cpp \ CodeGenFunction.cpp \ CodeGenModule.cpp \ + CodeGenPGO.cpp \ CodeGenTBAA.cpp \ CodeGenTypes.cpp \ ItaniumCXXABI.cpp \ MicrosoftCXXABI.cpp \ - MicrosoftVBTables.cpp \ ModuleBuilder.cpp \ + SanitizerBlacklist.cpp \ TargetInfo.cpp TGHDRS= AttrList \ + AttrParsedAttrList \ + AttrVisitor \ Attrs \ CommentCommandList \ CommentNodes \ Modified: projects/clang350-import/lib/clang/libclangdriver/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libclangdriver/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libclangdriver/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -6,11 +6,11 @@ LIB= clangdriver SRCDIR= tools/clang/lib/Driver SRCS= Action.cpp \ - CC1AsOptions.cpp \ Compilation.cpp \ Driver.cpp \ DriverOptions.cpp \ Job.cpp \ + Multilib.cpp \ Phases.cpp \ SanitizerArgs.cpp \ Tool.cpp \ @@ -20,8 +20,7 @@ SRCS= Action.cpp \ Types.cpp \ WindowsToolChain.cpp -TGHDRS= CC1AsOptions \ - DiagnosticCommonKinds \ +TGHDRS= DiagnosticCommonKinds \ DiagnosticDriverKinds \ DiagnosticSemaKinds \ Options Modified: projects/clang350-import/lib/clang/libclangfrontend/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libclangfrontend/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libclangfrontend/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -26,17 +26,18 @@ SRCS= ASTConsumers.cpp \ LangStandards.cpp \ LayoutOverrideSource.cpp \ LogDiagnosticPrinter.cpp \ + ModuleDependencyCollector.cpp \ MultiplexConsumer.cpp \ PrintPreprocessedOutput.cpp \ SerializedDiagnosticPrinter.cpp \ TextDiagnostic.cpp \ TextDiagnosticBuffer.cpp \ TextDiagnosticPrinter.cpp \ - VerifyDiagnosticConsumer.cpp \ - Warnings.cpp + VerifyDiagnosticConsumer.cpp TGHDRS= AttrList \ AttrParsedAttrList \ + AttrVisitor \ Attrs \ CommentCommandList \ CommentNodes \ Modified: projects/clang350-import/lib/clang/libclanglex/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libclanglex/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libclanglex/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -28,7 +28,7 @@ SRCS= HeaderMap.cpp \ TokenConcatenation.cpp \ TokenLexer.cpp -TGHDRS= AttrSpellings \ +TGHDRS= AttrSpellingListIndex \ DiagnosticCommonKinds \ DiagnosticLexKinds Modified: projects/clang350-import/lib/clang/libclangparse/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libclangparse/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libclangparse/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -16,15 +16,14 @@ SRCS= ParseAST.cpp \ ParseOpenMP.cpp \ ParsePragma.cpp \ ParseStmt.cpp \ + ParseStmtAsm.cpp \ ParseTemplate.cpp \ ParseTentative.cpp \ Parser.cpp -TGHDRS= AttrIdentifierArg \ - AttrLateParsed \ - AttrList \ +TGHDRS= AttrList \ AttrParsedAttrList \ - AttrTypeArg \ + AttrParserStringSwitches \ Attrs \ CommentCommandList \ CommentNodes \ Modified: projects/clang350-import/lib/clang/libclangrewrite/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libclangrewritecore/Makefile Mon Nov 24 18:43:37 2014 (r274971) +++ projects/clang350-import/lib/clang/libclangrewrite/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -2,9 +2,9 @@ .include -LIB= clangrewritecore +LIB= clangrewrite -SRCDIR= tools/clang/lib/Rewrite/Core +SRCDIR= tools/clang/lib/Rewrite SRCS= DeltaTree.cpp \ HTMLRewrite.cpp \ RewriteRope.cpp \ Modified: projects/clang350-import/lib/clang/libclangrewritefrontend/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libclangrewritefrontend/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libclangrewritefrontend/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -4,7 +4,7 @@ LIB= clangrewritefrontend -SRCDIR= tools/clang/lib/Rewrite/Frontend +SRCDIR= tools/clang/lib/Frontend/Rewrite SRCS= FixItRewriter.cpp \ FrontendActions.cpp \ HTMLPrint.cpp \ Modified: projects/clang350-import/lib/clang/libclangsema/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libclangsema/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libclangsema/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -49,7 +49,6 @@ SRCS= AnalysisBasedWarnings.cpp \ SemaTemplateInstantiateDecl.cpp \ SemaTemplateVariadic.cpp \ SemaType.cpp \ - TargetAttributesSema.cpp \ TypeLocBuilder.cpp TGHDRS= AttrList \ @@ -58,6 +57,7 @@ TGHDRS= AttrList \ AttrParsedAttrList \ AttrSpellingListIndex \ AttrTemplateInstantiate \ + AttrVisitor \ Attrs \ CommentCommandList \ CommentNodes \ Modified: projects/clang350-import/lib/clang/libclangstaticanalyzercheckers/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libclangstaticanalyzercheckers/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libclangstaticanalyzercheckers/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -33,7 +33,6 @@ SRCS= AllocationDiagnostics.cpp \ ExprInspectionChecker.cpp \ FixedAddressChecker.cpp \ GenericTaintChecker.cpp \ - IdempotentOperationChecker.cpp \ IdenticalExprChecker.cpp \ IvarInvalidationChecker.cpp \ LLVMConventionsChecker.cpp \ @@ -62,6 +61,7 @@ SRCS= AllocationDiagnostics.cpp \ StackAddrEscapeChecker.cpp \ StreamChecker.cpp \ TaintTesterChecker.cpp \ + TestAfterDivZeroChecker.cpp \ TraversalChecker.cpp \ UndefBranchChecker.cpp \ UndefCapturedBlockVarChecker.cpp \ @@ -74,6 +74,7 @@ SRCS= AllocationDiagnostics.cpp \ VirtualCallChecker.cpp TGHDRS= AttrList \ + AttrVisitor \ Attrs \ Checkers \ CommentCommandList \ Modified: projects/clang350-import/lib/clang/libclangstaticanalyzerfrontend/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libclangstaticanalyzerfrontend/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libclangstaticanalyzerfrontend/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -10,6 +10,7 @@ SRCS= AnalysisConsumer.cpp \ FrontendActions.cpp TGHDRS= AttrList \ + AttrVisitor \ Attrs \ Checkers \ CommentCommandList \ Modified: projects/clang350-import/lib/clang/libllvmanalysis/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libllvmanalysis/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libllvmanalysis/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -12,9 +12,12 @@ SRCS= AliasAnalysis.cpp \ AliasSetTracker.cpp \ Analysis.cpp \ BasicAliasAnalysis.cpp \ + BlockFrequencyInfo.cpp \ + BlockFrequencyInfoImpl.cpp \ BranchProbabilityInfo.cpp \ CFG.cpp \ CFGPrinter.cpp \ + CGSCCPassManager.cpp \ CaptureTracking.cpp \ CodeMetrics.cpp \ ConstantFolding.cpp \ @@ -28,6 +31,8 @@ SRCS= AliasAnalysis.cpp \ InstructionSimplify.cpp \ Interval.cpp \ IntervalPartition.cpp \ + JumpInstrTableInfo.cpp \ + LazyCallGraph.cpp \ LazyValueInfo.cpp \ LibCallAliasAnalysis.cpp \ LibCallSemantics.cpp \ @@ -56,9 +61,9 @@ SRCS= AliasAnalysis.cpp \ TypeBasedAliasAnalysis.cpp \ ValueTracking.cpp -.if ${MK_CLANG_EXTRAS} != "no" -SRCS+= BlockFrequencyInfo.cpp -.endif +#.if ${MK_CLANG_EXTRAS} != "no" +#SRCS+= BlockFrequencyInfo.cpp +#.endif TGHDRS= Intrinsics Modified: projects/clang350-import/lib/clang/libllvmarmcodegen/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libllvmarmcodegen/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libllvmarmcodegen/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -24,6 +24,7 @@ SRCS= A15SDOptimizer.cpp \ ARMMCInstLower.cpp \ ARMMachineFunctionInfo.cpp \ ARMRegisterInfo.cpp \ + ARMOptimizeBarriersPass.cpp \ ARMSelectionDAGInfo.cpp \ ARMSubtarget.cpp \ ARMTargetMachine.cpp \ Modified: projects/clang350-import/lib/clang/libllvmarmdesc/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libllvmarmdesc/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libllvmarmdesc/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -7,6 +7,7 @@ LIB= llvmarmdesc SRCDIR= lib/Target/ARM/MCTargetDesc SRCS= ARMAsmBackend.cpp \ ARMELFObjectWriter.cpp \ + ARMELFObjectWriter.cpp \ ARMELFStreamer.cpp \ ARMMCAsmInfo.cpp \ ARMMCCodeEmitter.cpp \ @@ -14,7 +15,10 @@ SRCS= ARMAsmBackend.cpp \ ARMMCTargetDesc.cpp \ ARMMachORelocationInfo.cpp \ ARMMachObjectWriter.cpp \ - ARMUnwindOpAsm.cpp + ARMTargetStreamer.cpp \ + ARMUnwindOpAsm.cpp \ + ARMWinCOFFObjectWriter.cpp \ + ARMWinCOFFStreamer.cpp CFLAGS+= -I${LLVM_SRCS}/${SRCDIR}/.. TGHDRS= ARMGenInstrInfo \ Modified: projects/clang350-import/lib/clang/libllvmasmprinter/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libllvmasmprinter/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libllvmasmprinter/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -6,19 +6,24 @@ LIB= llvmasmprinter SRCDIR= lib/CodeGen/AsmPrinter SRCS= ARMException.cpp \ + AddressPool.cpp \ AsmPrinter.cpp \ AsmPrinterDwarf.cpp \ AsmPrinterInlineAsm.cpp \ DIE.cpp \ DIEHash.cpp \ + DbgValueHistoryCalculator.cpp \ DwarfAccelTable.cpp \ DwarfCFIException.cpp \ - DwarfCompileUnit.cpp \ DwarfDebug.cpp \ - DwarfException.cpp \ + DwarfFile.cpp \ + DwarfStringPool.cpp \ + DwarfUnit.cpp \ + EHStreamer.cpp \ ErlangGCPrinter.cpp \ OcamlGCPrinter.cpp \ - Win64Exception.cpp + Win64Exception.cpp \ + WinCodeViewLineTables.cpp TGHDRS= Intrinsics Modified: projects/clang350-import/lib/clang/libllvmcodegen/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libllvmcodegen/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libllvmcodegen/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -8,11 +8,13 @@ SRCDIR= lib/CodeGen SRCS= AggressiveAntiDepBreaker.cpp \ AllocationOrder.cpp \ Analysis.cpp \ + AtomicExpandLoadLinkedPass.cpp \ BasicTargetTransformInfo.cpp \ BranchFolding.cpp \ CalcSpillWeights.cpp \ CallingConvLower.cpp \ CodeGen.cpp \ + CodeGenPrepare.cpp \ CriticalAntiDepBreaker.cpp \ DFAPacketizer.cpp \ DeadMachineInstructionElim.cpp \ @@ -26,11 +28,13 @@ SRCS= AggressiveAntiDepBreaker.cpp \ GCMetadata.cpp \ GCMetadataPrinter.cpp \ GCStrategy.cpp \ + GlobalMerge.cpp \ IfConversion.cpp \ InlineSpiller.cpp \ InterferenceCache.cpp \ IntrinsicLowering.cpp \ JITCodeEmitter.cpp \ + JumpInstrTables.cpp \ LLVMTargetMachine.cpp \ LatencyPriorityQueue.cpp \ LexicalScopes.cpp \ @@ -38,10 +42,10 @@ SRCS= AggressiveAntiDepBreaker.cpp \ LiveInterval.cpp \ LiveIntervalAnalysis.cpp \ LiveIntervalUnion.cpp \ + LivePhysRegs.cpp \ LiveRangeCalc.cpp \ LiveRangeEdit.cpp \ LiveRegMatrix.cpp \ - LiveRegUnits.cpp \ LiveStackAnalysis.cpp \ LiveVariables.cpp \ LocalStackSlotAllocation.cpp \ @@ -52,6 +56,7 @@ SRCS= AggressiveAntiDepBreaker.cpp \ MachineCSE.cpp \ MachineCodeEmitter.cpp \ MachineCopyPropagation.cpp \ + MachineDominanceFrontier.cpp \ MachineDominators.cpp \ MachineFunction.cpp \ MachineFunctionAnalysis.cpp \ @@ -65,6 +70,7 @@ SRCS= AggressiveAntiDepBreaker.cpp \ MachineModuleInfoImpls.cpp \ MachinePassRegistry.cpp \ MachinePostDominators.cpp \ + MachineRegionInfo.cpp \ MachineRegisterInfo.cpp \ MachineSSAUpdater.cpp \ MachineScheduler.cpp \ @@ -101,6 +107,7 @@ SRCS= AggressiveAntiDepBreaker.cpp \ Spiller.cpp \ SplitKit.cpp \ StackColoring.cpp \ + StackMapLivenessAnalysis.cpp \ StackMaps.cpp \ StackProtector.cpp \ StackSlotColoring.cpp \ Modified: projects/clang350-import/lib/clang/libllvmcore/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libllvmcore/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libllvmcore/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -9,19 +9,24 @@ SRCS= AsmWriter.cpp \ Attributes.cpp \ AutoUpgrade.cpp \ BasicBlock.cpp \ + Comdat.cpp \ ConstantFold.cpp \ + ConstantRange.cpp \ Constants.cpp \ Core.cpp \ DIBuilder.cpp \ DataLayout.cpp \ DebugInfo.cpp \ DebugLoc.cpp \ + DiagnosticInfo.cpp \ + DiagnosticPrinter.cpp \ Dominators.cpp \ Function.cpp \ GCOV.cpp \ GVMaterializer.cpp \ Globals.cpp \ IRBuilder.cpp \ + IRPrintingPasses.cpp \ InlineAsm.cpp \ Instruction.cpp \ Instructions.cpp \ @@ -30,12 +35,13 @@ SRCS= AsmWriter.cpp \ LLVMContextImpl.cpp \ LeakDetector.cpp \ LegacyPassManager.cpp \ + MDBuilder.cpp \ + Mangler.cpp \ Metadata.cpp \ Module.cpp \ Pass.cpp \ PassManager.cpp \ PassRegistry.cpp \ - PrintModulePass.cpp \ Type.cpp \ TypeFinder.cpp \ Use.cpp \ Modified: projects/clang350-import/lib/clang/libllvmmc/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libllvmmc/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libllvmmc/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -5,7 +5,8 @@ LIB= llvmmc SRCDIR= lib/MC -SRCS= ELFObjectWriter.cpp \ +SRCS= ConstantPools.cpp \ + ELFObjectWriter.cpp \ MCAsmBackend.cpp \ MCAsmInfo.cpp \ MCAsmInfoCOFF.cpp \ @@ -13,7 +14,6 @@ SRCS= ELFObjectWriter.cpp \ MCAsmInfoELF.cpp \ MCAsmStreamer.cpp \ MCAssembler.cpp \ - MCAtom.cpp \ MCCodeEmitter.cpp \ MCCodeGenInfo.cpp \ MCContext.cpp \ @@ -23,22 +23,17 @@ SRCS= ELFObjectWriter.cpp \ MCELFStreamer.cpp \ MCExpr.cpp \ MCExternalSymbolizer.cpp \ - MCFunction.cpp \ MCInst.cpp \ MCInstPrinter.cpp \ MCInstrAnalysis.cpp \ MCLabel.cpp \ + MCLinkerOptimizationHint.cpp \ MCMachOStreamer.cpp \ MCMachObjectTargetWriter.cpp \ - MCModule.cpp \ - MCModuleYAML.cpp \ MCNullStreamer.cpp \ - MCObjectDisassembler.cpp \ MCObjectFileInfo.cpp \ MCObjectStreamer.cpp \ - MCObjectSymbolizer.cpp \ MCObjectWriter.cpp \ - MCPureStreamer.cpp \ MCRegisterInfo.cpp \ MCRelocationInfo.cpp \ MCSection.cpp \ @@ -49,12 +44,15 @@ SRCS= ELFObjectWriter.cpp \ MCSubtargetInfo.cpp \ MCSymbol.cpp \ MCSymbolizer.cpp \ + MCTargetOptions.cpp \ MCValue.cpp \ MCWin64EH.cpp \ MachObjectWriter.cpp \ + StringTableBuilder.cpp \ SubtargetFeature.cpp \ WinCOFFObjectWriter.cpp \ - WinCOFFStreamer.cpp + WinCOFFStreamer.cpp \ + YAML.cpp .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no" SRCS+= MCDisassembler.cpp Added: projects/clang350-import/lib/clang/libllvmmcanalysis/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/lib/clang/libllvmmcanalysis/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -0,0 +1,15 @@ +# $FreeBSD$ + +.include + +LIB= llvmmcanalysis + +SRCDIR= lib/MC/MCAnalysis +SRCS= MCAtom.cpp \ + MCFunction.cpp \ + MCModule.cpp \ + MCModuleYAML.cpp \ + MCObjectDisassembler.cpp \ + MCObjectSymbolizer.cpp + +.include "../clang.lib.mk" Modified: projects/clang350-import/lib/clang/libllvmmipscodegen/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libllvmmipscodegen/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libllvmmipscodegen/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -7,6 +7,7 @@ LIB= llvmmipscodegen SRCDIR= lib/Target/Mips SRCS= Mips16FrameLowering.cpp \ Mips16HardFloat.cpp \ + Mips16HardFloatInfo.cpp \ Mips16ISelDAGToDAG.cpp \ Mips16ISelLowering.cpp \ Mips16InstrInfo.cpp \ @@ -16,6 +17,7 @@ SRCS= Mips16FrameLowering.cpp \ MipsCodeEmitter.cpp \ MipsConstantIslandPass.cpp \ MipsDelaySlotFiller.cpp \ + MipsFastISel.cpp \ MipsFrameLowering.cpp \ MipsISelDAGToDAG.cpp \ MipsISelLowering.cpp \ @@ -25,6 +27,7 @@ SRCS= Mips16FrameLowering.cpp \ MipsMCInstLower.cpp \ MipsMachineFunction.cpp \ MipsModuleISelDAGToDAG.cpp \ + MipsOptimizePICCall.cpp \ MipsOs16.cpp \ MipsRegisterInfo.cpp \ MipsSEFrameLowering.cpp \ @@ -42,6 +45,7 @@ TGHDRS= Intrinsics \ MipsGenCallingConv \ MipsGenCodeEmitter \ MipsGenDAGISel \ + MipsGenFastISel \ MipsGenInstrInfo \ MipsGenMCPseudoLowering \ MipsGenRegisterInfo \ Modified: projects/clang350-import/lib/clang/libllvmmipsdesc/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libllvmmipsdesc/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libllvmmipsdesc/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -5,12 +5,16 @@ LIB= llvmmipsdesc SRCDIR= lib/Target/Mips/MCTargetDesc -SRCS= MipsAsmBackend.cpp \ +SRCS= MipsABIFlagsSection.cpp \ + MipsAsmBackend.cpp \ MipsELFObjectWriter.cpp \ + MipsELFStreamer.cpp \ MipsMCAsmInfo.cpp \ MipsMCCodeEmitter.cpp \ + MipsMCExpr.cpp \ MipsMCTargetDesc.cpp \ - MipsReginfo.cpp \ + MipsNaClELFStreamer.cpp \ + MipsOptionRecord.cpp \ MipsTargetStreamer.cpp CFLAGS+= -I${LLVM_SRCS}/${SRCDIR}/.. Modified: projects/clang350-import/lib/clang/libllvmobject/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libllvmobject/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libllvmobject/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -13,10 +13,12 @@ SRCS= Archive.cpp \ ELFObjectFile.cpp \ ELFYAML.cpp \ Error.cpp \ + IRObjectFile.cpp \ MachOObjectFile.cpp \ MachOUniversal.cpp \ Object.cpp \ ObjectFile.cpp \ - YAML.cpp + RecordStreamer.cpp \ + SymbolicFile.cpp .include "../clang.lib.mk" Added: projects/clang350-import/lib/clang/libllvmpowerpcdisassembler/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/lib/clang/libllvmpowerpcdisassembler/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -0,0 +1,16 @@ +# $FreeBSD$ + +.include + +LIB= llvmpowerpcdisassembler + +SRCDIR= lib/Target/PowerPC/Disassembler +INCDIR= lib/Target/PowerPC +SRCS= PPCDisassembler.cpp + +TGHDRS= PPCGenDisassemblerTables \ + PPCGenInstrInfo \ + PPCGenRegisterInfo \ + PPCGenSubtargetInfo + +.include "../clang.lib.mk" Added: projects/clang350-import/lib/clang/libllvmprofiledata/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/lib/clang/libllvmprofiledata/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -0,0 +1,12 @@ +# $FreeBSD$ + +.include + +LIB= llvmprofiledata + +SRCDIR= lib/ProfileData +SRCS= InstrProf.cpp \ + InstrProfReader.cpp \ + InstrProfWriter.cpp + +.include "../clang.lib.mk" Modified: projects/clang350-import/lib/clang/libllvmruntimedyld/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libllvmruntimedyld/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libllvmruntimedyld/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -7,6 +7,7 @@ LIB= llvmruntimedyld SRCDIR= lib/ExecutionEngine/RuntimeDyld SRCS= GDBRegistrar.cpp \ RuntimeDyld.cpp \ + RuntimeDyldChecker.cpp \ RuntimeDyldELF.cpp \ RuntimeDyldMachO.cpp Modified: projects/clang350-import/lib/clang/libllvmscalaropts/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libllvmscalaropts/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libllvmscalaropts/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -6,7 +6,7 @@ LIB= llvmscalaropts SRCDIR= lib/Transforms/Scalar SRCS= ADCE.cpp \ - CodeGenPrepare.cpp \ + ConstantHoisting.cpp \ ConstantProp.cpp \ CorrelatedValuePropagation.cpp \ DCE.cpp \ @@ -14,10 +14,10 @@ SRCS= ADCE.cpp \ EarlyCSE.cpp \ FlattenCFGPass.cpp \ GVN.cpp \ - GlobalMerge.cpp \ IndVarSimplify.cpp \ JumpThreading.cpp \ LICM.cpp \ + LoadCombine.cpp \ LoopDeletion.cpp \ LoopIdiomRecognize.cpp \ LoopRerollPass.cpp \ @@ -27,6 +27,7 @@ SRCS= ADCE.cpp \ LoopUnswitch.cpp \ LowerAtomic.cpp \ MemCpyOptimizer.cpp \ + MergedLoadStoreMotion.cpp \ PartiallyInlineLibCalls.cpp \ Reassociate.cpp \ Reg2Mem.cpp \ @@ -34,6 +35,8 @@ SRCS= ADCE.cpp \ SROA.cpp \ SampleProfile.cpp \ ScalarReplAggregates.cpp \ + Scalarizer.cpp \ + SeparateConstOffsetFromGEP.cpp \ SimplifyCFGPass.cpp \ Sink.cpp \ StructurizeCFG.cpp \ Modified: projects/clang350-import/lib/clang/libllvmsupport/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libllvmsupport/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libllvmsupport/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -8,12 +8,14 @@ SRCDIR= lib/Support SRCS= APFloat.cpp \ APInt.cpp \ APSInt.cpp \ + ARMBuildAttrs.cpp \ + ARMWinEH.cpp \ Allocator.cpp \ Atomic.cpp \ BlockFrequency.cpp \ BranchProbability.cpp \ CommandLine.cpp \ - ConstantRange.cpp \ + Compression.cpp \ ConvertUTF.c \ ConvertUTFWrapper.cpp \ CrashRecoveryContext.cpp \ @@ -37,6 +39,8 @@ SRCS= APFloat.cpp \ IntrusiveRefCntPtr.cpp \ IsInf.cpp \ IsNAN.cpp \ + LEB128.cpp \ + LineIterator.cpp \ Locale.cpp \ LockFileManager.cpp \ MD5.cpp \ @@ -51,12 +55,15 @@ SRCS= APFloat.cpp \ Process.cpp \ Program.cpp \ RWMutex.cpp \ + RandomNumberGenerator.cpp \ Regex.cpp \ + ScaledNumber.cpp \ SearchForAddressOfSpecialSymbol.cpp \ Signals.cpp \ SmallPtrSet.cpp \ SmallVector.cpp \ SourceMgr.cpp \ + SpecialCaseList.cpp \ Statistic.cpp \ StreamableMemoryObject.cpp \ StringExtras.cpp \ @@ -84,16 +91,10 @@ SRCS= APFloat.cpp \ regerror.c \ regexec.c \ regfree.c \ - regstrlcpy.c \ - system_error.cpp - -.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no" -SRCS+= Disassembler.cpp -.endif + regstrlcpy.c .if ${MK_CLANG_EXTRAS} != "no" -SRCS+= Compression.cpp \ - DataStream.cpp \ +SRCS+= DataStream.cpp \ FileUtilities.cpp \ SystemUtils.cpp .endif Modified: projects/clang350-import/lib/clang/libllvmtablegen/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libllvmtablegen/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libllvmtablegen/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -8,6 +8,7 @@ SRCDIR= lib/TableGen SRCS= Error.cpp \ Main.cpp \ Record.cpp \ + SetTheory.cpp \ StringMatcher.cpp \ TableGenBackend.cpp \ TGLexer.cpp \ Modified: projects/clang350-import/lib/clang/libllvmtarget/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libllvmtarget/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libllvmtarget/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -5,8 +5,7 @@ LIB= llvmtarget SRCDIR= lib/Target -SRCS= Mangler.cpp \ - Target.cpp \ +SRCS= Target.cpp \ TargetIntrinsicInfo.cpp \ TargetJITInfo.cpp \ TargetLibraryInfo.cpp \ Modified: projects/clang350-import/lib/clang/libllvmtransformutils/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libllvmtransformutils/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libllvmtransformutils/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -5,7 +5,9 @@ LIB= llvmtransformutils SRCDIR= lib/Transforms/Utils -SRCS= BasicBlockUtils.cpp \ +SRCS= ASanStackFrameLayout.cpp \ + AddDiscriminators.cpp \ + BasicBlockUtils.cpp \ BreakCriticalEdges.cpp \ BuildLibCalls.cpp \ BypassSlowDivision.cpp \ @@ -13,6 +15,7 @@ SRCS= BasicBlockUtils.cpp \ CloneModule.cpp \ CmpInstAnalysis.cpp \ CodeExtractor.cpp \ + CtorUtils.cpp \ DemoteRegToStack.cpp \ FlattenCFG.cpp \ GlobalStatus.cpp \ @@ -36,7 +39,6 @@ SRCS= BasicBlockUtils.cpp \ SimplifyIndVar.cpp \ SimplifyInstructions.cpp \ SimplifyLibCalls.cpp \ - SpecialCaseList.cpp \ UnifyFunctionExitNodes.cpp \ ValueMapper.cpp Modified: projects/clang350-import/lib/clang/libllvmx86asmparser/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libllvmx86asmparser/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libllvmx86asmparser/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -6,7 +6,8 @@ LIB= llvmx86asmparser SRCDIR= lib/Target/X86/AsmParser INCDIR= lib/Target/X86 -SRCS= X86AsmParser.cpp +SRCS= X86AsmInstrumentation.cpp \ + X86AsmParser.cpp TGHDRS= X86GenAsmMatcher \ X86GenInstrInfo \ Modified: projects/clang350-import/lib/clang/libllvmx86codegen/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libllvmx86codegen/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libllvmx86codegen/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -6,7 +6,7 @@ LIB= llvmx86codegen SRCDIR= lib/Target/X86 SRCS= X86AsmPrinter.cpp \ - X86COFFMachineModuleInfo.cpp \ + X86AtomicExpandPass.cpp \ X86CodeEmitter.cpp \ X86FastISel.cpp \ X86FixupLEAs.cpp \ Modified: projects/clang350-import/lib/clang/libllvmx86desc/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libllvmx86desc/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libllvmx86desc/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -13,7 +13,8 @@ SRCS= X86AsmBackend.cpp \ X86MCTargetDesc.cpp \ X86MachORelocationInfo.cpp \ X86MachObjectWriter.cpp \ - X86WinCOFFObjectWriter.cpp + X86WinCOFFObjectWriter.cpp \ + X86WinCOFFStreamer.cpp CFLAGS+= -I${LLVM_SRCS}/${SRCDIR}/.. TGHDRS= X86GenInstrInfo \ Modified: projects/clang350-import/lib/clang/libllvmx86disassembler/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libllvmx86disassembler/Makefile Mon Nov 24 19:37:11 2014 (r274972) +++ projects/clang350-import/lib/clang/libllvmx86disassembler/Makefile Mon Nov 24 19:46:35 2014 (r274973) @@ -9,11 +9,12 @@ INCDIR= lib/Target/X86 SRCS= X86Disassembler.cpp .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no" -SRCS+= X86DisassemblerDecoder.c +SRCS+= X86DisassemblerDecoder.cpp .endif *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Mon Nov 24 19:48:04 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5C16B885; Mon, 24 Nov 2014 19:48:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 46A678B4; Mon, 24 Nov 2014 19:48:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAOJm4cL047979; Mon, 24 Nov 2014 19:48:04 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAOJm0DS047925; Mon, 24 Nov 2014 19:48:00 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411241948.sAOJm0DS047925@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 24 Nov 2014 19:48:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274974 - in projects/clang350-import/usr.bin/clang: bugpoint clang llc lli llvm-ar llvm-dis llvm-extract llvm-link llvm-mc llvm-nm llvm-objdump llvm-rtdyld macho-dump opt tblgen X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Nov 2014 19:48:04 -0000 Author: dim Date: Mon Nov 24 19:47:59 2014 New Revision: 274974 URL: https://svnweb.freebsd.org/changeset/base/274974 Log: Update llvm and clang binary Makefiles. Modified: projects/clang350-import/usr.bin/clang/bugpoint/Makefile projects/clang350-import/usr.bin/clang/clang/Makefile projects/clang350-import/usr.bin/clang/llc/Makefile projects/clang350-import/usr.bin/clang/lli/Makefile projects/clang350-import/usr.bin/clang/llvm-ar/Makefile projects/clang350-import/usr.bin/clang/llvm-dis/Makefile projects/clang350-import/usr.bin/clang/llvm-extract/Makefile projects/clang350-import/usr.bin/clang/llvm-link/Makefile projects/clang350-import/usr.bin/clang/llvm-mc/Makefile projects/clang350-import/usr.bin/clang/llvm-nm/Makefile projects/clang350-import/usr.bin/clang/llvm-objdump/Makefile projects/clang350-import/usr.bin/clang/llvm-rtdyld/Makefile projects/clang350-import/usr.bin/clang/macho-dump/Makefile projects/clang350-import/usr.bin/clang/opt/Makefile projects/clang350-import/usr.bin/clang/tblgen/Makefile Modified: projects/clang350-import/usr.bin/clang/bugpoint/Makefile ============================================================================== --- projects/clang350-import/usr.bin/clang/bugpoint/Makefile Mon Nov 24 19:46:35 2014 (r274973) +++ projects/clang350-import/usr.bin/clang/bugpoint/Makefile Mon Nov 24 19:47:59 2014 (r274974) @@ -16,12 +16,13 @@ SRCS= BugDriver.cpp \ bugpoint.cpp TGHDRS= Intrinsics -LIBDEPS=llvmirreader \ +LIBDEPS=llvmcodegen \ + llvmobjcarcopts \ + llvmirreader \ llvmbitwriter \ llvmbitreader \ llvmlinker \ llvmipo \ - llvmobjcarcopts \ llvmvectorize \ llvmscalaropts \ llvminstcombine \ @@ -31,7 +32,6 @@ LIBDEPS=llvmirreader \ llvmanalysis \ llvmtarget \ llvmmc \ - llvmobject \ llvmasmparser \ llvmcore \ llvmsupport Modified: projects/clang350-import/usr.bin/clang/clang/Makefile ============================================================================== --- projects/clang350-import/usr.bin/clang/clang/Makefile Mon Nov 24 19:46:35 2014 (r274973) +++ projects/clang350-import/usr.bin/clang/clang/Makefile Mon Nov 24 19:47:59 2014 (r274974) @@ -28,8 +28,7 @@ MLINKS+= clang.1 cc.1 \ clang.1 cpp.1 .endif -TGHDRS= CC1AsOptions \ - DiagnosticCommonKinds \ +TGHDRS= DiagnosticCommonKinds \ DiagnosticDriverKinds \ DiagnosticFrontendKinds \ DiagnosticLexKinds \ @@ -43,9 +42,6 @@ _clangstaticanalyzer= \ clangstaticanalyzercore _clangarcmigrate= \ clangarcmigrate -_clangrewriter= \ - clangrewritefrontend \ - clangrewritecore .endif # MK_CLANG_FULL LIBDEPS=clangfrontendtool \ @@ -55,22 +51,24 @@ LIBDEPS=clangfrontendtool \ clangcodegen \ clangparse \ clangsema \ + clangrewritefrontend \ + clangrewrite \ ${_clangstaticanalyzer} \ ${_clangarcmigrate} \ - ${_clangrewriter} \ clanganalysis \ clangedit \ clangast \ - clangbasic \ clanglex \ + clangbasic \ + llvmprofiledata \ llvmoption \ + llvmobjcarcopts \ llvmlinker \ llvmirreader \ llvmipo \ llvmvectorize \ llvminstrumentation \ llvmbitwriter \ - llvmbitreader \ llvmasmparser \ llvmarmdisassembler \ llvmarmcodegen \ @@ -84,6 +82,7 @@ LIBDEPS=clangfrontendtool \ llvmmipsdesc \ llvmmipsinfo \ llvmmipsinstprinter \ + llvmpowerpcdisassembler \ llvmpowerpccodegen \ llvmpowerpcasmparser \ llvmpowerpcdesc \ @@ -100,22 +99,25 @@ LIBDEPS=clangfrontendtool \ llvmx86codegen \ llvmselectiondag \ llvmasmprinter \ - llvmmcparser \ llvmcodegen \ - llvmobjcarcopts \ llvmscalaropts \ llvminstcombine \ llvmtransformutils \ llvmipa \ llvmanalysis \ + llvmtarget \ llvmx86desc \ + llvmobject \ + llvmmcparser \ + llvmbitreader \ + llvmcore \ llvmx86info \ - llvmtarget \ llvmx86instprinter \ llvmmc \ - llvmobject \ llvmx86utils \ - llvmcore \ llvmsupport .include "../clang.prog.mk" + +DPADD+= ${LIBZ} +LDADD+= -lz Modified: projects/clang350-import/usr.bin/clang/llc/Makefile ============================================================================== --- projects/clang350-import/usr.bin/clang/llc/Makefile Mon Nov 24 19:46:35 2014 (r274973) +++ projects/clang350-import/usr.bin/clang/llc/Makefile Mon Nov 24 19:47:59 2014 (r274974) @@ -9,7 +9,6 @@ SRCS= llc.cpp LIBDEPS=llvmirreader \ llvmasmparser \ - llvmbitreader \ llvmarmdisassembler \ llvmarmcodegen \ llvmarmasmparser \ @@ -22,6 +21,7 @@ LIBDEPS=llvmirreader \ llvmmipsdesc \ llvmmipsinfo \ llvmmipsinstprinter \ + llvmpowerpcdisassembler \ llvmpowerpccodegen \ llvmpowerpcasmparser \ llvmpowerpcdesc \ @@ -38,22 +38,25 @@ LIBDEPS=llvmirreader \ llvmx86codegen \ llvmselectiondag \ llvmasmprinter \ - llvmmcparser \ llvmcodegen \ - llvmobjcarcopts \ llvmscalaropts \ llvminstcombine \ llvmtransformutils \ llvmipa \ llvmanalysis \ + llvmtarget \ llvmx86desc \ + llvmobject \ + llvmmcparser \ + llvmbitreader \ + llvmcore \ llvmx86info \ - llvmtarget \ llvmx86instprinter \ llvmmc \ - llvmobject \ llvmx86utils \ - llvmcore \ llvmsupport .include "../clang.prog.mk" + +DPADD+= ${LIBZ} +LDADD+= -lz Modified: projects/clang350-import/usr.bin/clang/lli/Makefile ============================================================================== --- projects/clang350-import/usr.bin/clang/lli/Makefile Mon Nov 24 19:46:35 2014 (r274973) +++ projects/clang350-import/usr.bin/clang/lli/Makefile Mon Nov 24 19:47:59 2014 (r274974) @@ -14,7 +14,6 @@ LIBDEPS=llvmx86disassembler \ llvmx86asmparser \ llvmirreader \ llvmasmparser \ - llvmbitreader \ llvmx86codegen \ llvmx86desc \ llvmx86info \ @@ -22,24 +21,27 @@ LIBDEPS=llvmx86disassembler \ llvmx86utils \ llvmselectiondag \ llvmasmprinter \ - llvmmcparser \ llvminterpreter \ llvminstrumentation \ - llvmmcjit \ llvmjit \ llvmcodegen \ - llvmobjcarcopts \ llvmscalaropts \ llvminstcombine \ llvmtransformutils \ llvmipa \ llvmanalysis \ + llvmmcjit \ + llvmtarget \ llvmruntimedyld \ + llvmobject \ + llvmmcparser \ + llvmbitreader \ llvmexecutionengine \ - llvmtarget \ llvmmc \ - llvmobject \ llvmcore \ llvmsupport .include "../clang.prog.mk" + +DPADD+= ${LIBZ} +LDADD+= -lz Modified: projects/clang350-import/usr.bin/clang/llvm-ar/Makefile ============================================================================== --- projects/clang350-import/usr.bin/clang/llvm-ar/Makefile Mon Nov 24 19:46:35 2014 (r274973) +++ projects/clang350-import/usr.bin/clang/llvm-ar/Makefile Mon Nov 24 19:47:59 2014 (r274974) @@ -7,9 +7,54 @@ PROG_CXX=llvm-ar SRCDIR= tools/llvm-ar SRCS= llvm-ar.cpp -LIBDEPS=llvmobject \ +LIBDEPS=llvmarmdisassembler \ + llvmarmcodegen \ + llvmarmasmparser \ + llvmarmdesc \ + llvmarminfo \ + llvmarminstprinter \ + llvmmipsdisassembler \ + llvmmipscodegen \ + llvmmipsasmparser \ + llvmmipsdesc \ + llvmmipsinfo \ + llvmmipsinstprinter \ + llvmpowerpcdisassembler \ + llvmpowerpccodegen \ + llvmpowerpcasmparser \ + llvmpowerpcdesc \ + llvmpowerpcinfo \ + llvmpowerpcinstprinter \ + llvmsparcdisassembler \ + llvmsparccodegen \ + llvmsparcasmparser \ + llvmsparcdesc \ + llvmsparcinfo \ + llvmsparcinstprinter \ + llvmx86disassembler \ + llvmx86asmparser \ + llvmx86codegen \ + llvmselectiondag \ + llvmasmprinter \ + llvmcodegen \ + llvmscalaropts \ + llvminstcombine \ + llvmtransformutils \ + llvmipa \ + llvmanalysis \ + llvmtarget \ + llvmx86desc \ + llvmobject \ + llvmmcparser \ llvmbitreader \ llvmcore \ + llvmx86info \ + llvmx86instprinter \ + llvmmc \ + llvmx86utils \ llvmsupport .include "../clang.prog.mk" + +DPADD+= ${LIBZ} +LDADD+= -lz Modified: projects/clang350-import/usr.bin/clang/llvm-dis/Makefile ============================================================================== --- projects/clang350-import/usr.bin/clang/llvm-dis/Makefile Mon Nov 24 19:46:35 2014 (r274973) +++ projects/clang350-import/usr.bin/clang/llvm-dis/Makefile Mon Nov 24 19:47:59 2014 (r274974) @@ -11,7 +11,6 @@ TGHDRS= Intrinsics LIBDEPS=llvmanalysis \ llvmtarget \ llvmmc \ - llvmobject \ llvmbitreader \ llvmcore \ llvmsupport Modified: projects/clang350-import/usr.bin/clang/llvm-extract/Makefile ============================================================================== --- projects/clang350-import/usr.bin/clang/llvm-extract/Makefile Mon Nov 24 19:46:35 2014 (r274973) +++ projects/clang350-import/usr.bin/clang/llvm-extract/Makefile Mon Nov 24 19:47:59 2014 (r274974) @@ -12,7 +12,6 @@ LIBDEPS=llvmirreader \ llvmbitwriter \ llvmbitreader \ llvmipo \ - llvmobjcarcopts \ llvmvectorize \ llvmscalaropts \ llvminstcombine \ @@ -21,7 +20,6 @@ LIBDEPS=llvmirreader \ llvmanalysis \ llvmtarget \ llvmmc \ - llvmobject \ llvmcore \ llvmsupport Modified: projects/clang350-import/usr.bin/clang/llvm-link/Makefile ============================================================================== --- projects/clang350-import/usr.bin/clang/llvm-link/Makefile Mon Nov 24 19:46:35 2014 (r274973) +++ projects/clang350-import/usr.bin/clang/llvm-link/Makefile Mon Nov 24 19:47:59 2014 (r274974) @@ -17,7 +17,6 @@ LIBDEPS=llvmirreader \ llvmanalysis \ llvmtarget \ llvmmc \ - llvmobject \ llvmcore \ llvmsupport Modified: projects/clang350-import/usr.bin/clang/llvm-mc/Makefile ============================================================================== --- projects/clang350-import/usr.bin/clang/llvm-mc/Makefile Mon Nov 24 19:46:35 2014 (r274973) +++ projects/clang350-import/usr.bin/clang/llvm-mc/Makefile Mon Nov 24 19:47:59 2014 (r274974) @@ -22,6 +22,7 @@ LIBDEPS=llvmmcdisassembler \ llvmmipsdesc \ llvmmipsinfo \ llvmmipsinstprinter \ + llvmpowerpcdisassembler \ llvmpowerpccodegen \ llvmpowerpcasmparser \ llvmpowerpcdesc \ @@ -38,22 +39,25 @@ LIBDEPS=llvmmcdisassembler \ llvmx86codegen \ llvmselectiondag \ llvmasmprinter \ - llvmmcparser \ llvmcodegen \ - llvmobjcarcopts \ llvmscalaropts \ llvminstcombine \ llvmtransformutils \ llvmipa \ llvmanalysis \ + llvmtarget \ llvmx86desc \ + llvmobject \ + llvmmcparser \ + llvmbitreader \ + llvmcore \ llvmx86info \ - llvmtarget \ llvmx86instprinter \ llvmmc \ - llvmobject \ llvmx86utils \ - llvmcore \ llvmsupport .include "../clang.prog.mk" + +DPADD+= ${LIBZ} +LDADD+= -lz Modified: projects/clang350-import/usr.bin/clang/llvm-nm/Makefile ============================================================================== --- projects/clang350-import/usr.bin/clang/llvm-nm/Makefile Mon Nov 24 19:46:35 2014 (r274973) +++ projects/clang350-import/usr.bin/clang/llvm-nm/Makefile Mon Nov 24 19:47:59 2014 (r274974) @@ -7,9 +7,54 @@ PROG_CXX=llvm-nm SRCDIR= tools/llvm-nm SRCS= llvm-nm.cpp -LIBDEPS=llvmobject \ +LIBDEPS=llvmarmdisassembler \ + llvmarmcodegen \ + llvmarmasmparser \ + llvmarmdesc \ + llvmarminfo \ + llvmarminstprinter \ + llvmmipsdisassembler \ + llvmmipscodegen \ + llvmmipsasmparser \ + llvmmipsdesc \ + llvmmipsinfo \ + llvmmipsinstprinter \ + llvmpowerpcdisassembler \ + llvmpowerpccodegen \ + llvmpowerpcasmparser \ + llvmpowerpcdesc \ + llvmpowerpcinfo \ + llvmpowerpcinstprinter \ + llvmsparcdisassembler \ + llvmsparccodegen \ + llvmsparcasmparser \ + llvmsparcdesc \ + llvmsparcinfo \ + llvmsparcinstprinter \ + llvmx86disassembler \ + llvmx86asmparser \ + llvmx86codegen \ + llvmselectiondag \ + llvmasmprinter \ + llvmcodegen \ + llvmscalaropts \ + llvminstcombine \ + llvmtransformutils \ + llvmipa \ + llvmanalysis \ + llvmtarget \ + llvmx86desc \ + llvmobject \ + llvmmcparser \ llvmbitreader \ llvmcore \ + llvmx86info \ + llvmx86instprinter \ + llvmmc \ + llvmx86utils \ llvmsupport .include "../clang.prog.mk" + +DPADD+= ${LIBZ} +LDADD+= -lz Modified: projects/clang350-import/usr.bin/clang/llvm-objdump/Makefile ============================================================================== --- projects/clang350-import/usr.bin/clang/llvm-objdump/Makefile Mon Nov 24 19:46:35 2014 (r274973) +++ projects/clang350-import/usr.bin/clang/llvm-objdump/Makefile Mon Nov 24 19:47:59 2014 (r274974) @@ -14,6 +14,7 @@ SRCS= llvm-objdump.cpp \ MachODump.cpp LIBDEPS=llvmmcdisassembler \ + llvmmcanalysis \ llvmdebuginfo \ llvmarmdisassembler \ llvmarmcodegen \ @@ -27,6 +28,7 @@ LIBDEPS=llvmmcdisassembler \ llvmmipsdesc \ llvmmipsinfo \ llvmmipsinstprinter \ + llvmpowerpcdisassembler \ llvmpowerpccodegen \ llvmpowerpcasmparser \ llvmpowerpcdesc \ @@ -43,22 +45,25 @@ LIBDEPS=llvmmcdisassembler \ llvmx86codegen \ llvmselectiondag \ llvmasmprinter \ - llvmmcparser \ llvmcodegen \ - llvmobjcarcopts \ llvmscalaropts \ llvminstcombine \ llvmtransformutils \ llvmipa \ llvmanalysis \ + llvmtarget \ llvmx86desc \ + llvmobject \ + llvmmcparser \ + llvmbitreader \ + llvmcore \ llvmx86info \ - llvmtarget \ llvmx86instprinter \ llvmmc \ - llvmobject \ llvmx86utils \ - llvmcore \ llvmsupport .include "../clang.prog.mk" + +DPADD+= ${LIBZ} +LDADD+= -lz Modified: projects/clang350-import/usr.bin/clang/llvm-rtdyld/Makefile ============================================================================== --- projects/clang350-import/usr.bin/clang/llvm-rtdyld/Makefile Mon Nov 24 19:46:35 2014 (r274973) +++ projects/clang350-import/usr.bin/clang/llvm-rtdyld/Makefile Mon Nov 24 19:47:59 2014 (r274974) @@ -26,6 +26,7 @@ LIBDEPS=llvmdebuginfo \ llvmmipsdesc \ llvmmipsinfo \ llvmmipsinstprinter \ + llvmpowerpcdisassembler \ llvmpowerpccodegen \ llvmpowerpcasmparser \ llvmpowerpcdesc \ @@ -42,22 +43,25 @@ LIBDEPS=llvmdebuginfo \ llvmx86codegen \ llvmselectiondag \ llvmasmprinter \ - llvmmcparser \ llvmcodegen \ - llvmobjcarcopts \ llvmscalaropts \ llvminstcombine \ llvmtransformutils \ llvmipa \ llvmanalysis \ + llvmtarget \ llvmx86desc \ + llvmobject \ + llvmmcparser \ + llvmbitreader \ + llvmcore \ llvmx86info \ - llvmtarget \ llvmx86instprinter \ llvmmc \ - llvmobject \ llvmx86utils \ - llvmcore \ llvmsupport .include "../clang.prog.mk" + +DPADD+= ${LIBZ} +LDADD+= -lz Modified: projects/clang350-import/usr.bin/clang/macho-dump/Makefile ============================================================================== --- projects/clang350-import/usr.bin/clang/macho-dump/Makefile Mon Nov 24 19:46:35 2014 (r274973) +++ projects/clang350-import/usr.bin/clang/macho-dump/Makefile Mon Nov 24 19:47:59 2014 (r274974) @@ -9,6 +9,10 @@ SRCDIR= tools/macho-dump SRCS= macho-dump.cpp LIBDEPS=llvmobject \ + llvmmcparser \ + llvmmc \ + llvmbitreader \ + llvmcore \ llvmsupport .include "../clang.prog.mk" Modified: projects/clang350-import/usr.bin/clang/opt/Makefile ============================================================================== --- projects/clang350-import/usr.bin/clang/opt/Makefile Mon Nov 24 19:46:35 2014 (r274973) +++ projects/clang350-import/usr.bin/clang/opt/Makefile Mon Nov 24 19:47:59 2014 (r274974) @@ -6,7 +6,11 @@ PROG_CXX=opt SRCDIR= tools/opt SRCS= AnalysisWrappers.cpp \ + BreakpointPrinter.cpp \ GraphPrinters.cpp \ + NewPMDriver.cpp \ + PassPrinters.cpp \ + Passes.cpp \ PrintSCC.cpp \ opt.cpp @@ -23,6 +27,7 @@ LIBDEPS=llvmarmdisassembler \ llvmmipsdesc \ llvmmipsinfo \ llvmmipsinstprinter \ + llvmpowerpcdisassembler \ llvmpowerpccodegen \ llvmpowerpcasmparser \ llvmpowerpcdesc \ @@ -39,9 +44,10 @@ LIBDEPS=llvmarmdisassembler \ llvmx86codegen \ llvmselectiondag \ llvmasmprinter \ - llvmmcparser \ llvmcodegen \ llvmx86desc \ + llvmobject \ + llvmmcparser \ llvmx86info \ llvmx86instprinter \ llvmx86utils \ @@ -56,7 +62,6 @@ LIBDEPS=llvmarmdisassembler \ llvmanalysis \ llvmtarget \ llvmmc \ - llvmobject \ llvmirreader \ llvmasmparser \ llvmbitwriter \ @@ -65,3 +70,6 @@ LIBDEPS=llvmarmdisassembler \ llvmsupport .include "../clang.prog.mk" + +DPADD+= ${LIBZ} +LDADD+= -lz Modified: projects/clang350-import/usr.bin/clang/tblgen/Makefile ============================================================================== --- projects/clang350-import/usr.bin/clang/tblgen/Makefile Mon Nov 24 19:46:35 2014 (r274973) +++ projects/clang350-import/usr.bin/clang/tblgen/Makefile Mon Nov 24 19:47:59 2014 (r274974) @@ -31,9 +31,7 @@ SRCS= AsmMatcherEmitter.cpp \ OptParserEmitter.cpp \ PseudoLoweringEmitter.cpp \ RegisterInfoEmitter.cpp \ - SetTheory.cpp \ SubtargetEmitter.cpp \ - TGValueTypes.cpp \ TableGen.cpp \ X86DisassemblerTables.cpp \ X86ModRMFilters.cpp \ From owner-svn-src-projects@FreeBSD.ORG Mon Nov 24 19:50:02 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5AA55A46; Mon, 24 Nov 2014 19:50:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 47E0A8DB; Mon, 24 Nov 2014 19:50:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAOJo2wI048308; Mon, 24 Nov 2014 19:50:02 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAOJo2Sj048307; Mon, 24 Nov 2014 19:50:02 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411241950.sAOJo2Sj048307@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 24 Nov 2014 19:50:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274975 - projects/clang350-import/etc/mtree X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Nov 2014 19:50:02 -0000 Author: dim Date: Mon Nov 24 19:50:01 2014 New Revision: 274975 URL: https://svnweb.freebsd.org/changeset/base/274975 Log: Update BSD.include.dist for clang 3.5.0. Modified: projects/clang350-import/etc/mtree/BSD.include.dist Modified: projects/clang350-import/etc/mtree/BSD.include.dist ============================================================================== --- projects/clang350-import/etc/mtree/BSD.include.dist Mon Nov 24 19:47:59 2014 (r274974) +++ projects/clang350-import/etc/mtree/BSD.include.dist Mon Nov 24 19:50:01 2014 (r274975) @@ -92,7 +92,7 @@ .. .. clang - 3.4.1 + 3.5.0 .. .. crypto From owner-svn-src-projects@FreeBSD.ORG Mon Nov 24 20:01:07 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 352E7D34; Mon, 24 Nov 2014 20:01:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2199FA79; Mon, 24 Nov 2014 20:01:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAOK17FD053894; Mon, 24 Nov 2014 20:01:07 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAOK16pB053887; Mon, 24 Nov 2014 20:01:06 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411242001.sAOK16pB053887@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 24 Nov 2014 20:01:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274977 - in projects/clang350-import: share/mk sys/boot/i386/boot2 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Nov 2014 20:01:07 -0000 Author: dim Date: Mon Nov 24 20:01:05 2014 New Revision: 274977 URL: https://svnweb.freebsd.org/changeset/base/274977 Log: Ensure boot2 stays below the limit, by applying a patch from Roman Divacky which shrinks the code, and by using the custom llvm option to disable the Global Value Numbering optimization pass. Modified: projects/clang350-import/share/mk/bsd.sys.mk projects/clang350-import/sys/boot/i386/boot2/Makefile projects/clang350-import/sys/boot/i386/boot2/boot2.c Modified: projects/clang350-import/share/mk/bsd.sys.mk ============================================================================== --- projects/clang350-import/share/mk/bsd.sys.mk Mon Nov 24 19:55:45 2014 (r274976) +++ projects/clang350-import/share/mk/bsd.sys.mk Mon Nov 24 20:01:05 2014 (r274977) @@ -116,7 +116,7 @@ CWARNFLAGS+= -Wno-unknown-pragmas CLANG_NO_IAS= -no-integrated-as .endif CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\ - -mllvm -enable-load-pre=false -mllvm -simplifycfg-dup-ret + -mllvm -simplifycfg-dup-ret -mllvm -enable-gvn=false CFLAGS.clang+= -Qunused-arguments .if ${MACHINE_CPUARCH} == "sparc64" # Don't emit .cfi directives, since we must use GNU as on sparc64, for now. Modified: projects/clang350-import/sys/boot/i386/boot2/Makefile ============================================================================== --- projects/clang350-import/sys/boot/i386/boot2/Makefile Mon Nov 24 19:55:45 2014 (r274976) +++ projects/clang350-import/sys/boot/i386/boot2/Makefile Mon Nov 24 20:01:05 2014 (r274977) @@ -22,8 +22,7 @@ BOOT2_UFS?= UFS1_AND_UFS2 #BOOT2_UFS?= UFS2_ONLY #BOOT2_UFS?= UFS1_ONLY -CFLAGS= -Os \ - -fomit-frame-pointer \ +CFLAGS= -fomit-frame-pointer \ -mrtd \ -mregparm=3 \ -DUSE_XREAD \ @@ -39,12 +38,13 @@ CFLAGS= -Os \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ -Winline -CFLAGS.gcc+= -fno-guess-branch-probability \ +CFLAGS.gcc+= -Os \ + -fno-guess-branch-probability \ -fno-unit-at-a-time \ -mno-align-long-strings \ --param max-inline-insns-single=100 -CFLAGS.clang+=${CLANG_OPT_SMALL} +CFLAGS.clang+= -Oz ${CLANG_OPT_SMALL} LD_FLAGS=-static -N --gc-sections Modified: projects/clang350-import/sys/boot/i386/boot2/boot2.c ============================================================================== --- projects/clang350-import/sys/boot/i386/boot2/boot2.c Mon Nov 24 19:55:45 2014 (r274976) +++ projects/clang350-import/sys/boot/i386/boot2/boot2.c Mon Nov 24 20:01:05 2014 (r274977) @@ -323,7 +323,8 @@ load(void) caddr_t p; ufs_ino_t ino; uint32_t addr; - int i, j; + uint8_t i, j; + int k; if (!(ino = lookup(kname))) { if (!ls) @@ -344,7 +345,7 @@ load(void) return; } else if (IS_ELF(hdr.eh)) { fs_off = hdr.eh.e_phoff; - for (j = i = 0; i < hdr.eh.e_phnum && j < 2; i++) { + for (j = k = 0; k < hdr.eh.e_phnum && j < 2; k++) { if (xfsread(ino, ep + j, sizeof(ep[0]))) return; if (ep[j].p_type == PT_LOAD) @@ -393,7 +394,9 @@ parse() char *ep, *p, *q; const char *cp; unsigned int drv; - int c, i, j; + uint8_t i; + int c, j; + size_t k; while ((c = *arg++)) { if (c == ' ' || c == '\t' || c == '\n') @@ -416,7 +419,7 @@ parse() #if SERIAL } else if (c == 'S') { j = 0; - while ((unsigned int)(i = *arg++ - '0') <= 9) + while ((i = *arg++ - '0') <= 9) j = j * 10 + i; if (j > 0 && i == -'0') { comspeed = j; @@ -479,10 +482,10 @@ parse() ? DRV_HARD : 0) + drv; dsk_meta = 0; } - if ((i = ep - arg)) { - if ((size_t)i >= sizeof(knamebuf)) + if (k = ep - arg) { + if (k >= sizeof(knamebuf)) return -1; - memcpy(knamebuf, arg, i + 1); + memcpy(knamebuf, arg, k + 1); kname = knamebuf; } } @@ -605,8 +608,10 @@ drvread(void *buf, unsigned lba, unsigne { static unsigned c = 0x2d5c7c2f; - if (!OPT_CHECK(RBX_QUIET)) - printf("%c\b", c = c << 8 | c >> 24); + if (!OPT_CHECK(RBX_QUIET)) { + xputc(c = c << 8 | c >> 24); + xputc('\b'); + } v86.ctl = V86_ADDR | V86_CALLF | V86_FLAGS; v86.addr = XREADORG; /* call to xread in boot1 */ v86.es = VTOPSEG(buf); From owner-svn-src-projects@FreeBSD.ORG Mon Nov 24 20:10:16 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6F6CE248; Mon, 24 Nov 2014 20:10:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 59D95AFC; Mon, 24 Nov 2014 20:10:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAOKAGDi058868; Mon, 24 Nov 2014 20:10:16 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAOKACBB058843; Mon, 24 Nov 2014 20:10:12 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411242010.sAOKACBB058843@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 24 Nov 2014 20:10:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274979 - in projects/clang350-import: . etc/defaults etc/rc.d lib/libc/tests/ssp sys/cam/ctl sys/dev/ffec sys/kern sys/net sys/sys X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Nov 2014 20:10:16 -0000 Author: dim Date: Mon Nov 24 20:10:12 2014 New Revision: 274979 URL: https://svnweb.freebsd.org/changeset/base/274979 Log: Merge ^/head r274961 through r274978. Modified: projects/clang350-import/ObsoleteFiles.inc projects/clang350-import/etc/defaults/rc.conf projects/clang350-import/etc/rc.d/automount projects/clang350-import/lib/libc/tests/ssp/Makefile projects/clang350-import/sys/cam/ctl/ctl.c projects/clang350-import/sys/cam/ctl/ctl_frontend.c projects/clang350-import/sys/cam/ctl/ctl_frontend_cam_sim.c projects/clang350-import/sys/cam/ctl/ctl_frontend_internal.c projects/clang350-import/sys/cam/ctl/ctl_frontend_iscsi.c projects/clang350-import/sys/cam/ctl/ctl_io.h projects/clang350-import/sys/cam/ctl/ctl_private.h projects/clang350-import/sys/cam/ctl/ctl_tpc.c projects/clang350-import/sys/cam/ctl/scsi_ctl.c projects/clang350-import/sys/dev/ffec/if_ffec.c projects/clang350-import/sys/kern/kern_descrip.c projects/clang350-import/sys/kern/subr_bus.c projects/clang350-import/sys/net/if_tap.c projects/clang350-import/sys/sys/bus.h Directory Properties: projects/clang350-import/ (props changed) Modified: projects/clang350-import/ObsoleteFiles.inc ============================================================================== --- projects/clang350-import/ObsoleteFiles.inc Mon Nov 24 20:07:09 2014 (r274978) +++ projects/clang350-import/ObsoleteFiles.inc Mon Nov 24 20:10:12 2014 (r274979) @@ -44,6 +44,8 @@ OLD_FILES+=usr/share/man/man4/faith.4.gz OLD_FILES+=usr/share/man/man4/if_faith.4.gz OLD_FILES+=usr/sbin/faithd OLD_FILES+=usr/share/man/man8/faithd.8.gz +# 20141107: overhaul if_gre(4) +OLD_FILES+=usr/include/netinet/ip_gre.h # 20141102: postrandom obsoleted by new /dev/random code OLD_FILES+=etc/rc.d/postrandom # 20141031: initrandom obsoleted by new /dev/random code Modified: projects/clang350-import/etc/defaults/rc.conf ============================================================================== --- projects/clang350-import/etc/defaults/rc.conf Mon Nov 24 20:07:09 2014 (r274978) +++ projects/clang350-import/etc/defaults/rc.conf Mon Nov 24 20:10:12 2014 (r274979) @@ -317,7 +317,10 @@ amd_enable="NO" # Run amd service with amd_program="/usr/sbin/amd" # path to amd, if you want a different one. amd_flags="-a /.amd_mnt -l syslog /host /etc/amd.map /net /etc/amd.map" amd_map_program="NO" # Can be set to "ypcat -k amd.master" -autofs_enable="NO" # Run automountd(8) +autofs_enable="NO" # Run autofs daemons. +automount_flags="" # Flags to automount(8) (if autofs enabled). +automountd_flags="" # Flags to automountd(8) (if autofs enabled). +autounmountd_flags="" # Flags to autounmountd(8) (if autofs enabled). nfs_client_enable="NO" # This host is an NFS client (or NO). nfs_access_cache="60" # Client cache timeout in seconds nfs_server_enable="NO" # This host is an NFS server (or NO). Modified: projects/clang350-import/etc/rc.d/automount ============================================================================== --- projects/clang350-import/etc/rc.d/automount Mon Nov 24 20:07:09 2014 (r274978) +++ projects/clang350-import/etc/rc.d/automount Mon Nov 24 20:10:12 2014 (r274979) @@ -18,7 +18,7 @@ required_modules="autofs" automount_start() { - /usr/sbin/automount + /usr/sbin/automount ${automount_flags} } automount_stop() Modified: projects/clang350-import/lib/libc/tests/ssp/Makefile ============================================================================== --- projects/clang350-import/lib/libc/tests/ssp/Makefile Mon Nov 24 20:07:09 2014 (r274978) +++ projects/clang350-import/lib/libc/tests/ssp/Makefile Mon Nov 24 20:10:12 2014 (r274979) @@ -9,7 +9,10 @@ WARNS?= 2 CFLAGS.h_raw+= -fstack-protector-all -Wstack-protector .if ${COMPILER_TYPE} == "clang" +# Disable -fsanitize=bounds until runtime support is done for clang 3.5.0. +.if ${COMPILER_VERSION} < 30500 CFLAGS.h_raw+= -fsanitize=bounds +.endif .elif ${COMPILER_TYPE} == "gcc" CFLAGS.h_raw+= --param ssp-buffer-size=1 DPADD+= ${LIBSSP} Modified: projects/clang350-import/sys/cam/ctl/ctl.c ============================================================================== --- projects/clang350-import/sys/cam/ctl/ctl.c Mon Nov 24 20:07:09 2014 (r274978) +++ projects/clang350-import/sys/cam/ctl/ctl.c Mon Nov 24 20:10:12 2014 (r274979) @@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -644,7 +645,7 @@ ctl_isc_event_handler(ctl_ha_channel cha #if 0 printf("Serialize\n"); #endif - io = ctl_alloc_io((void *)ctl_softc->othersc_pool); + io = ctl_alloc_io_nowait(ctl_softc->othersc_pool); if (io == NULL) { printf("ctl_isc_event_handler: can't allocate " "ctl_io!\n"); @@ -889,8 +890,8 @@ ctl_isc_event_handler(ctl_ha_channel cha /* Handle resets sent from the other side */ case CTL_MSG_MANAGE_TASKS: { struct ctl_taskio *taskio; - taskio = (struct ctl_taskio *)ctl_alloc_io( - (void *)ctl_softc->othersc_pool); + taskio = (struct ctl_taskio *)ctl_alloc_io_nowait( + ctl_softc->othersc_pool); if (taskio == NULL) { printf("ctl_isc_event_handler: can't allocate " "ctl_io!\n"); @@ -918,8 +919,8 @@ ctl_isc_event_handler(ctl_ha_channel cha } /* Persistent Reserve action which needs attention */ case CTL_MSG_PERS_ACTION: - presio = (struct ctl_prio *)ctl_alloc_io( - (void *)ctl_softc->othersc_pool); + presio = (struct ctl_prio *)ctl_alloc_io_nowait( + ctl_softc->othersc_pool); if (presio == NULL) { printf("ctl_isc_event_handler: can't allocate " "ctl_io!\n"); @@ -1003,7 +1004,7 @@ static int ctl_init(void) { struct ctl_softc *softc; - struct ctl_io_pool *internal_pool, *emergency_pool, *other_pool; + void *other_pool; struct ctl_port *port; int i, error, retval; //int isc_retval; @@ -1049,7 +1050,8 @@ ctl_init(void) "Report no lun possible for invalid LUNs"); mtx_init(&softc->ctl_lock, "CTL mutex", NULL, MTX_DEF); - mtx_init(&softc->pool_lock, "CTL pool mutex", NULL, MTX_DEF); + softc->io_zone = uma_zcreate("CTL IO", sizeof(union ctl_io), + NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); softc->open_count = 0; /* @@ -1086,36 +1088,15 @@ ctl_init(void) STAILQ_INIT(&softc->fe_list); STAILQ_INIT(&softc->port_list); STAILQ_INIT(&softc->be_list); - STAILQ_INIT(&softc->io_pools); ctl_tpc_init(softc); - if (ctl_pool_create(softc, CTL_POOL_INTERNAL, CTL_POOL_ENTRIES_INTERNAL, - &internal_pool)!= 0){ - printf("ctl: can't allocate %d entry internal pool, " - "exiting\n", CTL_POOL_ENTRIES_INTERNAL); - return (ENOMEM); - } - - if (ctl_pool_create(softc, CTL_POOL_EMERGENCY, - CTL_POOL_ENTRIES_EMERGENCY, &emergency_pool) != 0) { - printf("ctl: can't allocate %d entry emergency pool, " - "exiting\n", CTL_POOL_ENTRIES_EMERGENCY); - ctl_pool_free(internal_pool); - return (ENOMEM); - } - - if (ctl_pool_create(softc, CTL_POOL_4OTHERSC, CTL_POOL_ENTRIES_OTHER_SC, + if (ctl_pool_create(softc, "othersc", CTL_POOL_ENTRIES_OTHER_SC, &other_pool) != 0) { printf("ctl: can't allocate %d entry other SC pool, " "exiting\n", CTL_POOL_ENTRIES_OTHER_SC); - ctl_pool_free(internal_pool); - ctl_pool_free(emergency_pool); return (ENOMEM); } - - softc->internal_pool = internal_pool; - softc->emergency_pool = emergency_pool; softc->othersc_pool = other_pool; if (worker_threads <= 0) @@ -1137,8 +1118,6 @@ ctl_init(void) &softc->ctl_proc, &thr->thread, 0, 0, "ctl", "work%d", i); if (error != 0) { printf("error creating CTL work thread!\n"); - ctl_pool_free(internal_pool); - ctl_pool_free(emergency_pool); ctl_pool_free(other_pool); return (error); } @@ -1147,8 +1126,6 @@ ctl_init(void) &softc->ctl_proc, NULL, 0, 0, "ctl", "lun"); if (error != 0) { printf("error creating CTL lun thread!\n"); - ctl_pool_free(internal_pool); - ctl_pool_free(emergency_pool); ctl_pool_free(other_pool); return (error); } @@ -1156,8 +1133,6 @@ ctl_init(void) &softc->ctl_proc, NULL, 0, 0, "ctl", "thresh"); if (error != 0) { printf("error creating CTL threshold thread!\n"); - ctl_pool_free(internal_pool); - ctl_pool_free(emergency_pool); ctl_pool_free(other_pool); return (error); } @@ -1210,7 +1185,6 @@ ctl_shutdown(void) { struct ctl_softc *softc; struct ctl_lun *lun, *next_lun; - struct ctl_io_pool *pool; softc = (struct ctl_softc *)control_softc; @@ -1231,24 +1205,13 @@ ctl_shutdown(void) ctl_frontend_deregister(&ioctl_frontend); - /* - * This will rip the rug out from under any FETDs or anyone else - * that has a pool allocated. Since we increment our module - * refcount any time someone outside the main CTL module allocates - * a pool, we shouldn't have any problems here. The user won't be - * able to unload the CTL module until client modules have - * successfully unloaded. - */ - while ((pool = STAILQ_FIRST(&softc->io_pools)) != NULL) - ctl_pool_free(pool); - #if 0 ctl_shutdown_thread(softc->work_thread); mtx_destroy(&softc->queue_lock); #endif ctl_tpc_shutdown(softc); - mtx_destroy(&softc->pool_lock); + uma_zdestroy(softc->io_zone); mtx_destroy(&softc->ctl_lock); destroy_dev(softc->dev); @@ -2371,21 +2334,15 @@ ctl_ioctl(struct cdev *dev, u_long cmd, } io = ctl_alloc_io(softc->ioctl_info.port.ctl_pool_ref); - if (io == NULL) { - printf("ctl_ioctl: can't allocate ctl_io!\n"); - retval = ENOSPC; - break; - } /* * Need to save the pool reference so it doesn't get * spammed by the user's ctl_io. */ pool_tmp = io->io_hdr.pool; - memcpy(io, (void *)addr, sizeof(*io)); - io->io_hdr.pool = pool_tmp; + /* * No status yet, so make sure the status is set properly. */ @@ -3729,285 +3686,95 @@ ctl_kfree_io(union ctl_io *io) #endif /* unused */ /* - * ctl_softc, pool_type, total_ctl_io are passed in. + * ctl_softc, pool_name, total_ctl_io are passed in. * npool is passed out. */ int -ctl_pool_create(struct ctl_softc *ctl_softc, ctl_pool_type pool_type, - uint32_t total_ctl_io, struct ctl_io_pool **npool) +ctl_pool_create(struct ctl_softc *ctl_softc, const char *pool_name, + uint32_t total_ctl_io, void **npool) { - uint32_t i; - union ctl_io *cur_io, *next_io; +#ifdef IO_POOLS struct ctl_io_pool *pool; - int retval; - - retval = 0; pool = (struct ctl_io_pool *)malloc(sizeof(*pool), M_CTL, M_NOWAIT | M_ZERO); - if (pool == NULL) { - retval = ENOMEM; - goto bailout; - } + if (pool == NULL) + return (ENOMEM); - pool->type = pool_type; + snprintf(pool->name, sizeof(pool->name), "CTL IO %s", pool_name); pool->ctl_softc = ctl_softc; - - mtx_lock(&ctl_softc->pool_lock); - pool->id = ctl_softc->cur_pool_id++; - mtx_unlock(&ctl_softc->pool_lock); - - pool->flags = CTL_POOL_FLAG_NONE; - pool->refcount = 1; /* Reference for validity. */ - STAILQ_INIT(&pool->free_queue); - - /* - * XXX KDM other options here: - * - allocate a page at a time - * - allocate one big chunk of memory. - * Page allocation might work well, but would take a little more - * tracking. - */ - for (i = 0; i < total_ctl_io; i++) { - cur_io = (union ctl_io *)malloc(sizeof(*cur_io), M_CTLIO, - M_NOWAIT); - if (cur_io == NULL) { - retval = ENOMEM; - break; - } - cur_io->io_hdr.pool = pool; - STAILQ_INSERT_TAIL(&pool->free_queue, &cur_io->io_hdr, links); - pool->total_ctl_io++; - pool->free_ctl_io++; - } - - if (retval != 0) { - for (cur_io = (union ctl_io *)STAILQ_FIRST(&pool->free_queue); - cur_io != NULL; cur_io = next_io) { - next_io = (union ctl_io *)STAILQ_NEXT(&cur_io->io_hdr, - links); - STAILQ_REMOVE(&pool->free_queue, &cur_io->io_hdr, - ctl_io_hdr, links); - free(cur_io, M_CTLIO); - } - - free(pool, M_CTL); - goto bailout; - } - mtx_lock(&ctl_softc->pool_lock); - ctl_softc->num_pools++; - STAILQ_INSERT_TAIL(&ctl_softc->io_pools, pool, links); - /* - * Increment our usage count if this is an external consumer, so we - * can't get unloaded until the external consumer (most likely a - * FETD) unloads and frees his pool. - * - * XXX KDM will this increment the caller's module use count, or - * mine? - */ -#if 0 - if ((pool_type != CTL_POOL_EMERGENCY) - && (pool_type != CTL_POOL_INTERNAL) - && (pool_type != CTL_POOL_4OTHERSC)) - MOD_INC_USE_COUNT; -#endif - - mtx_unlock(&ctl_softc->pool_lock); + pool->zone = uma_zsecond_create(pool->name, NULL, + NULL, NULL, NULL, ctl_softc->io_zone); + /* uma_prealloc(pool->zone, total_ctl_io); */ *npool = pool; - -bailout: - - return (retval); -} - -static int -ctl_pool_acquire(struct ctl_io_pool *pool) -{ - - mtx_assert(&pool->ctl_softc->pool_lock, MA_OWNED); - - if (pool->flags & CTL_POOL_FLAG_INVALID) - return (EINVAL); - - pool->refcount++; - - return (0); -} - -static void -ctl_pool_release(struct ctl_io_pool *pool) -{ - struct ctl_softc *ctl_softc = pool->ctl_softc; - union ctl_io *io; - - mtx_assert(&ctl_softc->pool_lock, MA_OWNED); - - if (--pool->refcount != 0) - return; - - while ((io = (union ctl_io *)STAILQ_FIRST(&pool->free_queue)) != NULL) { - STAILQ_REMOVE(&pool->free_queue, &io->io_hdr, ctl_io_hdr, - links); - free(io, M_CTLIO); - } - - STAILQ_REMOVE(&ctl_softc->io_pools, pool, ctl_io_pool, links); - ctl_softc->num_pools--; - - /* - * XXX KDM will this decrement the caller's usage count or mine? - */ -#if 0 - if ((pool->type != CTL_POOL_EMERGENCY) - && (pool->type != CTL_POOL_INTERNAL) - && (pool->type != CTL_POOL_4OTHERSC)) - MOD_DEC_USE_COUNT; +#else + *npool = ctl_softc->io_zone; #endif - - free(pool, M_CTL); + return (0); } void ctl_pool_free(struct ctl_io_pool *pool) { - struct ctl_softc *ctl_softc; if (pool == NULL) return; - ctl_softc = pool->ctl_softc; - mtx_lock(&ctl_softc->pool_lock); - pool->flags |= CTL_POOL_FLAG_INVALID; - ctl_pool_release(pool); - mtx_unlock(&ctl_softc->pool_lock); +#ifdef IO_POOLS + uma_zdestroy(pool->zone); + free(pool, M_CTL); +#endif } -/* - * This routine does not block (except for spinlocks of course). - * It tries to allocate a ctl_io union from the caller's pool as quickly as - * possible. - */ union ctl_io * ctl_alloc_io(void *pool_ref) { union ctl_io *io; - struct ctl_softc *ctl_softc; - struct ctl_io_pool *pool, *npool; - struct ctl_io_pool *emergency_pool; +#ifdef IO_POOLS + struct ctl_io_pool *pool = (struct ctl_io_pool *)pool_ref; - pool = (struct ctl_io_pool *)pool_ref; - - if (pool == NULL) { - printf("%s: pool is NULL\n", __func__); - return (NULL); - } - - emergency_pool = NULL; - - ctl_softc = pool->ctl_softc; - - mtx_lock(&ctl_softc->pool_lock); - /* - * First, try to get the io structure from the user's pool. - */ - if (ctl_pool_acquire(pool) == 0) { - io = (union ctl_io *)STAILQ_FIRST(&pool->free_queue); - if (io != NULL) { - STAILQ_REMOVE_HEAD(&pool->free_queue, links); - pool->total_allocated++; - pool->free_ctl_io--; - mtx_unlock(&ctl_softc->pool_lock); - return (io); - } else - ctl_pool_release(pool); - } - /* - * If he doesn't have any io structures left, search for an - * emergency pool and grab one from there. - */ - STAILQ_FOREACH(npool, &ctl_softc->io_pools, links) { - if (npool->type != CTL_POOL_EMERGENCY) - continue; - - if (ctl_pool_acquire(npool) != 0) - continue; - - emergency_pool = npool; - - io = (union ctl_io *)STAILQ_FIRST(&npool->free_queue); - if (io != NULL) { - STAILQ_REMOVE_HEAD(&npool->free_queue, links); - npool->total_allocated++; - npool->free_ctl_io--; - mtx_unlock(&ctl_softc->pool_lock); - return (io); - } else - ctl_pool_release(npool); - } - - /* Drop the spinlock before we malloc */ - mtx_unlock(&ctl_softc->pool_lock); + io = uma_zalloc(pool->zone, M_WAITOK); +#else + io = uma_zalloc((uma_zone_t)pool_ref, M_WAITOK); +#endif + if (io != NULL) + io->io_hdr.pool = pool_ref; + return (io); +} - /* - * The emergency pool (if it exists) didn't have one, so try an - * atomic (i.e. nonblocking) malloc and see if we get lucky. - */ - io = (union ctl_io *)malloc(sizeof(*io), M_CTLIO, M_NOWAIT); - if (io != NULL) { - /* - * If the emergency pool exists but is empty, add this - * ctl_io to its list when it gets freed. - */ - if (emergency_pool != NULL) { - mtx_lock(&ctl_softc->pool_lock); - if (ctl_pool_acquire(emergency_pool) == 0) { - io->io_hdr.pool = emergency_pool; - emergency_pool->total_ctl_io++; - /* - * Need to bump this, otherwise - * total_allocated and total_freed won't - * match when we no longer have anything - * outstanding. - */ - emergency_pool->total_allocated++; - } - mtx_unlock(&ctl_softc->pool_lock); - } else - io->io_hdr.pool = NULL; - } +union ctl_io * +ctl_alloc_io_nowait(void *pool_ref) +{ + union ctl_io *io; +#ifdef IO_POOLS + struct ctl_io_pool *pool = (struct ctl_io_pool *)pool_ref; + io = uma_zalloc(pool->zone, M_NOWAIT); +#else + io = uma_zalloc((uma_zone_t)pool_ref, M_NOWAIT); +#endif + if (io != NULL) + io->io_hdr.pool = pool_ref; return (io); } void ctl_free_io(union ctl_io *io) { +#ifdef IO_POOLS + struct ctl_io_pool *pool; +#endif + if (io == NULL) return; - /* - * If this ctl_io has a pool, return it to that pool. - */ - if (io->io_hdr.pool != NULL) { - struct ctl_io_pool *pool; - - pool = (struct ctl_io_pool *)io->io_hdr.pool; - mtx_lock(&pool->ctl_softc->pool_lock); - io->io_hdr.io_type = 0xff; - STAILQ_INSERT_TAIL(&pool->free_queue, &io->io_hdr, links); - pool->total_freed++; - pool->free_ctl_io++; - ctl_pool_release(pool); - mtx_unlock(&pool->ctl_softc->pool_lock); - } else { - /* - * Otherwise, just free it. We probably malloced it and - * the emergency pool wasn't available. - */ - free(io, M_CTLIO); - } - +#ifdef IO_POOLS + pool = (struct ctl_io_pool *)io->io_hdr.pool; + uma_zfree(pool->zone, io); +#else + uma_zfree((uma_zone_t)io->io_hdr.pool, io); +#endif } void @@ -4022,9 +3789,7 @@ ctl_zero_io(union ctl_io *io) * May need to preserve linked list pointers at some point too. */ pool_ref = io->io_hdr.pool; - memset(io, 0, sizeof(*io)); - io->io_hdr.pool = pool_ref; } @@ -5657,16 +5422,10 @@ ctl_start_stop(struct ctl_scsiio *ctsio) union ctl_io *new_io; new_io = ctl_alloc_io(ctsio->io_hdr.pool); - if (new_io == NULL) { - ctl_set_busy(ctsio); - ctl_done((union ctl_io *)ctsio); - } else { - ctl_copy_io((union ctl_io *)ctsio, - new_io); - retval = lun->backend->config_write(new_io); - ctl_set_success(ctsio); - ctl_done((union ctl_io *)ctsio); - } + ctl_copy_io((union ctl_io *)ctsio, new_io); + retval = lun->backend->config_write(new_io); + ctl_set_success(ctsio); + ctl_done((union ctl_io *)ctsio); } else { retval = lun->backend->config_write( (union ctl_io *)ctsio); Modified: projects/clang350-import/sys/cam/ctl/ctl_frontend.c ============================================================================== --- projects/clang350-import/sys/cam/ctl/ctl_frontend.c Mon Nov 24 20:07:09 2014 (r274978) +++ projects/clang350-import/sys/cam/ctl/ctl_frontend.c Mon Nov 24 20:10:12 2014 (r274979) @@ -138,7 +138,7 @@ ctl_frontend_find(char *frontend_name) int ctl_port_register(struct ctl_port *port) { - struct ctl_io_pool *pool; + void *pool; int port_num; int retval; @@ -176,7 +176,7 @@ ctl_port_register(struct ctl_port *port) * pending sense queue on the next command, whether or not it is * a REQUEST SENSE. */ - retval = ctl_pool_create(control_softc, CTL_POOL_FETD, + retval = ctl_pool_create(control_softc, port->port_name, port->num_requested_ctl_io + 20, &pool); if (retval != 0) { free(port->wwpn_iid, M_CTL); Modified: projects/clang350-import/sys/cam/ctl/ctl_frontend_cam_sim.c ============================================================================== --- projects/clang350-import/sys/cam/ctl/ctl_frontend_cam_sim.c Mon Nov 24 20:07:09 2014 (r274978) +++ projects/clang350-import/sys/cam/ctl/ctl_frontend_cam_sim.c Mon Nov 24 20:10:12 2014 (r274979) @@ -545,7 +545,7 @@ cfcs_action(struct cam_sim *sim, union c return; } - io = ctl_alloc_io(softc->port.ctl_pool_ref); + io = ctl_alloc_io_nowait(softc->port.ctl_pool_ref); if (io == NULL) { printf("%s: can't allocate ctl_io\n", __func__); ccb->ccb_h.status = CAM_BUSY | CAM_DEV_QFRZN; @@ -642,7 +642,7 @@ cfcs_action(struct cam_sim *sim, union c return; } - io = ctl_alloc_io(softc->port.ctl_pool_ref); + io = ctl_alloc_io_nowait(softc->port.ctl_pool_ref); if (io == NULL) { ccb->ccb_h.status = CAM_BUSY | CAM_DEV_QFRZN; xpt_freeze_devq(ccb->ccb_h.path, 1); @@ -737,7 +737,7 @@ cfcs_action(struct cam_sim *sim, union c return; } - io = ctl_alloc_io(softc->port.ctl_pool_ref); + io = ctl_alloc_io_nowait(softc->port.ctl_pool_ref); if (io == NULL) { ccb->ccb_h.status = CAM_BUSY | CAM_DEV_QFRZN; xpt_freeze_devq(ccb->ccb_h.path, 1); Modified: projects/clang350-import/sys/cam/ctl/ctl_frontend_internal.c ============================================================================== --- projects/clang350-import/sys/cam/ctl/ctl_frontend_internal.c Mon Nov 24 20:07:09 2014 (r274978) +++ projects/clang350-import/sys/cam/ctl/ctl_frontend_internal.c Mon Nov 24 20:10:12 2014 (r274979) @@ -761,11 +761,6 @@ cfi_done(union ctl_io *io) struct cfi_lun_io *new_lun_io; new_io = ctl_alloc_io(softc->port.ctl_pool_ref); - if (new_io == NULL) { - printf("%s: unable to allocate ctl_io for " - "error recovery\n", __func__); - goto done; - } ctl_zero_io(new_io); new_io->io_hdr.io_type = CTL_IO_TASK; @@ -967,12 +962,6 @@ cfi_lun_probe(struct cfi_lun *lun, int h union ctl_io *io; io = ctl_alloc_io(lun->softc->port.ctl_pool_ref); - if (io == NULL) { - printf("%s: unable to alloc ctl_io for target %ju " - "lun %d probe\n", __func__, - (uintmax_t)lun->target_id.id, lun->lun_id); - return; - } ctl_scsi_inquiry(io, /*data_ptr*/(uint8_t *)&lun->inq_data, /*data_len*/ sizeof(lun->inq_data), @@ -1014,12 +1003,6 @@ cfi_lun_probe(struct cfi_lun *lun, int h union ctl_io *io; io = ctl_alloc_io(lun->softc->port.ctl_pool_ref); - if (io == NULL) { - printf("%s: unable to alloc ctl_io for target %ju " - "lun %d probe\n", __func__, - (uintmax_t)lun->target_id.id, lun->lun_id); - return; - } dataptr = malloc(sizeof(struct scsi_read_capacity_data_long), M_CTL_CFI, M_NOWAIT); @@ -1394,7 +1377,7 @@ cfi_action(struct cfi_metatask *metatask if (SID_TYPE(&lun->inq_data) != T_DIRECT) continue; da_luns++; - io = ctl_alloc_io(softc->port.ctl_pool_ref); + io = ctl_alloc_io_nowait(softc->port.ctl_pool_ref); if (io != NULL) { ios_allocated++; STAILQ_INSERT_TAIL(&tmp_io_list, &io->io_hdr, @@ -1548,7 +1531,7 @@ cfi_action(struct cfi_metatask *metatask } - io = ctl_alloc_io(softc->port.ctl_pool_ref); + io = ctl_alloc_io_nowait(softc->port.ctl_pool_ref); if (io == NULL) { metatask->status = CFI_MT_ERROR; metatask->taskinfo.bbrread.status = CFI_BBR_NO_MEM; Modified: projects/clang350-import/sys/cam/ctl/ctl_frontend_iscsi.c ============================================================================== --- projects/clang350-import/sys/cam/ctl/ctl_frontend_iscsi.c Mon Nov 24 20:07:09 2014 (r274978) +++ projects/clang350-import/sys/cam/ctl/ctl_frontend_iscsi.c Mon Nov 24 20:10:12 2014 (r274979) @@ -542,13 +542,6 @@ cfiscsi_pdu_handle_scsi_command(struct i return; } io = ctl_alloc_io(cs->cs_target->ct_port.ctl_pool_ref); - if (io == NULL) { - CFISCSI_SESSION_WARN(cs, "can't allocate ctl_io; " - "dropping connection"); - icl_pdu_free(request); - cfiscsi_session_terminate(cs); - return; - } ctl_zero_io(io); io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr = request; io->io_hdr.io_type = CTL_IO_SCSI; @@ -606,13 +599,6 @@ cfiscsi_pdu_handle_task_request(struct i cs = PDU_SESSION(request); bhstmr = (struct iscsi_bhs_task_management_request *)request->ip_bhs; io = ctl_alloc_io(cs->cs_target->ct_port.ctl_pool_ref); - if (io == NULL) { - CFISCSI_SESSION_WARN(cs, "can't allocate ctl_io;" - "dropping connection"); - icl_pdu_free(request); - cfiscsi_session_terminate(cs); - return; - } ctl_zero_io(io); io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr = request; io->io_hdr.io_type = CTL_IO_TASK; @@ -1063,10 +1049,6 @@ cfiscsi_session_terminate_tasks(struct c if (cs->cs_target == NULL) return; /* No target yet, so nothing to do. */ io = ctl_alloc_io(cs->cs_target->ct_port.ctl_pool_ref); - if (io == NULL) { - CFISCSI_SESSION_WARN(cs, "can't allocate ctl_io"); - return; - } ctl_zero_io(io); io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr = cs; io->io_hdr.io_type = CTL_IO_TASK; Modified: projects/clang350-import/sys/cam/ctl/ctl_io.h ============================================================================== --- projects/clang350-import/sys/cam/ctl/ctl_io.h Mon Nov 24 20:07:09 2014 (r274978) +++ projects/clang350-import/sys/cam/ctl/ctl_io.h Mon Nov 24 20:10:12 2014 (r274979) @@ -511,6 +511,7 @@ union ctl_io { #ifdef _KERNEL union ctl_io *ctl_alloc_io(void *pool_ref); +union ctl_io *ctl_alloc_io_nowait(void *pool_ref); void ctl_free_io(union ctl_io *io); void ctl_zero_io(union ctl_io *io); void ctl_copy_io(union ctl_io *src, union ctl_io *dest); Modified: projects/clang350-import/sys/cam/ctl/ctl_private.h ============================================================================== --- projects/clang350-import/sys/cam/ctl/ctl_private.h Mon Nov 24 20:07:09 2014 (r274978) +++ projects/clang350-import/sys/cam/ctl/ctl_private.h Mon Nov 24 20:10:12 2014 (r274979) @@ -71,34 +71,13 @@ struct ctl_fe_ioctl_params { ctl_fe_ioctl_state state; }; -#define CTL_POOL_ENTRIES_INTERNAL 200 -#define CTL_POOL_ENTRIES_EMERGENCY 300 #define CTL_POOL_ENTRIES_OTHER_SC 200 -typedef enum { - CTL_POOL_INTERNAL, - CTL_POOL_FETD, - CTL_POOL_EMERGENCY, - CTL_POOL_4OTHERSC -} ctl_pool_type; - -typedef enum { - CTL_POOL_FLAG_NONE = 0x00, - CTL_POOL_FLAG_INVALID = 0x01 -} ctl_pool_flags; - struct ctl_io_pool { - ctl_pool_type type; - ctl_pool_flags flags; + char name[64]; uint32_t id; struct ctl_softc *ctl_softc; - uint32_t refcount; - uint64_t total_allocated; - uint64_t total_freed; - int32_t total_ctl_io; - int32_t free_ctl_io; - STAILQ_HEAD(, ctl_io_hdr) free_queue; - STAILQ_ENTRY(ctl_io_pool) links; + struct uma_zone *zone; }; typedef enum { @@ -475,9 +454,7 @@ struct ctl_softc { struct sysctl_ctx_list sysctl_ctx; struct sysctl_oid *sysctl_tree; struct ctl_ioctl_info ioctl_info; - struct ctl_io_pool *internal_pool; - struct ctl_io_pool *emergency_pool; - struct ctl_io_pool *othersc_pool; + void *othersc_pool; struct proc *ctl_proc; int targ_online; uint32_t ctl_lun_mask[(CTL_MAX_LUNS + 31) / 32]; @@ -492,10 +469,8 @@ struct ctl_softc { struct ctl_port *ctl_ports[CTL_MAX_PORTS]; uint32_t num_backends; STAILQ_HEAD(, ctl_backend_driver) be_list; - struct mtx pool_lock; - uint32_t num_pools; + struct uma_zone *io_zone; uint32_t cur_pool_id; - STAILQ_HEAD(, ctl_io_pool) io_pools; struct ctl_thread threads[CTL_MAX_THREADS]; TAILQ_HEAD(tpc_tokens, tpc_token) tpc_tokens; struct callout tpc_timeout; @@ -508,8 +483,8 @@ extern const struct ctl_cmd_entry ctl_cm uint32_t ctl_get_initindex(struct ctl_nexus *nexus); uint32_t ctl_get_resindex(struct ctl_nexus *nexus); uint32_t ctl_port_idx(int port_num); -int ctl_pool_create(struct ctl_softc *ctl_softc, ctl_pool_type pool_type, - uint32_t total_ctl_io, struct ctl_io_pool **npool); +int ctl_pool_create(struct ctl_softc *ctl_softc, const char *pool_name, + uint32_t total_ctl_io, void **npool); void ctl_pool_free(struct ctl_io_pool *pool); int ctl_scsi_release(struct ctl_scsiio *ctsio); int ctl_scsi_reserve(struct ctl_scsiio *ctsio); Modified: projects/clang350-import/sys/cam/ctl/ctl_tpc.c ============================================================================== --- projects/clang350-import/sys/cam/ctl/ctl_tpc.c Mon Nov 24 20:07:09 2014 (r274978) +++ projects/clang350-import/sys/cam/ctl/ctl_tpc.c Mon Nov 24 20:10:12 2014 (r274979) @@ -812,7 +812,6 @@ tpc_process_b2b(struct tpc_list *list) uint32_t srcblock, dstblock; if (list->stage == 1) { -complete: while ((tior = TAILQ_FIRST(&list->allio)) != NULL) { TAILQ_REMOVE(&list->allio, tior, links); ctl_free_io(tior->io); @@ -886,10 +885,6 @@ complete: tior->list = list; TAILQ_INSERT_TAIL(&list->allio, tior, links); tior->io = tpcl_alloc_io(); - if (tior->io == NULL) { - list->error = 1; - goto complete; - } ctl_scsi_read_write(tior->io, /*data_ptr*/ &list->buf[donebytes], /*data_len*/ roundbytes, @@ -909,10 +904,6 @@ complete: tiow->list = list; TAILQ_INSERT_TAIL(&list->allio, tiow, links); tiow->io = tpcl_alloc_io(); - if (tiow->io == NULL) { - list->error = 1; - goto complete; - } ctl_scsi_read_write(tiow->io, /*data_ptr*/ &list->buf[donebytes], /*data_len*/ roundbytes, @@ -951,7 +942,6 @@ tpc_process_verify(struct tpc_list *list uint64_t sl; if (list->stage == 1) { -complete: while ((tio = TAILQ_FIRST(&list->allio)) != NULL) { TAILQ_REMOVE(&list->allio, tio, links); ctl_free_io(tio->io); @@ -990,10 +980,6 @@ complete: tio->list = list; TAILQ_INSERT_TAIL(&list->allio, tio, links); tio->io = tpcl_alloc_io(); - if (tio->io == NULL) { - list->error = 1; - goto complete; - } ctl_scsi_tur(tio->io, /*tag_type*/ CTL_TAG_SIMPLE, /*control*/ 0); tio->io->io_hdr.retries = 3; tio->lun = sl; @@ -1013,7 +999,6 @@ tpc_process_register_key(struct tpc_list int datalen; if (list->stage == 1) { -complete: while ((tio = TAILQ_FIRST(&list->allio)) != NULL) { TAILQ_REMOVE(&list->allio, tio, links); ctl_free_io(tio->io); @@ -1050,10 +1035,6 @@ complete: tio->list = list; TAILQ_INSERT_TAIL(&list->allio, tio, links); tio->io = tpcl_alloc_io(); - if (tio->io == NULL) { - list->error = 1; - goto complete; - } datalen = sizeof(struct scsi_per_res_out_parms); list->buf = malloc(datalen, M_CTL, M_WAITOK); ctl_scsi_persistent_res_out(tio->io, @@ -1112,7 +1093,6 @@ tpc_process_wut(struct tpc_list *list) uint32_t srcblock, dstblock; if (list->stage > 0) { -complete: /* Cleanup after previous rounds. */ while ((tio = TAILQ_FIRST(&list->allio)) != NULL) { TAILQ_REMOVE(&list->allio, tio, links); @@ -1184,10 +1164,6 @@ complete: tior->list = list; TAILQ_INSERT_TAIL(&list->allio, tior, links); tior->io = tpcl_alloc_io(); - if (tior->io == NULL) { - list->error = 1; - goto complete; - } ctl_scsi_read_write(tior->io, /*data_ptr*/ &list->buf[donebytes], /*data_len*/ roundbytes, @@ -1207,10 +1183,6 @@ complete: tiow->list = list; TAILQ_INSERT_TAIL(&list->allio, tiow, links); tiow->io = tpcl_alloc_io(); - if (tiow->io == NULL) { - list->error = 1; - goto complete; - } ctl_scsi_read_write(tiow->io, /*data_ptr*/ &list->buf[donebytes], /*data_len*/ roundbytes, @@ -1289,10 +1261,6 @@ complete: tiow->list = list; TAILQ_INSERT_TAIL(&list->allio, tiow, links); tiow->io = tpcl_alloc_io(); - if (tiow->io == NULL) { - list->error = 1; - goto complete; - } ctl_scsi_write_same(tiow->io, /*data_ptr*/ list->buf, /*data_len*/ dstblock, Modified: projects/clang350-import/sys/cam/ctl/scsi_ctl.c ============================================================================== --- projects/clang350-import/sys/cam/ctl/scsi_ctl.c Mon Nov 24 20:07:09 2014 (r274978) +++ projects/clang350-import/sys/cam/ctl/scsi_ctl.c Mon Nov 24 20:10:12 2014 (r274979) @@ -72,10 +72,6 @@ __FBSDID("$FreeBSD$"); #include #include -typedef enum { - CTLFE_CCB_DEFAULT = 0x00 -} ctlfe_ccb_types; - struct ctlfe_softc { struct ctl_port port; path_id_t path_id; @@ -189,9 +185,7 @@ SYSCTL_INT(_kern_cam_ctl, OID_AUTO, dma_ &ctlfe_dma_enabled, 0, "DMA enabled"); MALLOC_DEFINE(M_CTLFE, "CAM CTL FE", "CAM CTL FE interface"); -#define ccb_type ppriv_field0 -/* This is only used in the ATIO */ -#define io_ptr ppriv_ptr1 +#define io_ptr ppriv_ptr0 /* This is only used in the CTIO */ #define ccb_atio ppriv_ptr1 @@ -546,6 +540,7 @@ ctlferegister(struct cam_periph *periph, for (i = 0; i < CTLFE_ATIO_PER_LUN; i++) { union ccb *new_ccb; + union ctl_io *new_io; new_ccb = (union ccb *)malloc(sizeof(*new_ccb), M_CTLFE, M_ZERO|M_NOWAIT); @@ -553,6 +548,14 @@ ctlferegister(struct cam_periph *periph, status = CAM_RESRC_UNAVAIL; break; } + new_io = ctl_alloc_io_nowait(bus_softc->port.ctl_pool_ref); + if (new_io == NULL) { + free(new_ccb, M_CTLFE); + status = CAM_RESRC_UNAVAIL; + break; + } + new_ccb->ccb_h.io_ptr = new_io; + xpt_setup_ccb(&new_ccb->ccb_h, periph->path, /*priority*/ 1); new_ccb->ccb_h.func_code = XPT_ACCEPT_TARGET_IO; new_ccb->ccb_h.cbfcnp = ctlfedone; @@ -561,6 +564,7 @@ ctlferegister(struct cam_periph *periph, softc->atios_sent++; status = new_ccb->ccb_h.status; if ((status & CAM_STATUS_MASK) != CAM_REQ_INPROG) { + ctl_free_io(new_io); free(new_ccb, M_CTLFE); break; } @@ -581,6 +585,7 @@ ctlferegister(struct cam_periph *periph, for (i = 0; i < CTLFE_IN_PER_LUN; i++) { union ccb *new_ccb; + union ctl_io *new_io; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Mon Nov 24 20:18:15 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B5377487; Mon, 24 Nov 2014 20:18:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A0B2EBF3; Mon, 24 Nov 2014 20:18:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAOKIFm7063847; Mon, 24 Nov 2014 20:18:15 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAOKIFFp063844; Mon, 24 Nov 2014 20:18:15 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411242018.sAOKIFFp063844@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 24 Nov 2014 20:18:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274980 - in projects/clang350-import: . tools/build/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Nov 2014 20:18:15 -0000 Author: dim Date: Mon Nov 24 20:18:14 2014 New Revision: 274980 URL: https://svnweb.freebsd.org/changeset/base/274980 Log: Update ObsoleteFiles.inc and OptionalObsoleteFiles.inc for the import of llvm/clang 3.5.0. Modified: projects/clang350-import/ObsoleteFiles.inc projects/clang350-import/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/clang350-import/ObsoleteFiles.inc ============================================================================== --- projects/clang350-import/ObsoleteFiles.inc Mon Nov 24 20:10:12 2014 (r274979) +++ projects/clang350-import/ObsoleteFiles.inc Mon Nov 24 20:18:14 2014 (r274980) @@ -38,6 +38,42 @@ # xargs -n1 | sort | uniq -d; # done +# 20141124: new clang import which bumps version from 3.4.1 to 3.5.0. +OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_aes.h +OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_pclmul.h +OLD_FILES+=usr/include/clang/3.4.1/altivec.h +OLD_FILES+=usr/include/clang/3.4.1/ammintrin.h +OLD_FILES+=usr/include/clang/3.4.1/arm_neon.h +OLD_FILES+=usr/include/clang/3.4.1/avx2intrin.h +OLD_FILES+=usr/include/clang/3.4.1/avxintrin.h +OLD_FILES+=usr/include/clang/3.4.1/bmi2intrin.h +OLD_FILES+=usr/include/clang/3.4.1/bmiintrin.h +OLD_FILES+=usr/include/clang/3.4.1/cpuid.h +OLD_FILES+=usr/include/clang/3.4.1/emmintrin.h +OLD_FILES+=usr/include/clang/3.4.1/f16cintrin.h +OLD_FILES+=usr/include/clang/3.4.1/fma4intrin.h +OLD_FILES+=usr/include/clang/3.4.1/fmaintrin.h +OLD_FILES+=usr/include/clang/3.4.1/immintrin.h +OLD_FILES+=usr/include/clang/3.4.1/lzcntintrin.h +OLD_FILES+=usr/include/clang/3.4.1/mm3dnow.h +OLD_FILES+=usr/include/clang/3.4.1/mm_malloc.h +OLD_FILES+=usr/include/clang/3.4.1/mmintrin.h +OLD_FILES+=usr/include/clang/3.4.1/module.map +OLD_FILES+=usr/include/clang/3.4.1/nmmintrin.h +OLD_FILES+=usr/include/clang/3.4.1/pmmintrin.h +OLD_FILES+=usr/include/clang/3.4.1/popcntintrin.h +OLD_FILES+=usr/include/clang/3.4.1/prfchwintrin.h +OLD_FILES+=usr/include/clang/3.4.1/rdseedintrin.h +OLD_FILES+=usr/include/clang/3.4.1/rtmintrin.h +OLD_FILES+=usr/include/clang/3.4.1/shaintrin.h +OLD_FILES+=usr/include/clang/3.4.1/smmintrin.h +OLD_FILES+=usr/include/clang/3.4.1/tbmintrin.h +OLD_FILES+=usr/include/clang/3.4.1/tmmintrin.h +OLD_FILES+=usr/include/clang/3.4.1/wmmintrin.h +OLD_FILES+=usr/include/clang/3.4.1/x86intrin.h +OLD_FILES+=usr/include/clang/3.4.1/xmmintrin.h +OLD_FILES+=usr/include/clang/3.4.1/xopintrin.h +OLD_DIRS+=usr/include/clang/3.4.1 # 20141109: faith/faithd removal OLD_FILES+=etc/rc.d/faith OLD_FILES+=usr/share/man/man4/faith.4.gz Modified: projects/clang350-import/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/clang350-import/tools/build/mk/OptionalObsoleteFiles.inc Mon Nov 24 20:10:12 2014 (r274979) +++ projects/clang350-import/tools/build/mk/OptionalObsoleteFiles.inc Mon Nov 24 20:18:14 2014 (r274980) @@ -489,41 +489,43 @@ OLD_FILES+=usr/bin/clang++ OLD_FILES+=usr/bin/clang-cpp OLD_FILES+=usr/bin/clang-tblgen OLD_FILES+=usr/bin/tblgen -OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_aes.h -OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_pclmul.h -OLD_FILES+=usr/include/clang/3.4.1/altivec.h -OLD_FILES+=usr/include/clang/3.4.1/ammintrin.h -OLD_FILES+=usr/include/clang/3.4.1/arm_neon.h -OLD_FILES+=usr/include/clang/3.4.1/avx2intrin.h -OLD_FILES+=usr/include/clang/3.4.1/avxintrin.h -OLD_FILES+=usr/include/clang/3.4.1/bmi2intrin.h -OLD_FILES+=usr/include/clang/3.4.1/bmiintrin.h -OLD_FILES+=usr/include/clang/3.4.1/cpuid.h -OLD_FILES+=usr/include/clang/3.4.1/emmintrin.h -OLD_FILES+=usr/include/clang/3.4.1/f16cintrin.h -OLD_FILES+=usr/include/clang/3.4.1/fma4intrin.h -OLD_FILES+=usr/include/clang/3.4.1/fmaintrin.h -OLD_FILES+=usr/include/clang/3.4.1/immintrin.h -OLD_FILES+=usr/include/clang/3.4.1/lzcntintrin.h -OLD_FILES+=usr/include/clang/3.4.1/mm3dnow.h -OLD_FILES+=usr/include/clang/3.4.1/mm_malloc.h -OLD_FILES+=usr/include/clang/3.4.1/mmintrin.h -OLD_FILES+=usr/include/clang/3.4.1/module.map -OLD_FILES+=usr/include/clang/3.4.1/nmmintrin.h -OLD_FILES+=usr/include/clang/3.4.1/pmmintrin.h -OLD_FILES+=usr/include/clang/3.4.1/popcntintrin.h -OLD_FILES+=usr/include/clang/3.4.1/prfchwintrin.h -OLD_FILES+=usr/include/clang/3.4.1/rdseedintrin.h -OLD_FILES+=usr/include/clang/3.4.1/rtmintrin.h -OLD_FILES+=usr/include/clang/3.4.1/shaintrin.h -OLD_FILES+=usr/include/clang/3.4.1/smmintrin.h -OLD_FILES+=usr/include/clang/3.4.1/tbmintrin.h -OLD_FILES+=usr/include/clang/3.4.1/tmmintrin.h -OLD_FILES+=usr/include/clang/3.4.1/wmmintrin.h -OLD_FILES+=usr/include/clang/3.4.1/x86intrin.h -OLD_FILES+=usr/include/clang/3.4.1/xmmintrin.h -OLD_FILES+=usr/include/clang/3.4.1/xopintrin.h -OLD_DIRS+=usr/include/clang/3.4.1 +OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_aes.h +OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_pclmul.h +OLD_FILES+=usr/include/clang/3.5.0/altivec.h +OLD_FILES+=usr/include/clang/3.5.0/ammintrin.h +OLD_FILES+=usr/include/clang/3.5.0/arm_acle.h +OLD_FILES+=usr/include/clang/3.5.0/arm_neon.h +OLD_FILES+=usr/include/clang/3.5.0/avx2intrin.h +OLD_FILES+=usr/include/clang/3.5.0/avxintrin.h +OLD_FILES+=usr/include/clang/3.5.0/bmi2intrin.h +OLD_FILES+=usr/include/clang/3.5.0/bmiintrin.h +OLD_FILES+=usr/include/clang/3.5.0/cpuid.h +OLD_FILES+=usr/include/clang/3.5.0/emmintrin.h +OLD_FILES+=usr/include/clang/3.5.0/f16cintrin.h +OLD_FILES+=usr/include/clang/3.5.0/fma4intrin.h +OLD_FILES+=usr/include/clang/3.5.0/fmaintrin.h +OLD_FILES+=usr/include/clang/3.5.0/ia32intrin.h +OLD_FILES+=usr/include/clang/3.5.0/immintrin.h +OLD_FILES+=usr/include/clang/3.5.0/lzcntintrin.h +OLD_FILES+=usr/include/clang/3.5.0/mm3dnow.h +OLD_FILES+=usr/include/clang/3.5.0/mm_malloc.h +OLD_FILES+=usr/include/clang/3.5.0/mmintrin.h +OLD_FILES+=usr/include/clang/3.5.0/module.modulemap +OLD_FILES+=usr/include/clang/3.5.0/nmmintrin.h +OLD_FILES+=usr/include/clang/3.5.0/pmmintrin.h +OLD_FILES+=usr/include/clang/3.5.0/popcntintrin.h +OLD_FILES+=usr/include/clang/3.5.0/prfchwintrin.h +OLD_FILES+=usr/include/clang/3.5.0/rdseedintrin.h +OLD_FILES+=usr/include/clang/3.5.0/rtmintrin.h +OLD_FILES+=usr/include/clang/3.5.0/shaintrin.h +OLD_FILES+=usr/include/clang/3.5.0/smmintrin.h +OLD_FILES+=usr/include/clang/3.5.0/tbmintrin.h +OLD_FILES+=usr/include/clang/3.5.0/tmmintrin.h +OLD_FILES+=usr/include/clang/3.5.0/wmmintrin.h +OLD_FILES+=usr/include/clang/3.5.0/x86intrin.h +OLD_FILES+=usr/include/clang/3.5.0/xmmintrin.h +OLD_FILES+=usr/include/clang/3.5.0/xopintrin.h +OLD_DIRS+=usr/include/clang/3.5.0 OLD_DIRS+=usr/include/clang OLD_FILES+=usr/share/doc/llvm/clang/LICENSE.TXT OLD_DIRS+=usr/share/doc/llvm/clang From owner-svn-src-projects@FreeBSD.ORG Mon Nov 24 20:20:01 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F1EAB7EE; Mon, 24 Nov 2014 20:20:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DF09AC2F; Mon, 24 Nov 2014 20:20:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAOKK0NT064469; Mon, 24 Nov 2014 20:20:00 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAOKK01D064468; Mon, 24 Nov 2014 20:20:00 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411242020.sAOKK01D064468@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 24 Nov 2014 20:20:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274981 - projects/clang350-import/sys/sys X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Nov 2014 20:20:01 -0000 Author: dim Date: Mon Nov 24 20:20:00 2014 New Revision: 274981 URL: https://svnweb.freebsd.org/changeset/base/274981 Log: Tentatively bump __FreeBSD_version for the import of llvm/clang 3.5.0. Modified: projects/clang350-import/sys/sys/param.h Modified: projects/clang350-import/sys/sys/param.h ============================================================================== --- projects/clang350-import/sys/sys/param.h Mon Nov 24 20:18:14 2014 (r274980) +++ projects/clang350-import/sys/sys/param.h Mon Nov 24 20:20:00 2014 (r274981) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1100047 /* Master, propagated to newvers */ +#define __FreeBSD_version 1100048 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From owner-svn-src-projects@FreeBSD.ORG Mon Nov 24 20:54:49 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EF304742; Mon, 24 Nov 2014 20:54:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DBA43A0; Mon, 24 Nov 2014 20:54:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAOKsn3q084925; Mon, 24 Nov 2014 20:54:49 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAOKsn6D084923; Mon, 24 Nov 2014 20:54:49 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411242054.sAOKsn6D084923@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 24 Nov 2014 20:54:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274982 - in projects/clang350-import/lib/clang: . libclangrewritefrontend X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Nov 2014 20:54:50 -0000 Author: dim Date: Mon Nov 24 20:54:48 2014 New Revision: 274982 URL: https://svnweb.freebsd.org/changeset/base/274982 Log: Disable the ObjC rewriter modules, since according to rdivacky these are only used by Xcode. This shaves off some compilation time. Modified: projects/clang350-import/lib/clang/clang.build.mk projects/clang350-import/lib/clang/libclangrewritefrontend/Makefile Modified: projects/clang350-import/lib/clang/clang.build.mk ============================================================================== --- projects/clang350-import/lib/clang/clang.build.mk Mon Nov 24 20:20:00 2014 (r274981) +++ projects/clang350-import/lib/clang/clang.build.mk Mon Nov 24 20:54:48 2014 (r274982) @@ -12,7 +12,6 @@ CFLAGS+= -I${LLVM_SRCS}/include -I${CLAN .if ${MK_CLANG_FULL} != "no" CFLAGS+= -DCLANG_ENABLE_ARCMT \ - -DCLANG_ENABLE_OBJC_REWRITER \ -DCLANG_ENABLE_STATIC_ANALYZER .endif # MK_CLANG_FULL Modified: projects/clang350-import/lib/clang/libclangrewritefrontend/Makefile ============================================================================== --- projects/clang350-import/lib/clang/libclangrewritefrontend/Makefile Mon Nov 24 20:20:00 2014 (r274981) +++ projects/clang350-import/lib/clang/libclangrewritefrontend/Makefile Mon Nov 24 20:54:48 2014 (r274982) @@ -10,8 +10,6 @@ SRCS= FixItRewriter.cpp \ HTMLPrint.cpp \ InclusionRewriter.cpp \ RewriteMacros.cpp \ - RewriteModernObjC.cpp \ - RewriteObjC.cpp \ RewriteTest.cpp TGHDRS= AttrList \ From owner-svn-src-projects@FreeBSD.ORG Mon Nov 24 20:57:20 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D5D9F858; Mon, 24 Nov 2014 20:57:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C11DAC1; Mon, 24 Nov 2014 20:57:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAOKvKeh085313; Mon, 24 Nov 2014 20:57:20 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAOKvKcH085312; Mon, 24 Nov 2014 20:57:20 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411242057.sAOKvKcH085312@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 24 Nov 2014 20:57:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274983 - in projects/clang350-import/contrib/llvm: lib/LineEditor lib/MC/MCAnalysis lib/ProfileData lib/Target/PowerPC/Disassembler tools/clang/lib/Frontend/Rewrite X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Nov 2014 20:57:20 -0000 Author: dim Date: Mon Nov 24 20:57:20 2014 New Revision: 274983 URL: https://svnweb.freebsd.org/changeset/base/274983 Log: Cleanup upstream build infrastructure files that we don't use. Deleted: projects/clang350-import/contrib/llvm/lib/LineEditor/CMakeLists.txt projects/clang350-import/contrib/llvm/lib/LineEditor/LLVMBuild.txt projects/clang350-import/contrib/llvm/lib/LineEditor/Makefile projects/clang350-import/contrib/llvm/lib/MC/MCAnalysis/CMakeLists.txt projects/clang350-import/contrib/llvm/lib/MC/MCAnalysis/LLVMBuild.txt projects/clang350-import/contrib/llvm/lib/MC/MCAnalysis/Makefile projects/clang350-import/contrib/llvm/lib/ProfileData/CMakeLists.txt projects/clang350-import/contrib/llvm/lib/ProfileData/LLVMBuild.txt projects/clang350-import/contrib/llvm/lib/ProfileData/Makefile projects/clang350-import/contrib/llvm/lib/Target/PowerPC/Disassembler/CMakeLists.txt projects/clang350-import/contrib/llvm/lib/Target/PowerPC/Disassembler/LLVMBuild.txt projects/clang350-import/contrib/llvm/lib/Target/PowerPC/Disassembler/Makefile projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/Rewrite/CMakeLists.txt projects/clang350-import/contrib/llvm/tools/clang/lib/Frontend/Rewrite/Makefile From owner-svn-src-projects@FreeBSD.ORG Tue Nov 25 05:14:39 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A4CC4DC8; Tue, 25 Nov 2014 05:14:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 92493C57; Tue, 25 Nov 2014 05:14:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAP5Edq3027527; Tue, 25 Nov 2014 05:14:39 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAP5EdMH027526; Tue, 25 Nov 2014 05:14:39 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411250514.sAP5EdMH027526@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 25 Nov 2014 05:14:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275005 - projects/building-blocks X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2014 05:14:39 -0000 Author: ngie Date: Tue Nov 25 05:14:39 2014 New Revision: 275005 URL: https://svnweb.freebsd.org/changeset/base/275005 Log: Start "Lego" project as coined by jkh in talk at MeetBSD California 2014 The goal of this project will be to tease out some of the optional/replaceable components in the tree, so it allows power users, appliance vendors, etc to use FreeBSD more as a foundation for a custom OS distribution The initial commit is based off of ^/head @ r274983 Added: - copied from r274983, head/ Directory Properties: projects/building-blocks/ (props changed) From owner-svn-src-projects@FreeBSD.ORG Tue Nov 25 07:12:33 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A462C385; Tue, 25 Nov 2014 07:12:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 91BFFA13; Tue, 25 Nov 2014 07:12:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAP7CXX0083102; Tue, 25 Nov 2014 07:12:33 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAP7CXiJ083101; Tue, 25 Nov 2014 07:12:33 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411250712.sAP7CXiJ083101@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 25 Nov 2014 07:12:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275013 - projects/building-blocks/etc X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2014 07:12:33 -0000 Author: ngie Date: Tue Nov 25 07:12:32 2014 New Revision: 275013 URL: https://svnweb.freebsd.org/changeset/base/275013 Log: Don't create symlinks for nls/openssl unless the respective options are set Modified: projects/building-blocks/etc/Makefile Modified: projects/building-blocks/etc/Makefile ============================================================================== --- projects/building-blocks/etc/Makefile Tue Nov 25 07:01:38 2014 (r275012) +++ projects/building-blocks/etc/Makefile Tue Nov 25 07:12:32 2014 (r275013) @@ -376,23 +376,29 @@ distrib-dirs: ${MTREES:N/*} ${INSTALL_SYMLINK} ../$$mandir \ ${DESTDIR}/usr/share/man/en.UTF-8/; \ done +.if ${MK_OPENSSL} != "no" cd ${DESTDIR}/usr/share/openssl/man; \ for mandir in man*; do \ ${INSTALL_SYMLINK} ../$$mandir \ ${DESTDIR}/usr/share/openssl/man/en.ISO8859-1/; \ done +.endif set - `grep "^[a-zA-Z]" ${.CURDIR}/man.alias`; \ while [ $$# -gt 0 ] ; do \ ${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/man/$$1"; \ - ${INSTALL_SYMLINK} "$$2" \ - "${DESTDIR}/usr/share/openssl/man/$$1"; \ - shift; shift; \ + if [ "${MK_OPENSSL}" != "no" ]; then \ + ${INSTALL_SYMLINK} "$$2" \ + "${DESTDIR}/usr/share/openssl/man/$$1"; \ + shift; shift; \ + fi; \ done +.if ${MK_NLS} != "no" set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \ while [ $$# -gt 0 ] ; do \ ${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/nls/$$1"; \ shift; shift; \ done +.endif etc-examples: cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ From owner-svn-src-projects@FreeBSD.ORG Tue Nov 25 07:14:16 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E44A85EC; Tue, 25 Nov 2014 07:14:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D19E7A2B; Tue, 25 Nov 2014 07:14:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAP7EGrD083410; Tue, 25 Nov 2014 07:14:16 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAP7EG3f083408; Tue, 25 Nov 2014 07:14:16 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411250714.sAP7EG3f083408@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 25 Nov 2014 07:14:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275015 - projects/building-blocks/etc X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2014 07:14:17 -0000 Author: ngie Date: Tue Nov 25 07:14:16 2014 New Revision: 275015 URL: https://svnweb.freebsd.org/changeset/base/275015 Log: The shift; shift needs to be moved outside the .if ${MK_OPENSSL} conditional Modified: projects/building-blocks/etc/Makefile Modified: projects/building-blocks/etc/Makefile ============================================================================== --- projects/building-blocks/etc/Makefile Tue Nov 25 07:13:31 2014 (r275014) +++ projects/building-blocks/etc/Makefile Tue Nov 25 07:14:16 2014 (r275015) @@ -389,8 +389,8 @@ distrib-dirs: ${MTREES:N/*} if [ "${MK_OPENSSL}" != "no" ]; then \ ${INSTALL_SYMLINK} "$$2" \ "${DESTDIR}/usr/share/openssl/man/$$1"; \ - shift; shift; \ fi; \ + shift; shift; \ done .if ${MK_NLS} != "no" set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \ From owner-svn-src-projects@FreeBSD.ORG Tue Nov 25 07:30:28 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 091EE90C; Tue, 25 Nov 2014 07:30:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E9766BE0; Tue, 25 Nov 2014 07:30:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAP7UR7i088976; Tue, 25 Nov 2014 07:30:27 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAP7UQpU088971; Tue, 25 Nov 2014 07:30:26 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411250730.sAP7UQpU088971@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 25 Nov 2014 07:30:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275016 - in projects/building-blocks: share/mk tools/build/mk tools/build/options usr.sbin X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2014 07:30:28 -0000 Author: ngie Date: Tue Nov 25 07:30:26 2014 New Revision: 275016 URL: https://svnweb.freebsd.org/changeset/base/275016 Log: Make bsdinstall(8) and sade(8) optional components via MK_BSDINSTALL=yes Added: projects/building-blocks/tools/build/options/WITHOUT_BSDINSTALL (contents, props changed) Modified: projects/building-blocks/share/mk/src.opts.mk projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc projects/building-blocks/usr.sbin/Makefile Modified: projects/building-blocks/share/mk/src.opts.mk ============================================================================== --- projects/building-blocks/share/mk/src.opts.mk Tue Nov 25 07:14:16 2014 (r275015) +++ projects/building-blocks/share/mk/src.opts.mk Tue Nov 25 07:30:26 2014 (r275016) @@ -57,6 +57,7 @@ __DEFAULT_YES_OPTIONS = \ BLUETOOTH \ BOOT \ BSD_CPIO \ + BSDINSTALL \ BSNMP \ BZIP2 \ CALENDAR \ Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Nov 25 07:14:16 2014 (r275015) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Nov 25 07:30:26 2014 (r275016) @@ -274,6 +274,39 @@ OLD_FILES+=usr/share/man/man8/sdpd.8.gz # to be filled in #.endif +.if ${MK_BSDINSTALL} == no +OLD_FILES+=usr/libexec/bsdinstall/adduser +OLD_FILES+=usr/libexec/bsdinstall/auto +OLD_FILES+=usr/libexec/bsdinstall/autopart +OLD_FILES+=usr/libexec/bsdinstall/checksum +OLD_FILES+=usr/libexec/bsdinstall/config +OLD_FILES+=usr/libexec/bsdinstall/distextract +OLD_FILES+=usr/libexec/bsdinstall/distfetch +OLD_FILES+=usr/libexec/bsdinstall/docsinstall +OLD_FILES+=usr/libexec/bsdinstall/entropy +OLD_FILES+=usr/libexec/bsdinstall/hostname +OLD_FILES+=usr/libexec/bsdinstall/jail +OLD_FILES+=usr/libexec/bsdinstall/keymap +OLD_FILES+=usr/libexec/bsdinstall/mirrorselect +OLD_FILES+=usr/libexec/bsdinstall/mount +OLD_FILES+=usr/libexec/bsdinstall/netconfig +OLD_FILES+=usr/libexec/bsdinstall/netconfig_ipv4 +OLD_FILES+=usr/libexec/bsdinstall/netconfig_ipv6 +OLD_FILES+=usr/libexec/bsdinstall/partedit +OLD_FILES+=usr/libexec/bsdinstall/rootpass +OLD_FILES+=usr/libexec/bsdinstall/script +OLD_FILES+=usr/libexec/bsdinstall/scriptedpart +OLD_FILES+=usr/libexec/bsdinstall/services +OLD_FILES+=usr/libexec/bsdinstall/time +OLD_FILES+=usr/libexec/bsdinstall/umount +OLD_FILES+=usr/libexec/bsdinstall/wlanconfig +OLD_FILES+=usr/libexec/bsdinstall/zfsboot +OLD_FILES+=usr/sbin/bsdinstall +OLD_FILES+=usr/share/man/man8/bsdinstall.8.gz +OLD_FILES+=usr/share/man/man8/sade.8.gz +OLD_DIRS+=usr/libexec/bsdinstall +.endif + .if ${MK_CALENDAR} == no OLD_FILES+=etc/periodic/daily/300.calendar OLD_FILES+=usr/bin/calendar Added: projects/building-blocks/tools/build/options/WITHOUT_BSDINSTALL ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/build/options/WITHOUT_BSDINSTALL Tue Nov 25 07:30:26 2014 (r275016) @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build +.Xr bsdinstall 8 , +.Xr sade 8 , +and related programs. Modified: projects/building-blocks/usr.sbin/Makefile ============================================================================== --- projects/building-blocks/usr.sbin/Makefile Tue Nov 25 07:14:16 2014 (r275015) +++ projects/building-blocks/usr.sbin/Makefile Tue Nov 25 07:30:26 2014 (r275016) @@ -9,7 +9,6 @@ SUBDIR= adduser \ binmiscctl \ bootparamd \ bsdconfig \ - bsdinstall \ cdcontrol \ chkgrp \ chown \ @@ -128,6 +127,10 @@ SUBDIR+= authpf SUBDIR+= bluetooth .endif +.if ${MK_BSDINSTALL} != "no" +SUBDIR+= bsdinstall +.endif + .if ${MK_BSNMP} != "no" SUBDIR+= bsnmpd .endif From owner-svn-src-projects@FreeBSD.ORG Tue Nov 25 08:04:33 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 757312EB; Tue, 25 Nov 2014 08:04:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6293FEFC; Tue, 25 Nov 2014 08:04:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAP84Xxi006954; Tue, 25 Nov 2014 08:04:33 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAP84XUB006953; Tue, 25 Nov 2014 08:04:33 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411250804.sAP84XUB006953@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 25 Nov 2014 08:04:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275018 - projects/building-blocks/etc/rc.d X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2014 08:04:33 -0000 Author: ngie Date: Tue Nov 25 08:04:32 2014 New Revision: 275018 URL: https://svnweb.freebsd.org/changeset/base/275018 Log: Don't install othermta unless MK_MAIL == yes Modified: projects/building-blocks/etc/rc.d/Makefile Modified: projects/building-blocks/etc/rc.d/Makefile ============================================================================== --- projects/building-blocks/etc/rc.d/Makefile Tue Nov 25 07:47:44 2014 (r275017) +++ projects/building-blocks/etc/rc.d/Makefile Tue Nov 25 08:04:32 2014 (r275018) @@ -107,7 +107,7 @@ FILES= DAEMON \ ntpd \ ntpdate \ ${_opensm} \ - othermta \ + ${_othermta} \ pf \ pflog \ pfsync \ @@ -186,6 +186,10 @@ _kfd= kfd _kpasswdd= kpasswdd .endif +.if ${MK_MAIL} != "no" +_othermta= othermta +.endif + .if ${MK_OFED} != "no" _opensm= opensm .endif From owner-svn-src-projects@FreeBSD.ORG Tue Nov 25 08:39:48 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 49294B3E; Tue, 25 Nov 2014 08:39:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 34DF2305; Tue, 25 Nov 2014 08:39:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAP8dmn0021736; Tue, 25 Nov 2014 08:39:48 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAP8dkcX021727; Tue, 25 Nov 2014 08:39:46 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411250839.sAP8dkcX021727@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 25 Nov 2014 08:39:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275019 - in projects/building-blocks: etc etc/rc.d share/mk tools/build/mk tools/build/options usr.sbin X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2014 08:39:48 -0000 Author: ngie Date: Tue Nov 25 08:39:46 2014 New Revision: 275019 URL: https://svnweb.freebsd.org/changeset/base/275019 Log: Make inetd optional via MK_INETD Added: projects/building-blocks/tools/build/options/WITHOUT_INETD (contents, props changed) Modified: projects/building-blocks/etc/Makefile projects/building-blocks/etc/rc.d/Makefile projects/building-blocks/share/mk/src.opts.mk projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc projects/building-blocks/usr.sbin/Makefile Modified: projects/building-blocks/etc/Makefile ============================================================================== --- projects/building-blocks/etc/Makefile Tue Nov 25 08:04:32 2014 (r275018) +++ projects/building-blocks/etc/Makefile Tue Nov 25 08:39:46 2014 (r275019) @@ -25,7 +25,6 @@ BIN1= auto_master \ hosts \ hosts.allow \ hosts.equiv \ - inetd.conf \ libalias.conf \ libmap.conf \ login.access \ @@ -95,6 +94,10 @@ BIN1+= snmpd.config BIN1+= freebsd-update.conf .endif +.if ${MK_INETD} != "no" +BIN1+= inetd.conf +.endif + .if ${MK_LOCATE} != "no" BIN1+= ${.CURDIR}/../usr.bin/locate/locate/locate.rc .endif Modified: projects/building-blocks/etc/rc.d/Makefile ============================================================================== --- projects/building-blocks/etc/rc.d/Makefile Tue Nov 25 08:04:32 2014 (r275018) +++ projects/building-blocks/etc/rc.d/Makefile Tue Nov 25 08:39:46 2014 (r275019) @@ -56,7 +56,7 @@ FILES= DAEMON \ hostid \ hostid_save \ hostname \ - inetd \ + ${_inetd} \ ip6addrctl \ ipfilter \ ipfs \ @@ -175,6 +175,10 @@ _ubthidhci= ubthidhci _casperd= casperd .endif +.if ${MK_INETD} != "no" +_inetd= inetd +.endif + .if ${MK_NS_CACHING} != "no" _nscd= nscd .endif Modified: projects/building-blocks/share/mk/src.opts.mk ============================================================================== --- projects/building-blocks/share/mk/src.opts.mk Tue Nov 25 08:04:32 2014 (r275018) +++ projects/building-blocks/share/mk/src.opts.mk Tue Nov 25 08:39:46 2014 (r275019) @@ -95,6 +95,7 @@ __DEFAULT_YES_OPTIONS = \ ICONV \ INET \ INET6 \ + INETD \ IPFILTER \ IPFW \ JAIL \ Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Nov 25 08:04:32 2014 (r275018) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Nov 25 08:39:46 2014 (r275019) @@ -2013,6 +2013,13 @@ OLD_FILES+=usr/share/man/man8/traceroute OLD_FILES+=rescue/ping6 .endif +.if ${MK_INETD} == no +OLD_FILES+=etc/rc.d/inetd +OLD_FILES+=usr/sbin/inetd +OLD_FILES+=usr/share/man/man5/inetd.conf.5.gz +OLD_FILES+=usr/share/man/man8/inetd.8.gz +.endif + .if ${MK_INFO} == no OLD_FILES+=usr/bin/info OLD_FILES+=usr/bin/infokey Added: projects/building-blocks/tools/build/options/WITHOUT_INETD ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/build/options/WITHOUT_INETD Tue Nov 25 08:39:46 2014 (r275019) @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build +.Xr inetd 8 . Modified: projects/building-blocks/usr.sbin/Makefile ============================================================================== --- projects/building-blocks/usr.sbin/Makefile Tue Nov 25 08:04:32 2014 (r275018) +++ projects/building-blocks/usr.sbin/Makefile Tue Nov 25 08:39:46 2014 (r275019) @@ -34,7 +34,6 @@ SUBDIR= adduser \ gstat \ i2c \ ifmcstat \ - inetd \ iostat \ iscsid \ kldxref \ @@ -175,6 +174,10 @@ SUBDIR+= rtsold SUBDIR+= traceroute6 .endif +.if ${MK_INETD} != "no" +SUBDIR+= inetd +.endif + .if ${MK_IPFW} != "no" SUBDIR+= ipfwpcap .endif From owner-svn-src-projects@FreeBSD.ORG Tue Nov 25 13:06:48 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CAD9B142; Tue, 25 Nov 2014 13:06:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B77B67F4; Tue, 25 Nov 2014 13:06:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAPD6mdu051681; Tue, 25 Nov 2014 13:06:48 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAPD6mRk051680; Tue, 25 Nov 2014 13:06:48 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411251306.sAPD6mRk051680@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 25 Nov 2014 13:06:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275037 - projects/sendfile/sys/kern X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2014 13:06:48 -0000 Author: glebius Date: Tue Nov 25 13:06:47 2014 New Revision: 275037 URL: https://svnweb.freebsd.org/changeset/base/275037 Log: - Provide better code to calculate npages and rhpages. - Put a comment explaining logic behind rhpages. Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/sendfile/sys/kern/uipc_syscalls.c Modified: projects/sendfile/sys/kern/uipc_syscalls.c ============================================================================== --- projects/sendfile/sys/kern/uipc_syscalls.c Tue Nov 25 12:58:21 2014 (r275036) +++ projects/sendfile/sys/kern/uipc_syscalls.c Tue Nov 25 13:06:47 2014 (r275037) @@ -2462,16 +2462,18 @@ retry_space: if (space > rem) space = rem; - if (off & PAGE_MASK) - npages = 1 + howmany(space - - (PAGE_SIZE - (off & PAGE_MASK)), PAGE_SIZE); - else - npages = howmany(space, PAGE_SIZE); - - rhpages = SF_READAHEAD(flags) ? - SF_READAHEAD(flags) : roundup2(rem - space, PAGE_SIZE); - rhpages = min(howmany(obj_size - (off & ~PAGE_MASK) - - (npages * PAGE_SIZE), PAGE_SIZE), rhpages); + npages = howmany(space + (off & PAGE_MASK), PAGE_SIZE); + + /* + * Calculate maximum allowed number of pages for readahead + * at this iteration. First, we allow readahead up to "rem". + * If application wants more, let it be. But check against + * "obj_size", since vm_pager_has_page() can hint beyond EOF. + */ + rhpages = howmany(rem + (off & PAGE_MASK), PAGE_SIZE) - npages; + rhpages = max(SF_READAHEAD(flags), rhpages); + rhpages = min(howmany(obj_size - trunc_page(off), PAGE_SIZE) - + npages, rhpages); sfio = malloc(sizeof(struct sf_io) + (rhpages + npages) * sizeof(vm_page_t), M_TEMP, M_WAITOK); From owner-svn-src-projects@FreeBSD.ORG Tue Nov 25 19:01:50 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E987988F; Tue, 25 Nov 2014 19:01:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D7117866; Tue, 25 Nov 2014 19:01:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAPJ1oHM025627; Tue, 25 Nov 2014 19:01:50 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAPJ1olk025624; Tue, 25 Nov 2014 19:01:50 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411251901.sAPJ1olk025624@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 25 Nov 2014 19:01:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275063 - in projects/building-blocks: share/mk usr.sbin X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2014 19:01:51 -0000 Author: ngie Date: Tue Nov 25 19:01:49 2014 New Revision: 275063 URL: https://svnweb.freebsd.org/changeset/base/275063 Log: Make src.opts.mk the source of truth for whether or not to build hyperv In particular, according to several Makefiles it can only be built/run on amd64 and i386/i386. It isn't supported on i386/pc98 Modified: projects/building-blocks/share/mk/src.opts.mk projects/building-blocks/usr.sbin/Makefile.i386 Modified: projects/building-blocks/share/mk/src.opts.mk ============================================================================== --- projects/building-blocks/share/mk/src.opts.mk Tue Nov 25 18:58:40 2014 (r275062) +++ projects/building-blocks/share/mk/src.opts.mk Tue Nov 25 19:01:49 2014 (r275063) @@ -91,7 +91,6 @@ __DEFAULT_YES_OPTIONS = \ GPL_DTC \ GROFF \ HTML \ - HYPERV \ ICONV \ INET \ INET6 \ @@ -213,6 +212,13 @@ __DEFAULT_NO_OPTIONS+=CLANG_IS_CC CLANG __DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX .endif +# hyperv is only supported on amd64 and i386/i386 +.if ${__T} == "amd64" || (${__T} == "i386" && ${__TT} == "i386") +__DEFAULT_YES_OPTIONS+=HYPERV +.else +MK_HYPERV:= no +.endif + .include # Modified: projects/building-blocks/usr.sbin/Makefile.i386 ============================================================================== --- projects/building-blocks/usr.sbin/Makefile.i386 Tue Nov 25 18:58:40 2014 (r275062) +++ projects/building-blocks/usr.sbin/Makefile.i386 Tue Nov 25 19:01:49 2014 (r275063) @@ -9,6 +9,9 @@ SUBDIR+= asf SUBDIR+= btxld .endif SUBDIR+= cpucontrol +.if ${MK_HYPERV} != "no" +SUBDIR+= hyperv +.endif SUBDIR+= kgmon SUBDIR+= kgzip SUBDIR+= lptcontrol @@ -28,9 +31,6 @@ SUBDIR+= zzz SUBDIR+= acpi .endif SUBDIR+= boot0cfg -.if ${MK_HYPERV} != "no" -SUBDIR+= hyperv -.endif .if ${MK_WIRELESS} != "no" SUBDIR+= wlconfig .endif From owner-svn-src-projects@FreeBSD.ORG Tue Nov 25 19:17:13 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 756CB273; Tue, 25 Nov 2014 19:17:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 629069EC; Tue, 25 Nov 2014 19:17:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAPJHD45031067; Tue, 25 Nov 2014 19:17:13 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAPJHDfB031066; Tue, 25 Nov 2014 19:17:13 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411251917.sAPJHDfB031066@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 25 Nov 2014 19:17:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275066 - projects/building-blocks/tools/build/options X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2014 19:17:13 -0000 Author: ngie Date: Tue Nov 25 19:17:12 2014 New Revision: 275066 URL: https://svnweb.freebsd.org/changeset/base/275066 Log: Add an additional src.conf doc snippet for WITH_HYPERV Added: projects/building-blocks/tools/build/options/WITH_HYPERV - copied, changed from r275063, projects/building-blocks/tools/build/options/WITHOUT_HYPERV Copied and modified: projects/building-blocks/tools/build/options/WITH_HYPERV (from r275063, projects/building-blocks/tools/build/options/WITHOUT_HYPERV) ============================================================================== --- projects/building-blocks/tools/build/options/WITHOUT_HYPERV Tue Nov 25 19:01:49 2014 (r275063, copy source) +++ projects/building-blocks/tools/build/options/WITH_HYPERV Tue Nov 25 19:17:12 2014 (r275066) @@ -1,2 +1,2 @@ .\" $FreeBSD$ -Set to not build or install HyperV utilities. +Set to build and install HyperV utilities. From owner-svn-src-projects@FreeBSD.ORG Tue Nov 25 19:20:27 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A3EBB542; Tue, 25 Nov 2014 19:20:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 854ABA08; Tue, 25 Nov 2014 19:20:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAPJKRkp032018; Tue, 25 Nov 2014 19:20:27 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAPJKP9q032007; Tue, 25 Nov 2014 19:20:25 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411251920.sAPJKP9q032007@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 25 Nov 2014 19:20:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275067 - in projects/building-blocks: share/examples share/man/man4 share/mk tools/build/mk tools/build/options usr.sbin X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2014 19:20:27 -0000 Author: ngie Date: Tue Nov 25 19:20:25 2014 New Revision: 275067 URL: https://svnweb.freebsd.org/changeset/base/275067 Log: Make building/installing bhyve optional via MK_BHYVE on amd64 Disable building/installing bhyve from src.opts.mk on unsupported architectures (!amd64) Added: projects/building-blocks/tools/build/options/WITHOUT_BHYVE (contents, props changed) projects/building-blocks/tools/build/options/WITH_BHYVE (contents, props changed) Modified: projects/building-blocks/share/examples/Makefile projects/building-blocks/share/man/man4/Makefile projects/building-blocks/share/mk/src.opts.mk projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc projects/building-blocks/usr.sbin/Makefile.amd64 Modified: projects/building-blocks/share/examples/Makefile ============================================================================== --- projects/building-blocks/share/examples/Makefile Tue Nov 25 19:17:12 2014 (r275066) +++ projects/building-blocks/share/examples/Makefile Tue Nov 25 19:20:25 2014 (r275067) @@ -7,7 +7,6 @@ LDIRS= BSD_daemon \ FreeBSD_version \ IPv6 \ - bhyve \ bootforth \ csh \ diskless \ @@ -42,7 +41,6 @@ XFILES= BSD_daemon/FreeBSD.pfa \ FreeBSD_version/Makefile \ FreeBSD_version/README \ IPv6/USAGE \ - bhyve/vmrun.sh \ bootforth/README \ bootforth/boot.4th \ bootforth/frames.4th \ @@ -207,6 +205,11 @@ NO_OBJ= # in environments where it's not possible to keep /sys publicly readable) SHARED?= copies +.if ${MK_BHYVE} != "no" +LDIRS+= bhyve +XFILES+= bhyve/vmrun.sh +.endif + beforeinstall: ${SHARED} etc-examples .ORDER: ${SHARED} etc-examples Modified: projects/building-blocks/share/man/man4/Makefile ============================================================================== --- projects/building-blocks/share/man/man4/Makefile Tue Nov 25 19:17:12 2014 (r275066) +++ projects/building-blocks/share/man/man4/Makefile Tue Nov 25 19:20:25 2014 (r275067) @@ -835,7 +835,6 @@ _xnb.4= xnb.4 .endif .if ${MACHINE_CPUARCH} == "amd64" -_bhyve.4= bhyve.4 _if_ntb.4= if_ntb.4 _ntb.4= ntb.4 _ntb_hw.4= ntb_hw.4 @@ -858,6 +857,10 @@ _nvram2env.4= nvram2env.4 SUBDIR= man4.${MACHINE_CPUARCH} .endif +.if ${MK_BHYVE} != "no" +_bhyve.4= bhyve.4 +.endif + .if ${MK_TESTS} != "no" ATF= ${.CURDIR}/../../../contrib/atf .PATH: ${ATF}/doc Modified: projects/building-blocks/share/mk/src.opts.mk ============================================================================== --- projects/building-blocks/share/mk/src.opts.mk Tue Nov 25 19:17:12 2014 (r275066) +++ projects/building-blocks/share/mk/src.opts.mk Tue Nov 25 19:20:25 2014 (r275067) @@ -212,6 +212,13 @@ __DEFAULT_NO_OPTIONS+=CLANG_IS_CC CLANG __DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX .endif +# bhyve is only supported on amd64 +.if ${__T} == "amd64" +__DEFAULT_YES_OPTIONS+=BHYVE +.else +MK_BHYVE:= no +.endif + # hyperv is only supported on amd64 and i386/i386 .if ${__T} == "amd64" || (${__T} == "i386" && ${__TT} == "i386") __DEFAULT_YES_OPTIONS+=HYPERV Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Nov 25 19:17:12 2014 (r275066) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Nov 25 19:20:25 2014 (r275067) @@ -144,6 +144,14 @@ OLD_FILES+=usr/share/man/man8/authpf.8.g OLD_FILES+=usr/share/man/man8/authpf-noip.8.gz .endif +.if ${MK_BHYVE} == no +OLD_FILES+=usr/sbin/bhyve +OLD_FILES+=usr/sbin/bhyvectl +OLD_FILES+=usr/sbin/bhyveload +OLD_FILES+=usr/share/man/man8/bhyve.8.gz +OLD_FILES+=usr/share/man/man8/bhyveload.8.gz +.endif + .if ${MK_BLUETOOTH} == no OLD_FILES+=etc/bluetooth/hcsecd.conf OLD_FILES+=etc/bluetooth/hosts Added: projects/building-blocks/tools/build/options/WITHOUT_BHYVE ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/build/options/WITHOUT_BHYVE Tue Nov 25 19:20:25 2014 (r275067) @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr bhyve 8 , +associated utilities, and examples. Added: projects/building-blocks/tools/build/options/WITH_BHYVE ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/build/options/WITH_BHYVE Tue Nov 25 19:20:25 2014 (r275067) @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to build and install +.Xr bhyve 8 , +associated utilities, and examples. Modified: projects/building-blocks/usr.sbin/Makefile.amd64 ============================================================================== --- projects/building-blocks/usr.sbin/Makefile.amd64 Tue Nov 25 19:17:12 2014 (r275066) +++ projects/building-blocks/usr.sbin/Makefile.amd64 Tue Nov 25 19:20:25 2014 (r275067) @@ -10,9 +10,11 @@ SUBDIR+= acpi SUBDIR+= apm .endif SUBDIR+= asf +.if ${MK_BHYVE} != "no" SUBDIR+= bhyve SUBDIR+= bhyvectl SUBDIR+= bhyveload +.endif SUBDIR+= boot0cfg .if ${MK_TOOLCHAIN} != "no" SUBDIR+= btxld From owner-svn-src-projects@FreeBSD.ORG Tue Nov 25 19:37:56 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 93876A4B; Tue, 25 Nov 2014 19:37:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 80E3AC06; Tue, 25 Nov 2014 19:37:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAPJbuw0040776; Tue, 25 Nov 2014 19:37:56 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAPJbuUX040775; Tue, 25 Nov 2014 19:37:56 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411251937.sAPJbuUX040775@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 25 Nov 2014 19:37:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275068 - projects/building-blocks/etc/rc.d X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2014 19:37:56 -0000 Author: ngie Date: Tue Nov 25 19:37:55 2014 New Revision: 275068 URL: https://svnweb.freebsd.org/changeset/base/275068 Log: Only install etc/rc.d/bsnmpd if MK_BSNMP == yes Modified: projects/building-blocks/etc/rc.d/Makefile Modified: projects/building-blocks/etc/rc.d/Makefile ============================================================================== --- projects/building-blocks/etc/rc.d/Makefile Tue Nov 25 19:20:25 2014 (r275067) +++ projects/building-blocks/etc/rc.d/Makefile Tue Nov 25 19:37:55 2014 (r275068) @@ -27,7 +27,7 @@ FILES= DAEMON \ ${_bluetooth} \ bootparams \ bridge \ - bsnmpd \ + ${_bsnmpd} \ ${_bthidd} \ ${_casperd} \ ccd \ @@ -171,6 +171,10 @@ _hcsecd= hcsecd _ubthidhci= ubthidhci .endif +.if ${MK_BSNMP} != "no" +_bsnmpd= bsnmpd +.endif + .if ${MK_CASPER} != "no" _casperd= casperd .endif From owner-svn-src-projects@FreeBSD.ORG Tue Nov 25 19:38:24 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BB0C2B2E; Tue, 25 Nov 2014 19:38:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A77A8C08; Tue, 25 Nov 2014 19:38:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAPJcOwL040886; Tue, 25 Nov 2014 19:38:24 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAPJcOIA040885; Tue, 25 Nov 2014 19:38:24 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411251938.sAPJcOIA040885@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 25 Nov 2014 19:38:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275069 - projects/building-blocks/tools/build/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2014 19:38:24 -0000 Author: ngie Date: Tue Nov 25 19:38:23 2014 New Revision: 275069 URL: https://svnweb.freebsd.org/changeset/base/275069 Log: Fill in entries for MK_BSNMP == no Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Nov 25 19:37:55 2014 (r275068) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Nov 25 19:38:23 2014 (r275069) @@ -315,6 +315,88 @@ OLD_FILES+=usr/share/man/man8/sade.8.gz OLD_DIRS+=usr/libexec/bsdinstall .endif +.if ${MK_BSNMP} == no +OLD_FILES+=etc/rc.d/bsnmpd +OLD_FILES+=usr/bin/bsnmpget +OLD_FILES+=usr/bin/bsnmpset +OLD_FILES+=usr/bin/bsnmpwalk +OLD_FILES+=usr/include/bsnmp/asn1.h +OLD_FILES+=usr/include/bsnmp/bridge_snmp.h +OLD_FILES+=usr/include/bsnmp/snmp.h +OLD_FILES+=usr/include/bsnmp/snmp_mibII.h +OLD_FILES+=usr/include/bsnmp/snmp_netgraph.h +OLD_FILES+=usr/include/bsnmp/snmpagent.h +OLD_FILES+=usr/include/bsnmp/snmpclient.h +OLD_FILES+=usr/include/bsnmp/snmpmod.h +OLD_FILES+=usr/lib/libbsnmp.a +OLD_FILES+=usr/lib/libbsnmp.so.6 +OLD_FILES+=usr/lib/libbsnmptools.a +OLD_FILES+=usr/lib/libbsnmptools.so.0 +OLD_FILES+=usr/lib/snmp_bridge.so.6 +OLD_FILES+=usr/lib/snmp_hast.so.6 +OLD_FILES+=usr/lib/snmp_hostres.so.6 +OLD_FILES+=usr/lib/snmp_lm75.so.6 +OLD_FILES+=usr/lib/snmp_mibII.so.6 +OLD_FILES+=usr/lib/snmp_netgraph.so.6 +OLD_FILES+=usr/lib/snmp_target.so.6 +OLD_FILES+=usr/lib/snmp_usm.so.6 +OLD_FILES+=usr/lib/snmp_vacm.so.6 +OLD_FILES+=usr/lib/snmp_wlan.so.6 +OLD_FILES+=usr/sbin/bsnmpd +OLD_FILES+=usr/sbin/gensnmptree +OLD_FILES+=usr/share/man/man1/bsnmpd.1.gz +OLD_FILES+=usr/share/man/man1/bsnmpget.1.gz +OLD_FILES+=usr/share/man/man1/bsnmpset.1.gz +OLD_FILES+=usr/share/man/man1/bsnmpwalk.1.gz +OLD_FILES+=usr/share/man/man1/gensnmptree.1.gz +OLD_FILES+=usr/share/man/man3/asn1.3.gz +OLD_FILES+=usr/share/man/man3/bsnmpagent.3.gz +OLD_FILES+=usr/share/man/man3/bsnmpclient.3.gz +OLD_FILES+=usr/share/man/man3/bsnmplib.3.gz +OLD_FILES+=usr/share/man/man3/snmp_bridge.3.gz +OLD_FILES+=usr/share/man/man3/snmp_hast.3.gz +OLD_FILES+=usr/share/man/man3/snmp_hostres.3.gz +OLD_FILES+=usr/share/man/man3/snmp_lm75.3.gz +OLD_FILES+=usr/share/man/man3/snmp_mibII.3.gz +OLD_FILES+=usr/share/man/man3/snmp_netgraph.3.gz +OLD_FILES+=usr/share/man/man3/snmp_target.3.gz +OLD_FILES+=usr/share/man/man3/snmp_usm.3.gz +OLD_FILES+=usr/share/man/man3/snmp_vacm.3.gz +OLD_FILES+=usr/share/man/man3/snmp_wlan.3.gz +OLD_FILES+=usr/share/man/man3/snmpmod.3.gz +OLD_FILES+=usr/share/snmp/defs/bridge_tree.def +OLD_FILES+=usr/share/snmp/defs/hast_tree.def +OLD_FILES+=usr/share/snmp/defs/hostres_tree.def +OLD_FILES+=usr/share/snmp/defs/lm75_tree.def +OLD_FILES+=usr/share/snmp/defs/mibII_tree.def +OLD_FILES+=usr/share/snmp/defs/netgraph_tree.def +OLD_FILES+=usr/share/snmp/defs/pf_tree.def +OLD_FILES+=usr/share/snmp/defs/target_tree.def +OLD_FILES+=usr/share/snmp/defs/tree.def +OLD_FILES+=usr/share/snmp/defs/usm_tree.def +OLD_FILES+=usr/share/snmp/defs/vacm_tree.def +OLD_FILES+=usr/share/snmp/defs/wlan_tree.def +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-BRIDGE-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-HAST-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-HOSTRES-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-IP-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-LM75-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-MIB2-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-PF-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-NETGRAPH.txt +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-SNMPD.txt +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-WIRELESS-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/BRIDGE-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/FREEBSD-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/FOKUS-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/RSTP-MIB.txt +OLD_DIRS+=usr/include/bsnmp +OLD_DIRS+=usr/share/snmp +OLD_DIRS+=usr/share/snmp/defs +OLD_DIRS+=usr/share/snmp/mibs +.endif + .if ${MK_CALENDAR} == no OLD_FILES+=etc/periodic/daily/300.calendar OLD_FILES+=usr/bin/calendar From owner-svn-src-projects@FreeBSD.ORG Tue Nov 25 19:45:29 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6A9DAD02; Tue, 25 Nov 2014 19:45:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 57B4ECEA; Tue, 25 Nov 2014 19:45:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAPJjThv045209; Tue, 25 Nov 2014 19:45:29 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAPJjT0S045208; Tue, 25 Nov 2014 19:45:29 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411251945.sAPJjT0S045208@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 25 Nov 2014 19:45:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275070 - projects/building-blocks/lib X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2014 19:45:29 -0000 Author: ngie Date: Tue Nov 25 19:45:28 2014 New Revision: 275070 URL: https://svnweb.freebsd.org/changeset/base/275070 Log: Don't build/install lib/libvmmapi if MK_BHYVE == no Suggested by: grehan Modified: projects/building-blocks/lib/Makefile Modified: projects/building-blocks/lib/Makefile ============================================================================== --- projects/building-blocks/lib/Makefile Tue Nov 25 19:38:23 2014 (r275069) +++ projects/building-blocks/lib/Makefile Tue Nov 25 19:45:28 2014 (r275070) @@ -167,6 +167,10 @@ _csu=csu _libngatm= libngatm .endif +.if ${MK_BHYVE} != "no" +_libvmmapi= libvmmapi +.endif + .if ${MK_BLUETOOTH} != "no" _libbluetooth= libbluetooth _libsdp= libsdp @@ -242,10 +246,6 @@ _libproc= libproc _librtld_db= librtld_db .endif -.if ${MACHINE_CPUARCH} == "amd64" -_libvmmapi= libvmmapi -.endif - .if ${MACHINE_CPUARCH} == "mips" _libproc= libproc _librtld_db= librtld_db From owner-svn-src-projects@FreeBSD.ORG Tue Nov 25 21:08:32 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8AF45571; Tue, 25 Nov 2014 21:08:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 77A6E84E; Tue, 25 Nov 2014 21:08:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAPL8WFr083793; Tue, 25 Nov 2014 21:08:32 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAPL8Wsk083791; Tue, 25 Nov 2014 21:08:32 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411252108.sAPL8Wsk083791@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 25 Nov 2014 21:08:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275075 - projects/clang350-import/sys/boot/pc98/boot2 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2014 21:08:32 -0000 Author: dim Date: Tue Nov 25 21:08:31 2014 New Revision: 275075 URL: https://svnweb.freebsd.org/changeset/base/275075 Log: Similar to r274977, use the correct combination of flags to get the pc98 boot2 below the limit. Modified: projects/clang350-import/sys/boot/pc98/boot2/Makefile Modified: projects/clang350-import/sys/boot/pc98/boot2/Makefile ============================================================================== --- projects/clang350-import/sys/boot/pc98/boot2/Makefile Tue Nov 25 21:03:04 2014 (r275074) +++ projects/clang350-import/sys/boot/pc98/boot2/Makefile Tue Nov 25 21:08:31 2014 (r275075) @@ -19,8 +19,7 @@ BOOT2_UFS?= UFS1_AND_UFS2 #BOOT2_UFS?= UFS2_ONLY #BOOT2_UFS?= UFS1_ONLY -CFLAGS= -Os \ - -fomit-frame-pointer \ +CFLAGS= -fomit-frame-pointer \ -mrtd \ -mregparm=3 \ -D${BOOT2_UFS} \ @@ -37,7 +36,8 @@ CFLAGS= -Os \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ -Winline -CFLAGS.gcc+= -fno-guess-branch-probability \ +CFLAGS.gcc+= -Os \ + -fno-guess-branch-probability \ -fno-unit-at-a-time \ -mno-align-long-strings \ --param max-inline-insns-single=100 @@ -48,7 +48,7 @@ CFLAGS.gcc+= -fno-guess-branch-probabili # Initialize the bi_bios_geom using the BIOS geometry #CFLAGS+= -DGET_BIOSGEOM -CFLAGS.clang+=${CLANG_OPT_SMALL} +CFLAGS.clang+= -Oz ${CLANG_OPT_SMALL} LD_FLAGS=-static -N --gc-sections From owner-svn-src-projects@FreeBSD.ORG Tue Nov 25 21:43:22 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 639E4371; Tue, 25 Nov 2014 21:43:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 28447C37; Tue, 25 Nov 2014 21:43:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAPLhM59002865; Tue, 25 Nov 2014 21:43:22 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAPLh2gB002629; Tue, 25 Nov 2014 21:43:02 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411252143.sAPLh2gB002629@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 25 Nov 2014 21:43:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275078 - in projects/clang350-import: . bin/csh bin/df bin/ed bin/ls bin/pkill bin/ps bin/rmail bin/sh cddl/contrib/opensolaris/lib/libdtrace/common contrib/mdocml contrib/netbsd-tests... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2014 21:43:22 -0000 Author: dim Date: Tue Nov 25 21:43:01 2014 New Revision: 275078 URL: https://svnweb.freebsd.org/changeset/base/275078 Log: r274961 through r275075 Added: projects/clang350-import/lib/libgpio/ - copied from r275077, head/lib/libgpio/ projects/clang350-import/sys/dev/beri/virtio/virtio.c - copied unchanged from r275077, head/sys/dev/beri/virtio/virtio.c projects/clang350-import/sys/dev/beri/virtio/virtio.h - copied unchanged from r275077, head/sys/dev/beri/virtio/virtio.h projects/clang350-import/sys/dev/beri/virtio/virtio_block.c - copied unchanged from r275077, head/sys/dev/beri/virtio/virtio_block.c projects/clang350-import/sys/mips/conf/WZR-HPAG300H - copied unchanged from r275077, head/sys/mips/conf/WZR-HPAG300H projects/clang350-import/sys/mips/conf/WZR-HPAG300H.hints - copied unchanged from r275077, head/sys/mips/conf/WZR-HPAG300H.hints Deleted: projects/clang350-import/usr.sbin/cron/Makefile.inc projects/clang350-import/usr.sbin/fifolog/Makefile.inc Modified: projects/clang350-import/MAINTAINERS (contents, props changed) projects/clang350-import/bin/csh/Makefile projects/clang350-import/bin/df/Makefile projects/clang350-import/bin/ed/Makefile projects/clang350-import/bin/ls/Makefile projects/clang350-import/bin/pkill/Makefile projects/clang350-import/bin/ps/Makefile projects/clang350-import/bin/rmail/Makefile projects/clang350-import/bin/sh/Makefile projects/clang350-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c projects/clang350-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c projects/clang350-import/contrib/mdocml/lib.in projects/clang350-import/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c projects/clang350-import/gnu/lib/libdialog/Makefile projects/clang350-import/gnu/lib/libgcc/Makefile projects/clang350-import/gnu/lib/libreadline/readline/Makefile projects/clang350-import/gnu/lib/libstdc++/Makefile projects/clang350-import/gnu/usr.bin/dialog/Makefile projects/clang350-import/gnu/usr.bin/diff/Makefile projects/clang350-import/gnu/usr.bin/gdb/gdb/Makefile projects/clang350-import/gnu/usr.bin/gdb/gdbtui/Makefile projects/clang350-import/gnu/usr.bin/gdb/kgdb/Makefile projects/clang350-import/gnu/usr.bin/grep/Makefile projects/clang350-import/kerberos5/Makefile.inc projects/clang350-import/kerberos5/lib/libasn1/Makefile projects/clang350-import/kerberos5/lib/libgssapi_krb5/Makefile projects/clang350-import/kerberos5/lib/libgssapi_ntlm/Makefile projects/clang350-import/kerberos5/lib/libgssapi_spnego/Makefile projects/clang350-import/kerberos5/lib/libhdb/Makefile projects/clang350-import/kerberos5/lib/libheimbase/Makefile projects/clang350-import/kerberos5/lib/libheimipcc/Makefile projects/clang350-import/kerberos5/lib/libheimipcs/Makefile projects/clang350-import/kerberos5/lib/libheimntlm/Makefile projects/clang350-import/kerberos5/lib/libheimsqlite/Makefile projects/clang350-import/kerberos5/lib/libhx509/Makefile projects/clang350-import/kerberos5/lib/libkadm5clnt/Makefile projects/clang350-import/kerberos5/lib/libkadm5srv/Makefile projects/clang350-import/kerberos5/lib/libkafs5/Makefile projects/clang350-import/kerberos5/lib/libkdc/Makefile projects/clang350-import/kerberos5/lib/libkrb5/Makefile projects/clang350-import/kerberos5/lib/libroken/Makefile projects/clang350-import/kerberos5/lib/libwind/Makefile projects/clang350-import/kerberos5/libexec/digest-service/Makefile projects/clang350-import/kerberos5/libexec/hprop/Makefile projects/clang350-import/kerberos5/libexec/hpropd/Makefile projects/clang350-import/kerberos5/libexec/ipropd-master/Makefile projects/clang350-import/kerberos5/libexec/ipropd-slave/Makefile projects/clang350-import/kerberos5/libexec/kadmind/Makefile projects/clang350-import/kerberos5/libexec/kcm/Makefile projects/clang350-import/kerberos5/libexec/kdc/Makefile projects/clang350-import/kerberos5/libexec/kdigest/Makefile projects/clang350-import/kerberos5/libexec/kfd/Makefile projects/clang350-import/kerberos5/libexec/kimpersonate/Makefile projects/clang350-import/kerberos5/libexec/kpasswdd/Makefile projects/clang350-import/kerberos5/tools/asn1_compile/Makefile projects/clang350-import/kerberos5/tools/slc/Makefile projects/clang350-import/kerberos5/usr.bin/hxtool/Makefile projects/clang350-import/kerberos5/usr.bin/kadmin/Makefile projects/clang350-import/kerberos5/usr.bin/kcc/Makefile projects/clang350-import/kerberos5/usr.bin/kdestroy/Makefile projects/clang350-import/kerberos5/usr.bin/kf/Makefile projects/clang350-import/kerberos5/usr.bin/kgetcred/Makefile projects/clang350-import/kerberos5/usr.bin/kinit/Makefile projects/clang350-import/kerberos5/usr.bin/kpasswd/Makefile projects/clang350-import/kerberos5/usr.bin/ksu/Makefile projects/clang350-import/kerberos5/usr.bin/string2key/Makefile projects/clang350-import/kerberos5/usr.bin/verify_krb5_conf/Makefile projects/clang350-import/kerberos5/usr.sbin/iprop-log/Makefile projects/clang350-import/kerberos5/usr.sbin/kstash/Makefile projects/clang350-import/kerberos5/usr.sbin/ktutil/Makefile projects/clang350-import/lib/Makefile projects/clang350-import/lib/atf/libatf-c++/Makefile projects/clang350-import/lib/libarchive/Makefile projects/clang350-import/lib/libarchive/test/Makefile projects/clang350-import/lib/libbsnmp/libbsnmp/Makefile projects/clang350-import/lib/libc++/Makefile projects/clang350-import/lib/libc/Makefile projects/clang350-import/lib/libc/gen/errlst.c projects/clang350-import/lib/libc/gen/isnan.c projects/clang350-import/lib/libc/gen/syslog.c projects/clang350-import/lib/libc/gen/tls.c projects/clang350-import/lib/libc/include/errlst.h projects/clang350-import/lib/libc/net/base64.c projects/clang350-import/lib/libc/net/getifaddrs.3 projects/clang350-import/lib/libc/net/nsdispatch.c projects/clang350-import/lib/libc/sys/stack_protector.c projects/clang350-import/lib/libc/sys/stack_protector_compat.c projects/clang350-import/lib/libcam/Makefile projects/clang350-import/lib/libcapsicum/Makefile projects/clang350-import/lib/libcasper/Makefile projects/clang350-import/lib/libcrypt/tests/Makefile projects/clang350-import/lib/libcuse/Makefile projects/clang350-import/lib/libdevstat/Makefile projects/clang350-import/lib/libdpv/Makefile projects/clang350-import/lib/libdwarf/Makefile projects/clang350-import/lib/libedit/Makefile projects/clang350-import/lib/libexecinfo/Makefile projects/clang350-import/lib/libfetch/Makefile projects/clang350-import/lib/libgeom/Makefile projects/clang350-import/lib/libjail/jail.c projects/clang350-import/lib/libjail/jail_getid.c projects/clang350-import/lib/libkiconv/quirks.c projects/clang350-import/lib/libkiconv/xlat16_iconv.c projects/clang350-import/lib/libkiconv/xlat16_sysctl.c projects/clang350-import/lib/libldns/Makefile projects/clang350-import/lib/libmagic/Makefile projects/clang350-import/lib/libmd/rmd160c.c projects/clang350-import/lib/libmd/sha1c.c projects/clang350-import/lib/libmemstat/Makefile projects/clang350-import/lib/libmp/Makefile projects/clang350-import/lib/libmp/tests/Makefile projects/clang350-import/lib/libnv/tests/Makefile projects/clang350-import/lib/libopie/Makefile projects/clang350-import/lib/libpam/modules/Makefile.inc projects/clang350-import/lib/libpam/modules/pam_krb5/Makefile projects/clang350-import/lib/libpam/modules/pam_ksu/Makefile projects/clang350-import/lib/libpam/modules/pam_nologin/Makefile projects/clang350-import/lib/libpam/modules/pam_opie/Makefile projects/clang350-import/lib/libpam/modules/pam_opieaccess/Makefile projects/clang350-import/lib/libpam/modules/pam_passwdqc/Makefile projects/clang350-import/lib/libpam/modules/pam_radius/Makefile projects/clang350-import/lib/libpam/modules/pam_ssh/Makefile projects/clang350-import/lib/libpam/modules/pam_tacplus/Makefile projects/clang350-import/lib/libpam/modules/pam_unix/Makefile projects/clang350-import/lib/libpjdlog/Makefile projects/clang350-import/lib/libproc/Makefile projects/clang350-import/lib/libprocstat/Makefile projects/clang350-import/lib/libradius/Makefile projects/clang350-import/lib/librpcsec_gss/Makefile projects/clang350-import/lib/librt/Makefile projects/clang350-import/lib/librt/tests/Makefile projects/clang350-import/lib/libsmb/Makefile projects/clang350-import/lib/libsqlite3/Makefile projects/clang350-import/lib/libstdthreads/Makefile projects/clang350-import/lib/libtacplus/Makefile projects/clang350-import/lib/libthr/thread/thr_exit.c projects/clang350-import/lib/libthr/thread/thr_private.h projects/clang350-import/lib/libulog/Makefile projects/clang350-import/lib/libunbound/Makefile projects/clang350-import/lib/libusb/Makefile projects/clang350-import/lib/libutil/tests/Makefile projects/clang350-import/lib/msun/src/s_isnan.c projects/clang350-import/lib/msun/tests/Makefile projects/clang350-import/lib/ncurses/form/Makefile projects/clang350-import/lib/ncurses/menu/Makefile projects/clang350-import/lib/ncurses/panel/Makefile projects/clang350-import/libexec/atf/atf-check/Makefile projects/clang350-import/libexec/atf/atf-sh/Makefile projects/clang350-import/libexec/atrun/Makefile projects/clang350-import/libexec/casper/dns/Makefile projects/clang350-import/libexec/casper/grp/Makefile projects/clang350-import/libexec/casper/pwd/Makefile projects/clang350-import/libexec/casper/random/Makefile projects/clang350-import/libexec/casper/sysctl/Makefile projects/clang350-import/libexec/dma/Makefile projects/clang350-import/libexec/fingerd/Makefile projects/clang350-import/libexec/ftpd/Makefile projects/clang350-import/libexec/getty/Makefile projects/clang350-import/libexec/mail.local/Makefile projects/clang350-import/libexec/pppoed/Makefile projects/clang350-import/libexec/rlogind/Makefile projects/clang350-import/libexec/rpc.rquotad/Makefile projects/clang350-import/libexec/rpc.rstatd/Makefile projects/clang350-import/libexec/rpc.rusersd/Makefile projects/clang350-import/libexec/rpc.rwalld/Makefile projects/clang350-import/libexec/rpc.sprayd/Makefile projects/clang350-import/libexec/rshd/Makefile projects/clang350-import/libexec/rtld-elf/Makefile projects/clang350-import/libexec/rtld-elf/rtld.c projects/clang350-import/libexec/smrsh/Makefile projects/clang350-import/libexec/tcpd/Makefile projects/clang350-import/libexec/telnetd/Makefile projects/clang350-import/libexec/tftpd/Makefile projects/clang350-import/libexec/ulog-helper/Makefile projects/clang350-import/libexec/ypxfr/Makefile projects/clang350-import/sbin/atm/atmconfig/Makefile projects/clang350-import/sbin/badsect/Makefile projects/clang350-import/sbin/bsdlabel/Makefile projects/clang350-import/sbin/camcontrol/Makefile projects/clang350-import/sbin/casperd/Makefile projects/clang350-import/sbin/ccdconfig/Makefile projects/clang350-import/sbin/ddb/Makefile projects/clang350-import/sbin/devd/Makefile projects/clang350-import/sbin/dhclient/Makefile projects/clang350-import/sbin/dmesg/Makefile projects/clang350-import/sbin/dumpfs/Makefile projects/clang350-import/sbin/fdisk/Makefile projects/clang350-import/sbin/fdisk_pc98/Makefile projects/clang350-import/sbin/ffsinfo/Makefile projects/clang350-import/sbin/fsck_ffs/Makefile projects/clang350-import/sbin/fsck_ffs/dir.c projects/clang350-import/sbin/fsdb/Makefile projects/clang350-import/sbin/gbde/Makefile projects/clang350-import/sbin/geom/Makefile projects/clang350-import/sbin/geom/class/eli/Makefile projects/clang350-import/sbin/geom/class/journal/Makefile projects/clang350-import/sbin/geom/class/mirror/Makefile projects/clang350-import/sbin/geom/class/part/Makefile projects/clang350-import/sbin/geom/class/raid/Makefile projects/clang350-import/sbin/geom/class/raid3/Makefile projects/clang350-import/sbin/geom/core/Makefile projects/clang350-import/sbin/ggate/ggatec/Makefile projects/clang350-import/sbin/ggate/ggated/Makefile projects/clang350-import/sbin/ggate/ggatel/Makefile projects/clang350-import/sbin/growfs/Makefile projects/clang350-import/sbin/gvinum/Makefile projects/clang350-import/sbin/hastctl/Makefile projects/clang350-import/sbin/hastd/Makefile projects/clang350-import/sbin/ifconfig/Makefile projects/clang350-import/sbin/init/Makefile projects/clang350-import/sbin/ipf/Makefile.inc projects/clang350-import/sbin/ipf/ipf/Makefile projects/clang350-import/sbin/ipf/ipfstat/Makefile projects/clang350-import/sbin/ipf/ipsend/Makefile projects/clang350-import/sbin/ipfw/Makefile projects/clang350-import/sbin/iscontrol/Makefile projects/clang350-import/sbin/md5/Makefile projects/clang350-import/sbin/mdconfig/Makefile projects/clang350-import/sbin/mount/Makefile projects/clang350-import/sbin/mount_cd9660/Makefile projects/clang350-import/sbin/mount_msdosfs/Makefile projects/clang350-import/sbin/mount_udf/Makefile projects/clang350-import/sbin/nandfs/Makefile projects/clang350-import/sbin/natd/Makefile projects/clang350-import/sbin/newfs/Makefile projects/clang350-import/sbin/newfs_nandfs/Makefile projects/clang350-import/sbin/pfctl/Makefile projects/clang350-import/sbin/pflogd/Makefile projects/clang350-import/sbin/ping/Makefile projects/clang350-import/sbin/ping6/Makefile projects/clang350-import/sbin/quotacheck/Makefile projects/clang350-import/sbin/rcorder/Makefile projects/clang350-import/sbin/routed/Makefile projects/clang350-import/sbin/routed/rtquery/Makefile projects/clang350-import/sbin/savecore/Makefile projects/clang350-import/sbin/setkey/Makefile projects/clang350-import/sbin/sunlabel/Makefile projects/clang350-import/sbin/swapon/Makefile projects/clang350-import/sbin/tunefs/Makefile projects/clang350-import/secure/lib/libssh/Makefile projects/clang350-import/secure/lib/libssl/Makefile projects/clang350-import/secure/libexec/sftp-server/Makefile projects/clang350-import/secure/libexec/ssh-keysign/Makefile projects/clang350-import/secure/libexec/ssh-pkcs11-helper/Makefile projects/clang350-import/secure/usr.bin/bdes/Makefile projects/clang350-import/secure/usr.bin/openssl/Makefile projects/clang350-import/secure/usr.bin/scp/Makefile projects/clang350-import/secure/usr.bin/sftp/Makefile projects/clang350-import/secure/usr.bin/ssh-add/Makefile projects/clang350-import/secure/usr.bin/ssh-agent/Makefile projects/clang350-import/secure/usr.bin/ssh-keygen/Makefile projects/clang350-import/secure/usr.bin/ssh-keyscan/Makefile projects/clang350-import/secure/usr.bin/ssh/Makefile projects/clang350-import/secure/usr.sbin/sshd/Makefile projects/clang350-import/share/man/man9/Makefile projects/clang350-import/share/man/man9/timeout.9 projects/clang350-import/share/mk/bsd.libnames.mk projects/clang350-import/share/mk/src.libnames.mk projects/clang350-import/sys/amd64/include/asm.h projects/clang350-import/sys/arm/altera/socfpga/files.socfpga projects/clang350-import/sys/arm/altera/socfpga/socfpga_machdep.c projects/clang350-import/sys/arm/conf/SOCKIT-BERI projects/clang350-import/sys/arm/include/asm.h projects/clang350-import/sys/boot/fdt/dts/arm/socfpga-sockit-beri.dts projects/clang350-import/sys/boot/i386/boot2/boot2.c projects/clang350-import/sys/cam/ctl/ctl.c projects/clang350-import/sys/cam/ctl/ctl_backend_block.c projects/clang350-import/sys/cam/ctl/ctl_backend_ramdisk.c projects/clang350-import/sys/cam/ctl/ctl_frontend_iscsi.c projects/clang350-import/sys/cam/ctl/ctl_io.h projects/clang350-import/sys/cam/ctl/ctl_tpc.c projects/clang350-import/sys/cam/ctl/scsi_ctl.c projects/clang350-import/sys/conf/files projects/clang350-import/sys/conf/files.amd64 projects/clang350-import/sys/conf/files.i386 projects/clang350-import/sys/contrib/dev/ral/Makefile projects/clang350-import/sys/dev/usb/controller/ohci_pci.c projects/clang350-import/sys/i386/i386/machdep.c projects/clang350-import/sys/i386/include/asm.h projects/clang350-import/sys/netinet6/nd6.c projects/clang350-import/sys/powerpc/include/asm.h projects/clang350-import/sys/powerpc/include/profile.h projects/clang350-import/sys/sparc64/include/asm.h projects/clang350-import/sys/sys/callout.h projects/clang350-import/usr.bin/apply/Makefile projects/clang350-import/usr.bin/ar/Makefile projects/clang350-import/usr.bin/atm/sscop/Makefile projects/clang350-import/usr.bin/awk/Makefile projects/clang350-import/usr.bin/bc/Makefile projects/clang350-import/usr.bin/bluetooth/bthost/Makefile projects/clang350-import/usr.bin/bluetooth/btsockstat/Makefile projects/clang350-import/usr.bin/bluetooth/rfcomm_sppd/Makefile projects/clang350-import/usr.bin/bsdiff/bsdiff/Makefile projects/clang350-import/usr.bin/bsdiff/bspatch/Makefile projects/clang350-import/usr.bin/bzip2/Makefile projects/clang350-import/usr.bin/calendar/Makefile projects/clang350-import/usr.bin/chkey/Makefile projects/clang350-import/usr.bin/chpass/Makefile projects/clang350-import/usr.bin/colldef/Makefile projects/clang350-import/usr.bin/compile_et/Makefile projects/clang350-import/usr.bin/cpio/Makefile projects/clang350-import/usr.bin/cpio/test/Makefile projects/clang350-import/usr.bin/dc/Makefile projects/clang350-import/usr.bin/demandoc/Makefile projects/clang350-import/usr.bin/dpv/Makefile projects/clang350-import/usr.bin/drill/Makefile projects/clang350-import/usr.bin/du/Makefile projects/clang350-import/usr.bin/ee/Makefile projects/clang350-import/usr.bin/enigma/Makefile projects/clang350-import/usr.bin/fetch/Makefile projects/clang350-import/usr.bin/file/Makefile projects/clang350-import/usr.bin/fstat/Makefile projects/clang350-import/usr.bin/ftp/Makefile projects/clang350-import/usr.bin/gcore/Makefile projects/clang350-import/usr.bin/grep/Makefile projects/clang350-import/usr.bin/gzip/Makefile projects/clang350-import/usr.bin/host/Makefile projects/clang350-import/usr.bin/ipcrm/Makefile projects/clang350-import/usr.bin/ipcs/Makefile projects/clang350-import/usr.bin/iscsictl/Makefile projects/clang350-import/usr.bin/kdump/Makefile projects/clang350-import/usr.bin/keylogin/Makefile projects/clang350-import/usr.bin/killall/Makefile projects/clang350-import/usr.bin/ktrdump/Makefile projects/clang350-import/usr.bin/less/Makefile projects/clang350-import/usr.bin/limits/Makefile projects/clang350-import/usr.bin/lock/Makefile projects/clang350-import/usr.bin/login/Makefile projects/clang350-import/usr.bin/lzmainfo/Makefile projects/clang350-import/usr.bin/m4/Makefile projects/clang350-import/usr.bin/makewhatis/Makefile projects/clang350-import/usr.bin/mandoc/Makefile projects/clang350-import/usr.bin/minigzip/Makefile projects/clang350-import/usr.bin/ministat/Makefile projects/clang350-import/usr.bin/mkimg/Makefile projects/clang350-import/usr.bin/mkulzma/Makefile projects/clang350-import/usr.bin/mkuzip/Makefile projects/clang350-import/usr.bin/msgs/Makefile projects/clang350-import/usr.bin/nc/Makefile projects/clang350-import/usr.bin/ncal/Makefile projects/clang350-import/usr.bin/netstat/Makefile projects/clang350-import/usr.bin/newgrp/Makefile projects/clang350-import/usr.bin/newkey/Makefile projects/clang350-import/usr.bin/nfsstat/Makefile projects/clang350-import/usr.bin/opieinfo/Makefile projects/clang350-import/usr.bin/opiekey/Makefile projects/clang350-import/usr.bin/opiepasswd/Makefile projects/clang350-import/usr.bin/pamtest/Makefile projects/clang350-import/usr.bin/passwd/Makefile projects/clang350-import/usr.bin/procstat/Makefile projects/clang350-import/usr.bin/quota/Makefile projects/clang350-import/usr.bin/rctl/Makefile projects/clang350-import/usr.bin/rup/Makefile projects/clang350-import/usr.bin/rusers/Makefile projects/clang350-import/usr.bin/script/Makefile projects/clang350-import/usr.bin/seq/Makefile projects/clang350-import/usr.bin/smbutil/Makefile projects/clang350-import/usr.bin/sort/Makefile projects/clang350-import/usr.bin/split/Makefile projects/clang350-import/usr.bin/su/Makefile projects/clang350-import/usr.bin/systat/Makefile projects/clang350-import/usr.bin/tabs/Makefile projects/clang350-import/usr.bin/talk/Makefile projects/clang350-import/usr.bin/tar/Makefile projects/clang350-import/usr.bin/telnet/Makefile projects/clang350-import/usr.bin/tftp/Makefile projects/clang350-import/usr.bin/top/Makefile projects/clang350-import/usr.bin/tput/Makefile projects/clang350-import/usr.bin/truncate/Makefile projects/clang350-import/usr.bin/tset/Makefile projects/clang350-import/usr.bin/ul/Makefile projects/clang350-import/usr.bin/units/Makefile projects/clang350-import/usr.bin/unzip/Makefile projects/clang350-import/usr.bin/usbhidaction/Makefile projects/clang350-import/usr.bin/usbhidctl/Makefile projects/clang350-import/usr.bin/vacation/Makefile projects/clang350-import/usr.bin/vi/Makefile projects/clang350-import/usr.bin/vmstat/Makefile projects/clang350-import/usr.bin/w/Makefile projects/clang350-import/usr.bin/wc/Makefile projects/clang350-import/usr.bin/xinstall/Makefile projects/clang350-import/usr.bin/xlint/lint1/Makefile projects/clang350-import/usr.bin/xo/Makefile projects/clang350-import/usr.bin/xz/Makefile projects/clang350-import/usr.bin/xzdec/Makefile projects/clang350-import/usr.sbin/acpi/acpidb/Makefile projects/clang350-import/usr.sbin/amd/Makefile.inc projects/clang350-import/usr.sbin/amd/amd/Makefile projects/clang350-import/usr.sbin/amd/amq/Makefile projects/clang350-import/usr.sbin/amd/fixmount/Makefile projects/clang350-import/usr.sbin/amd/fsinfo/Makefile projects/clang350-import/usr.sbin/amd/hlfsd/Makefile projects/clang350-import/usr.sbin/amd/mk-amd-map/Makefile projects/clang350-import/usr.sbin/amd/pawd/Makefile projects/clang350-import/usr.sbin/amd/wire-test/Makefile projects/clang350-import/usr.sbin/ancontrol/Makefile projects/clang350-import/usr.sbin/apmd/Makefile projects/clang350-import/usr.sbin/asf/Makefile projects/clang350-import/usr.sbin/audit/Makefile projects/clang350-import/usr.sbin/auditd/Makefile projects/clang350-import/usr.sbin/auditdistd/Makefile projects/clang350-import/usr.sbin/auditreduce/Makefile projects/clang350-import/usr.sbin/authpf/Makefile projects/clang350-import/usr.sbin/autofs/Makefile projects/clang350-import/usr.sbin/bhyve/Makefile projects/clang350-import/usr.sbin/bhyvectl/Makefile projects/clang350-import/usr.sbin/bhyveload/Makefile projects/clang350-import/usr.sbin/bluetooth/ath3kfw/Makefile projects/clang350-import/usr.sbin/bluetooth/bt3cfw/Makefile projects/clang350-import/usr.sbin/bluetooth/bthidcontrol/Makefile projects/clang350-import/usr.sbin/bluetooth/bthidd/Makefile projects/clang350-import/usr.sbin/bluetooth/btpand/Makefile projects/clang350-import/usr.sbin/bluetooth/hccontrol/Makefile projects/clang350-import/usr.sbin/bluetooth/hcsecd/Makefile projects/clang350-import/usr.sbin/bluetooth/hcseriald/Makefile projects/clang350-import/usr.sbin/bluetooth/l2control/Makefile projects/clang350-import/usr.sbin/bluetooth/l2ping/Makefile projects/clang350-import/usr.sbin/bluetooth/rfcomm_pppd/Makefile projects/clang350-import/usr.sbin/bluetooth/sdpcontrol/Makefile projects/clang350-import/usr.sbin/boot0cfg/Makefile projects/clang350-import/usr.sbin/boot98cfg/Makefile projects/clang350-import/usr.sbin/bsdinstall/distextract/Makefile projects/clang350-import/usr.sbin/bsdinstall/distfetch/Makefile projects/clang350-import/usr.sbin/bsdinstall/partedit/Makefile projects/clang350-import/usr.sbin/bsnmpd/bsnmpd/Makefile projects/clang350-import/usr.sbin/bsnmpd/modules/snmp_hast/Makefile projects/clang350-import/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile projects/clang350-import/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile projects/clang350-import/usr.sbin/bsnmpd/tools/bsnmptools/Makefile projects/clang350-import/usr.sbin/cdcontrol/Makefile projects/clang350-import/usr.sbin/ckdist/Makefile projects/clang350-import/usr.sbin/clear_locks/Makefile projects/clang350-import/usr.sbin/config/Makefile projects/clang350-import/usr.sbin/cron/cron/Makefile projects/clang350-import/usr.sbin/cron/crontab/Makefile projects/clang350-import/usr.sbin/ctladm/Makefile projects/clang350-import/usr.sbin/ctld/Makefile projects/clang350-import/usr.sbin/ctm/ctm/Makefile projects/clang350-import/usr.sbin/ctm/mkCTM/Makefile projects/clang350-import/usr.sbin/daemon/Makefile projects/clang350-import/usr.sbin/dconschat/Makefile projects/clang350-import/usr.sbin/devinfo/Makefile projects/clang350-import/usr.sbin/diskinfo/Makefile projects/clang350-import/usr.sbin/editmap/Makefile projects/clang350-import/usr.sbin/edquota/Makefile projects/clang350-import/usr.sbin/fifolog/fifolog_create/Makefile projects/clang350-import/usr.sbin/fifolog/fifolog_reader/Makefile projects/clang350-import/usr.sbin/fifolog/fifolog_writer/Makefile projects/clang350-import/usr.sbin/flowctl/Makefile projects/clang350-import/usr.sbin/ftp-proxy/Makefile projects/clang350-import/usr.sbin/gssd/Makefile projects/clang350-import/usr.sbin/gstat/Makefile projects/clang350-import/usr.sbin/ifmcstat/Makefile projects/clang350-import/usr.sbin/inetd/Makefile projects/clang350-import/usr.sbin/iostat/Makefile projects/clang350-import/usr.sbin/ipfwpcap/Makefile projects/clang350-import/usr.sbin/iscsid/Makefile projects/clang350-import/usr.sbin/jail/Makefile projects/clang350-import/usr.sbin/jail/command.c projects/clang350-import/usr.sbin/jail/jail.c projects/clang350-import/usr.sbin/jail/state.c projects/clang350-import/usr.sbin/jexec/Makefile projects/clang350-import/usr.sbin/jls/Makefile projects/clang350-import/usr.sbin/kbdcontrol/Makefile projects/clang350-import/usr.sbin/keyserv/Makefile projects/clang350-import/usr.sbin/kgmon/Makefile projects/clang350-import/usr.sbin/lmcconfig/Makefile projects/clang350-import/usr.sbin/lpr/Makefile.inc projects/clang350-import/usr.sbin/lpr/chkprintcap/Makefile projects/clang350-import/usr.sbin/lpr/lpc/Makefile projects/clang350-import/usr.sbin/lpr/lpd/Makefile projects/clang350-import/usr.sbin/lpr/lpq/Makefile projects/clang350-import/usr.sbin/lpr/lpr/Makefile projects/clang350-import/usr.sbin/lpr/lprm/Makefile projects/clang350-import/usr.sbin/lpr/pac/Makefile projects/clang350-import/usr.sbin/mailstats/Makefile projects/clang350-import/usr.sbin/mailwrapper/Makefile projects/clang350-import/usr.sbin/makefs/Makefile projects/clang350-import/usr.sbin/makemap/Makefile projects/clang350-import/usr.sbin/mfiutil/Makefile projects/clang350-import/usr.sbin/mount_smbfs/Makefile projects/clang350-import/usr.sbin/mountd/Makefile projects/clang350-import/usr.sbin/moused/Makefile projects/clang350-import/usr.sbin/mptutil/Makefile projects/clang350-import/usr.sbin/mtree/Makefile projects/clang350-import/usr.sbin/nandtool/Makefile projects/clang350-import/usr.sbin/ndiscvt/Makefile projects/clang350-import/usr.sbin/ngctl/Makefile projects/clang350-import/usr.sbin/nghook/Makefile projects/clang350-import/usr.sbin/nmtree/Makefile projects/clang350-import/usr.sbin/nscd/Makefile projects/clang350-import/usr.sbin/ntp/Makefile.inc projects/clang350-import/usr.sbin/ntp/ntp-keygen/Makefile projects/clang350-import/usr.sbin/ntp/ntpd/Makefile projects/clang350-import/usr.sbin/ntp/ntpdate/Makefile projects/clang350-import/usr.sbin/ntp/ntpdc/Makefile projects/clang350-import/usr.sbin/ntp/ntpq/Makefile projects/clang350-import/usr.sbin/ntp/ntptime/Makefile projects/clang350-import/usr.sbin/ntp/sntp/Makefile projects/clang350-import/usr.sbin/pkg/Makefile projects/clang350-import/usr.sbin/pmccontrol/Makefile projects/clang350-import/usr.sbin/pmcstat/Makefile projects/clang350-import/usr.sbin/powerd/Makefile projects/clang350-import/usr.sbin/ppp/Makefile projects/clang350-import/usr.sbin/pppctl/Makefile projects/clang350-import/usr.sbin/praliases/Makefile projects/clang350-import/usr.sbin/praudit/Makefile projects/clang350-import/usr.sbin/pstat/Makefile projects/clang350-import/usr.sbin/pw/Makefile projects/clang350-import/usr.sbin/quotaon/Makefile projects/clang350-import/usr.sbin/rarpd/Makefile projects/clang350-import/usr.sbin/repquota/Makefile projects/clang350-import/usr.sbin/rpc.lockd/Makefile projects/clang350-import/usr.sbin/rpc.statd/Makefile projects/clang350-import/usr.sbin/rpc.yppasswdd/Makefile projects/clang350-import/usr.sbin/rpc.ypupdated/Makefile projects/clang350-import/usr.sbin/rpc.ypxfrd/Makefile projects/clang350-import/usr.sbin/rpcbind/Makefile projects/clang350-import/usr.sbin/rrenumd/Makefile projects/clang350-import/usr.sbin/rtadvd/Makefile projects/clang350-import/usr.sbin/rtsold/Makefile projects/clang350-import/usr.sbin/sendmail/Makefile projects/clang350-import/usr.sbin/services_mkdb/Makefile projects/clang350-import/usr.sbin/snapinfo/Makefile projects/clang350-import/usr.sbin/spray/Makefile projects/clang350-import/usr.sbin/syslogd/Makefile projects/clang350-import/usr.sbin/tcpdchk/Makefile projects/clang350-import/usr.sbin/tcpdmatch/Makefile projects/clang350-import/usr.sbin/tcpdump/tcpdump/Makefile projects/clang350-import/usr.sbin/timed/timed/Makefile projects/clang350-import/usr.sbin/traceroute/Makefile projects/clang350-import/usr.sbin/traceroute6/Makefile projects/clang350-import/usr.sbin/tzsetup/Makefile projects/clang350-import/usr.sbin/ugidfw/Makefile projects/clang350-import/usr.sbin/uhsoctl/Makefile projects/clang350-import/usr.sbin/unbound/anchor/Makefile projects/clang350-import/usr.sbin/unbound/checkconf/Makefile projects/clang350-import/usr.sbin/unbound/control/Makefile projects/clang350-import/usr.sbin/unbound/daemon/Makefile projects/clang350-import/usr.sbin/usbconfig/Makefile projects/clang350-import/usr.sbin/vipw/Makefile projects/clang350-import/usr.sbin/watch/Makefile projects/clang350-import/usr.sbin/watchdogd/Makefile projects/clang350-import/usr.sbin/wpa/Makefile.crypto projects/clang350-import/usr.sbin/wpa/hostapd/Makefile projects/clang350-import/usr.sbin/wpa/hostapd_cli/Makefile projects/clang350-import/usr.sbin/wpa/wpa_cli/Makefile projects/clang350-import/usr.sbin/wpa/wpa_passphrase/Makefile projects/clang350-import/usr.sbin/wpa/wpa_priv/Makefile projects/clang350-import/usr.sbin/wpa/wpa_supplicant/Makefile projects/clang350-import/usr.sbin/ypserv/Makefile Directory Properties: projects/clang350-import/ (props changed) Modified: projects/clang350-import/MAINTAINERS ============================================================================== --- projects/clang350-import/MAINTAINERS Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/MAINTAINERS Tue Nov 25 21:43:01 2014 (r275078) @@ -48,7 +48,6 @@ cd(4) ken Pre-commit review requested. pass(4) ken Pre-commit review requested. ch(4) ken Pre-commit review requested. em(4) jfv Pre-commit review requested. -tdfx(4) cokane Just keep me informed of changes, try not to break it. sendmail gshapiro Pre-commit review requested. etc/mail gshapiro Pre-commit review requested. Keep in sync with -STABLE. @@ -118,7 +117,6 @@ lib/libc/stdtime edwin Heads-up apprec is maintained by a third party source. sbin/routed bms Pre-commit review; notify vendor at rhyolite.com isci(4) jimharris Pre-commit review requested. -3dfx cokane Pre-commit review preferred. cmx daniel@roe.ch Pre-commit review preferred. filemon obrien Pre-commit review preferred. sysdoc trhodes Pre-commit review preferred. Modified: projects/clang350-import/bin/csh/Makefile ============================================================================== --- projects/clang350-import/bin/csh/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/bin/csh/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -40,8 +40,7 @@ MLINKS= csh.1 tcsh.1 # utilities of the same name are handled with the associated manpage, # builtin.1 in share/man/man1/. -DPADD= ${LIBTERMCAPW} ${LIBCRYPT} -LDADD= -ltermcapw -lcrypt +LIBADD= termcapw crypt LINKS= ${BINDIR}/csh ${BINDIR}/tcsh Modified: projects/clang350-import/bin/df/Makefile ============================================================================== --- projects/clang350-import/bin/df/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/bin/df/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -9,7 +9,6 @@ SRCS= df.c vfslist.c CFLAGS+= -I${MOUNT} -DPADD= ${LIBUTIL} ${LIBXO} -LDADD= -lutil -lxo +LIBADD= xo util .include Modified: projects/clang350-import/bin/ed/Makefile ============================================================================== --- projects/clang350-import/bin/ed/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/bin/ed/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -9,8 +9,7 @@ MLINKS= ed.1 red.1 .if ${MK_OPENSSL} != "no" && ${MK_ED_CRYPTO} != "no" CFLAGS+=-DDES -DPADD= ${LIBCRYPTO} -LDADD= -lcrypto +LIBADD= crypto .endif .include Modified: projects/clang350-import/bin/ls/Makefile ============================================================================== --- projects/clang350-import/bin/ls/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/bin/ls/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -5,14 +5,12 @@ PROG= ls SRCS= cmp.c ls.c print.c util.c -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .if !defined(RELEASE_CRUNCH) && \ ${MK_LS_COLORS} != no CFLAGS+= -DCOLORLS -DPADD+= ${LIBTERMCAPW} -LDADD+= -ltermcapw +LIBADD+= termcapw .endif .include Modified: projects/clang350-import/bin/pkill/Makefile ============================================================================== --- projects/clang350-import/bin/pkill/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/bin/pkill/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -5,8 +5,7 @@ PROG= pkill -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm LINKS= ${BINDIR}/pkill ${BINDIR}/pgrep MLINKS= pkill.1 pgrep.1 Modified: projects/clang350-import/bin/ps/Makefile ============================================================================== --- projects/clang350-import/bin/ps/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/bin/ps/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -11,7 +11,6 @@ SRCS= fmt.c keyword.c nlist.c print.c ps # on large systems. # CFLAGS+=-DLAZY_PS -DPADD= ${LIBM} ${LIBKVM} ${LIBJAIL} -LDADD= -lm -lkvm -ljail +LIBADD= m kvm jail .include Modified: projects/clang350-import/bin/rmail/Makefile ============================================================================== --- projects/clang350-import/bin/rmail/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/bin/rmail/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -14,11 +14,7 @@ MAN= rmail.8 WARNS?= 2 CFLAGS+=-I${SENDMAIL_DIR}/include -I. -LIBSMDIR= ${.OBJDIR}/../../lib/libsm -LIBSM= ${LIBSMDIR}/libsm.a - -DPADD= ${LIBSM} -LDADD= ${LIBSM} +LIBADD= sm SRCS+= sm_os.h CLEANFILES+=sm_os.h Modified: projects/clang350-import/bin/sh/Makefile ============================================================================== --- projects/clang350-import/bin/sh/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/bin/sh/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -18,8 +18,7 @@ SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS} # utilities of the same name are handled with the associated manpage, # builtin.1 in share/man/man1/. -DPADD= ${LIBEDIT} ${LIBTERMCAPW} -LDADD= -ledit -ltermcapw +LIBADD= edit CFLAGS+=-DSHELL -I. -I${.CURDIR} # for debug: Modified: projects/clang350-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c ============================================================================== --- projects/clang350-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c Tue Nov 25 21:43:01 2014 (r275078) @@ -1211,13 +1211,13 @@ dt_module_update(dtrace_hdl_t *dtp, stru #if defined(__FreeBSD__) if (sh.sh_size == 0) continue; - if (is_elf_obj && (sh.sh_type == SHT_PROGBITS || - sh.sh_type == SHT_NOBITS)) { + if (sh.sh_type == SHT_PROGBITS || sh.sh_type == SHT_NOBITS) { alignmask = sh.sh_addralign - 1; mapbase += alignmask; mapbase &= ~alignmask; sh.sh_addr = mapbase; - dmp->dm_sec_offsets[elf_ndxscn(sp)] = sh.sh_addr; + if (is_elf_obj) + dmp->dm_sec_offsets[elf_ndxscn(sp)] = sh.sh_addr; mapbase += sh.sh_size; } #endif Modified: projects/clang350-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c ============================================================================== --- projects/clang350-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c Tue Nov 25 21:43:01 2014 (r275078) @@ -545,8 +545,9 @@ dt_probe_define(dt_provider_t *pvp, dt_p for (pip = prp->pr_inst; pip != NULL; pip = pip->pi_next) { if (strcmp(pip->pi_fname, fname) == 0 && - ((rname == NULL && pip->pi_rname[0] == '\0') || - (rname != NULL && strcmp(pip->pi_rname, rname)) == 0)) + ((rname == NULL && pip->pi_rname == NULL) || + (rname != NULL && pip->pi_rname != NULL && + strcmp(pip->pi_rname, rname) == 0))) break; } Modified: projects/clang350-import/contrib/mdocml/lib.in ============================================================================== --- projects/clang350-import/contrib/mdocml/lib.in Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/contrib/mdocml/lib.in Tue Nov 25 21:43:01 2014 (r275078) @@ -56,6 +56,7 @@ LINE("libftpio", "FTP Connection Managem LINE("libform", "Curses Form Library (libform, \\-lform)") LINE("libgeom", "Userland API Library for Kernel GEOM subsystem (libgeom, \\-lgeom)") LINE("libgpib", "General-Purpose Instrument Bus (GPIB) library (libgpib, \\-lgpib)") +LINE("libgpio", "General-Purpose Input Output (GPIO) library (libgpio, \\-lgpio)") LINE("libhammer", "HAMMER Filesystem Userland Library (libhammer, \\-lhammer)") LINE("libi386", "i386 Architecture Library (libi386, \\-li386)") LINE("libintl", "Internationalized Message Handling Library (libintl, \\-lintl)") Modified: projects/clang350-import/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c ============================================================================== --- projects/clang350-import/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c Tue Nov 25 21:43:01 2014 (r275078) @@ -51,7 +51,11 @@ run(int n, ...) ATF_REQUIRE_EQ(n, DEPTH - calls - 1); va_start(va, n); +#if defined(__FreeBSD__) && defined(__amd64__) + for (i = 0; i < 5; i++) { +#else for (i = 0; i < 9; i++) { +#endif ia = va_arg(va, int); ATF_REQUIRE_EQ(i, ia); } @@ -101,13 +105,6 @@ ATF_TC_BODY(setcontext_link, tc) ucontext_t save; volatile int i = 0; /* avoid longjmp clobbering */ -#ifdef __FreeBSD__ -#ifdef __amd64__ - atf_tc_expect_fail("setcontext in this testcase fails on " - "FreeBSD/amd64 with rc == -1/errno == EINVAL; see PR # 194828"); -#endif -#endif - for (i = 0; i < DEPTH; ++i) { ATF_REQUIRE_EQ(getcontext(&uc[i]), 0); @@ -115,21 +112,20 @@ ATF_TC_BODY(setcontext_link, tc) uc[i].uc_stack.ss_size = STACKSZ; uc[i].uc_link = (i > 0) ? &uc[i - 1] : &save; +#if defined(__FreeBSD__) && defined(__amd64__) + /* FreeBSD/amd64 only permits up to 6 arguments. */ + makecontext(&uc[i], (void *)run, 6, i, + 0, 1, 2, 3, 4); +#else makecontext(&uc[i], (void *)run, 10, i, 0, 1, 2, 3, 4, 5, 6, 7, 8); +#endif } ATF_REQUIRE_EQ(getcontext(&save), 0); -#ifdef __FreeBSD__ - if (calls == 0) { - int rc = setcontext(&uc[DEPTH-1]); - ATF_REQUIRE_EQ_MSG(rc, 0, "%d != 0; (errno = %d)", rc, errno); - } -#else if (calls == 0) ATF_REQUIRE_EQ(setcontext(&uc[DEPTH-1]), 0); -#endif } ATF_TP_ADD_TCS(tp) Modified: projects/clang350-import/gnu/lib/libdialog/Makefile ============================================================================== --- projects/clang350-import/gnu/lib/libdialog/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/gnu/lib/libdialog/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -13,8 +13,7 @@ SRCS= argv.c arrows.c buildlist.c butto INCS= dialog.h dlg_colors.h dlg_config.h dlg_keys.h MAN= dialog.3 -DPADD= ${LIBNCURSESW} ${LIBM} -LDADD= -lncursesw -lm +LIBADD= ncursesw m CFLAGS+= -I${.CURDIR} -I${DIALOG} -D_XOPEN_SOURCE_EXTENDED -DGCC_UNUSED=__unused .PATH: ${DIALOG} Modified: projects/clang350-import/gnu/lib/libgcc/Makefile ============================================================================== --- projects/clang350-import/gnu/lib/libgcc/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/gnu/lib/libgcc/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -28,8 +28,7 @@ CFLAGS+= -DIN_GCC -DIN_LIBGCC2 -D__GCC_F -I${.CURDIR}/../../usr.bin/cc/cc_tools LDFLAGS+= -nodefaultlibs -DPADD+= ${LIBC} -LDADD+= -lc +LIBADD+= c OBJS= # added to below in various ways depending on TARGET_CPUARCH @@ -119,8 +118,7 @@ LIB1ASMSRC = lib1funcs.asm LIB1ASMFUNCS = _dvmd_tls _bb_init_func LIB2ADDEH = unwind-arm.c libunwind.S pr-support.c unwind-c.c # Some compilers generate __aeabi_ functions libgcc_s is missing -DPADD+= ${LIBCOMPILER_RT} -LDADD+= -lcompiler_rt +LIBADD+= compiler_rt .endif .if ${TARGET_CPUARCH} == mips Modified: projects/clang350-import/gnu/lib/libreadline/readline/Makefile ============================================================================== --- projects/clang350-import/gnu/lib/libreadline/readline/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/gnu/lib/libreadline/readline/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -23,7 +23,6 @@ ${.OBJDIR}/${_h}: ${SRCDIR}/${_h} ${INSTALL} ${.ALLSRC} ${.TARGET} .endfor -DPADD= ${LIBTERMCAPW} -LDADD= -ltermcapw +LIBADD= ncursesw .include Modified: projects/clang350-import/gnu/lib/libstdc++/Makefile ============================================================================== --- projects/clang350-import/gnu/lib/libstdc++/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/gnu/lib/libstdc++/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -23,8 +23,8 @@ CXXFLAGS+= -fno-implicit-templates -ffun -Wno-deprecated PO_CXXFLAGS= ${CXXFLAGS:N-ffunction-sections} -DPADD= ${LIBM} -LDADD= -lm -Wl,-f,libsupc++.so.1 +LIBADD+= m +LDADD= -Wl,-f,libsupc++.so.1 # libstdc++ sources SRCS+= bitmap_allocator.cc pool_allocator.cc \ Modified: projects/clang350-import/gnu/usr.bin/dialog/Makefile ============================================================================== --- projects/clang350-import/gnu/usr.bin/dialog/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/gnu/usr.bin/dialog/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -3,8 +3,7 @@ DIALOG= ${.CURDIR}/../../../contrib/dialog PROG= dialog -DPADD= ${LIBDIALOG} ${LIBNCURSESW} ${LIBM} -LDADD= -ldialog -lncursesw -lm +LIBADD= dialog ncursesw m CFLAGS+= -I${.CURDIR} -I${DIALOG} .PATH: ${DIALOG} Modified: projects/clang350-import/gnu/usr.bin/diff/Makefile ============================================================================== --- projects/clang350-import/gnu/usr.bin/diff/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/gnu/usr.bin/diff/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -26,8 +26,7 @@ CFLAGS+=-I${DESTDIR}/usr/include/gnu SUBDIR+=doc -DPADD= ${LIBGNUREGEX} -LDADD= -lgnuregex +LIBADD+= gnuregex .if ${MK_TESTS} != "no" SUBDIR+= tests Modified: projects/clang350-import/gnu/usr.bin/gdb/gdb/Makefile ============================================================================== --- projects/clang350-import/gnu/usr.bin/gdb/gdb/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/gnu/usr.bin/gdb/gdb/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -11,8 +11,9 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a # global symbols visible. LDFLAGS+= -Wl,-E -DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lm ${LDREADLINE} -ltermcapw -lgnuregex +DPADD= ${GDBLIBS} ${BULIBS} +LDADD= ${GDBLIBS} ${BULIBS} +LIBADD+= m readline ncursesw gnuregex .include CFLAGS+= -DDEBUGDIR=\"${DEBUGDIR}\" Modified: projects/clang350-import/gnu/usr.bin/gdb/gdbtui/Makefile ============================================================================== --- projects/clang350-import/gnu/usr.bin/gdb/gdbtui/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/gnu/usr.bin/gdb/gdbtui/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -12,7 +12,8 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a # global symbols visible. LDFLAGS+= -Wl,-E -DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lm ${LDREADLINE} -ltermcapw -lgnuregex +DPADD= ${GDBLIBS} ${BULIBS} +LDADD= ${GDBLIBS} ${BULIBS} +LIBADD+= m readline ncursesw gnuregex .include Modified: projects/clang350-import/gnu/usr.bin/gdb/kgdb/Makefile ============================================================================== --- projects/clang350-import/gnu/usr.bin/gdb/kgdb/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/gnu/usr.bin/gdb/kgdb/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -8,10 +8,9 @@ BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_ ${OBJ_BU}/libiberty/libiberty.a GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a -DPADD= ${GDBLIBS} ${BULIBS} ${LIBKVM} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} \ - ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX} -lm ${LDREADLINE} -ltermcapw \ - -lgnuregex +DPADD= ${GDBLIBS} ${BULIBS} ${LIBKVM} +LDADD= ${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX} +LIBADD+= m readline ncursesw gnuregex .if defined(GDB_CROSS_DEBUGGER) CFLAGS+= -Wl,-export-dynamic Modified: projects/clang350-import/gnu/usr.bin/grep/Makefile ============================================================================== --- projects/clang350-import/gnu/usr.bin/grep/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/gnu/usr.bin/grep/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -22,8 +22,7 @@ LINKS+= ${BINDIR}/grep ${BINDIR}/egrep \ MLINKS= grep.1 egrep.1 grep.1 fgrep.1 .endif -DPADD= ${LIBGNUREGEX} ${LIBBZ2} -LDADD= -lgnuregex -lbz2 +LIBADD= gnuregex bz2 .if ${MK_BSD_GREP} != "yes" LINKS+= ${BINDIR}/grep ${BINDIR}/bzgrep \ @@ -33,8 +32,7 @@ MLINKS+=grep.1 bzgrep.1 grep.1 bzegrep.1 .endif .if defined(GREP_LIBZ) && !empty(GREP_LIBZ) -LDADD+= -lz -DPADD+= ${LIBZ} +LIBADD+= z CFLAGS+=-DHAVE_LIBZ=1 .if ${MK_BSD_GREP} != "yes" LINKS+= ${BINDIR}/grep ${BINDIR}/zgrep \ Modified: projects/clang350-import/kerberos5/Makefile.inc ============================================================================== --- projects/clang350-import/kerberos5/Makefile.inc Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/Makefile.inc Tue Nov 25 21:43:01 2014 (r275078) @@ -16,9 +16,6 @@ LDAPCFLAGS= -I${OPENLDAPBASE}/include -D LDAPLDFLAGS= -L${OPENLDAPBASE}/lib -Wl,-rpath,${OPENLDAPBASE}/lib .endif -LIBVERS= ${.OBJDIR}/../../lib/libvers/libvers.a -LIBSL= ${.OBJDIR}/../../lib/libsl/libsl.a - .if defined(SRCS) ETSRCS= \ Modified: projects/clang350-import/kerberos5/lib/libasn1/Makefile ============================================================================== --- projects/clang350-import/kerberos5/lib/libasn1/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/lib/libasn1/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -3,8 +3,7 @@ LIB= asn1 LDFLAGS= -Wl,--no-undefined INCS= asn1_err.h asn1-common.h heim_asn1.h der.h der-protos.h der-private.h -LDADD= -lcom_err -lroken -DPADD= ${LIBCOM_ERR} ${LIBROKEN} +LIBADD= com_err roken VERSION_MAP= ${.CURDIR}/version.map SRCS= asn1_err.c \ Modified: projects/clang350-import/kerberos5/lib/libgssapi_krb5/Makefile ============================================================================== --- projects/clang350-import/kerberos5/lib/libgssapi_krb5/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/lib/libgssapi_krb5/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -2,9 +2,7 @@ LIB= gssapi_krb5 LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined -LDADD= -lgssapi -lkrb5 -lhx509 -lcrypto -lroken -lasn1 -lcom_err -lcrypt -DPADD= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBCRYPTO} ${LIBROKEN} ${LIBASN1} \ - ${LIBCOM_ERR} ${LIBCRYPT} +LIBADD= gssapi krb5 crypto roken asn1 com_err SHLIB_MAJOR= 10 INCS= ${KRB5DIR}/lib/gssapi/gssapi/gssapi_krb5.h Modified: projects/clang350-import/kerberos5/lib/libgssapi_ntlm/Makefile ============================================================================== --- projects/clang350-import/kerberos5/lib/libgssapi_ntlm/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/lib/libgssapi_ntlm/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -2,8 +2,7 @@ LIB= gssapi_ntlm LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined -LDADD= -lcrypto -lgssapi -lkrb5 -lhx509 -lheimntlm -lroken -DPADD= ${LIBCRYPTO} ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBROKEN} +LIBADD= crypto gssapi krb5 heimntlm roken SHLIB_MAJOR= 10 SRCS= accept_sec_context.c \ Modified: projects/clang350-import/kerberos5/lib/libgssapi_spnego/Makefile ============================================================================== --- projects/clang350-import/kerberos5/lib/libgssapi_spnego/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/lib/libgssapi_spnego/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -2,8 +2,7 @@ LIB= gssapi_spnego LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined -LDADD= -lgssapi -lheimbase -lasn1 -lroken -DPADD= ${LIBGSSAPI} ${LIBHEIMBASE} ${LIBASN1} ${LIBROKEN} +LIBADD= gssapi heimbase asn1 roken SHLIB_MAJOR= 10 SRCS= accept_sec_context.c \ Modified: projects/clang350-import/kerberos5/lib/libhdb/Makefile ============================================================================== --- projects/clang350-import/kerberos5/lib/libhdb/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/lib/libhdb/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -3,8 +3,8 @@ LIB= hdb LDFLAGS= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/lib/hdb/version-script.map -LDADD= -lasn1 -lcom_err -lkrb5 -lroken -lheimsqlite -DPADD= ${LIBASN1} ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN} ${LIBHEIMSQLITE} ${LDAPDPADD} +LIBADD= asn1 com_err krb5 roken heimsqlite +DPADD= ${LDAPDPADD} MAN= HDB.3 hdb_entry_ex.3 Modified: projects/clang350-import/kerberos5/lib/libheimbase/Makefile ============================================================================== --- projects/clang350-import/kerberos5/lib/libheimbase/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/lib/libheimbase/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -2,7 +2,7 @@ LIB= heimbase LDFLAGS= -Wl,--no-undefined -LDADD= -lpthread +LIBADD= pthread VERSION_MAP= ${KRB5DIR}/base/version-script.map INCS= heimbase.h Modified: projects/clang350-import/kerberos5/lib/libheimipcc/Makefile ============================================================================== --- projects/clang350-import/kerberos5/lib/libheimipcc/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/lib/libheimipcc/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -2,8 +2,7 @@ LIB= heimipcc PRIVATELIB= -LDADD= -lheimbase -lroken -lpthread -DPADD= ${LIBHEIMBASE} ${LIBROKEN} ${LIBPTHREAD} +LIBADD= heimbase roken pthread SRCS= \ client.c \ Modified: projects/clang350-import/kerberos5/lib/libheimipcs/Makefile ============================================================================== --- projects/clang350-import/kerberos5/lib/libheimipcs/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/lib/libheimipcs/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -2,9 +2,7 @@ LIB= heimipcs PRIVATELIB= -LDADD= -lheimbase -lroken -LDFLAGS= -pthread -DPADD= ${LIBHEIMBASE} ${LIBROKEN} +LIBADD= heimbase roken pthread SRCS= \ server.c \ Modified: projects/clang350-import/kerberos5/lib/libheimntlm/Makefile ============================================================================== --- projects/clang350-import/kerberos5/lib/libheimntlm/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/lib/libheimntlm/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -2,8 +2,7 @@ LIB= heimntlm LDFLAGS= -Wl,--no-undefined -LDADD= -lcrypto -lcom_err -lkrb5 -lroken -DPADD= ${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN} +LIBADD= crypto com_err krb5 roken SRCS= ntlm.c ntlm_err.c INCS= heimntlm.h heimntlm-protos.h ntlm_err.h CFLAGS+=-I${KRB5DIR}/lib/ntlm -I${KRB5DIR}/lib/roken Modified: projects/clang350-import/kerberos5/lib/libheimsqlite/Makefile ============================================================================== --- projects/clang350-import/kerberos5/lib/libheimsqlite/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/lib/libheimsqlite/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -2,8 +2,7 @@ LIB= heimsqlite SRCS= sqlite3.c -DPADD= ${LIBPTHREAD} -LDADD= -lpthread +LIBADD= pthread CFLAGS+=-I${KRB5DIR}/lib/sqlite .include Modified: projects/clang350-import/kerberos5/lib/libhx509/Makefile ============================================================================== --- projects/clang350-import/kerberos5/lib/libhx509/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/lib/libhx509/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -3,8 +3,7 @@ LIB= hx509 LDFLAGS= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/lib/hx509/version-script.map -LDADD= -lasn1 -lcom_err -lcrypto -lroken -lwind -DPADD= ${LIBASN1} ${LIBCOM_ERR} ${LIBCRYPTO} ${LIBROKEN} ${LIBWIND} +LIBADD= asn1 com_err crypto roken wind MAN= hx509.3 \ hx509_ca.3 \ Modified: projects/clang350-import/kerberos5/lib/libkadm5clnt/Makefile ============================================================================== --- projects/clang350-import/kerberos5/lib/libkadm5clnt/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/lib/libkadm5clnt/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -2,8 +2,7 @@ LIB= kadm5clnt LDFLAGS= -Wl,--no-undefined -LDADD= -lcom_err -lkrb5 -lroken -DPADD= ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN} +LIBADD= com_err krb5 roken INCS= admin.h \ kadm5-private.h \ Modified: projects/clang350-import/kerberos5/lib/libkadm5srv/Makefile ============================================================================== --- projects/clang350-import/kerberos5/lib/libkadm5srv/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/lib/libkadm5srv/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -2,8 +2,7 @@ LIB= kadm5srv LDFLAGS= -Wl,--no-undefined -LDADD= -lcom_err -lhdb -lkrb5 -lroken -DPADD= ${LIBCOM_ERR} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} +LIBADD= com_err hdb krb5 roken VERSION_MAP= ${KRB5DIR}/lib/kadm5/version-script.map MAN= kadm5_pwcheck.3 Modified: projects/clang350-import/kerberos5/lib/libkafs5/Makefile ============================================================================== --- projects/clang350-import/kerberos5/lib/libkafs5/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/lib/libkafs5/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -1,9 +1,8 @@ # $FreeBSD$ LIB= kafs5 -LDADD= -lasn1 -lroken -lkrb5 LDFLAGS= -Wl,--no-undefined -DPADD= ${LIBASN1} ${LIBKRB5} ${LIBROKEN} +LIBADD= asn1 krb5 roken INCS= kafs.h MAN= kafs5.3 VERSION_MAP= ${.CURDIR}/version.map Modified: projects/clang350-import/kerberos5/lib/libkdc/Makefile ============================================================================== --- projects/clang350-import/kerberos5/lib/libkdc/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/lib/libkdc/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -3,9 +3,7 @@ LIB= kdc LDFLAGS= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/kdc/version-script.map -LDADD= -lroken -lhdb -lhx509 -lkrb5 -lheimntlm -lasn1 -lcrypt -lcrypto -DPADD= ${LIBROKEN} ${LIBHDB} ${LIBHX509} ${LIBKRB5} ${LIBHEIMNTLM} \ - ${LIBASN1} ${LIBCRYPT} ${LIBCRYPTO} +LIBADD= roken hdb hx509 krb5 heimntlm asn1 crypto INCS= kdc.h \ kdc-protos.h Modified: projects/clang350-import/kerberos5/lib/libkrb5/Makefile ============================================================================== --- projects/clang350-import/kerberos5/lib/libkrb5/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/lib/libkrb5/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -3,9 +3,7 @@ LIB= krb5 LDFLAGS= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/lib/krb5/version-script.map -LDADD= -lasn1 -lcom_err -lcrypt -lcrypto -lhx509 -lroken -lwind -lheimbase ${LDHEIMIPCC} -DPADD= ${LIBASN1} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO} ${LIBHX509} ${LIBROKEN} ${LIBWIND} ${LIBHEIMBASE} ${LIBHEIMIPCC} -USEPRIVATELIB= heimipcc +LIBADD= asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc INCS= heim_err.h \ heim_threads.h \ @@ -628,3 +626,4 @@ CFLAGS+= -I${KRB5DIR}/lib/krb5 \ .include .PATH: ${KRB5DIR}/lib/krb5 ${KRB5DIR}/lib/asn1 ${KRB5DIR}/include ${.CURDIR}/../../include ${KRB5DIR}/doc/doxyout/krb5/man/man3/ +USEPRIVATELIB= heimipcc Modified: projects/clang350-import/kerberos5/lib/libroken/Makefile ============================================================================== --- projects/clang350-import/kerberos5/lib/libroken/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/lib/libroken/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -1,8 +1,7 @@ # $FreeBSD$ LIB= roken -LDADD= -lcrypt -DPADD= ${LIBCRYPT} +LIBADD= crypt VERSION_MAP= ${KRB5DIR}/lib/roken/version-script.map INCS= roken.h \ roken-common.h \ Modified: projects/clang350-import/kerberos5/lib/libwind/Makefile ============================================================================== --- projects/clang350-import/kerberos5/lib/libwind/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/lib/libwind/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -3,8 +3,7 @@ LIB= wind LDFLAGS= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/lib/wind/version-script.map -LDADD= -lcom_err -lroken -DPADD= ${LIBCOM_ERR} ${LIBROKEN} +LIBADD= com_err roken INCS= wind.h \ wind_err.h Modified: projects/clang350-import/kerberos5/libexec/digest-service/Makefile ============================================================================== --- projects/clang350-import/kerberos5/libexec/digest-service/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/libexec/digest-service/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -8,11 +8,7 @@ CFLAGS+= -I${KRB5DIR}/kdc \ -I${KRB5DIR}/lib/ipc \ -I${KRB5DIR}/lib/wind \ -I${KRB5DIR}/lib/roken -DPADD= ${LIBHDB} ${LIBKDC} ${LIBHEIMIPCS} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \ - ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS} -LDADD= -lhdb -lkdc ${LDHEIMIPCS} -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \ - ${LIBVERS} -lheimntlm -USEPRIVATELIB= heimipcs +LIBADD= hdb kdc heimipcs krb5 roken asn1 crypto vers heimntlm .include Modified: projects/clang350-import/kerberos5/libexec/hprop/Makefile ============================================================================== --- projects/clang350-import/kerberos5/libexec/hprop/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/libexec/hprop/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -10,10 +10,9 @@ CFLAGS+=-I${KRB5DIR}/lib/hx509 CFLAGS+=-I${KRB5DIR}/lib/ntlm CFLAGS+=-I${KRB5DIR}/kdc CFLAGS+=-I${.OBJDIR}/../../lib/libkrb5 -DPADD= ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD} -LDADD= -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +LIBADD= hdb krb5 roken vers +DPADD= ${LDAPDPADD} +LDADD= ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} .include Modified: projects/clang350-import/kerberos5/libexec/hpropd/Makefile ============================================================================== --- projects/clang350-import/kerberos5/libexec/hpropd/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/libexec/hpropd/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -4,10 +4,9 @@ PROG= hpropd MAN= hpropd.8 CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/kdc ${LDAPCFLAGS} -DPADD= ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD} -LDADD= -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +LIBADD= hdb krb5 roken vers +DPADD= ${LDAPDPADD} +LDADD= ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} .include Modified: projects/clang350-import/kerberos5/libexec/ipropd-master/Makefile ============================================================================== --- projects/clang350-import/kerberos5/libexec/ipropd-master/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/libexec/ipropd-master/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -5,10 +5,9 @@ MAN= iprop.8 SRCS= ipropd_common.c ipropd_master.c kadm5_err.h CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ -I. ${LDAPCFLAGS} -DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD} -LDADD= -lkadm5srv -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +LIBADD= kadm5srv hdb krb5 roken vers +DPADD= ${LDAPDPADD} +LDADD= ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} foo:: Modified: projects/clang350-import/kerberos5/libexec/ipropd-slave/Makefile ============================================================================== --- projects/clang350-import/kerberos5/libexec/ipropd-slave/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/libexec/ipropd-slave/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -5,10 +5,9 @@ MAN= SRCS= ipropd_common.c ipropd_slave.c kadm5_err.h CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ -I. ${LDAPCFLAGS} -DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD} -LDADD= -lkadm5srv -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +LIBADD= kadm5srv hdb krb5 roken vers +DPADD= ${LDAPDPADD} +LDADD= ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} .include Modified: projects/clang350-import/kerberos5/libexec/kadmind/Makefile ============================================================================== --- projects/clang350-import/kerberos5/libexec/kadmind/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/libexec/kadmind/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -9,10 +9,9 @@ SRCS= rpc.c \ CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ ${LDAPCFLAGS} -DPADD= ${LIBKADM5SRV} ${LIBGSSAPI} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} \ - ${LIBASN1} ${LIBVERS} ${LIBCRYPTO} ${LIBCRYPT} ${LDAPDPADD} -LDADD= -lkadm5srv -lgssapi -lhdb -lkrb5 -lroken \ - -lasn1 ${LIBVERS} -lcrypto -lcrypt ${LDAPLDADD} +LIBADD= kadm5srv gssapi hdb krb5 roken vers +DPADD= ${LDAPDPADD} +LDADD= ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} .include Modified: projects/clang350-import/kerberos5/libexec/kcm/Makefile ============================================================================== --- projects/clang350-import/kerberos5/libexec/kcm/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/libexec/kcm/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -19,11 +19,9 @@ SRCS= acl.c \ CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/kcm -I${KRB5DIR}/lib/ipc ${LDAPCFLAGS} -DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBHEIMNTLM} \ - ${LIBHEIMIPCS} ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS} ${LDAPDPADD} -LDADD= -lhdb -lkrb5 -lroken -lasn1 -lheimntlm ${LDHEIMIPCS} \ - -lcrypto -lcrypt ${LIBVERS} ${LDAPLDADD} -USEPRIVATELIB= heimipcs +LIBADD= krb5 roken heimntlm heimipcs crypto +DPADD= ${LDAPDPADD} +LDADD= ${LIBVERS} ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} .include Modified: projects/clang350-import/kerberos5/libexec/kdc/Makefile ============================================================================== --- projects/clang350-import/kerberos5/libexec/kdc/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/libexec/kdc/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -10,9 +10,7 @@ SRCS= config.c \ CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/kdc ${LDAPCFLAGS} -DPADD= ${LIBKDC} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \ - ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS} -LDADD= -lkdc -lhdb -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS} +LIBADD= kdc hdb krb5 roken crypt vers .include Modified: projects/clang350-import/kerberos5/libexec/kdigest/Makefile ============================================================================== --- projects/clang350-import/kerberos5/libexec/kdigest/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/libexec/kdigest/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -5,10 +5,7 @@ MAN= kdigest.8 CFLAGS+= -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/sl -I. -DPADD= ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \ - ${LIBCRYPT} ${LIBSL} ${LIBVERS} ${LIBEDIT} -LDADD= -lkrb5 -lheimntlm -lroken -lasn1 -lcrypto -lcrypt ${LIBSL} \ - ${LIBVERS} -ledit +LIBADD= krb5 heimntlm roken crypto edit sl vers SRCS= kdigest.c \ kdigest-commands.c \ kdigest-commands.h Modified: projects/clang350-import/kerberos5/libexec/kfd/Makefile ============================================================================== --- projects/clang350-import/kerberos5/libexec/kfd/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/libexec/kfd/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -4,10 +4,7 @@ PROG= kfd MAN= kfd.8 CFLAGS+= -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken -DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \ - ${LIBCRYPT} ${LIBVERS} -LDADD= -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \ - ${LIBVERS} +LIBADD= krb5 roken vers .include Modified: projects/clang350-import/kerberos5/libexec/kimpersonate/Makefile ============================================================================== --- projects/clang350-import/kerberos5/libexec/kimpersonate/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/libexec/kimpersonate/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -6,10 +6,7 @@ CFLAGS+= -I${KRB5DIR}/lib/hx509 \ -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/sl -I. -DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \ - ${LIBCRYPT} ${LIBVERS} -LDADD= -lkafs5 -lkrb5 -lheimntlm -lroken -lasn1 -lcrypto -lcrypt \ - ${LIBVERS} +LIBADD= krb5 roken asn1 vers .include Modified: projects/clang350-import/kerberos5/libexec/kpasswdd/Makefile ============================================================================== --- projects/clang350-import/kerberos5/libexec/kpasswdd/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/libexec/kpasswdd/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -3,10 +3,9 @@ PROG= kpasswdd MAN= kpasswdd.8 CFLAGS+=-I${KRB5DIR}/lib/roken -I../../lib/libhdb ${LDAPCFLAGS} -DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD} -LDADD= -lkadm5srv -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +LIBADD= kadm5srv hdb krb5 roken vers asn1 +DPADD= ${LDAPDPADD} +LDADD= ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} .include Modified: projects/clang350-import/kerberos5/tools/asn1_compile/Makefile ============================================================================== --- projects/clang350-import/kerberos5/tools/asn1_compile/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/tools/asn1_compile/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -3,8 +3,9 @@ PROG= asn1_compile MAN= LIBROKEN_A= ${.OBJDIR}/../../lib/libroken/libroken.a -LDADD= ${LIBROKEN_A} ${LIBVERS} -DPADD= ${LIBROKEN_A} ${LIBVERS} +LIBADD= vers +LDADD= ${LIBROKEN_A} +DPADD= ${LIBROKEN_A} SRCS= \ asn1parse.y \ Modified: projects/clang350-import/kerberos5/tools/slc/Makefile ============================================================================== --- projects/clang350-import/kerberos5/tools/slc/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/tools/slc/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -2,8 +2,9 @@ PROG= slc LIBROKEN_A= ${.OBJDIR}/../../lib/libroken/libroken.a -LDADD= ${LIBROKEN_A} ${LIBVERS} -DPADD= ${LIBROKEN_A} ${LIBVERS} +LIBADD= vers +LDADD= ${LIBROKEN_A} +DPADD= ${LIBROKEN_A} MAN= SRCS= roken.h \ Modified: projects/clang350-import/kerberos5/usr.bin/hxtool/Makefile ============================================================================== --- projects/clang350-import/kerberos5/usr.bin/hxtool/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/usr.bin/hxtool/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -6,8 +6,7 @@ CFLAGS+= -I${KRB5DIR}/lib/hx509 \ -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/sl -I. -DPADD= ${LIBHX509} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBSL} ${LIBVERS} ${LIBEDIT} -LDADD= -lhx509 -lroken -lasn1 -lcrypto -lcrypt ${LIBSL} ${LIBVERS} -ledit +LIBADD= hx509 roken asn1 crypto sl vers edit SRCS= hxtool.c hxtool-commands.c hxtool-commands.h hxtool-commands.h: hxtool-commands.in Modified: projects/clang350-import/kerberos5/usr.bin/kadmin/Makefile ============================================================================== --- projects/clang350-import/kerberos5/usr.bin/kadmin/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/usr.bin/kadmin/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -26,14 +26,9 @@ SRCS= add_enctype.c \ CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/sl -I. ${LDAPCFLAGS} -DPADD= ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} \ - ${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBASN1} \ - ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \ - ${LIBEDIT} ${LIBNCURSESW} ${LDAPDPADD} -LDADD= -lkadm5clnt -lkadm5srv -lhdb -lkrb5 -lhx509 \ - ${LIBSL} -lroken ${LIBVERS} -lasn1 \ - -lcrypto -lcrypt -lcom_err \ - -ledit -lncursesw ${LDAPLDADD} +LIBADD= kadm5clnt kadm5srv hdb krb5 roken vers sl asn1 crypto edit +DPADD= ${LDAPDPADD} +LDADD= ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} .include Modified: projects/clang350-import/kerberos5/usr.bin/kcc/Makefile ============================================================================== --- projects/clang350-import/kerberos5/usr.bin/kcc/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/usr.bin/kcc/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -8,10 +8,7 @@ CFLAGS+= -I${KRB5DIR}/lib/hx509 \ -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/sl -I. -DPADD= ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \ - ${LIBCRYPT} ${LIBKAFS5} ${LIBSL} ${LIBVERS} ${LIBEDIT} -LDADD= -lkrb5 -lheimntlm -lroken -lasn1 -lcrypto -lcrypt -lkafs5 ${LIBSL} \ - ${LIBVERS} -ledit +LIBADD= krb5 roken asn1 kafs5 edit sl vers SRCS= kcc.c \ kcc-commands.c \ kcc-commands.h \ Modified: projects/clang350-import/kerberos5/usr.bin/kdestroy/Makefile ============================================================================== --- projects/clang350-import/kerberos5/usr.bin/kdestroy/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/usr.bin/kdestroy/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -2,10 +2,7 @@ PROG= kdestroy CFLAGS+=-I${KRB5DIR}/lib/roken -DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} -LDADD= -lkafs5 -lkrb5 -lheimntlm -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt +LIBADD= kafs5 krb5 roken vers MAN= kdestroy.1 .include Modified: projects/clang350-import/kerberos5/usr.bin/kf/Makefile ============================================================================== --- projects/clang350-import/kerberos5/usr.bin/kf/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/usr.bin/kf/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -4,10 +4,7 @@ PROG= kf MAN= kf.1 CFLAGS+= -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken -DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \ - ${LIBCRYPT} ${LIBVERS} -LDADD= -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \ - ${LIBVERS} +LIBADD= krb5 roken vers .include Modified: projects/clang350-import/kerberos5/usr.bin/kgetcred/Makefile ============================================================================== --- projects/clang350-import/kerberos5/usr.bin/kgetcred/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/usr.bin/kgetcred/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -3,8 +3,7 @@ PROG= kgetcred CFLAGS+= -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken -DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS} -LDADD= -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS} +LIBADD= krb5 roken asn1 vers .include Modified: projects/clang350-import/kerberos5/usr.bin/kinit/Makefile ============================================================================== --- projects/clang350-import/kerberos5/usr.bin/kinit/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/usr.bin/kinit/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -2,10 +2,7 @@ PROG= kinit CFLAGS+=-I${KRB5DIR}/lib/roken -DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} -LDADD= -lkafs5 -lkrb5 -lheimntlm -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err +LIBADD= kafs5 krb5 heimntlm roken crypto vers .include Modified: projects/clang350-import/kerberos5/usr.bin/kpasswd/Makefile ============================================================================== --- projects/clang350-import/kerberos5/usr.bin/kpasswd/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/usr.bin/kpasswd/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -2,10 +2,7 @@ PROG= kpasswd CFLAGS+=-I${KRB5DIR}/lib/roken -DPADD= ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} -LDADD= -lkrb5 -lhx509 -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err +LIBADD= hdb krb5 roken vers crypto .include Modified: projects/clang350-import/kerberos5/usr.bin/ksu/Makefile ============================================================================== --- projects/clang350-import/kerberos5/usr.bin/ksu/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/usr.bin/ksu/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -8,10 +8,7 @@ PRECIOUSPROG= MAN= SRCS= su.c CFLAGS+=-I${KRB5DIR}/lib/roken -DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} -LDADD= -lkafs5 -lkrb5 -lhx509 -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err +LIBADD= kafs5 krb5 roken vers crypto crypt .include Modified: projects/clang350-import/kerberos5/usr.bin/string2key/Makefile ============================================================================== --- projects/clang350-import/kerberos5/usr.bin/string2key/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/usr.bin/string2key/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -7,9 +7,7 @@ CFLAGS+= -I${KRB5DIR}/kdc \ -I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/windc -DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \ - ${LIBCRYPT} ${LIBVERS} -LDADD= -lhdb -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS} +LIBADD= krb5 roken crypto vers .include Modified: projects/clang350-import/kerberos5/usr.bin/verify_krb5_conf/Makefile ============================================================================== --- projects/clang350-import/kerberos5/usr.bin/verify_krb5_conf/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/usr.bin/verify_krb5_conf/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -3,10 +3,7 @@ PROG= verify_krb5_conf MAN= verify_krb5_conf.8 CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken -DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} -LDADD= -lkafs5 -lkrb5 -lhx509 -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err +LIBADD= krb5 roken vers .include Modified: projects/clang350-import/kerberos5/usr.sbin/iprop-log/Makefile ============================================================================== --- projects/clang350-import/kerberos5/usr.sbin/iprop-log/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/usr.sbin/iprop-log/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -8,10 +8,7 @@ CFLAGS+= -I${KRB5DIR}/lib/kadm5 \ -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/sl \ -I. -DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} \ - ${LIBCRYPT} ${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBEDIT} -LDADD= -lkadm5srv -lhdb -lkrb5 -lasn1 -lcrypto -lcrypt ${LIBSL} -lroken \ - ${LIBVERS} -ledit +LIBADD= kadm5srv hdb krb5 roken edit sl vers iprop-commands.h: iprop-commands.in ${SLC} ${.ALLSRC:M*.in} Modified: projects/clang350-import/kerberos5/usr.sbin/kstash/Makefile ============================================================================== --- projects/clang350-import/kerberos5/usr.sbin/kstash/Makefile Tue Nov 25 21:18:18 2014 (r275077) +++ projects/clang350-import/kerberos5/usr.sbin/kstash/Makefile Tue Nov 25 21:43:01 2014 (r275078) @@ -4,10 +4,9 @@ PROG= kstash MAN= kstash.8 CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/kdc ${LDAPCFLAGS} -DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LDAPDPADD} -LDADD= -lhdb -lkrb5 -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt ${LDAPLDADD} +LIBADD= hdb krb5 crypto vers +DPADD= ${LDAPDPADD} +LDADD= ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Tue Nov 25 22:38:17 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A02DA85B; Tue, 25 Nov 2014 22:38:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8C5141B9; Tue, 25 Nov 2014 22:38:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAPMcHNw027986; Tue, 25 Nov 2014 22:38:17 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAPMcHNF027985; Tue, 25 Nov 2014 22:38:17 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411252238.sAPMcHNF027985@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 25 Nov 2014 22:38:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275085 - projects/building-blocks/tools/build/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2014 22:38:17 -0000 Author: ngie Date: Tue Nov 25 22:38:16 2014 New Revision: 275085 URL: https://svnweb.freebsd.org/changeset/base/275085 Log: Add more MK_BSNMP == no entries for things not caught due to custom settings in $SRCCONF Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Nov 25 22:37:27 2014 (r275084) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Nov 25 22:38:16 2014 (r275085) @@ -323,6 +323,7 @@ OLD_FILES+=usr/bin/bsnmpwalk OLD_FILES+=usr/include/bsnmp/asn1.h OLD_FILES+=usr/include/bsnmp/bridge_snmp.h OLD_FILES+=usr/include/bsnmp/snmp.h +OLD_FILES+=usr/include/bsnmp/snmp_atm.h OLD_FILES+=usr/include/bsnmp/snmp_mibII.h OLD_FILES+=usr/include/bsnmp/snmp_netgraph.h OLD_FILES+=usr/include/bsnmp/snmpagent.h @@ -330,14 +331,18 @@ OLD_FILES+=usr/include/bsnmp/snmpclient. OLD_FILES+=usr/include/bsnmp/snmpmod.h OLD_FILES+=usr/lib/libbsnmp.a OLD_FILES+=usr/lib/libbsnmp.so.6 +OLD_FILES+=usr/lib/libbsnmp_p.a OLD_FILES+=usr/lib/libbsnmptools.a OLD_FILES+=usr/lib/libbsnmptools.so.0 +OLD_FILES+=usr/lib/libbsnmptools_p.a +OLD_FILES+=usr/lib/snmp_atm.so.6 OLD_FILES+=usr/lib/snmp_bridge.so.6 OLD_FILES+=usr/lib/snmp_hast.so.6 OLD_FILES+=usr/lib/snmp_hostres.so.6 OLD_FILES+=usr/lib/snmp_lm75.so.6 OLD_FILES+=usr/lib/snmp_mibII.so.6 OLD_FILES+=usr/lib/snmp_netgraph.so.6 +OLD_FILES+=usr/lib/snmp_pf.so.6 OLD_FILES+=usr/lib/snmp_target.so.6 OLD_FILES+=usr/lib/snmp_usm.so.6 OLD_FILES+=usr/lib/snmp_vacm.so.6 @@ -353,6 +358,7 @@ OLD_FILES+=usr/share/man/man3/asn1.3.gz OLD_FILES+=usr/share/man/man3/bsnmpagent.3.gz OLD_FILES+=usr/share/man/man3/bsnmpclient.3.gz OLD_FILES+=usr/share/man/man3/bsnmplib.3.gz +OLD_FILES+=usr/share/man/man3/snmp_atm.3.gz OLD_FILES+=usr/share/man/man3/snmp_bridge.3.gz OLD_FILES+=usr/share/man/man3/snmp_hast.3.gz OLD_FILES+=usr/share/man/man3/snmp_hostres.3.gz @@ -364,6 +370,8 @@ OLD_FILES+=usr/share/man/man3/snmp_usm.3 OLD_FILES+=usr/share/man/man3/snmp_vacm.3.gz OLD_FILES+=usr/share/man/man3/snmp_wlan.3.gz OLD_FILES+=usr/share/man/man3/snmpmod.3.gz +OLD_FILES+=usr/share/snmp/defs/atm_freebsd.def +OLD_FILES+=usr/share/snmp/defs/atm_tree.def OLD_FILES+=usr/share/snmp/defs/bridge_tree.def OLD_FILES+=usr/share/snmp/defs/hast_tree.def OLD_FILES+=usr/share/snmp/defs/hostres_tree.def @@ -376,6 +384,8 @@ OLD_FILES+=usr/share/snmp/defs/tree.def OLD_FILES+=usr/share/snmp/defs/usm_tree.def OLD_FILES+=usr/share/snmp/defs/vacm_tree.def OLD_FILES+=usr/share/snmp/defs/wlan_tree.def +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM-FREEBSD-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM.txt OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-BRIDGE-MIB.txt OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-HAST-MIB.txt OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-HOSTRES-MIB.txt @@ -383,13 +393,13 @@ OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-I OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-LM75-MIB.txt OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-MIB.txt OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-MIB2-MIB.txt -OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-PF-MIB.txt OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-NETGRAPH.txt +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-PF-MIB.txt OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-SNMPD.txt OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-WIRELESS-MIB.txt OLD_FILES+=usr/share/snmp/mibs/BRIDGE-MIB.txt -OLD_FILES+=usr/share/snmp/mibs/FREEBSD-MIB.txt OLD_FILES+=usr/share/snmp/mibs/FOKUS-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/FREEBSD-MIB.txt OLD_FILES+=usr/share/snmp/mibs/RSTP-MIB.txt OLD_DIRS+=usr/include/bsnmp OLD_DIRS+=usr/share/snmp From owner-svn-src-projects@FreeBSD.ORG Tue Nov 25 23:01:01 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DE97D266; Tue, 25 Nov 2014 23:01:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B1643400; Tue, 25 Nov 2014 23:01:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAPN11Lr041537; Tue, 25 Nov 2014 23:01:01 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAPN11AC041536; Tue, 25 Nov 2014 23:01:01 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411252301.sAPN11AC041536@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 25 Nov 2014 23:01:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275089 - projects/building-blocks/tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2014 23:01:02 -0000 Author: ngie Date: Tue Nov 25 23:01:01 2014 New Revision: 275089 URL: https://svnweb.freebsd.org/changeset/base/275089 Log: Add script I'm using to add entries to OptionalObsoleteFiles.inc Added: projects/building-blocks/tools/add-optional-obsolete-files-entries.sh (contents, props changed) Added: projects/building-blocks/tools/add-optional-obsolete-files-entries.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/add-optional-obsolete-files-entries.sh Tue Nov 25 23:01:01 2014 (r275089) @@ -0,0 +1,49 @@ +#!/bin/sh +# +# Simple script for enumerating installed files for a list of directories +# +# usage: add-optional-obsolete-files-entries.sh directory .. +# +# $FreeBSD$ + +: ${TMPDIR=/tmp} + +DESTDIR=$(mktemp -d $TMPDIR/tmp.XXXXXX) || exit +trap "rm -Rf $DESTDIR" EXIT INT TERM + +# Don't pollute the output with +: ${SRCCONF=/dev/null} +: ${__MAKE_CONF=/dev/null} + +if [ $# -gt 0 ] +then + directories=$* +else + directories=. +fi + +export __MAKE_CONF DESTDIR SRCCONF + +SRCTOP=$(cd $(make -V'${.MAKE.MAKEFILES:M*/share/mk/sys.mk:H:H:H}'); pwd) + +# Don't install the manpage symlinks +(cd $SRCTOP; make hier INSTALL_SYMLINK=true MK_MAN=no >/dev/null) + +for directory in $directories +do + (cd $directory && make install >/dev/null) || exit +done +# Prune empty directories +# XXX: is [ -n ... ] call necessary? +while empty_dirs=$(find $DESTDIR -type d -and -empty) && [ -n "$empty_dirs" ] +do + rmdir $empty_dirs +done + +# Enumerate all of the installed files/directories +(cd $DESTDIR; + find -s . -type f -mindepth 1 | sed -e 's,^,OLD_FILES+=,'; + find -s . -type d -mindepth 1 -and \! -empty | \ + egrep -v '^\./(s*bin|libexec|usr|usr/include|usr/lib|usr/libexec|usr/s*bin|usr/share|usr/share/man|usr/share/man/man[0-9])$' | \ + sed -e 's,^,OLD_DIRS+=,' +) | sed -e 's,+=\./,+=,' From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 00:13:52 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7AB0ED04; Wed, 26 Nov 2014 00:13:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 673EBD9E; Wed, 26 Nov 2014 00:13:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQ0Dq96075402; Wed, 26 Nov 2014 00:13:52 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQ0Dq5o075401; Wed, 26 Nov 2014 00:13:52 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411260013.sAQ0Dq5o075401@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 26 Nov 2014 00:13:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275091 - projects/building-blocks/libexec/rpc.rusersd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 00:13:52 -0000 Author: ngie Date: Wed Nov 26 00:13:51 2014 New Revision: 275091 URL: https://svnweb.freebsd.org/changeset/base/275091 Log: Remove deadcode Modified: projects/building-blocks/libexec/rpc.rusersd/Makefile Modified: projects/building-blocks/libexec/rpc.rusersd/Makefile ============================================================================== --- projects/building-blocks/libexec/rpc.rusersd/Makefile Wed Nov 26 00:06:21 2014 (r275090) +++ projects/building-blocks/libexec/rpc.rusersd/Makefile Wed Nov 26 00:13:51 2014 (r275091) @@ -7,9 +7,4 @@ MAN = rpc.rusersd.8 DPADD= ${LIBRPCSVC} ${LIBUTIL} LDADD= -lrpcsvc -lutil -#.if exists(/usr/X11R6/include/X11/extensions/xidle.h) -#CFLAGS+= -DXIDLE -#LDADD+= -L/usr/X11R6/lib -lXext -lX11 -#.endif - .include From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 02:37:01 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8D67AAED; Wed, 26 Nov 2014 02:37:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7AED7D69; Wed, 26 Nov 2014 02:37:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQ2b1ax041538; Wed, 26 Nov 2014 02:37:01 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQ2b1CA041537; Wed, 26 Nov 2014 02:37:01 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411260237.sAQ2b1CA041537@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 26 Nov 2014 02:37:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275097 - projects/building-blocks/tools/build/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 02:37:01 -0000 Author: ngie Date: Wed Nov 26 02:37:00 2014 New Revision: 275097 URL: https://svnweb.freebsd.org/changeset/base/275097 Log: Missed the bsnmp config file Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 02:20:25 2014 (r275096) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 02:37:00 2014 (r275097) @@ -316,6 +316,7 @@ OLD_DIRS+=usr/libexec/bsdinstall .endif .if ${MK_BSNMP} == no +OLD_FILES+=etc/snmpd.config OLD_FILES+=etc/rc.d/bsnmpd OLD_FILES+=usr/bin/bsnmpget OLD_FILES+=usr/bin/bsnmpset From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 02:46:49 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6767DDA5; Wed, 26 Nov 2014 02:46:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 54B51E44; Wed, 26 Nov 2014 02:46:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQ2kniR046124; Wed, 26 Nov 2014 02:46:49 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQ2kmRb046122; Wed, 26 Nov 2014 02:46:48 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411260246.sAQ2kmRb046122@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 26 Nov 2014 02:46:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275098 - in projects/building-blocks: etc/rc.d tools/build/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 02:46:49 -0000 Author: ngie Date: Wed Nov 26 02:46:48 2014 New Revision: 275098 URL: https://svnweb.freebsd.org/changeset/base/275098 Log: Only install the accounting/apm rc scripts for MK_ACCT/MK_APM if the relevant knobs are set Modified: projects/building-blocks/etc/rc.d/Makefile projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/etc/rc.d/Makefile ============================================================================== --- projects/building-blocks/etc/rc.d/Makefile Wed Nov 26 02:37:00 2014 (r275097) +++ projects/building-blocks/etc/rc.d/Makefile Wed Nov 26 02:46:48 2014 (r275098) @@ -8,12 +8,9 @@ FILES= DAEMON \ NETWORKING \ SERVERS \ abi \ - accounting \ addswap \ adjkerntz \ amd \ - apm \ - apmd \ archdep \ atm1 \ atm2 \ @@ -164,6 +161,15 @@ FILES= DAEMON \ zfs \ zvol +.if ${MK_ACCT} != "no" +FILES+= accounting +.endif + +.if ${MK_APM} != "no" +FILES+= apm +FILES+= apmd +.endif + .if ${MK_BLUETOOTH} != "no" _bluetooth= bluetooth _bthidd= bthidd Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 02:37:00 2014 (r275097) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 02:46:48 2014 (r275098) @@ -6,6 +6,7 @@ # .if ${MK_ACCT} == no +OLD_FILES+=etc/rc.d/accounting OLD_FILES+=etc/periodic/daily/310.accounting OLD_FILES+=usr/sbin/accton OLD_FILES+=usr/sbin/sa @@ -48,6 +49,8 @@ OLD_FILES+=usr/share/man/man8/wire-test. .endif .if ${MK_APM} == no +OLD_FILES+=etc/rc.d/apm +OLD_FILES+=etc/rc.d/apmd OLD_FILES+=etc/apmd.conf OLD_FILES+=usr/sbin/apm OLD_FILES+=usr/share/examples/etc/apmd.conf From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 02:59:38 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4B412F86; Wed, 26 Nov 2014 02:59:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 38856F1F; Wed, 26 Nov 2014 02:59:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQ2xcfF051041; Wed, 26 Nov 2014 02:59:38 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQ2xbLE051039; Wed, 26 Nov 2014 02:59:37 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411260259.sAQ2xbLE051039@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 26 Nov 2014 02:59:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275099 - in projects/building-blocks: etc/pam.d tools/build/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 02:59:38 -0000 Author: ngie Date: Wed Nov 26 02:59:37 2014 New Revision: 275099 URL: https://svnweb.freebsd.org/changeset/base/275099 Log: Don't install the rsh and telnetd pam.d files if MK_RCMDS == no or MK_TELNET == no, respectively Modified: projects/building-blocks/etc/pam.d/Makefile projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/etc/pam.d/Makefile ============================================================================== --- projects/building-blocks/etc/pam.d/Makefile Wed Nov 26 02:46:48 2014 (r275098) +++ projects/building-blocks/etc/pam.d/Makefile Wed Nov 26 02:59:37 2014 (r275099) @@ -2,6 +2,8 @@ NO_OBJ= +.include + FILES= README \ atrun \ cron \ @@ -10,11 +12,17 @@ FILES= README \ login \ other \ passwd pop3 \ - rsh \ sshd su system \ - telnetd \ xdm +.if ${MK_RCMDS} != "no" +FILES+= rsh +.endif + +.if ${MK_TELNET} != "no" +FILES+= telnetd +.endif + FILESDIR= /etc/pam.d FILESMODE= 644 FILESMODE_README= 444 Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 02:46:48 2014 (r275098) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 02:59:37 2014 (r275099) @@ -3913,6 +3913,7 @@ OLD_FILES+=usr/lib/private/libssh_p.a .if ${MK_RCMDS} == no OLD_FILES+=bin/rcp +OLD_FILES+=etc/pam.d/rsh OLD_FILES+=etc/rc.d/rwho OLD_FILES+=etc/periodic/daily/140.clean-rwho OLD_FILES+=etc/periodic/daily/430.status-rwho @@ -4279,6 +4280,7 @@ OLD_FILES+=usr/share/nls/uk_UA.UTF-8/tcs .endif .if ${MK_TELNET} == no +OLD_FILES+=etc/pam.d/telnetd OLD_FILES+=usr/bin/telnet OLD_FILES+=usr/libexec/telnetd OLD_FILES+=usr/share/man/man1/telnet.1.gz From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 03:38:13 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 59C52898; Wed, 26 Nov 2014 03:38:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4711763D; Wed, 26 Nov 2014 03:38:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQ3cDce070622; Wed, 26 Nov 2014 03:38:13 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQ3cDRD070621; Wed, 26 Nov 2014 03:38:13 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411260338.sAQ3cDRD070621@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 26 Nov 2014 03:38:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275100 - projects/building-blocks/tools/build/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 03:38:13 -0000 Author: ngie Date: Wed Nov 26 03:38:12 2014 New Revision: 275100 URL: https://svnweb.freebsd.org/changeset/base/275100 Log: MK_HYPERV: Sort OLD_FILES and add /usr/libexec/hyperv to OLD_DIRS Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 02:59:37 2014 (r275099) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 03:38:12 2014 (r275100) @@ -4925,9 +4925,10 @@ OLD_FILES+=usr/share/examples/dma/mailer .if ${MK_HYPERV} == no OLD_FILES+=etc/devd/hyperv.conf -OLD_FILES+=usr/libexec/hyperv/hv_set_ifconfig -OLD_FILES+=usr/libexec/hyperv/hv_get_dns_info OLD_FILES+=usr/libexec/hyperv/hv_get_dhcp_info +OLD_FILES+=usr/libexec/hyperv/hv_get_dns_info +OLD_FILES+=usr/libexec/hyperv/hv_set_ifconfig OLD_FILES+=usr/sbin/hv_kvp_daemon OLD_FILES+=usr/share/man/man8/hv_kvp_daemon.8.gz +OLD_DIRS+=usr/libexec/hyperv .endif From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 06:54:18 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9093F321; Wed, 26 Nov 2014 06:54:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7D639A49; Wed, 26 Nov 2014 06:54:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQ6sIQM063017; Wed, 26 Nov 2014 06:54:18 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQ6sI0Y063016; Wed, 26 Nov 2014 06:54:18 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411260654.sAQ6sI0Y063016@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 26 Nov 2014 06:54:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275102 - projects/building-blocks X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 06:54:18 -0000 Author: ngie Date: Wed Nov 26 06:54:17 2014 New Revision: 275102 URL: https://svnweb.freebsd.org/changeset/base/275102 Log: Don't try and build 32-bit versions of hyperv / bhyve Modified: projects/building-blocks/Makefile.inc1 Modified: projects/building-blocks/Makefile.inc1 ============================================================================== --- projects/building-blocks/Makefile.inc1 Wed Nov 26 04:23:21 2014 (r275101) +++ projects/building-blocks/Makefile.inc1 Wed Nov 26 06:54:17 2014 (r275102) @@ -433,7 +433,7 @@ LIB32WMAKEFLAGS+= CC="${XCC} ${LIB32FLAG MK_TESTS=no LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \ - MK_MAN=no MK_INFO=no MK_HTML=no + MK_MAN=no MK_INFO=no MK_HTML=no MK_HYPERV=no MK_BHYVE=no LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} \ MK_TOOLCHAIN=no ${IMAKE_INSTALL} .endif From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 08:44:11 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DC01E655; Wed, 26 Nov 2014 08:44:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C5B26696; Wed, 26 Nov 2014 08:44:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQ8iBxp014261; Wed, 26 Nov 2014 08:44:11 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQ8i6pw014230; Wed, 26 Nov 2014 08:44:06 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411260844.sAQ8i6pw014230@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 26 Nov 2014 08:44:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275106 - in projects/building-blocks: etc etc/rc.d include/protocols libexec sbin share/examples share/man/man4 share/mk tools/build/mk tools/build/options usr.bin usr.sbin X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 08:44:12 -0000 Author: ngie Date: Wed Nov 26 08:44:05 2014 New Revision: 275106 URL: https://svnweb.freebsd.org/changeset/base/275106 Log: Conditionalize a number of components in the tree - bootparamd - bootpd - finger/fingerd - ftp/ftpd - hastctl/hastd - iscsid, et al - rbootd - talk/talkd - tcpd, et al - tftp/tftpd Add src.conf entries for the various components and do a best effort at adding components to tools/build/mk/OptionalObsoleteFiles.inc Added: projects/building-blocks/tools/build/options/WITHOUT_BOOTPARAMD (contents, props changed) projects/building-blocks/tools/build/options/WITHOUT_BOOTPD (contents, props changed) projects/building-blocks/tools/build/options/WITHOUT_FINGER (contents, props changed) projects/building-blocks/tools/build/options/WITHOUT_FTP (contents, props changed) projects/building-blocks/tools/build/options/WITHOUT_HAST (contents, props changed) projects/building-blocks/tools/build/options/WITHOUT_ISCSI (contents, props changed) projects/building-blocks/tools/build/options/WITHOUT_RBOOTD (contents, props changed) projects/building-blocks/tools/build/options/WITHOUT_TALK (contents, props changed) projects/building-blocks/tools/build/options/WITHOUT_TCP_WRAPPERS (contents, props changed) projects/building-blocks/tools/build/options/WITHOUT_TFTP (contents, props changed) Modified: projects/building-blocks/etc/Makefile projects/building-blocks/etc/rc.d/Makefile projects/building-blocks/include/protocols/Makefile projects/building-blocks/libexec/Makefile projects/building-blocks/sbin/Makefile projects/building-blocks/share/examples/Makefile projects/building-blocks/share/man/man4/Makefile projects/building-blocks/share/mk/src.opts.mk projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc projects/building-blocks/usr.bin/Makefile projects/building-blocks/usr.sbin/Makefile Modified: projects/building-blocks/etc/Makefile ============================================================================== --- projects/building-blocks/etc/Makefile Wed Nov 26 08:14:30 2014 (r275105) +++ projects/building-blocks/etc/Makefile Wed Nov 26 08:44:05 2014 (r275106) @@ -19,7 +19,6 @@ BIN1= auto_master \ dhclient.conf \ disktab \ fbtab \ - ftpusers \ gettytab \ group \ hosts \ @@ -94,6 +93,10 @@ BIN1+= snmpd.config BIN1+= freebsd-update.conf .endif +.if ${MK_FTP} != "no" +BIN1+= ftpusers +.endif + .if ${MK_INETD} != "no" BIN1+= inetd.conf .endif Modified: projects/building-blocks/etc/rc.d/Makefile ============================================================================== --- projects/building-blocks/etc/rc.d/Makefile Wed Nov 26 08:14:30 2014 (r275105) +++ projects/building-blocks/etc/rc.d/Makefile Wed Nov 26 08:44:05 2014 (r275106) @@ -22,7 +22,6 @@ FILES= DAEMON \ autounmountd \ bgfsck \ ${_bluetooth} \ - bootparams \ bridge \ ${_bsnmpd} \ ${_bthidd} \ @@ -40,14 +39,12 @@ FILES= DAEMON \ dmesg \ dumpon \ fsck \ - ftpd \ gbde \ geli \ geli2 \ gptboot \ growfs \ gssd \ - hastd \ ${_hcsecd} \ hostapd \ hostid \ @@ -63,8 +60,6 @@ FILES= DAEMON \ ipropd_master \ ipropd_slave \ ipsec \ - iscsictl \ - iscsid \ jail \ ${_kadmind} \ ${_kdc} \ @@ -177,6 +172,10 @@ _hcsecd= hcsecd _ubthidhci= ubthidhci .endif +.if ${MK_BOOTPARAMD} != "no" +FILES+= bootparams +.endif + .if ${MK_BSNMP} != "no" _bsnmpd= bsnmpd .endif @@ -185,10 +184,23 @@ _bsnmpd= bsnmpd _casperd= casperd .endif +.if ${MK_FTP} != "no" +FILES+= ftpd +.endif + +.if ${MK_HAST} != "no" +FILES+= hastd +.endif + .if ${MK_INETD} != "no" _inetd= inetd .endif +.if ${MK_ISCSI} != "no" +FILES+= iscsictl +FILES+= iscsid +.endif + .if ${MK_NS_CACHING} != "no" _nscd= nscd .endif Modified: projects/building-blocks/include/protocols/Makefile ============================================================================== --- projects/building-blocks/include/protocols/Makefile Wed Nov 26 08:14:30 2014 (r275105) +++ projects/building-blocks/include/protocols/Makefile Wed Nov 26 08:44:05 2014 (r275106) @@ -1,7 +1,13 @@ # $FreeBSD$ +.include + NO_OBJ= -INCS= dumprestore.h routed.h rwhod.h talkd.h timed.h +INCS= dumprestore.h routed.h rwhod.h timed.h INCSDIR=${INCLUDEDIR}/protocols +.if ${MK_TALK} == "no" +INCS+= talkd.h +.endif + .include Modified: projects/building-blocks/libexec/Makefile ============================================================================== --- projects/building-blocks/libexec/Makefile Wed Nov 26 08:14:30 2014 (r275105) +++ projects/building-blocks/libexec/Makefile Wed Nov 26 08:44:05 2014 (r275106) @@ -5,18 +5,14 @@ SUBDIR= ${_atf} \ ${_atrun} \ - bootpd \ ${_casper} \ ${_comsat} \ ${_dma} \ ${_dma-mbox-create} \ - fingerd \ - ftpd \ getty \ ${_mail.local} \ ${_mknetid} \ ${_pppoed} \ - rbootd \ revnetgroup \ ${_rlogind} \ rpc.rquotad \ @@ -28,11 +24,8 @@ SUBDIR= ${_atf} \ ${_rtld-elf} \ save-entropy \ ${_smrsh} \ - talkd \ - tcpd \ ${_telnetd} \ ${_tests} \ - tftpd \ ${_tftp-proxy} \ ulog-helper \ ${_ypxfr} @@ -41,10 +34,22 @@ SUBDIR= ${_atf} \ _atrun= atrun .endif +.if ${MK_BOOTPD} != "no" +SUBDIR+= bootpd +.endif + .if ${MK_CASPER} != "no" _casper= casper .endif +.if ${MK_FINGER} != "no" +SUBDIR+= fingerd +.endif + +.if ${MK_FTP} != "no" +SUBDIR+= ftpd +.endif + .if ${MK_MAIL} != "no" _comsat= comsat .endif @@ -71,6 +76,10 @@ _tftp-proxy= tftp-proxy _rtld-elf= rtld-elf .endif +.if ${MK_RBOOTD} != "no" +SUBDIR+= rbootd +.endif + .if ${MK_RCMDS} != "no" _rlogind= rlogind _rshd= rshd @@ -81,10 +90,22 @@ _mail.local= mail.local _smrsh= smrsh .endif +.if ${MK_TALK} != "no" +SUBDIR+= talkd +.endif + +.if ${MK_TCP_WRAPPERS} != "no" +SUBDIR+= tcpd +.endif + .if ${MK_TELNET} != "no" _telnetd= telnetd .endif +.if ${MK_TFTP} != "no" +SUBDIR+= tftpd +.endif + .if ${MK_TESTS} != "no" _atf= atf _tests= tests Modified: projects/building-blocks/sbin/Makefile ============================================================================== --- projects/building-blocks/sbin/Makefile Wed Nov 26 08:14:30 2014 (r275105) +++ projects/building-blocks/sbin/Makefile Wed Nov 26 08:44:05 2014 (r275106) @@ -31,11 +31,8 @@ SUBDIR=adjkerntz \ ggate \ growfs \ gvinum \ - hastctl \ - hastd \ ifconfig \ init \ - iscontrol \ kldconfig \ kldload \ kldstat \ @@ -86,6 +83,11 @@ SUBDIR+= casperd SUBDIR+= devd .endif +.if ${MK_HAST} != "no" +SUBDIR+= hastctl +SUBDIR+= hastd +.endif + .if ${MK_IPFILTER} != "no" SUBDIR+= ipf .endif @@ -95,6 +97,10 @@ SUBDIR+= ipfw SUBDIR+= natd .endif +.if ${MK_ISCSI} != "no" +SUBDIR+= iscontrol +.endif + .if ${MK_NAND} != "no" SUBDIR+= nandfs SUBDIR+= newfs_nandfs Modified: projects/building-blocks/share/examples/Makefile ============================================================================== --- projects/building-blocks/share/examples/Makefile Wed Nov 26 08:14:30 2014 (r275105) +++ projects/building-blocks/share/examples/Makefile Wed Nov 26 08:44:05 2014 (r275106) @@ -13,7 +13,6 @@ LDIRS= BSD_daemon \ drivers \ etc \ find_interface \ - hast \ ibcs2 \ indent \ ipfw \ @@ -62,11 +61,6 @@ XFILES= BSD_daemon/FreeBSD.pfa \ find_interface/Makefile \ find_interface/README \ find_interface/find_interface.c \ - hast/ucarp.sh \ - hast/ucarp_down.sh \ - hast/ucarp_up.sh \ - hast/vip-down.sh \ - hast/vip-up.sh \ ibcs2/README \ ibcs2/hello.uu \ indent/indent.pro \ @@ -210,6 +204,15 @@ LDIRS+= bhyve XFILES+= bhyve/vmrun.sh .endif +.if ${MK_HAST} != "no" +LDIRS+= hast +XFILES+= hast/ucarp.sh \ + hast/ucarp_down.sh \ + hast/ucarp_up.sh \ + hast/vip-down.sh \ + hast/vip-up.sh +.endif + beforeinstall: ${SHARED} etc-examples .ORDER: ${SHARED} etc-examples Modified: projects/building-blocks/share/man/man4/Makefile ============================================================================== --- projects/building-blocks/share/man/man4/Makefile Wed Nov 26 08:14:30 2014 (r275105) +++ projects/building-blocks/share/man/man4/Makefile Wed Nov 26 08:44:05 2014 (r275106) @@ -206,8 +206,6 @@ MAN= aac.4 \ ipw.4 \ ipwfw.4 \ isci.4 \ - iscsi.4 \ - iscsi_initiator.4 \ ismt.4 \ isp.4 \ ispfw.4 \ @@ -861,6 +859,11 @@ SUBDIR= man4.${MACHINE_CPUARCH} _bhyve.4= bhyve.4 .endif +.if ${MK_ISCSI} != "no" +MAN+= iscsi.4 +MAN+= iscsi_initiator.4 +.endif + .if ${MK_TESTS} != "no" ATF= ${.CURDIR}/../../../contrib/atf .PATH: ${ATF}/doc Modified: projects/building-blocks/share/mk/src.opts.mk ============================================================================== --- projects/building-blocks/share/mk/src.opts.mk Wed Nov 26 08:14:30 2014 (r275105) +++ projects/building-blocks/share/mk/src.opts.mk Wed Nov 26 08:44:05 2014 (r275106) @@ -56,6 +56,8 @@ __DEFAULT_YES_OPTIONS = \ BINUTILS_BOOTSTRAP \ BLUETOOTH \ BOOT \ + BOOTPD \ + BOOTPARAMD \ BSD_CPIO \ BSDINSTALL \ BSNMP \ @@ -76,11 +78,13 @@ __DEFAULT_YES_OPTIONS = \ ED_CRYPTO \ EXAMPLES \ FDT \ + FINGER \ FLOPPY \ FMTREE \ FORTH \ FP_LIBC \ FREEBSD_UPDATE \ + FTP \ GAMES \ GCOV \ GDB \ @@ -90,6 +94,7 @@ __DEFAULT_YES_OPTIONS = \ GPIO \ GPL_DTC \ GROFF \ + HAST \ HTML \ ICONV \ INET \ @@ -97,6 +102,7 @@ __DEFAULT_YES_OPTIONS = \ INETD \ IPFILTER \ IPFW \ + ISCSI \ JAIL \ KDUMP \ KVM \ @@ -130,6 +136,7 @@ __DEFAULT_YES_OPTIONS = \ PPP \ QUOTAS \ RCMDS \ + RBOOTD \ RCS \ RESCUE \ ROUTED \ @@ -143,10 +150,13 @@ __DEFAULT_YES_OPTIONS = \ SYSCALL_COMPAT \ SYSCONS \ SYSINSTALL \ + TALK \ + TCP_WRAPPERS \ TCSH \ TELNET \ TESTS \ TEXTPROC \ + TFTP \ UNBOUND \ USB \ UTMPX \ Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 08:14:30 2014 (r275105) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 08:44:05 2014 (r275106) @@ -285,6 +285,26 @@ OLD_FILES+=usr/share/man/man8/sdpd.8.gz # to be filled in #.endif +.if ${MK_BOOTPARAMD} == no +OLD_FILES+=rc.d/bootparams +OLD_FILES+=usr/sbin/bootparamd +OLD_FILES+=usr/sbin/callbootd +OLD_FILES+=usr/share/man/man5/bootparams.5.gz +OLD_FILES+=usr/share/man/man8/bootparamd.8.gz +.endif + +.if ${MK_BOOTPD} == no +OLD_FILES+=usr/libexec/bootpd +OLD_FILES+=usr/libexec/bootpgw +OLD_FILES+=usr/sbin/bootpef +OLD_FILES+=usr/sbin/bootptest +OLD_FILES+=usr/share/man/man5/bootptab.5.gz +OLD_FILES+=usr/share/man/man8/bootpd.8.gz +OLD_FILES+=usr/share/man/man8/bootpef.8.gz +OLD_FILES+=usr/share/man/man8/bootpgw.8.gz +OLD_FILES+=usr/share/man/man8/bootptest.8.gz +.endif + .if ${MK_BSDINSTALL} == no OLD_FILES+=usr/libexec/bsdinstall/adduser OLD_FILES+=usr/libexec/bsdinstall/auto @@ -742,6 +762,14 @@ OLD_FILES+=usr/share/man/man1/gperf.1.gz .endif .endif +.if ${MK_FINGER} == no +OLD_FILES+=usr/bin/finger +OLD_FILES+=usr/libexec/fingerd +OLD_FILES+=usr/share/man/man1/finger.1.gz +OLD_FILES+=usr/share/man/man5/finger.conf.5.gz +OLD_FILES+=usr/share/man/man8/fingerd.8.gz +.endif + .if ${MK_FMTREE} == no OLD_FILES+=usr/sbin/fmtree OLD_FILES+=usr/share/man/man8/fmtree.8.gz @@ -1358,6 +1386,18 @@ OLD_FILES+=usr/share/man/man5/freebsd-up OLD_FILES+=usr/share/man/man8/freebsd-update.8.gz .endif +.if ${MK_FTP} == no +OLD_FILES+=usr/bin/ftp +OLD_FILES+=usr/bin/gate-ftp +OLD_FILES+=usr/bin/pftp +OLD_FILES+=usr/libexec/ftpd +OLD_FILES+=usr/share/man/man1/ftp.1.gz +OLD_FILES+=usr/share/man/man1/gate-ftp.1.gz +OLD_FILES+=usr/share/man/man1/pftp.1.gz +OLD_FILES+=usr/share/man/man5/ftpchroot.5.gz +OLD_FILES+=usr/share/man/man8/ftpd.8.gz +.endif + .if ${MK_GAMES} == no OLD_FILES+=usr/games/bcd OLD_FILES+=usr/games/caesar @@ -2053,6 +2093,20 @@ OLD_FILES+=usr/share/man/man5/qop.5.gz OLD_FILES+=usr/share/man/man8/gssd.8.gz .endif +.if ${MK_HAST} == no +OLD_FILES+=sbin/hastctl +OLD_FILES+=sbin/hastd +OLD_FILES+=usr/share/examples/hast/ucarp.sh +OLD_FILES+=usr/share/examples/hast/ucarp_down.sh +OLD_FILES+=usr/share/examples/hast/ucarp_up.sh +OLD_FILES+=usr/share/examples/hast/vip-down.sh +OLD_FILES+=usr/share/examples/hast/vip-up.sh +OLD_FILES+=usr/share/man/man5/hast.conf.5.gz +OLD_FILES+=usr/share/man/man8/hastctl.8.gz +OLD_FILES+=usr/share/man/man8/hastd.8.gz +OLD_DIRS+=usr/share/examples/hast +.endif + .if ${MK_HESIOD} == no OLD_FILES+=usr/bin/hesinfo OLD_FILES+=usr/include/hesiod.h @@ -2252,6 +2306,20 @@ OLD_FILES+=usr/share/man/man8/ipfwpcap.8 OLD_FILES+=usr/share/man/man8/natd.8.gz .endif +.if ${MK_ISCSI} == no +OLD_FILES+=etc/rc.d/iscsictl +OLD_FILES+=etc/rc.d/iscsid +OLD_FILES+=sbin/iscontrol +OLD_FILES+=usr/bin/iscsictl +OLD_FILES+=usr/sbin/iscsid +OLD_FILES+=usr/share/man/man4/iscsi.4.gz +OLD_FILES+=usr/share/man/man4/iscsi_initiator.4.gz +OLD_FILES+=usr/share/man/man5/iscsi.conf.5.gz +OLD_FILES+=usr/share/man/man8/iscontrol.8.gz +OLD_FILES+=usr/share/man/man8/iscsictl.8.gz +OLD_FILES+=usr/share/man/man8/iscsid.8.gz +.endif + .if ${MK_JAIL} == no OLD_FILES+=usr/sbin/jail OLD_FILES+=usr/sbin/jexec @@ -3911,6 +3979,11 @@ OLD_FILES+=usr/lib/private/libldns_p.a OLD_FILES+=usr/lib/private/libssh_p.a .endif +.if ${MK_RBOOTD} == no +OLD_FILES+=usr/libexec/rbootd +OLD_FILES+=usr/share/man/man8/rbootd.8.gz +.endif + .if ${MK_RCMDS} == no OLD_FILES+=bin/rcp OLD_FILES+=etc/pam.d/rsh @@ -4219,6 +4292,23 @@ OLD_DIRS+=usr/share/doc/pjdfstest # to be filled in #.endif +.if ${MK_TALK} == no +OLD_FILES+=usr/bin/talk +OLD_FILES+=usr/include/protocols/talkd.h +OLD_FILES+=usr/libexec/ntalkd +OLD_FILES+=usr/share/man/man1/talk.1.gz +OLD_FILES+=usr/share/man/man8/talkd.8.gz +.endif + +.if ${MK_TCP_WRAPPERS} == no +OLD_FILES+=usr/libexec/tcpd +OLD_FILES+=usr/sbin/tcpdchk +OLD_FILES+=usr/sbin/tcpdmatch +OLD_FILES+=usr/share/man/man8/tcpd.8.gz +OLD_FILES+=usr/share/man/man8/tcpdchk.8.gz +OLD_FILES+=usr/share/man/man8/tcpdmatch.8.gz +.endif + .if ${MK_TCSH} == no OLD_FILES+=bin/csh OLD_FILES+=bin/tcsh @@ -4287,6 +4377,13 @@ OLD_FILES+=usr/share/man/man1/telnet.1.g OLD_FILES+=usr/share/man/man8/telnetd.8.gz .endif +.if ${MK_TFTP} == no +OLD_FILES+=usr/bin/tftp +OLD_FILES+=usr/libexec/tftpd +OLD_FILES+=usr/share/man/man1/tftp.1.gz +OLD_FILES+=usr/share/man/man8/tftpd.8.gz +.endif + .if ${MK_TESTS} == yes OLD_FILES+=usr/bin/atf-sh OLD_FILES+=usr/include/atf-c++/config.hpp Added: projects/building-blocks/tools/build/options/WITHOUT_BOOTPARAMD ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/build/options/WITHOUT_BOOTPARAMD Wed Nov 26 08:44:05 2014 (r275106) @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr bootparamd 8 . Added: projects/building-blocks/tools/build/options/WITHOUT_BOOTPD ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/build/options/WITHOUT_BOOTPD Wed Nov 26 08:44:05 2014 (r275106) @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr bootpd 8 . Added: projects/building-blocks/tools/build/options/WITHOUT_FINGER ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/build/options/WITHOUT_FINGER Wed Nov 26 08:44:05 2014 (r275106) @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr finger 1 +and +.Xr fingerd 8 . Added: projects/building-blocks/tools/build/options/WITHOUT_FTP ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/build/options/WITHOUT_FTP Wed Nov 26 08:44:05 2014 (r275106) @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr ftp 1 +and +.Xr ftpd 8 . Added: projects/building-blocks/tools/build/options/WITHOUT_HAST ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/build/options/WITHOUT_HAST Wed Nov 26 08:44:05 2014 (r275106) @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr hastd 8 +and related utilities. Added: projects/building-blocks/tools/build/options/WITHOUT_ISCSI ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/build/options/WITHOUT_ISCSI Wed Nov 26 08:44:05 2014 (r275106) @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr iscid 8 +and related utilities. Added: projects/building-blocks/tools/build/options/WITHOUT_RBOOTD ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/build/options/WITHOUT_RBOOTD Wed Nov 26 08:44:05 2014 (r275106) @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr rbootd 8 . Added: projects/building-blocks/tools/build/options/WITHOUT_TALK ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/build/options/WITHOUT_TALK Wed Nov 26 08:44:05 2014 (r275106) @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr talk 1 +and +.Xr talkd 8 . Added: projects/building-blocks/tools/build/options/WITHOUT_TCP_WRAPPERS ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/build/options/WITHOUT_TCP_WRAPPERS Wed Nov 26 08:44:05 2014 (r275106) @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr tcpd 8 , +and related utilities. Added: projects/building-blocks/tools/build/options/WITHOUT_TFTP ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/build/options/WITHOUT_TFTP Wed Nov 26 08:44:05 2014 (r275106) @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr tftp 1 +and +.Xr tftpd 8 . Modified: projects/building-blocks/usr.bin/Makefile ============================================================================== --- projects/building-blocks/usr.bin/Makefile Wed Nov 26 08:14:30 2014 (r275105) +++ projects/building-blocks/usr.bin/Makefile Wed Nov 26 08:44:05 2014 (r275106) @@ -49,12 +49,10 @@ SUBDIR= alias \ fetch \ file \ find \ - finger \ fmt \ fold \ fstat \ fsync \ - ftp \ gcore \ gencat \ getconf \ @@ -68,7 +66,6 @@ SUBDIR= alias \ id \ ipcrm \ ipcs \ - iscsictl \ join \ jot \ ${_kdump} \ @@ -160,12 +157,10 @@ SUBDIR= alias \ systat \ tabs \ tail \ - talk \ tar \ tcopy \ tee \ ${_tests} \ - tftp \ time \ timeout \ tip \ @@ -236,10 +231,18 @@ SUBDIR+= calendar _clang= clang .endif +.if ${MK_FINGER} != "no" +SUBDIR+= finger +.endif + .if ${MK_FMAKE} != "no" SUBDIR+= make .endif +.if ${MK_FTP} != "no" +SUBDIR+= ftp +.endif + .if ${MK_GPL_DTC} != "yes" SUBDIR+= dtc .endif @@ -258,6 +261,10 @@ _mkcsmapper= mkcsmapper _mkesdb= mkesdb .endif +.if ${MK_ISCSI} != "no" +SUBDIR+= iscsictl +.endif + .if ${MK_KDUMP} != "no" SUBDIR+= kdump SUBDIR+= truss @@ -330,6 +337,10 @@ SUBDIR+= rwho SUBDIR+= vacation .endif +.if ${MK_TALK} != "no" +SUBDIR+= talk +.endif + .if ${MK_TELNET} != "no" SUBDIR+= telnet .endif @@ -344,6 +355,10 @@ SUBDIR+= colcrt SUBDIR+= ul .endif +.if ${MK_TFTP} != "no" +SUBDIR+= tftp +.endif + .if ${MK_TOOLCHAIN} != "no" SUBDIR+= ar SUBDIR+= c89 Modified: projects/building-blocks/usr.sbin/Makefile ============================================================================== --- projects/building-blocks/usr.sbin/Makefile Wed Nov 26 08:14:30 2014 (r275105) +++ projects/building-blocks/usr.sbin/Makefile Wed Nov 26 08:44:05 2014 (r275106) @@ -7,7 +7,6 @@ SUBDIR= adduser \ arp \ autofs \ binmiscctl \ - bootparamd \ bsdconfig \ cdcontrol \ chkgrp \ @@ -35,7 +34,6 @@ SUBDIR= adduser \ i2c \ ifmcstat \ iostat \ - iscsid \ kldxref \ mailwrapper \ makefs \ @@ -82,8 +80,6 @@ SUBDIR= adduser \ spray \ syslogd \ sysrc \ - tcpdchk \ - tcpdmatch \ tcpdrop \ tcpdump \ timed \ @@ -126,6 +122,10 @@ SUBDIR+= authpf SUBDIR+= bluetooth .endif +.if ${MK_BOOTPARAMD} != "no" +SUBDIR+= bootparamd +.endif + .if ${MK_BSDINSTALL} != "no" SUBDIR+= bsdinstall .endif @@ -182,6 +182,10 @@ SUBDIR+= inetd SUBDIR+= ipfwpcap .endif +.if ${MK_ISCSI} != "no" +SUBDIR+= iscsid +.endif + .if ${MK_JAIL} != "no" SUBDIR+= jail SUBDIR+= jexec @@ -294,6 +298,11 @@ SUBDIR+= praliases SUBDIR+= sendmail .endif +.if ${MK_TCP_WRAPPERS} != "no" +SUBDIR+= tcpdchk +SUBDIR+= tcpdmatch +.endif + .if ${MK_TESTS} != "no" SUBDIR+= tests .endif From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 11:41:29 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6DCD7AC5; Wed, 26 Nov 2014 11:41:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 573A2BA5; Wed, 26 Nov 2014 11:41:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQBfTCI096936; Wed, 26 Nov 2014 11:41:29 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQBfEK4096858; Wed, 26 Nov 2014 11:41:14 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411261141.sAQBfEK4096858@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 26 Nov 2014 11:41:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275111 - in projects/sendfile: . bin/csh bin/df bin/ed bin/ls bin/pkill bin/ps bin/rmail bin/sh cddl/contrib/opensolaris/lib/libdtrace/common contrib/llvm/tools/lldb/docs contrib/mdocm... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 11:41:29 -0000 Author: glebius Date: Wed Nov 26 11:41:12 2014 New Revision: 275111 URL: https://svnweb.freebsd.org/changeset/base/275111 Log: Merge head r258543 through r275110. Added: projects/sendfile/lib/libgpio/ - copied from r275110, head/lib/libgpio/ projects/sendfile/sys/dev/beri/virtio/virtio.c - copied unchanged from r275110, head/sys/dev/beri/virtio/virtio.c projects/sendfile/sys/dev/beri/virtio/virtio.h - copied unchanged from r275110, head/sys/dev/beri/virtio/virtio.h projects/sendfile/sys/dev/beri/virtio/virtio_block.c - copied unchanged from r275110, head/sys/dev/beri/virtio/virtio_block.c projects/sendfile/sys/mips/conf/WZR-HPAG300H - copied unchanged from r275110, head/sys/mips/conf/WZR-HPAG300H projects/sendfile/sys/mips/conf/WZR-HPAG300H.hints - copied unchanged from r275110, head/sys/mips/conf/WZR-HPAG300H.hints Deleted: projects/sendfile/usr.sbin/cron/Makefile.inc projects/sendfile/usr.sbin/fifolog/Makefile.inc Modified: projects/sendfile/MAINTAINERS (contents, props changed) projects/sendfile/ObsoleteFiles.inc projects/sendfile/bin/csh/Makefile projects/sendfile/bin/df/Makefile projects/sendfile/bin/ed/Makefile projects/sendfile/bin/ls/Makefile projects/sendfile/bin/pkill/Makefile projects/sendfile/bin/ps/Makefile projects/sendfile/bin/rmail/Makefile projects/sendfile/bin/sh/Makefile projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c projects/sendfile/contrib/llvm/tools/lldb/docs/lldb.1 projects/sendfile/contrib/mdocml/lib.in projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c projects/sendfile/contrib/ofed/libmlx4/src/cq.c projects/sendfile/contrib/ofed/libmlx4/src/mlx4-abi.h projects/sendfile/contrib/ofed/libmlx4/src/mlx4.c projects/sendfile/contrib/ofed/libmlx4/src/mlx4.h projects/sendfile/contrib/ofed/libmlx4/src/verbs.c projects/sendfile/etc/defaults/rc.conf projects/sendfile/etc/rc.d/automount projects/sendfile/gnu/lib/libdialog/Makefile projects/sendfile/gnu/lib/libgcc/Makefile projects/sendfile/gnu/lib/libreadline/readline/Makefile projects/sendfile/gnu/lib/libstdc++/Makefile projects/sendfile/gnu/usr.bin/binutils/addr2line/addr2line.1 projects/sendfile/gnu/usr.bin/binutils/as/as.1 projects/sendfile/gnu/usr.bin/binutils/ld/ld.1 projects/sendfile/gnu/usr.bin/binutils/nm/nm.1 projects/sendfile/gnu/usr.bin/binutils/objcopy/objcopy.1 projects/sendfile/gnu/usr.bin/binutils/objdump/objdump.1 projects/sendfile/gnu/usr.bin/binutils/readelf/readelf.1 projects/sendfile/gnu/usr.bin/binutils/size/size.1 projects/sendfile/gnu/usr.bin/binutils/strings/strings.1 projects/sendfile/gnu/usr.bin/binutils/strip/strip.1 projects/sendfile/gnu/usr.bin/dialog/Makefile projects/sendfile/gnu/usr.bin/diff/Makefile projects/sendfile/gnu/usr.bin/gdb/gdb/Makefile projects/sendfile/gnu/usr.bin/gdb/gdbtui/Makefile projects/sendfile/gnu/usr.bin/gdb/kgdb/Makefile projects/sendfile/gnu/usr.bin/grep/Makefile projects/sendfile/gnu/usr.bin/groff/tmac/Makefile projects/sendfile/kerberos5/Makefile.inc projects/sendfile/kerberos5/lib/libasn1/Makefile projects/sendfile/kerberos5/lib/libgssapi_krb5/Makefile projects/sendfile/kerberos5/lib/libgssapi_ntlm/Makefile projects/sendfile/kerberos5/lib/libgssapi_spnego/Makefile projects/sendfile/kerberos5/lib/libhdb/Makefile projects/sendfile/kerberos5/lib/libheimbase/Makefile projects/sendfile/kerberos5/lib/libheimipcc/Makefile projects/sendfile/kerberos5/lib/libheimipcs/Makefile projects/sendfile/kerberos5/lib/libheimntlm/Makefile projects/sendfile/kerberos5/lib/libheimsqlite/Makefile projects/sendfile/kerberos5/lib/libhx509/Makefile projects/sendfile/kerberos5/lib/libkadm5clnt/Makefile projects/sendfile/kerberos5/lib/libkadm5srv/Makefile projects/sendfile/kerberos5/lib/libkafs5/Makefile projects/sendfile/kerberos5/lib/libkdc/Makefile projects/sendfile/kerberos5/lib/libkrb5/Makefile projects/sendfile/kerberos5/lib/libroken/Makefile projects/sendfile/kerberos5/lib/libwind/Makefile projects/sendfile/kerberos5/libexec/digest-service/Makefile projects/sendfile/kerberos5/libexec/hprop/Makefile projects/sendfile/kerberos5/libexec/hpropd/Makefile projects/sendfile/kerberos5/libexec/ipropd-master/Makefile projects/sendfile/kerberos5/libexec/ipropd-slave/Makefile projects/sendfile/kerberos5/libexec/kadmind/Makefile projects/sendfile/kerberos5/libexec/kcm/Makefile projects/sendfile/kerberos5/libexec/kdc/Makefile projects/sendfile/kerberos5/libexec/kdigest/Makefile projects/sendfile/kerberos5/libexec/kfd/Makefile projects/sendfile/kerberos5/libexec/kimpersonate/Makefile projects/sendfile/kerberos5/libexec/kpasswdd/Makefile projects/sendfile/kerberos5/tools/asn1_compile/Makefile projects/sendfile/kerberos5/tools/slc/Makefile projects/sendfile/kerberos5/usr.bin/hxtool/Makefile projects/sendfile/kerberos5/usr.bin/kadmin/Makefile projects/sendfile/kerberos5/usr.bin/kcc/Makefile projects/sendfile/kerberos5/usr.bin/kdestroy/Makefile projects/sendfile/kerberos5/usr.bin/kf/Makefile projects/sendfile/kerberos5/usr.bin/kgetcred/Makefile projects/sendfile/kerberos5/usr.bin/kinit/Makefile projects/sendfile/kerberos5/usr.bin/kpasswd/Makefile projects/sendfile/kerberos5/usr.bin/ksu/Makefile projects/sendfile/kerberos5/usr.bin/string2key/Makefile projects/sendfile/kerberos5/usr.bin/verify_krb5_conf/Makefile projects/sendfile/kerberos5/usr.sbin/iprop-log/Makefile projects/sendfile/kerberos5/usr.sbin/kstash/Makefile projects/sendfile/kerberos5/usr.sbin/ktutil/Makefile projects/sendfile/lib/Makefile projects/sendfile/lib/atf/libatf-c++/Makefile projects/sendfile/lib/libarchive/Makefile projects/sendfile/lib/libarchive/test/Makefile projects/sendfile/lib/libbsnmp/libbsnmp/Makefile projects/sendfile/lib/libc++/Makefile projects/sendfile/lib/libc/Makefile projects/sendfile/lib/libc/gen/errlst.c projects/sendfile/lib/libc/gen/isnan.c projects/sendfile/lib/libc/gen/syslog.c projects/sendfile/lib/libc/gen/tls.c projects/sendfile/lib/libc/include/errlst.h projects/sendfile/lib/libc/net/base64.c projects/sendfile/lib/libc/net/getifaddrs.3 projects/sendfile/lib/libc/net/nsdispatch.c projects/sendfile/lib/libc/sys/mount.2 projects/sendfile/lib/libc/sys/poll.2 projects/sendfile/lib/libc/sys/stack_protector.c projects/sendfile/lib/libc/sys/stack_protector_compat.c projects/sendfile/lib/libc/tests/ssp/Makefile projects/sendfile/lib/libcam/Makefile projects/sendfile/lib/libcapsicum/Makefile projects/sendfile/lib/libcasper/Makefile projects/sendfile/lib/libcrypt/tests/Makefile projects/sendfile/lib/libcuse/Makefile projects/sendfile/lib/libdevstat/Makefile projects/sendfile/lib/libdpv/Makefile projects/sendfile/lib/libdpv/dpv.3 projects/sendfile/lib/libdwarf/Makefile projects/sendfile/lib/libedit/Makefile projects/sendfile/lib/libexecinfo/Makefile projects/sendfile/lib/libfetch/Makefile projects/sendfile/lib/libgeom/Makefile projects/sendfile/lib/libjail/jail.c projects/sendfile/lib/libjail/jail_getid.c projects/sendfile/lib/libkiconv/quirks.c projects/sendfile/lib/libkiconv/xlat16_iconv.c projects/sendfile/lib/libkiconv/xlat16_sysctl.c projects/sendfile/lib/libldns/Makefile projects/sendfile/lib/libmagic/Makefile projects/sendfile/lib/libmd/rmd160c.c projects/sendfile/lib/libmd/sha1c.c projects/sendfile/lib/libmemstat/Makefile projects/sendfile/lib/libmp/Makefile projects/sendfile/lib/libmp/tests/Makefile projects/sendfile/lib/libnv/tests/Makefile projects/sendfile/lib/libopie/Makefile projects/sendfile/lib/libpam/libpam/tests/Makefile projects/sendfile/lib/libpam/modules/Makefile.inc projects/sendfile/lib/libpam/modules/pam_krb5/Makefile projects/sendfile/lib/libpam/modules/pam_ksu/Makefile projects/sendfile/lib/libpam/modules/pam_nologin/Makefile projects/sendfile/lib/libpam/modules/pam_opie/Makefile projects/sendfile/lib/libpam/modules/pam_opieaccess/Makefile projects/sendfile/lib/libpam/modules/pam_passwdqc/Makefile projects/sendfile/lib/libpam/modules/pam_radius/Makefile projects/sendfile/lib/libpam/modules/pam_ssh/Makefile projects/sendfile/lib/libpam/modules/pam_tacplus/Makefile projects/sendfile/lib/libpam/modules/pam_unix/Makefile projects/sendfile/lib/libpjdlog/Makefile projects/sendfile/lib/libproc/Makefile projects/sendfile/lib/libprocstat/Makefile projects/sendfile/lib/libradius/Makefile projects/sendfile/lib/librpcsec_gss/Makefile projects/sendfile/lib/librt/Makefile projects/sendfile/lib/librt/tests/Makefile projects/sendfile/lib/libsmb/Makefile projects/sendfile/lib/libsqlite3/Makefile projects/sendfile/lib/libstdthreads/Makefile projects/sendfile/lib/libtacplus/Makefile projects/sendfile/lib/libthr/thread/thr_exit.c projects/sendfile/lib/libthr/thread/thr_private.h projects/sendfile/lib/libulog/Makefile projects/sendfile/lib/libunbound/Makefile projects/sendfile/lib/libusb/Makefile projects/sendfile/lib/libutil/tests/Makefile projects/sendfile/lib/msun/src/s_isnan.c projects/sendfile/lib/msun/tests/Makefile projects/sendfile/lib/ncurses/form/Makefile projects/sendfile/lib/ncurses/menu/Makefile projects/sendfile/lib/ncurses/panel/Makefile projects/sendfile/libexec/atf/atf-check/Makefile projects/sendfile/libexec/atf/atf-sh/Makefile projects/sendfile/libexec/atrun/Makefile projects/sendfile/libexec/casper/dns/Makefile projects/sendfile/libexec/casper/grp/Makefile projects/sendfile/libexec/casper/pwd/Makefile projects/sendfile/libexec/casper/random/Makefile projects/sendfile/libexec/casper/sysctl/Makefile projects/sendfile/libexec/dma/Makefile projects/sendfile/libexec/fingerd/Makefile projects/sendfile/libexec/ftpd/Makefile projects/sendfile/libexec/getty/Makefile projects/sendfile/libexec/mail.local/Makefile projects/sendfile/libexec/pppoed/Makefile projects/sendfile/libexec/rlogind/Makefile projects/sendfile/libexec/rpc.rquotad/Makefile projects/sendfile/libexec/rpc.rstatd/Makefile projects/sendfile/libexec/rpc.rusersd/Makefile projects/sendfile/libexec/rpc.rwalld/Makefile projects/sendfile/libexec/rpc.sprayd/Makefile projects/sendfile/libexec/rshd/Makefile projects/sendfile/libexec/rtld-elf/Makefile projects/sendfile/libexec/rtld-elf/rtld.c projects/sendfile/libexec/smrsh/Makefile projects/sendfile/libexec/tcpd/Makefile projects/sendfile/libexec/telnetd/Makefile projects/sendfile/libexec/tftpd/Makefile projects/sendfile/libexec/ulog-helper/Makefile projects/sendfile/libexec/ypxfr/Makefile projects/sendfile/release/picobsd/tinyware/login/Makefile projects/sendfile/release/picobsd/tinyware/oinit/Makefile projects/sendfile/release/picobsd/tinyware/passwd/Makefile projects/sendfile/sbin/atm/atmconfig/Makefile projects/sendfile/sbin/badsect/Makefile projects/sendfile/sbin/bsdlabel/Makefile projects/sendfile/sbin/camcontrol/Makefile projects/sendfile/sbin/casperd/Makefile projects/sendfile/sbin/ccdconfig/Makefile projects/sendfile/sbin/ddb/Makefile projects/sendfile/sbin/devd/Makefile projects/sendfile/sbin/dhclient/Makefile projects/sendfile/sbin/dmesg/Makefile projects/sendfile/sbin/dumpfs/Makefile projects/sendfile/sbin/fdisk/Makefile projects/sendfile/sbin/fdisk_pc98/Makefile projects/sendfile/sbin/ffsinfo/Makefile projects/sendfile/sbin/fsck_ffs/Makefile projects/sendfile/sbin/fsck_ffs/dir.c projects/sendfile/sbin/fsdb/Makefile projects/sendfile/sbin/gbde/Makefile projects/sendfile/sbin/geom/Makefile projects/sendfile/sbin/geom/class/eli/Makefile projects/sendfile/sbin/geom/class/journal/Makefile projects/sendfile/sbin/geom/class/mirror/Makefile projects/sendfile/sbin/geom/class/part/Makefile projects/sendfile/sbin/geom/class/raid/Makefile projects/sendfile/sbin/geom/class/raid3/Makefile projects/sendfile/sbin/geom/core/Makefile projects/sendfile/sbin/ggate/ggatec/Makefile projects/sendfile/sbin/ggate/ggated/Makefile projects/sendfile/sbin/ggate/ggatel/Makefile projects/sendfile/sbin/growfs/Makefile projects/sendfile/sbin/gvinum/Makefile projects/sendfile/sbin/hastctl/Makefile projects/sendfile/sbin/hastd/Makefile projects/sendfile/sbin/ifconfig/Makefile projects/sendfile/sbin/init/Makefile projects/sendfile/sbin/ipf/Makefile.inc projects/sendfile/sbin/ipf/ipf/Makefile projects/sendfile/sbin/ipf/ipfstat/Makefile projects/sendfile/sbin/ipf/ipsend/Makefile projects/sendfile/sbin/ipfw/Makefile projects/sendfile/sbin/ipfw/ipfw.8 projects/sendfile/sbin/iscontrol/Makefile projects/sendfile/sbin/md5/Makefile projects/sendfile/sbin/mdconfig/Makefile projects/sendfile/sbin/mount/Makefile projects/sendfile/sbin/mount_cd9660/Makefile projects/sendfile/sbin/mount_msdosfs/Makefile projects/sendfile/sbin/mount_udf/Makefile projects/sendfile/sbin/nandfs/Makefile projects/sendfile/sbin/natd/Makefile projects/sendfile/sbin/newfs/Makefile projects/sendfile/sbin/newfs_nandfs/Makefile projects/sendfile/sbin/pfctl/Makefile projects/sendfile/sbin/pflogd/Makefile projects/sendfile/sbin/ping/Makefile projects/sendfile/sbin/ping6/Makefile projects/sendfile/sbin/quotacheck/Makefile projects/sendfile/sbin/rcorder/Makefile projects/sendfile/sbin/routed/Makefile projects/sendfile/sbin/routed/rtquery/Makefile projects/sendfile/sbin/savecore/Makefile projects/sendfile/sbin/setkey/Makefile projects/sendfile/sbin/sunlabel/Makefile projects/sendfile/sbin/swapon/Makefile projects/sendfile/sbin/tunefs/Makefile projects/sendfile/secure/lib/libssh/Makefile projects/sendfile/secure/lib/libssl/Makefile projects/sendfile/secure/libexec/sftp-server/Makefile projects/sendfile/secure/libexec/ssh-keysign/Makefile projects/sendfile/secure/libexec/ssh-pkcs11-helper/Makefile projects/sendfile/secure/usr.bin/bdes/Makefile projects/sendfile/secure/usr.bin/openssl/Makefile projects/sendfile/secure/usr.bin/scp/Makefile projects/sendfile/secure/usr.bin/sftp/Makefile projects/sendfile/secure/usr.bin/ssh-add/Makefile projects/sendfile/secure/usr.bin/ssh-agent/Makefile projects/sendfile/secure/usr.bin/ssh-keygen/Makefile projects/sendfile/secure/usr.bin/ssh-keyscan/Makefile projects/sendfile/secure/usr.bin/ssh/Makefile projects/sendfile/secure/usr.sbin/sshd/Makefile projects/sendfile/share/man/man4/gre.4 projects/sendfile/share/man/man4/man4.arm/cgem.4 projects/sendfile/share/man/man4/me.4 projects/sendfile/share/man/man4/netmap.4 projects/sendfile/share/man/man9/Makefile projects/sendfile/share/man/man9/get_cyclecount.9 projects/sendfile/share/man/man9/malloc.9 projects/sendfile/share/man/man9/sleepqueue.9 projects/sendfile/share/man/man9/timeout.9 projects/sendfile/share/mk/bsd.libnames.mk projects/sendfile/share/mk/src.libnames.mk projects/sendfile/sys/amd64/include/asm.h projects/sendfile/sys/amd64/vmm/vmm.c projects/sendfile/sys/arm/altera/socfpga/files.socfpga projects/sendfile/sys/arm/altera/socfpga/socfpga_machdep.c projects/sendfile/sys/arm/conf/SOCKIT-BERI projects/sendfile/sys/arm/include/asm.h projects/sendfile/sys/arm/include/cpuconf.h projects/sendfile/sys/boot/common/zfsloader.8 projects/sendfile/sys/boot/fdt/dts/arm/socfpga-sockit-beri.dts projects/sendfile/sys/boot/i386/boot2/boot2.c projects/sendfile/sys/boot/i386/gptzfsboot/gptzfsboot.8 projects/sendfile/sys/cam/ctl/ctl.c projects/sendfile/sys/cam/ctl/ctl_backend_block.c projects/sendfile/sys/cam/ctl/ctl_backend_ramdisk.c projects/sendfile/sys/cam/ctl/ctl_frontend.c projects/sendfile/sys/cam/ctl/ctl_frontend_cam_sim.c projects/sendfile/sys/cam/ctl/ctl_frontend_internal.c projects/sendfile/sys/cam/ctl/ctl_frontend_iscsi.c projects/sendfile/sys/cam/ctl/ctl_io.h projects/sendfile/sys/cam/ctl/ctl_private.h projects/sendfile/sys/cam/ctl/ctl_tpc.c projects/sendfile/sys/cam/ctl/scsi_ctl.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/sendfile/sys/conf/files projects/sendfile/sys/conf/files.amd64 projects/sendfile/sys/conf/files.arm projects/sendfile/sys/conf/files.i386 projects/sendfile/sys/conf/options.arm projects/sendfile/sys/contrib/dev/ral/Makefile projects/sendfile/sys/dev/ahci/ahci_pci.c projects/sendfile/sys/dev/ata/ata-pci.h projects/sendfile/sys/dev/ata/chipsets/ata-intel.c projects/sendfile/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c projects/sendfile/sys/dev/ffec/if_ffec.c projects/sendfile/sys/dev/ichsmb/ichsmb_pci.c projects/sendfile/sys/dev/ichwd/ichwd.c projects/sendfile/sys/dev/ichwd/ichwd.h projects/sendfile/sys/dev/mpt/mpt.c projects/sendfile/sys/dev/sound/pci/hda/hdac.c projects/sendfile/sys/dev/sound/pci/hda/hdac.h projects/sendfile/sys/dev/sound/usb/uaudio.c projects/sendfile/sys/dev/uart/uart_bus_pci.c projects/sendfile/sys/dev/usb/controller/ehci_pci.c projects/sendfile/sys/dev/usb/controller/ohci_pci.c projects/sendfile/sys/dev/usb/controller/xhci_pci.c projects/sendfile/sys/dev/usb/quirk/usb_quirk.c projects/sendfile/sys/dev/usb/usbdevs projects/sendfile/sys/i386/i386/machdep.c projects/sendfile/sys/i386/include/asm.h projects/sendfile/sys/kern/kern_descrip.c projects/sendfile/sys/kern/subr_bus.c projects/sendfile/sys/mips/include/cache_mipsNN.h projects/sendfile/sys/net/if_tap.c projects/sendfile/sys/netinet6/nd6.c projects/sendfile/sys/powerpc/include/asm.h projects/sendfile/sys/powerpc/include/profile.h projects/sendfile/sys/sparc64/include/asm.h projects/sendfile/sys/sys/bus.h projects/sendfile/sys/sys/callout.h projects/sendfile/sys/vm/swap_pager.c projects/sendfile/sys/vm/vnode_pager.c projects/sendfile/tools/build/mk/OptionalObsoleteFiles.inc projects/sendfile/tools/tools/ath/athaggrstats/Makefile projects/sendfile/tools/tools/ath/athstats/Makefile projects/sendfile/tools/tools/mwl/mwlstats/Makefile projects/sendfile/tools/tools/net80211/wlanstats/Makefile projects/sendfile/tools/tools/npe/npestats/Makefile projects/sendfile/usr.bin/apply/Makefile projects/sendfile/usr.bin/ar/Makefile projects/sendfile/usr.bin/atm/sscop/Makefile projects/sendfile/usr.bin/awk/Makefile projects/sendfile/usr.bin/bc/Makefile projects/sendfile/usr.bin/bluetooth/bthost/Makefile projects/sendfile/usr.bin/bluetooth/btsockstat/Makefile projects/sendfile/usr.bin/bluetooth/rfcomm_sppd/Makefile projects/sendfile/usr.bin/bsdiff/bsdiff/Makefile projects/sendfile/usr.bin/bsdiff/bspatch/Makefile projects/sendfile/usr.bin/bzip2/Makefile projects/sendfile/usr.bin/calendar/Makefile projects/sendfile/usr.bin/chkey/Makefile projects/sendfile/usr.bin/chpass/Makefile projects/sendfile/usr.bin/clang/clang/clang.1 projects/sendfile/usr.bin/colldef/Makefile projects/sendfile/usr.bin/compile_et/Makefile projects/sendfile/usr.bin/cpio/Makefile projects/sendfile/usr.bin/cpio/test/Makefile projects/sendfile/usr.bin/dc/Makefile projects/sendfile/usr.bin/demandoc/Makefile projects/sendfile/usr.bin/dpv/Makefile projects/sendfile/usr.bin/dpv/dpv.1 projects/sendfile/usr.bin/drill/Makefile projects/sendfile/usr.bin/du/Makefile projects/sendfile/usr.bin/ee/Makefile projects/sendfile/usr.bin/elfdump/elfdump.c projects/sendfile/usr.bin/enigma/Makefile projects/sendfile/usr.bin/fetch/Makefile projects/sendfile/usr.bin/file/Makefile projects/sendfile/usr.bin/fstat/Makefile projects/sendfile/usr.bin/ftp/Makefile projects/sendfile/usr.bin/gcore/Makefile projects/sendfile/usr.bin/grep/Makefile projects/sendfile/usr.bin/gzip/Makefile projects/sendfile/usr.bin/host/Makefile projects/sendfile/usr.bin/ipcrm/Makefile projects/sendfile/usr.bin/ipcs/Makefile projects/sendfile/usr.bin/iscsictl/Makefile projects/sendfile/usr.bin/kdump/Makefile projects/sendfile/usr.bin/keylogin/Makefile projects/sendfile/usr.bin/killall/Makefile projects/sendfile/usr.bin/ktrdump/Makefile projects/sendfile/usr.bin/less/Makefile projects/sendfile/usr.bin/lex/lex.1 projects/sendfile/usr.bin/limits/Makefile projects/sendfile/usr.bin/lock/Makefile projects/sendfile/usr.bin/login/Makefile projects/sendfile/usr.bin/lzmainfo/Makefile projects/sendfile/usr.bin/m4/Makefile projects/sendfile/usr.bin/makewhatis/Makefile projects/sendfile/usr.bin/mandoc/Makefile projects/sendfile/usr.bin/minigzip/Makefile projects/sendfile/usr.bin/ministat/Makefile projects/sendfile/usr.bin/mkimg/Makefile projects/sendfile/usr.bin/mkulzma/Makefile projects/sendfile/usr.bin/mkuzip/Makefile projects/sendfile/usr.bin/msgs/Makefile projects/sendfile/usr.bin/nc/Makefile projects/sendfile/usr.bin/ncal/Makefile projects/sendfile/usr.bin/netstat/Makefile projects/sendfile/usr.bin/newgrp/Makefile projects/sendfile/usr.bin/newkey/Makefile projects/sendfile/usr.bin/nfsstat/Makefile projects/sendfile/usr.bin/opieinfo/Makefile projects/sendfile/usr.bin/opiekey/Makefile projects/sendfile/usr.bin/opiepasswd/Makefile projects/sendfile/usr.bin/pamtest/Makefile projects/sendfile/usr.bin/passwd/Makefile projects/sendfile/usr.bin/procstat/Makefile projects/sendfile/usr.bin/quota/Makefile projects/sendfile/usr.bin/rctl/Makefile projects/sendfile/usr.bin/rup/Makefile projects/sendfile/usr.bin/rusers/Makefile projects/sendfile/usr.bin/script/Makefile projects/sendfile/usr.bin/seq/Makefile projects/sendfile/usr.bin/smbutil/Makefile projects/sendfile/usr.bin/sort/Makefile projects/sendfile/usr.bin/split/Makefile projects/sendfile/usr.bin/su/Makefile projects/sendfile/usr.bin/svn/svn/Makefile projects/sendfile/usr.bin/svn/svnadmin/Makefile projects/sendfile/usr.bin/svn/svndumpfilter/Makefile projects/sendfile/usr.bin/svn/svnlook/Makefile projects/sendfile/usr.bin/svn/svnmucc/Makefile projects/sendfile/usr.bin/svn/svnrdump/Makefile projects/sendfile/usr.bin/svn/svnserve/Makefile projects/sendfile/usr.bin/svn/svnsync/Makefile projects/sendfile/usr.bin/svn/svnversion/Makefile projects/sendfile/usr.bin/systat/Makefile projects/sendfile/usr.bin/tabs/Makefile projects/sendfile/usr.bin/talk/Makefile projects/sendfile/usr.bin/tar/Makefile projects/sendfile/usr.bin/telnet/Makefile projects/sendfile/usr.bin/tftp/Makefile projects/sendfile/usr.bin/top/Makefile projects/sendfile/usr.bin/tput/Makefile projects/sendfile/usr.bin/truncate/Makefile projects/sendfile/usr.bin/tset/Makefile projects/sendfile/usr.bin/ul/Makefile projects/sendfile/usr.bin/units/Makefile projects/sendfile/usr.bin/unzip/Makefile projects/sendfile/usr.bin/usbhidaction/Makefile projects/sendfile/usr.bin/usbhidctl/Makefile projects/sendfile/usr.bin/vacation/Makefile projects/sendfile/usr.bin/vi/Makefile projects/sendfile/usr.bin/vmstat/Makefile projects/sendfile/usr.bin/w/Makefile projects/sendfile/usr.bin/wc/Makefile projects/sendfile/usr.bin/xinstall/Makefile projects/sendfile/usr.bin/xlint/lint1/Makefile projects/sendfile/usr.bin/xo/Makefile projects/sendfile/usr.bin/xz/Makefile projects/sendfile/usr.bin/xzdec/Makefile projects/sendfile/usr.sbin/acpi/acpidb/Makefile projects/sendfile/usr.sbin/amd/Makefile.inc projects/sendfile/usr.sbin/amd/amd/Makefile projects/sendfile/usr.sbin/amd/amq/Makefile projects/sendfile/usr.sbin/amd/fixmount/Makefile projects/sendfile/usr.sbin/amd/fsinfo/Makefile projects/sendfile/usr.sbin/amd/hlfsd/Makefile projects/sendfile/usr.sbin/amd/mk-amd-map/Makefile projects/sendfile/usr.sbin/amd/pawd/Makefile projects/sendfile/usr.sbin/amd/wire-test/Makefile projects/sendfile/usr.sbin/ancontrol/Makefile projects/sendfile/usr.sbin/apmd/Makefile projects/sendfile/usr.sbin/asf/Makefile projects/sendfile/usr.sbin/audit/Makefile projects/sendfile/usr.sbin/auditd/Makefile projects/sendfile/usr.sbin/auditdistd/Makefile projects/sendfile/usr.sbin/auditreduce/Makefile projects/sendfile/usr.sbin/authpf/Makefile projects/sendfile/usr.sbin/autofs/Makefile projects/sendfile/usr.sbin/bhyve/Makefile projects/sendfile/usr.sbin/bhyvectl/Makefile projects/sendfile/usr.sbin/bhyveload/Makefile projects/sendfile/usr.sbin/bluetooth/ath3kfw/Makefile projects/sendfile/usr.sbin/bluetooth/bt3cfw/Makefile projects/sendfile/usr.sbin/bluetooth/bthidcontrol/Makefile projects/sendfile/usr.sbin/bluetooth/bthidd/Makefile projects/sendfile/usr.sbin/bluetooth/btpand/Makefile projects/sendfile/usr.sbin/bluetooth/hccontrol/Makefile projects/sendfile/usr.sbin/bluetooth/hcsecd/Makefile projects/sendfile/usr.sbin/bluetooth/hcseriald/Makefile projects/sendfile/usr.sbin/bluetooth/l2control/Makefile projects/sendfile/usr.sbin/bluetooth/l2ping/Makefile projects/sendfile/usr.sbin/bluetooth/rfcomm_pppd/Makefile projects/sendfile/usr.sbin/bluetooth/sdpcontrol/Makefile projects/sendfile/usr.sbin/boot0cfg/Makefile projects/sendfile/usr.sbin/boot98cfg/Makefile projects/sendfile/usr.sbin/bsdinstall/distextract/Makefile projects/sendfile/usr.sbin/bsdinstall/distfetch/Makefile projects/sendfile/usr.sbin/bsdinstall/partedit/Makefile projects/sendfile/usr.sbin/bsnmpd/bsnmpd/Makefile projects/sendfile/usr.sbin/bsnmpd/modules/snmp_hast/Makefile projects/sendfile/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile projects/sendfile/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile projects/sendfile/usr.sbin/bsnmpd/tools/bsnmptools/Makefile projects/sendfile/usr.sbin/cdcontrol/Makefile projects/sendfile/usr.sbin/ckdist/Makefile projects/sendfile/usr.sbin/clear_locks/Makefile projects/sendfile/usr.sbin/config/Makefile projects/sendfile/usr.sbin/config/main.c projects/sendfile/usr.sbin/config/mkmakefile.c projects/sendfile/usr.sbin/cron/cron/Makefile projects/sendfile/usr.sbin/cron/crontab/Makefile projects/sendfile/usr.sbin/ctladm/Makefile projects/sendfile/usr.sbin/ctld/Makefile projects/sendfile/usr.sbin/ctld/ctl.conf.5 projects/sendfile/usr.sbin/ctm/ctm/Makefile projects/sendfile/usr.sbin/ctm/mkCTM/Makefile projects/sendfile/usr.sbin/daemon/Makefile projects/sendfile/usr.sbin/dconschat/Makefile projects/sendfile/usr.sbin/devinfo/Makefile projects/sendfile/usr.sbin/diskinfo/Makefile projects/sendfile/usr.sbin/editmap/Makefile projects/sendfile/usr.sbin/edquota/Makefile projects/sendfile/usr.sbin/fifolog/fifolog_create/Makefile projects/sendfile/usr.sbin/fifolog/fifolog_reader/Makefile projects/sendfile/usr.sbin/fifolog/fifolog_writer/Makefile projects/sendfile/usr.sbin/flowctl/Makefile projects/sendfile/usr.sbin/ftp-proxy/Makefile projects/sendfile/usr.sbin/gssd/Makefile projects/sendfile/usr.sbin/gstat/Makefile projects/sendfile/usr.sbin/ifmcstat/Makefile projects/sendfile/usr.sbin/inetd/Makefile projects/sendfile/usr.sbin/iostat/Makefile projects/sendfile/usr.sbin/ipfwpcap/Makefile projects/sendfile/usr.sbin/iscsid/Makefile projects/sendfile/usr.sbin/jail/Makefile projects/sendfile/usr.sbin/jail/command.c projects/sendfile/usr.sbin/jail/jail.c projects/sendfile/usr.sbin/jail/state.c projects/sendfile/usr.sbin/jexec/Makefile projects/sendfile/usr.sbin/jls/Makefile projects/sendfile/usr.sbin/kbdcontrol/Makefile projects/sendfile/usr.sbin/keyserv/Makefile projects/sendfile/usr.sbin/kgmon/Makefile projects/sendfile/usr.sbin/lmcconfig/Makefile projects/sendfile/usr.sbin/lpr/Makefile.inc projects/sendfile/usr.sbin/lpr/chkprintcap/Makefile projects/sendfile/usr.sbin/lpr/lpc/Makefile projects/sendfile/usr.sbin/lpr/lpd/Makefile projects/sendfile/usr.sbin/lpr/lpq/Makefile projects/sendfile/usr.sbin/lpr/lpr/Makefile projects/sendfile/usr.sbin/lpr/lprm/Makefile projects/sendfile/usr.sbin/lpr/pac/Makefile projects/sendfile/usr.sbin/mailstats/Makefile projects/sendfile/usr.sbin/mailwrapper/Makefile projects/sendfile/usr.sbin/makefs/Makefile projects/sendfile/usr.sbin/makemap/Makefile projects/sendfile/usr.sbin/mfiutil/Makefile projects/sendfile/usr.sbin/mount_smbfs/Makefile projects/sendfile/usr.sbin/mountd/Makefile projects/sendfile/usr.sbin/moused/Makefile projects/sendfile/usr.sbin/mptutil/Makefile projects/sendfile/usr.sbin/mtree/Makefile projects/sendfile/usr.sbin/nandtool/Makefile projects/sendfile/usr.sbin/ndiscvt/Makefile projects/sendfile/usr.sbin/ngctl/Makefile projects/sendfile/usr.sbin/nghook/Makefile projects/sendfile/usr.sbin/nmtree/Makefile projects/sendfile/usr.sbin/nscd/Makefile projects/sendfile/usr.sbin/ntp/Makefile.inc projects/sendfile/usr.sbin/ntp/ntp-keygen/Makefile projects/sendfile/usr.sbin/ntp/ntpd/Makefile projects/sendfile/usr.sbin/ntp/ntpdate/Makefile projects/sendfile/usr.sbin/ntp/ntpdc/Makefile projects/sendfile/usr.sbin/ntp/ntpq/Makefile projects/sendfile/usr.sbin/ntp/ntptime/Makefile projects/sendfile/usr.sbin/ntp/sntp/Makefile projects/sendfile/usr.sbin/pkg/Makefile projects/sendfile/usr.sbin/pmccontrol/Makefile projects/sendfile/usr.sbin/pmcstat/Makefile projects/sendfile/usr.sbin/powerd/Makefile projects/sendfile/usr.sbin/ppp/Makefile projects/sendfile/usr.sbin/pppctl/Makefile projects/sendfile/usr.sbin/praliases/Makefile projects/sendfile/usr.sbin/praudit/Makefile projects/sendfile/usr.sbin/pstat/Makefile projects/sendfile/usr.sbin/pw/Makefile projects/sendfile/usr.sbin/quotaon/Makefile projects/sendfile/usr.sbin/rarpd/Makefile projects/sendfile/usr.sbin/repquota/Makefile projects/sendfile/usr.sbin/rpc.lockd/Makefile projects/sendfile/usr.sbin/rpc.statd/Makefile projects/sendfile/usr.sbin/rpc.yppasswdd/Makefile projects/sendfile/usr.sbin/rpc.ypupdated/Makefile projects/sendfile/usr.sbin/rpc.ypxfrd/Makefile projects/sendfile/usr.sbin/rpcbind/Makefile projects/sendfile/usr.sbin/rrenumd/Makefile projects/sendfile/usr.sbin/rtadvd/Makefile projects/sendfile/usr.sbin/rtsold/Makefile projects/sendfile/usr.sbin/sendmail/Makefile projects/sendfile/usr.sbin/services_mkdb/Makefile projects/sendfile/usr.sbin/snapinfo/Makefile projects/sendfile/usr.sbin/spray/Makefile projects/sendfile/usr.sbin/syslogd/Makefile projects/sendfile/usr.sbin/tcpdchk/Makefile projects/sendfile/usr.sbin/tcpdmatch/Makefile projects/sendfile/usr.sbin/tcpdump/tcpdump/Makefile projects/sendfile/usr.sbin/timed/timed/Makefile projects/sendfile/usr.sbin/traceroute/Makefile projects/sendfile/usr.sbin/traceroute6/Makefile projects/sendfile/usr.sbin/tzsetup/Makefile projects/sendfile/usr.sbin/ugidfw/Makefile projects/sendfile/usr.sbin/uhsoctl/Makefile projects/sendfile/usr.sbin/unbound/anchor/Makefile projects/sendfile/usr.sbin/unbound/checkconf/Makefile projects/sendfile/usr.sbin/unbound/control/Makefile projects/sendfile/usr.sbin/unbound/daemon/Makefile projects/sendfile/usr.sbin/usbconfig/Makefile projects/sendfile/usr.sbin/vipw/Makefile projects/sendfile/usr.sbin/watch/Makefile projects/sendfile/usr.sbin/watchdogd/Makefile projects/sendfile/usr.sbin/wpa/Makefile.crypto projects/sendfile/usr.sbin/wpa/hostapd/Makefile projects/sendfile/usr.sbin/wpa/hostapd_cli/Makefile projects/sendfile/usr.sbin/wpa/wpa_cli/Makefile projects/sendfile/usr.sbin/wpa/wpa_passphrase/Makefile projects/sendfile/usr.sbin/wpa/wpa_priv/Makefile projects/sendfile/usr.sbin/wpa/wpa_supplicant/Makefile projects/sendfile/usr.sbin/ypserv/Makefile Directory Properties: projects/sendfile/ (props changed) projects/sendfile/cddl/ (props changed) projects/sendfile/cddl/contrib/opensolaris/ (props changed) projects/sendfile/contrib/llvm/ (props changed) projects/sendfile/contrib/llvm/tools/lldb/ (props changed) projects/sendfile/contrib/mdocml/ (props changed) projects/sendfile/etc/ (props changed) projects/sendfile/gnu/lib/ (props changed) projects/sendfile/gnu/usr.bin/binutils/ (props changed) projects/sendfile/gnu/usr.bin/gdb/ (props changed) projects/sendfile/lib/libc/ (props changed) projects/sendfile/lib/libutil/ (props changed) projects/sendfile/sbin/ (props changed) projects/sendfile/sbin/ipfw/ (props changed) projects/sendfile/share/ (props changed) projects/sendfile/share/man/man4/ (props changed) projects/sendfile/sys/ (props changed) projects/sendfile/sys/amd64/vmm/ (props changed) projects/sendfile/sys/boot/ (props changed) projects/sendfile/sys/cddl/contrib/opensolaris/ (props changed) projects/sendfile/sys/conf/ (props changed) projects/sendfile/usr.bin/calendar/ (props changed) projects/sendfile/usr.bin/mkimg/ (props changed) projects/sendfile/usr.bin/procstat/ (props changed) projects/sendfile/usr.sbin/bhyve/ (props changed) projects/sendfile/usr.sbin/bhyvectl/ (props changed) projects/sendfile/usr.sbin/bhyveload/ (props changed) projects/sendfile/usr.sbin/jail/ (props changed) projects/sendfile/usr.sbin/ndiscvt/ (props changed) projects/sendfile/usr.sbin/rtadvd/ (props changed) projects/sendfile/usr.sbin/rtsold/ (props changed) Modified: projects/sendfile/MAINTAINERS ============================================================================== --- projects/sendfile/MAINTAINERS Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/MAINTAINERS Wed Nov 26 11:41:12 2014 (r275111) @@ -48,7 +48,6 @@ cd(4) ken Pre-commit review requested. pass(4) ken Pre-commit review requested. ch(4) ken Pre-commit review requested. em(4) jfv Pre-commit review requested. -tdfx(4) cokane Just keep me informed of changes, try not to break it. sendmail gshapiro Pre-commit review requested. etc/mail gshapiro Pre-commit review requested. Keep in sync with -STABLE. @@ -118,7 +117,6 @@ lib/libc/stdtime edwin Heads-up apprec is maintained by a third party source. sbin/routed bms Pre-commit review; notify vendor at rhyolite.com isci(4) jimharris Pre-commit review requested. -3dfx cokane Pre-commit review preferred. cmx daniel@roe.ch Pre-commit review preferred. filemon obrien Pre-commit review preferred. sysdoc trhodes Pre-commit review preferred. Modified: projects/sendfile/ObsoleteFiles.inc ============================================================================== --- projects/sendfile/ObsoleteFiles.inc Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/ObsoleteFiles.inc Wed Nov 26 11:41:12 2014 (r275111) @@ -44,6 +44,8 @@ OLD_FILES+=usr/share/man/man4/faith.4.gz OLD_FILES+=usr/share/man/man4/if_faith.4.gz OLD_FILES+=usr/sbin/faithd OLD_FILES+=usr/share/man/man8/faithd.8.gz +# 20141107: overhaul if_gre(4) +OLD_FILES+=usr/include/netinet/ip_gre.h # 20141102: postrandom obsoleted by new /dev/random code OLD_FILES+=etc/rc.d/postrandom # 20141031: initrandom obsoleted by new /dev/random code Modified: projects/sendfile/bin/csh/Makefile ============================================================================== --- projects/sendfile/bin/csh/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/bin/csh/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -40,8 +40,7 @@ MLINKS= csh.1 tcsh.1 # utilities of the same name are handled with the associated manpage, # builtin.1 in share/man/man1/. -DPADD= ${LIBTERMCAPW} ${LIBCRYPT} -LDADD= -ltermcapw -lcrypt +LIBADD= termcapw crypt LINKS= ${BINDIR}/csh ${BINDIR}/tcsh Modified: projects/sendfile/bin/df/Makefile ============================================================================== --- projects/sendfile/bin/df/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/bin/df/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -9,7 +9,6 @@ SRCS= df.c vfslist.c CFLAGS+= -I${MOUNT} -DPADD= ${LIBUTIL} ${LIBXO} -LDADD= -lutil -lxo +LIBADD= xo util .include Modified: projects/sendfile/bin/ed/Makefile ============================================================================== --- projects/sendfile/bin/ed/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/bin/ed/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -9,8 +9,7 @@ MLINKS= ed.1 red.1 .if ${MK_OPENSSL} != "no" && ${MK_ED_CRYPTO} != "no" CFLAGS+=-DDES -DPADD= ${LIBCRYPTO} -LDADD= -lcrypto +LIBADD= crypto .endif .include Modified: projects/sendfile/bin/ls/Makefile ============================================================================== --- projects/sendfile/bin/ls/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/bin/ls/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -5,14 +5,12 @@ PROG= ls SRCS= cmp.c ls.c print.c util.c -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .if !defined(RELEASE_CRUNCH) && \ ${MK_LS_COLORS} != no CFLAGS+= -DCOLORLS -DPADD+= ${LIBTERMCAPW} -LDADD+= -ltermcapw +LIBADD+= termcapw .endif .include Modified: projects/sendfile/bin/pkill/Makefile ============================================================================== --- projects/sendfile/bin/pkill/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/bin/pkill/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -5,8 +5,7 @@ PROG= pkill -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm LINKS= ${BINDIR}/pkill ${BINDIR}/pgrep MLINKS= pkill.1 pgrep.1 Modified: projects/sendfile/bin/ps/Makefile ============================================================================== --- projects/sendfile/bin/ps/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/bin/ps/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -11,7 +11,6 @@ SRCS= fmt.c keyword.c nlist.c print.c ps # on large systems. # CFLAGS+=-DLAZY_PS -DPADD= ${LIBM} ${LIBKVM} ${LIBJAIL} -LDADD= -lm -lkvm -ljail +LIBADD= m kvm jail .include Modified: projects/sendfile/bin/rmail/Makefile ============================================================================== --- projects/sendfile/bin/rmail/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/bin/rmail/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -14,11 +14,7 @@ MAN= rmail.8 WARNS?= 2 CFLAGS+=-I${SENDMAIL_DIR}/include -I. -LIBSMDIR= ${.OBJDIR}/../../lib/libsm -LIBSM= ${LIBSMDIR}/libsm.a - -DPADD= ${LIBSM} -LDADD= ${LIBSM} +LIBADD= sm SRCS+= sm_os.h CLEANFILES+=sm_os.h Modified: projects/sendfile/bin/sh/Makefile ============================================================================== --- projects/sendfile/bin/sh/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/bin/sh/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -18,8 +18,7 @@ SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS} # utilities of the same name are handled with the associated manpage, # builtin.1 in share/man/man1/. -DPADD= ${LIBEDIT} ${LIBTERMCAPW} -LDADD= -ledit -ltermcapw +LIBADD= edit CFLAGS+=-DSHELL -I. -I${.CURDIR} # for debug: Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c Wed Nov 26 11:41:12 2014 (r275111) @@ -1211,13 +1211,13 @@ dt_module_update(dtrace_hdl_t *dtp, stru #if defined(__FreeBSD__) if (sh.sh_size == 0) continue; - if (is_elf_obj && (sh.sh_type == SHT_PROGBITS || - sh.sh_type == SHT_NOBITS)) { + if (sh.sh_type == SHT_PROGBITS || sh.sh_type == SHT_NOBITS) { alignmask = sh.sh_addralign - 1; mapbase += alignmask; mapbase &= ~alignmask; sh.sh_addr = mapbase; - dmp->dm_sec_offsets[elf_ndxscn(sp)] = sh.sh_addr; + if (is_elf_obj) + dmp->dm_sec_offsets[elf_ndxscn(sp)] = sh.sh_addr; mapbase += sh.sh_size; } #endif Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c Wed Nov 26 11:41:12 2014 (r275111) @@ -545,8 +545,9 @@ dt_probe_define(dt_provider_t *pvp, dt_p for (pip = prp->pr_inst; pip != NULL; pip = pip->pi_next) { if (strcmp(pip->pi_fname, fname) == 0 && - ((rname == NULL && pip->pi_rname[0] == '\0') || - (rname != NULL && strcmp(pip->pi_rname, rname)) == 0)) + ((rname == NULL && pip->pi_rname == NULL) || + (rname != NULL && pip->pi_rname != NULL && + strcmp(pip->pi_rname, rname) == 0))) break; } Modified: projects/sendfile/contrib/llvm/tools/lldb/docs/lldb.1 ============================================================================== --- projects/sendfile/contrib/llvm/tools/lldb/docs/lldb.1 Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/contrib/llvm/tools/lldb/docs/lldb.1 Wed Nov 26 11:41:12 2014 (r275111) @@ -1,4 +1,4 @@ -.Dd 7 June, 2012 \" DATE +.Dd June 7, 2012 \" DATE .Dt LLDB 1 \" Program name and manual section number .Os Darwin \" Operating System .Sh NAME \" Section Header - required - don't modify @@ -15,30 +15,30 @@ .Ar [[--] ...] .Sh DESCRIPTION \" Section Header - required - don't modify .Nm -is the command line interface for the LLDB debugger library. +is the command line interface for the LLDB debugger library. .Nm can debug C, C++, Objective-C, and Objective-C++ programs. .Pp The following options are available: .Bl -tag -width indent -.It Fl h, -help -Prints out the usage information for the +.It Fl h, -help +Prints out the usage information for the .Nm debugger. The \fB\-\-help\fR text may be more up-to-date and authoritative than the command line options described in this man page. -.It Fl v, -version -Prints out the version number of the -.Nm +.It Fl v, -version +Prints out the version number of the +.Nm debugger. .It Fl a, -arch Ar arch -Specifies which architecture +Specifies which architecture .Nm will use when launching the specified program (assuming the provided executable is built for multiple architectures.) .It Fl f, -file Ar filename Specifies the executable file that -.nm +.Nm will be launching / attaching to. .It Fl n, -attach-name Ar process-name Specifies the name of a currently-running process to attach to. @@ -60,10 +60,10 @@ Currently only the Python extensions hav .It Fl d, -debug Tells the debugger to print out extra information for debugging itself. .It Fl s, -source Ar filename -Tells +Tells .Nm to read in and execute the file "\fBfilename\fR", which -should contain +should contain .Nm commands. .It Fl e, -editor @@ -81,7 +81,7 @@ Remember to end the options with "--" if In .Nm there is a \fBhelp\fR command which can be used to find descriptions and examples of -all +all .Nm commands. To get help on "\fBbreakpoint set\fR" you would type "\fBhelp breakpoint set\fR". .Pp @@ -94,18 +94,18 @@ will read settings/aliases/commands from .Pp First, it will read a \fB~/.lldbinit-\fIdebugger\fR command file. If you are using the .Nm -command line interface, this is \fB~/.lldbinit-lldb\fR. If you are using +command line interface, this is \fB~/.lldbinit-lldb\fR. If you are using .Nm inside a GUI debugger like .Nm Xcode this will be \fB~/.lldbinit-Xcode\fR. This is a useful place to put settings that you -want to apply only when a given +want to apply only when a given .Nm command interpreter is used. .Pp Second, \fB~/.lldbinit\fR is read. .Pp -Third, an \fR.lldbinit\fR file in the current working directory (where +Third, an \fR.lldbinit\fR file in the current working directory (where .Nm is started) will be read. .Sh SEE ALSO Modified: projects/sendfile/contrib/mdocml/lib.in ============================================================================== --- projects/sendfile/contrib/mdocml/lib.in Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/contrib/mdocml/lib.in Wed Nov 26 11:41:12 2014 (r275111) @@ -56,6 +56,7 @@ LINE("libftpio", "FTP Connection Managem LINE("libform", "Curses Form Library (libform, \\-lform)") LINE("libgeom", "Userland API Library for Kernel GEOM subsystem (libgeom, \\-lgeom)") LINE("libgpib", "General-Purpose Instrument Bus (GPIB) library (libgpib, \\-lgpib)") +LINE("libgpio", "General-Purpose Input Output (GPIO) library (libgpio, \\-lgpio)") LINE("libhammer", "HAMMER Filesystem Userland Library (libhammer, \\-lhammer)") LINE("libi386", "i386 Architecture Library (libi386, \\-li386)") LINE("libintl", "Internationalized Message Handling Library (libintl, \\-lintl)") Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c Wed Nov 26 11:41:12 2014 (r275111) @@ -51,7 +51,11 @@ run(int n, ...) ATF_REQUIRE_EQ(n, DEPTH - calls - 1); va_start(va, n); +#if defined(__FreeBSD__) && defined(__amd64__) + for (i = 0; i < 5; i++) { +#else for (i = 0; i < 9; i++) { +#endif ia = va_arg(va, int); ATF_REQUIRE_EQ(i, ia); } @@ -101,13 +105,6 @@ ATF_TC_BODY(setcontext_link, tc) ucontext_t save; volatile int i = 0; /* avoid longjmp clobbering */ -#ifdef __FreeBSD__ -#ifdef __amd64__ - atf_tc_expect_fail("setcontext in this testcase fails on " - "FreeBSD/amd64 with rc == -1/errno == EINVAL; see PR # 194828"); -#endif -#endif - for (i = 0; i < DEPTH; ++i) { ATF_REQUIRE_EQ(getcontext(&uc[i]), 0); @@ -115,21 +112,20 @@ ATF_TC_BODY(setcontext_link, tc) uc[i].uc_stack.ss_size = STACKSZ; uc[i].uc_link = (i > 0) ? &uc[i - 1] : &save; +#if defined(__FreeBSD__) && defined(__amd64__) + /* FreeBSD/amd64 only permits up to 6 arguments. */ + makecontext(&uc[i], (void *)run, 6, i, + 0, 1, 2, 3, 4); +#else makecontext(&uc[i], (void *)run, 10, i, 0, 1, 2, 3, 4, 5, 6, 7, 8); +#endif } ATF_REQUIRE_EQ(getcontext(&save), 0); -#ifdef __FreeBSD__ - if (calls == 0) { - int rc = setcontext(&uc[DEPTH-1]); - ATF_REQUIRE_EQ_MSG(rc, 0, "%d != 0; (errno = %d)", rc, errno); - } -#else if (calls == 0) ATF_REQUIRE_EQ(setcontext(&uc[DEPTH-1]), 0); -#endif } ATF_TP_ADD_TCS(tp) Modified: projects/sendfile/contrib/ofed/libmlx4/src/cq.c ============================================================================== --- projects/sendfile/contrib/ofed/libmlx4/src/cq.c Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/contrib/ofed/libmlx4/src/cq.c Wed Nov 26 11:41:12 2014 (r275111) @@ -109,15 +109,16 @@ struct mlx4_err_cqe { static struct mlx4_cqe *get_cqe(struct mlx4_cq *cq, int entry) { - return cq->buf.buf + entry * MLX4_CQ_ENTRY_SIZE; + return cq->buf.buf + entry * cq->cqe_size; } static void *get_sw_cqe(struct mlx4_cq *cq, int n) { struct mlx4_cqe *cqe = get_cqe(cq, n & cq->ibv_cq.cqe); + struct mlx4_cqe *tcqe = cq->cqe_size == 64 ? cqe + 1 : cqe; - return (!!(cqe->owner_sr_opcode & MLX4_CQE_OWNER_MASK) ^ - !!(n & (cq->ibv_cq.cqe + 1))) ? NULL : cqe; + return (!!(tcqe->owner_sr_opcode & MLX4_CQE_OWNER_MASK) ^ + !!(n & (cq->ibv_cq.cqe + 1))) ? NULL : tcqe; } static struct mlx4_cqe *next_cqe_sw(struct mlx4_cq *cq) @@ -402,6 +403,7 @@ void __mlx4_cq_clean(struct mlx4_cq *cq, uint8_t owner_bit; int nfreed = 0; int is_xrc_srq = 0; + int cqe_inc = cq->cqe_size == 64 ? 1 : 0; if (srq && srq->ibv_srq.xrc_cq) is_xrc_srq = 1; @@ -423,6 +425,7 @@ void __mlx4_cq_clean(struct mlx4_cq *cq, */ while ((int) --prod_index - (int) cq->cons_index >= 0) { cqe = get_cqe(cq, prod_index & cq->ibv_cq.cqe); + cqe += cqe_inc; if (is_xrc_srq && (ntohl(cqe->g_mlpath_rqpn & 0xffffff) == srq->srqn) && !(cqe->owner_sr_opcode & MLX4_CQE_IS_SEND_MASK)) { @@ -434,6 +437,7 @@ void __mlx4_cq_clean(struct mlx4_cq *cq, ++nfreed; } else if (nfreed) { dest = get_cqe(cq, (prod_index + nfreed) & cq->ibv_cq.cqe); + dest += cqe_inc; owner_bit = dest->owner_sr_opcode & MLX4_CQE_OWNER_MASK; memcpy(dest, cqe, sizeof *cqe); dest->owner_sr_opcode = owner_bit | @@ -473,28 +477,32 @@ void mlx4_cq_resize_copy_cqes(struct mlx { struct mlx4_cqe *cqe; int i; + int cqe_inc = cq->cqe_size == 64 ? 1 : 0; i = cq->cons_index; cqe = get_cqe(cq, (i & old_cqe)); + cqe += cqe_inc; while ((cqe->owner_sr_opcode & MLX4_CQE_OPCODE_MASK) != MLX4_CQE_OPCODE_RESIZE) { cqe->owner_sr_opcode = (cqe->owner_sr_opcode & ~MLX4_CQE_OWNER_MASK) | (((i + 1) & (cq->ibv_cq.cqe + 1)) ? MLX4_CQE_OWNER_MASK : 0); - memcpy(buf + ((i + 1) & cq->ibv_cq.cqe) * MLX4_CQ_ENTRY_SIZE, - cqe, MLX4_CQ_ENTRY_SIZE); + memcpy(buf + ((i + 1) & cq->ibv_cq.cqe) * cq->cqe_size, + cqe - cqe_inc, cq->cqe_size); ++i; cqe = get_cqe(cq, (i & old_cqe)); + cqe += cqe_inc; } ++cq->cons_index; } -int mlx4_alloc_cq_buf(struct mlx4_device *dev, struct mlx4_buf *buf, int nent) +int mlx4_alloc_cq_buf(struct mlx4_device *dev, struct mlx4_buf *buf, int nent, + int entry_size) { - if (mlx4_alloc_buf(buf, align(nent * MLX4_CQ_ENTRY_SIZE, dev->page_size), + if (mlx4_alloc_buf(buf, align(nent * entry_size, dev->page_size), dev->page_size)) return -1; - memset(buf->buf, 0, nent * MLX4_CQ_ENTRY_SIZE); + memset(buf->buf, 0, nent * entry_size); return 0; } Modified: projects/sendfile/contrib/ofed/libmlx4/src/mlx4-abi.h ============================================================================== --- projects/sendfile/contrib/ofed/libmlx4/src/mlx4-abi.h Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/contrib/ofed/libmlx4/src/mlx4-abi.h Wed Nov 26 11:41:12 2014 (r275111) @@ -40,9 +40,11 @@ struct mlx4_alloc_ucontext_resp { struct ibv_get_context_resp ibv_resp; + __u32 dev_caps; __u32 qp_tab_size; __u16 bf_reg_size; __u16 bf_regs_per_page; + __u32 cqe_size; }; struct mlx4_alloc_pd_resp { Modified: projects/sendfile/contrib/ofed/libmlx4/src/mlx4.c ============================================================================== --- projects/sendfile/contrib/ofed/libmlx4/src/mlx4.c Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/contrib/ofed/libmlx4/src/mlx4.c Wed Nov 26 11:41:12 2014 (r275111) @@ -201,6 +201,7 @@ static struct ibv_context *mlx4_alloc_co context->bf_buf_size = 0; } + context->cqe_size = resp.cqe_size; pthread_spin_init(&context->uar_lock, PTHREAD_PROCESS_PRIVATE); context->ibv_ctx.ops = mlx4_ctx_ops; Modified: projects/sendfile/contrib/ofed/libmlx4/src/mlx4.h ============================================================================== --- projects/sendfile/contrib/ofed/libmlx4/src/mlx4.h Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/contrib/ofed/libmlx4/src/mlx4.h Wed Nov 26 11:41:12 2014 (r275111) @@ -103,10 +103,6 @@ #endif enum { - MLX4_CQ_ENTRY_SIZE = 0x20 -}; - -enum { MLX4_STAT_RATE_OFFSET = 5 }; @@ -192,6 +188,7 @@ struct mlx4_context { int max_qp_wr; int max_sge; int max_cqe; + int cqe_size; struct { struct mlx4_srq **table; @@ -226,6 +223,7 @@ struct mlx4_cq { uint32_t *set_ci_db; uint32_t *arm_db; int arm_sn; + int cqe_size; }; struct mlx4_srq { @@ -369,7 +367,8 @@ int mlx4_dereg_mr(struct ibv_mr *mr); struct ibv_cq *mlx4_create_cq(struct ibv_context *context, int cqe, struct ibv_comp_channel *channel, int comp_vector); -int mlx4_alloc_cq_buf(struct mlx4_device *dev, struct mlx4_buf *buf, int nent); +int mlx4_alloc_cq_buf(struct mlx4_device *dev, struct mlx4_buf *buf, int nent, + int entry_size); int mlx4_resize_cq(struct ibv_cq *cq, int cqe); int mlx4_destroy_cq(struct ibv_cq *cq); int mlx4_poll_cq(struct ibv_cq *cq, int ne, struct ibv_wc *wc); Modified: projects/sendfile/contrib/ofed/libmlx4/src/verbs.c ============================================================================== --- projects/sendfile/contrib/ofed/libmlx4/src/verbs.c Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/contrib/ofed/libmlx4/src/verbs.c Wed Nov 26 11:41:12 2014 (r275111) @@ -168,6 +168,7 @@ struct ibv_cq *mlx4_create_cq(struct ibv struct mlx4_create_cq_resp resp; struct mlx4_cq *cq; int ret; + struct mlx4_context *mctx = to_mctx(context); /* Sanity check CQ size before proceeding */ if (cqe > 0x3fffff) @@ -184,9 +185,11 @@ struct ibv_cq *mlx4_create_cq(struct ibv cqe = align_queue_size(cqe + 1); - if (mlx4_alloc_cq_buf(to_mdev(context->device), &cq->buf, cqe)) + if (mlx4_alloc_cq_buf(to_mdev(context->device), &cq->buf, cqe, mctx->cqe_size)) goto err; + cq->cqe_size = mctx->cqe_size; + cq->set_ci_db = mlx4_alloc_db(to_mctx(context), MLX4_DB_TYPE_CQ); if (!cq->set_ci_db) goto err_buf; @@ -247,7 +250,8 @@ int mlx4_resize_cq(struct ibv_cq *ibcq, goto out; } - ret = mlx4_alloc_cq_buf(to_mdev(ibcq->context->device), &buf, cqe); + ret = mlx4_alloc_cq_buf(to_mdev(ibcq->context->device), &buf, cqe, + cq->cqe_size); if (ret) goto out; Modified: projects/sendfile/etc/defaults/rc.conf ============================================================================== --- projects/sendfile/etc/defaults/rc.conf Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/etc/defaults/rc.conf Wed Nov 26 11:41:12 2014 (r275111) @@ -317,7 +317,10 @@ amd_enable="NO" # Run amd service with amd_program="/usr/sbin/amd" # path to amd, if you want a different one. amd_flags="-a /.amd_mnt -l syslog /host /etc/amd.map /net /etc/amd.map" amd_map_program="NO" # Can be set to "ypcat -k amd.master" -autofs_enable="NO" # Run automountd(8) +autofs_enable="NO" # Run autofs daemons. +automount_flags="" # Flags to automount(8) (if autofs enabled). +automountd_flags="" # Flags to automountd(8) (if autofs enabled). +autounmountd_flags="" # Flags to autounmountd(8) (if autofs enabled). nfs_client_enable="NO" # This host is an NFS client (or NO). nfs_access_cache="60" # Client cache timeout in seconds nfs_server_enable="NO" # This host is an NFS server (or NO). Modified: projects/sendfile/etc/rc.d/automount ============================================================================== --- projects/sendfile/etc/rc.d/automount Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/etc/rc.d/automount Wed Nov 26 11:41:12 2014 (r275111) @@ -18,7 +18,7 @@ required_modules="autofs" automount_start() { - /usr/sbin/automount + /usr/sbin/automount ${automount_flags} } automount_stop() Modified: projects/sendfile/gnu/lib/libdialog/Makefile ============================================================================== --- projects/sendfile/gnu/lib/libdialog/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/lib/libdialog/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -13,8 +13,7 @@ SRCS= argv.c arrows.c buildlist.c butto INCS= dialog.h dlg_colors.h dlg_config.h dlg_keys.h MAN= dialog.3 -DPADD= ${LIBNCURSESW} ${LIBM} -LDADD= -lncursesw -lm +LIBADD= ncursesw m CFLAGS+= -I${.CURDIR} -I${DIALOG} -D_XOPEN_SOURCE_EXTENDED -DGCC_UNUSED=__unused .PATH: ${DIALOG} Modified: projects/sendfile/gnu/lib/libgcc/Makefile ============================================================================== --- projects/sendfile/gnu/lib/libgcc/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/lib/libgcc/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -28,8 +28,7 @@ CFLAGS+= -DIN_GCC -DIN_LIBGCC2 -D__GCC_F -I${.CURDIR}/../../usr.bin/cc/cc_tools LDFLAGS+= -nodefaultlibs -DPADD+= ${LIBC} -LDADD+= -lc +LIBADD+= c OBJS= # added to below in various ways depending on TARGET_CPUARCH @@ -119,8 +118,7 @@ LIB1ASMSRC = lib1funcs.asm LIB1ASMFUNCS = _dvmd_tls _bb_init_func LIB2ADDEH = unwind-arm.c libunwind.S pr-support.c unwind-c.c # Some compilers generate __aeabi_ functions libgcc_s is missing -DPADD+= ${LIBCOMPILER_RT} -LDADD+= -lcompiler_rt +LIBADD+= compiler_rt .endif .if ${TARGET_CPUARCH} == mips Modified: projects/sendfile/gnu/lib/libreadline/readline/Makefile ============================================================================== --- projects/sendfile/gnu/lib/libreadline/readline/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/lib/libreadline/readline/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -23,7 +23,6 @@ ${.OBJDIR}/${_h}: ${SRCDIR}/${_h} ${INSTALL} ${.ALLSRC} ${.TARGET} .endfor -DPADD= ${LIBTERMCAPW} -LDADD= -ltermcapw +LIBADD= ncursesw .include Modified: projects/sendfile/gnu/lib/libstdc++/Makefile ============================================================================== --- projects/sendfile/gnu/lib/libstdc++/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/lib/libstdc++/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -23,8 +23,8 @@ CXXFLAGS+= -fno-implicit-templates -ffun -Wno-deprecated PO_CXXFLAGS= ${CXXFLAGS:N-ffunction-sections} -DPADD= ${LIBM} -LDADD= -lm -Wl,-f,libsupc++.so.1 +LIBADD+= m +LDADD= -Wl,-f,libsupc++.so.1 # libstdc++ sources SRCS+= bitmap_allocator.cc pool_allocator.cc \ Modified: projects/sendfile/gnu/usr.bin/binutils/addr2line/addr2line.1 ============================================================================== --- projects/sendfile/gnu/usr.bin/binutils/addr2line/addr2line.1 Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/binutils/addr2line/addr2line.1 Wed Nov 26 11:41:12 2014 (r275111) @@ -33,7 +33,7 @@ . ds R" "" . ds C` "" . ds C' "" -'br\} +\} .el\{\ . ds -- \|\(em\| . ds PI \(*p @@ -107,7 +107,6 @@ .ds Ae A\h'-(\w'A'u*4/10)'E . \" corrections for vroff .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' . \" for low resolution devices (crt and lpr) .if \n(.H>23 .if \n(.V>19 \ \{\ Modified: projects/sendfile/gnu/usr.bin/binutils/as/as.1 ============================================================================== --- projects/sendfile/gnu/usr.bin/binutils/as/as.1 Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/binutils/as/as.1 Wed Nov 26 11:41:12 2014 (r275111) @@ -33,7 +33,7 @@ . ds R" "" . ds C` "" . ds C' "" -'br\} +\} .el\{\ . ds -- \|\(em\| . ds PI \(*p @@ -107,7 +107,6 @@ .ds Ae A\h'-(\w'A'u*4/10)'E . \" corrections for vroff .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' . \" for low resolution devices (crt and lpr) .if \n(.H>23 .if \n(.V>19 \ \{\ Modified: projects/sendfile/gnu/usr.bin/binutils/ld/ld.1 ============================================================================== --- projects/sendfile/gnu/usr.bin/binutils/ld/ld.1 Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/binutils/ld/ld.1 Wed Nov 26 11:41:12 2014 (r275111) @@ -33,7 +33,7 @@ . ds R" "" . ds C` "" . ds C' "" -'br\} +\} .el\{\ . ds -- \|\(em\| . ds PI \(*p @@ -107,7 +107,6 @@ .ds Ae A\h'-(\w'A'u*4/10)'E . \" corrections for vroff .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' . \" for low resolution devices (crt and lpr) .if \n(.H>23 .if \n(.V>19 \ \{\ Modified: projects/sendfile/gnu/usr.bin/binutils/nm/nm.1 ============================================================================== --- projects/sendfile/gnu/usr.bin/binutils/nm/nm.1 Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/binutils/nm/nm.1 Wed Nov 26 11:41:12 2014 (r275111) @@ -33,7 +33,7 @@ . ds R" "" . ds C` "" . ds C' "" -'br\} +\} .el\{\ . ds -- \|\(em\| . ds PI \(*p @@ -107,7 +107,6 @@ .ds Ae A\h'-(\w'A'u*4/10)'E . \" corrections for vroff .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' . \" for low resolution devices (crt and lpr) .if \n(.H>23 .if \n(.V>19 \ \{\ Modified: projects/sendfile/gnu/usr.bin/binutils/objcopy/objcopy.1 ============================================================================== --- projects/sendfile/gnu/usr.bin/binutils/objcopy/objcopy.1 Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/binutils/objcopy/objcopy.1 Wed Nov 26 11:41:12 2014 (r275111) @@ -33,7 +33,7 @@ . ds R" "" . ds C` "" . ds C' "" -'br\} +\} .el\{\ . ds -- \|\(em\| . ds PI \(*p @@ -107,7 +107,6 @@ .ds Ae A\h'-(\w'A'u*4/10)'E . \" corrections for vroff .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' . \" for low resolution devices (crt and lpr) .if \n(.H>23 .if \n(.V>19 \ \{\ Modified: projects/sendfile/gnu/usr.bin/binutils/objdump/objdump.1 ============================================================================== --- projects/sendfile/gnu/usr.bin/binutils/objdump/objdump.1 Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/binutils/objdump/objdump.1 Wed Nov 26 11:41:12 2014 (r275111) @@ -33,7 +33,7 @@ . ds R" "" . ds C` "" . ds C' "" -'br\} +\} .el\{\ . ds -- \|\(em\| . ds PI \(*p @@ -107,7 +107,6 @@ .ds Ae A\h'-(\w'A'u*4/10)'E . \" corrections for vroff .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' . \" for low resolution devices (crt and lpr) .if \n(.H>23 .if \n(.V>19 \ \{\ Modified: projects/sendfile/gnu/usr.bin/binutils/readelf/readelf.1 ============================================================================== --- projects/sendfile/gnu/usr.bin/binutils/readelf/readelf.1 Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/binutils/readelf/readelf.1 Wed Nov 26 11:41:12 2014 (r275111) @@ -33,7 +33,7 @@ . ds R" "" . ds C` "" . ds C' "" -'br\} +\} .el\{\ . ds -- \|\(em\| . ds PI \(*p @@ -107,7 +107,6 @@ .ds Ae A\h'-(\w'A'u*4/10)'E . \" corrections for vroff .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' . \" for low resolution devices (crt and lpr) .if \n(.H>23 .if \n(.V>19 \ \{\ Modified: projects/sendfile/gnu/usr.bin/binutils/size/size.1 ============================================================================== --- projects/sendfile/gnu/usr.bin/binutils/size/size.1 Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/binutils/size/size.1 Wed Nov 26 11:41:12 2014 (r275111) @@ -33,7 +33,7 @@ . ds R" "" . ds C` "" . ds C' "" -'br\} +\} .el\{\ . ds -- \|\(em\| . ds PI \(*p @@ -107,7 +107,6 @@ .ds Ae A\h'-(\w'A'u*4/10)'E . \" corrections for vroff .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' . \" for low resolution devices (crt and lpr) .if \n(.H>23 .if \n(.V>19 \ \{\ Modified: projects/sendfile/gnu/usr.bin/binutils/strings/strings.1 ============================================================================== --- projects/sendfile/gnu/usr.bin/binutils/strings/strings.1 Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/binutils/strings/strings.1 Wed Nov 26 11:41:12 2014 (r275111) @@ -33,7 +33,7 @@ . ds R" "" . ds C` "" . ds C' "" -'br\} +\} .el\{\ . ds -- \|\(em\| . ds PI \(*p @@ -107,7 +107,6 @@ .ds Ae A\h'-(\w'A'u*4/10)'E . \" corrections for vroff .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' . \" for low resolution devices (crt and lpr) .if \n(.H>23 .if \n(.V>19 \ \{\ Modified: projects/sendfile/gnu/usr.bin/binutils/strip/strip.1 ============================================================================== --- projects/sendfile/gnu/usr.bin/binutils/strip/strip.1 Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/binutils/strip/strip.1 Wed Nov 26 11:41:12 2014 (r275111) @@ -33,7 +33,7 @@ . ds R" "" . ds C` "" . ds C' "" -'br\} +\} .el\{\ . ds -- \|\(em\| . ds PI \(*p @@ -107,7 +107,6 @@ .ds Ae A\h'-(\w'A'u*4/10)'E . \" corrections for vroff .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' . \" for low resolution devices (crt and lpr) .if \n(.H>23 .if \n(.V>19 \ \{\ Modified: projects/sendfile/gnu/usr.bin/dialog/Makefile ============================================================================== --- projects/sendfile/gnu/usr.bin/dialog/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/dialog/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -3,8 +3,7 @@ DIALOG= ${.CURDIR}/../../../contrib/dialog PROG= dialog -DPADD= ${LIBDIALOG} ${LIBNCURSESW} ${LIBM} -LDADD= -ldialog -lncursesw -lm +LIBADD= dialog ncursesw m CFLAGS+= -I${.CURDIR} -I${DIALOG} .PATH: ${DIALOG} Modified: projects/sendfile/gnu/usr.bin/diff/Makefile ============================================================================== --- projects/sendfile/gnu/usr.bin/diff/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/diff/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -26,8 +26,7 @@ CFLAGS+=-I${DESTDIR}/usr/include/gnu SUBDIR+=doc -DPADD= ${LIBGNUREGEX} -LDADD= -lgnuregex +LIBADD+= gnuregex .if ${MK_TESTS} != "no" SUBDIR+= tests Modified: projects/sendfile/gnu/usr.bin/gdb/gdb/Makefile ============================================================================== --- projects/sendfile/gnu/usr.bin/gdb/gdb/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/gdb/gdb/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -11,8 +11,9 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a # global symbols visible. LDFLAGS+= -Wl,-E -DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lm ${LDREADLINE} -ltermcapw -lgnuregex +DPADD= ${GDBLIBS} ${BULIBS} +LDADD= ${GDBLIBS} ${BULIBS} +LIBADD+= m readline ncursesw gnuregex .include CFLAGS+= -DDEBUGDIR=\"${DEBUGDIR}\" Modified: projects/sendfile/gnu/usr.bin/gdb/gdbtui/Makefile ============================================================================== --- projects/sendfile/gnu/usr.bin/gdb/gdbtui/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/gdb/gdbtui/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -12,7 +12,8 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a # global symbols visible. LDFLAGS+= -Wl,-E -DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lm ${LDREADLINE} -ltermcapw -lgnuregex +DPADD= ${GDBLIBS} ${BULIBS} +LDADD= ${GDBLIBS} ${BULIBS} +LIBADD+= m readline ncursesw gnuregex .include Modified: projects/sendfile/gnu/usr.bin/gdb/kgdb/Makefile ============================================================================== --- projects/sendfile/gnu/usr.bin/gdb/kgdb/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/gdb/kgdb/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -8,10 +8,9 @@ BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_ ${OBJ_BU}/libiberty/libiberty.a GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a -DPADD= ${GDBLIBS} ${BULIBS} ${LIBKVM} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} \ - ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX} -lm ${LDREADLINE} -ltermcapw \ - -lgnuregex +DPADD= ${GDBLIBS} ${BULIBS} ${LIBKVM} +LDADD= ${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX} +LIBADD+= m readline ncursesw gnuregex .if defined(GDB_CROSS_DEBUGGER) CFLAGS+= -Wl,-export-dynamic Modified: projects/sendfile/gnu/usr.bin/grep/Makefile ============================================================================== --- projects/sendfile/gnu/usr.bin/grep/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/grep/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -22,8 +22,7 @@ LINKS+= ${BINDIR}/grep ${BINDIR}/egrep \ MLINKS= grep.1 egrep.1 grep.1 fgrep.1 .endif -DPADD= ${LIBGNUREGEX} ${LIBBZ2} -LDADD= -lgnuregex -lbz2 +LIBADD= gnuregex bz2 .if ${MK_BSD_GREP} != "yes" LINKS+= ${BINDIR}/grep ${BINDIR}/bzgrep \ @@ -33,8 +32,7 @@ MLINKS+=grep.1 bzgrep.1 grep.1 bzegrep.1 .endif .if defined(GREP_LIBZ) && !empty(GREP_LIBZ) -LDADD+= -lz -DPADD+= ${LIBZ} +LIBADD+= z CFLAGS+=-DHAVE_LIBZ=1 .if ${MK_BSD_GREP} != "yes" LINKS+= ${BINDIR}/grep ${BINDIR}/zgrep \ Modified: projects/sendfile/gnu/usr.bin/groff/tmac/Makefile ============================================================================== --- projects/sendfile/gnu/usr.bin/groff/tmac/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/groff/tmac/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -11,9 +11,8 @@ MDOCDIR?= ${TMACDIR}/mdoc MAN= groff_ms.7 groff_man.7 groff_me.7 groff_mdoc.7 MAN+= groff_trace.7 groff_www.7 MLINKS= groff_ms.7 ms.7 -MLINKS+= groff_man.7 man.7 MLINKS+= groff_me.7 me.7 -MLINKS+= groff_mdoc.7 mdoc.7 groff_mdoc.7 mdoc.samples.7 +MLINKS+= groff_mdoc.7 mdoc.samples.7 CLEANFILES= ${MAN} ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/} Modified: projects/sendfile/kerberos5/Makefile.inc ============================================================================== --- projects/sendfile/kerberos5/Makefile.inc Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/kerberos5/Makefile.inc Wed Nov 26 11:41:12 2014 (r275111) @@ -16,9 +16,6 @@ LDAPCFLAGS= -I${OPENLDAPBASE}/include -D LDAPLDFLAGS= -L${OPENLDAPBASE}/lib -Wl,-rpath,${OPENLDAPBASE}/lib .endif -LIBVERS= ${.OBJDIR}/../../lib/libvers/libvers.a -LIBSL= ${.OBJDIR}/../../lib/libsl/libsl.a - .if defined(SRCS) ETSRCS= \ Modified: projects/sendfile/kerberos5/lib/libasn1/Makefile ============================================================================== --- projects/sendfile/kerberos5/lib/libasn1/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/kerberos5/lib/libasn1/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -3,8 +3,7 @@ LIB= asn1 LDFLAGS= -Wl,--no-undefined INCS= asn1_err.h asn1-common.h heim_asn1.h der.h der-protos.h der-private.h -LDADD= -lcom_err -lroken -DPADD= ${LIBCOM_ERR} ${LIBROKEN} +LIBADD= com_err roken VERSION_MAP= ${.CURDIR}/version.map SRCS= asn1_err.c \ Modified: projects/sendfile/kerberos5/lib/libgssapi_krb5/Makefile ============================================================================== --- projects/sendfile/kerberos5/lib/libgssapi_krb5/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/kerberos5/lib/libgssapi_krb5/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -2,9 +2,7 @@ LIB= gssapi_krb5 LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined -LDADD= -lgssapi -lkrb5 -lhx509 -lcrypto -lroken -lasn1 -lcom_err -lcrypt -DPADD= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBCRYPTO} ${LIBROKEN} ${LIBASN1} \ - ${LIBCOM_ERR} ${LIBCRYPT} +LIBADD= gssapi krb5 crypto roken asn1 com_err SHLIB_MAJOR= 10 INCS= ${KRB5DIR}/lib/gssapi/gssapi/gssapi_krb5.h Modified: projects/sendfile/kerberos5/lib/libgssapi_ntlm/Makefile ============================================================================== --- projects/sendfile/kerberos5/lib/libgssapi_ntlm/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/kerberos5/lib/libgssapi_ntlm/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -2,8 +2,7 @@ LIB= gssapi_ntlm LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined -LDADD= -lcrypto -lgssapi -lkrb5 -lhx509 -lheimntlm -lroken -DPADD= ${LIBCRYPTO} ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBROKEN} +LIBADD= crypto gssapi krb5 heimntlm roken SHLIB_MAJOR= 10 SRCS= accept_sec_context.c \ Modified: projects/sendfile/kerberos5/lib/libgssapi_spnego/Makefile ============================================================================== --- projects/sendfile/kerberos5/lib/libgssapi_spnego/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/kerberos5/lib/libgssapi_spnego/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -2,8 +2,7 @@ LIB= gssapi_spnego LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined -LDADD= -lgssapi -lheimbase -lasn1 -lroken -DPADD= ${LIBGSSAPI} ${LIBHEIMBASE} ${LIBASN1} ${LIBROKEN} +LIBADD= gssapi heimbase asn1 roken SHLIB_MAJOR= 10 SRCS= accept_sec_context.c \ Modified: projects/sendfile/kerberos5/lib/libhdb/Makefile ============================================================================== --- projects/sendfile/kerberos5/lib/libhdb/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/kerberos5/lib/libhdb/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -3,8 +3,8 @@ LIB= hdb LDFLAGS= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/lib/hdb/version-script.map -LDADD= -lasn1 -lcom_err -lkrb5 -lroken -lheimsqlite -DPADD= ${LIBASN1} ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN} ${LIBHEIMSQLITE} ${LDAPDPADD} +LIBADD= asn1 com_err krb5 roken heimsqlite +DPADD= ${LDAPDPADD} MAN= HDB.3 hdb_entry_ex.3 Modified: projects/sendfile/kerberos5/lib/libheimbase/Makefile ============================================================================== --- projects/sendfile/kerberos5/lib/libheimbase/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/kerberos5/lib/libheimbase/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -2,7 +2,7 @@ LIB= heimbase LDFLAGS= -Wl,--no-undefined -LDADD= -lpthread +LIBADD= pthread VERSION_MAP= ${KRB5DIR}/base/version-script.map INCS= heimbase.h Modified: projects/sendfile/kerberos5/lib/libheimipcc/Makefile ============================================================================== --- projects/sendfile/kerberos5/lib/libheimipcc/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/kerberos5/lib/libheimipcc/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -2,8 +2,7 @@ LIB= heimipcc PRIVATELIB= -LDADD= -lheimbase -lroken -lpthread -DPADD= ${LIBHEIMBASE} ${LIBROKEN} ${LIBPTHREAD} +LIBADD= heimbase roken pthread SRCS= \ client.c \ Modified: projects/sendfile/kerberos5/lib/libheimipcs/Makefile ============================================================================== --- projects/sendfile/kerberos5/lib/libheimipcs/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/kerberos5/lib/libheimipcs/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -2,9 +2,7 @@ LIB= heimipcs PRIVATELIB= -LDADD= -lheimbase -lroken -LDFLAGS= -pthread -DPADD= ${LIBHEIMBASE} ${LIBROKEN} +LIBADD= heimbase roken pthread SRCS= \ server.c \ Modified: projects/sendfile/kerberos5/lib/libheimntlm/Makefile ============================================================================== --- projects/sendfile/kerberos5/lib/libheimntlm/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/kerberos5/lib/libheimntlm/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -2,8 +2,7 @@ LIB= heimntlm LDFLAGS= -Wl,--no-undefined -LDADD= -lcrypto -lcom_err -lkrb5 -lroken -DPADD= ${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN} +LIBADD= crypto com_err krb5 roken SRCS= ntlm.c ntlm_err.c INCS= heimntlm.h heimntlm-protos.h ntlm_err.h CFLAGS+=-I${KRB5DIR}/lib/ntlm -I${KRB5DIR}/lib/roken *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 12:49:38 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1490EA79; Wed, 26 Nov 2014 12:49:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 01A3030F; Wed, 26 Nov 2014 12:49:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQCnbXx028437; Wed, 26 Nov 2014 12:49:37 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQCnbjS028436; Wed, 26 Nov 2014 12:49:37 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411261249.sAQCnbjS028436@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 26 Nov 2014 12:49:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275114 - projects/building-blocks/include/protocols X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 12:49:38 -0000 Author: ngie Date: Wed Nov 26 12:49:37 2014 New Revision: 275114 URL: https://svnweb.freebsd.org/changeset/base/275114 Log: Fix some accidentally inverted logic Modified: projects/building-blocks/include/protocols/Makefile Modified: projects/building-blocks/include/protocols/Makefile ============================================================================== --- projects/building-blocks/include/protocols/Makefile Wed Nov 26 12:46:23 2014 (r275113) +++ projects/building-blocks/include/protocols/Makefile Wed Nov 26 12:49:37 2014 (r275114) @@ -6,7 +6,7 @@ NO_OBJ= INCS= dumprestore.h routed.h rwhod.h timed.h INCSDIR=${INCLUDEDIR}/protocols -.if ${MK_TALK} == "no" +.if ${MK_TALK} != "no" INCS+= talkd.h .endif From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 12:54:59 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7424CBBE; Wed, 26 Nov 2014 12:54:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 60EA03E8; Wed, 26 Nov 2014 12:54:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQCsxAa032501; Wed, 26 Nov 2014 12:54:59 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQCswKi032495; Wed, 26 Nov 2014 12:54:58 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411261254.sAQCswKi032495@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 26 Nov 2014 12:54:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275115 - in projects/building-blocks: include/protocols tools/build/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 12:54:59 -0000 Author: ngie Date: Wed Nov 26 12:54:58 2014 New Revision: 275115 URL: https://svnweb.freebsd.org/changeset/base/275115 Log: Account for /usr/include/protocols/r{outed,whod}.h with their respective build knobs Modified: projects/building-blocks/include/protocols/Makefile projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/include/protocols/Makefile ============================================================================== --- projects/building-blocks/include/protocols/Makefile Wed Nov 26 12:49:37 2014 (r275114) +++ projects/building-blocks/include/protocols/Makefile Wed Nov 26 12:54:58 2014 (r275115) @@ -3,9 +3,17 @@ .include NO_OBJ= -INCS= dumprestore.h routed.h rwhod.h timed.h +INCS= dumprestore.h timed.h INCSDIR=${INCLUDEDIR}/protocols +.if ${MK_RCMDS} != "no" +INCS+= rwhod.h +.endif + +.if ${MK_ROUTED} != "no" +INCS+= routed.h +.endif + .if ${MK_TALK} != "no" INCS+= talkd.h .endif Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 12:49:37 2014 (r275114) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 12:54:58 2014 (r275115) @@ -3985,6 +3985,7 @@ OLD_FILES+=usr/share/man/man8/rbootd.8.g .endif .if ${MK_RCMDS} == no +OLD_FILES+=usr/include/protocols/rwhod.h OLD_FILES+=bin/rcp OLD_FILES+=etc/pam.d/rsh OLD_FILES+=etc/rc.d/rwho @@ -4040,6 +4041,7 @@ OLD_FILES+=usr/share/man/man8/etcupdate. #.endif .if ${MK_ROUTED} == no +OLD_FILES+=usr/include/protocols/routed.h OLD_FILES+=sbin/routed OLD_FILES+=sbin/rtquery OLD_FILES+=usr/share/man/man8/routed.8.gz From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 13:25:11 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 84B6B439; Wed, 26 Nov 2014 13:25:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 65CC6918; Wed, 26 Nov 2014 13:25:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQDPB4g049735; Wed, 26 Nov 2014 13:25:11 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQDPA70049724; Wed, 26 Nov 2014 13:25:10 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411261325.sAQDPA70049724@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 26 Nov 2014 13:25:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275116 - in projects/building-blocks: etc/rc.d share/mk tools/build/mk tools/build/options usr.sbin X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 13:25:11 -0000 Author: ngie Date: Wed Nov 26 13:25:09 2014 New Revision: 275116 URL: https://svnweb.freebsd.org/changeset/base/275116 Log: Add MK_TIMED option for optionally building usr.sbin/timed, et al Added: projects/building-blocks/tools/build/options/WITHOUT_TIMED (contents, props changed) Modified: projects/building-blocks/etc/rc.d/Makefile projects/building-blocks/share/mk/src.opts.mk projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc projects/building-blocks/usr.sbin/Makefile Modified: projects/building-blocks/etc/rc.d/Makefile ============================================================================== --- projects/building-blocks/etc/rc.d/Makefile Wed Nov 26 12:54:58 2014 (r275115) +++ projects/building-blocks/etc/rc.d/Makefile Wed Nov 26 13:25:09 2014 (r275116) @@ -137,7 +137,6 @@ FILES= DAEMON \ syscons \ sysctl \ syslogd \ - timed \ tmp \ ${_ubthidhci} \ ugidfw \ @@ -236,6 +235,10 @@ FILES+= ftp-proxy FILES+= rwho .endif +.if ${MK_TIMED} != "no" +FILES+= timed +.endif + .if ${MK_UNBOUND} != "no" _unbound= local_unbound .endif Modified: projects/building-blocks/share/mk/src.opts.mk ============================================================================== --- projects/building-blocks/share/mk/src.opts.mk Wed Nov 26 12:54:58 2014 (r275115) +++ projects/building-blocks/share/mk/src.opts.mk Wed Nov 26 13:25:09 2014 (r275116) @@ -157,6 +157,7 @@ __DEFAULT_YES_OPTIONS = \ TESTS \ TEXTPROC \ TFTP \ + TIMED \ UNBOUND \ USB \ UTMPX \ Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 12:54:58 2014 (r275115) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 13:25:09 2014 (r275116) @@ -4911,6 +4911,14 @@ OLD_FILES+=${TESTS_FILES} . endif .endif # Test suite. +.if ${MK_TIMED} == no +OLD_FILES+=etc/rc.d/timed +OLD_FILES+=usr/sbin/timed +OLD_FILES+=usr/sbin/timedc +OLD_FILES+=usr/share/man/man8/timed.8.gz +OLD_FILES+=usr/share/man/man8/timedc.8.gz +.endif + #.if ${MK_TOOLCHAIN} == no # to be filled in #.endif Added: projects/building-blocks/tools/build/options/WITHOUT_TIMED ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/build/options/WITHOUT_TIMED Wed Nov 26 13:25:09 2014 (r275116) @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr timed 8 . Modified: projects/building-blocks/usr.sbin/Makefile ============================================================================== --- projects/building-blocks/usr.sbin/Makefile Wed Nov 26 12:54:58 2014 (r275115) +++ projects/building-blocks/usr.sbin/Makefile Wed Nov 26 13:25:09 2014 (r275116) @@ -82,7 +82,6 @@ SUBDIR= adduser \ sysrc \ tcpdrop \ tcpdump \ - timed \ traceroute \ trpt \ tzsetup \ @@ -307,6 +306,10 @@ SUBDIR+= tcpdmatch SUBDIR+= tests .endif +.if ${MK_TIMED} != "no" +SUBDIR+= timed +.endif + .if ${MK_TOOLCHAIN} != "no" SUBDIR+= config SUBDIR+= crunch From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 13:26:12 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EB3E6524; Wed, 26 Nov 2014 13:26:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D87A0920; Wed, 26 Nov 2014 13:26:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQDQCBr050114; Wed, 26 Nov 2014 13:26:12 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQDQCNG050113; Wed, 26 Nov 2014 13:26:12 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411261326.sAQDQCNG050113@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 26 Nov 2014 13:26:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275117 - projects/building-blocks/tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 13:26:13 -0000 Author: ngie Date: Wed Nov 26 13:26:12 2014 New Revision: 275117 URL: https://svnweb.freebsd.org/changeset/base/275117 Log: Ignore LIBPRIVATEDIR when suggesting directories to prune Modified: projects/building-blocks/tools/add-optional-obsolete-files-entries.sh Modified: projects/building-blocks/tools/add-optional-obsolete-files-entries.sh ============================================================================== --- projects/building-blocks/tools/add-optional-obsolete-files-entries.sh Wed Nov 26 13:25:09 2014 (r275116) +++ projects/building-blocks/tools/add-optional-obsolete-files-entries.sh Wed Nov 26 13:26:12 2014 (r275117) @@ -44,6 +44,6 @@ done (cd $DESTDIR; find -s . -type f -mindepth 1 | sed -e 's,^,OLD_FILES+=,'; find -s . -type d -mindepth 1 -and \! -empty | \ - egrep -v '^\./(s*bin|libexec|usr|usr/include|usr/lib|usr/libexec|usr/s*bin|usr/share|usr/share/man|usr/share/man/man[0-9])$' | \ + egrep -v '^\./(s*bin|libexec|usr|usr/include|usr/lib|usr/lib/private|usr/libexec|usr/s*bin|usr/share|usr/share/man|usr/share/man/man[0-9])$' | \ sed -e 's,^,OLD_DIRS+=,' ) | sed -e 's,+=\./,+=,' From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 14:01:28 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C5973E7D; Wed, 26 Nov 2014 14:01:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B244ECA1; Wed, 26 Nov 2014 14:01:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQE1S1s069976; Wed, 26 Nov 2014 14:01:28 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQE1SGd069975; Wed, 26 Nov 2014 14:01:28 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411261401.sAQE1SGd069975@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 26 Nov 2014 14:01:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275119 - projects/building-blocks/tools/build/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 14:01:29 -0000 Author: ngie Date: Wed Nov 26 14:01:27 2014 New Revision: 275119 URL: https://svnweb.freebsd.org/changeset/base/275119 Log: Fix use of OLD_FILES and OLD_LIBS for MK_BSNMP and MK_TESTS Convention in the file is that .a files be added to OLD_FILES and versioned .so's be added to OLD_LIBS Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 13:56:54 2014 (r275118) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 14:01:27 2014 (r275119) @@ -354,23 +354,23 @@ OLD_FILES+=usr/include/bsnmp/snmpagent.h OLD_FILES+=usr/include/bsnmp/snmpclient.h OLD_FILES+=usr/include/bsnmp/snmpmod.h OLD_FILES+=usr/lib/libbsnmp.a -OLD_FILES+=usr/lib/libbsnmp.so.6 +OLD_LIBS+=usr/lib/libbsnmp.so.6 OLD_FILES+=usr/lib/libbsnmp_p.a OLD_FILES+=usr/lib/libbsnmptools.a -OLD_FILES+=usr/lib/libbsnmptools.so.0 +OLD_LIBS+=usr/lib/libbsnmptools.so.0 OLD_FILES+=usr/lib/libbsnmptools_p.a -OLD_FILES+=usr/lib/snmp_atm.so.6 -OLD_FILES+=usr/lib/snmp_bridge.so.6 -OLD_FILES+=usr/lib/snmp_hast.so.6 -OLD_FILES+=usr/lib/snmp_hostres.so.6 -OLD_FILES+=usr/lib/snmp_lm75.so.6 -OLD_FILES+=usr/lib/snmp_mibII.so.6 -OLD_FILES+=usr/lib/snmp_netgraph.so.6 -OLD_FILES+=usr/lib/snmp_pf.so.6 -OLD_FILES+=usr/lib/snmp_target.so.6 -OLD_FILES+=usr/lib/snmp_usm.so.6 -OLD_FILES+=usr/lib/snmp_vacm.so.6 -OLD_FILES+=usr/lib/snmp_wlan.so.6 +OLD_LIBS+=usr/lib/snmp_atm.so.6 +OLD_LIBS+=usr/lib/snmp_bridge.so.6 +OLD_LIBS+=usr/lib/snmp_hast.so.6 +OLD_LIBS+=usr/lib/snmp_hostres.so.6 +OLD_LIBS+=usr/lib/snmp_lm75.so.6 +OLD_LIBS+=usr/lib/snmp_mibII.so.6 +OLD_LIBS+=usr/lib/snmp_netgraph.so.6 +OLD_LIBS+=usr/lib/snmp_pf.so.6 +OLD_LIBS+=usr/lib/snmp_target.so.6 +OLD_LIBS+=usr/lib/snmp_usm.so.6 +OLD_LIBS+=usr/lib/snmp_vacm.so.6 +OLD_LIBS+=usr/lib/snmp_wlan.so.6 OLD_FILES+=usr/sbin/bsnmpd OLD_FILES+=usr/sbin/gensnmptree OLD_FILES+=usr/share/man/man1/bsnmpd.1.gz @@ -4390,15 +4390,15 @@ OLD_FILES+=usr/share/man/man8/tftpd.8.gz OLD_FILES+=usr/bin/atf-sh OLD_FILES+=usr/include/atf-c++/config.hpp OLD_FILES+=usr/include/atf-c/config.h -OLD_LIBS+=usr/lib/libatf-c++.a +OLD_FILES+=usr/lib/libatf-c++.a OLD_LIBS+=usr/lib/libatf-c++.so OLD_LIBS+=usr/lib/libatf-c++.so.1 OLD_LIBS+=usr/lib/libatf-c++.so.2 -OLD_LIBS+=usr/lib/libatf-c++_p.a -OLD_LIBS+=usr/lib/libatf-c.a +OLD_FILES+=usr/lib/libatf-c++_p.a +OLD_FILES+=usr/lib/libatf-c.a OLD_LIBS+=usr/lib/libatf-c.so OLD_LIBS+=usr/lib/libatf-c.so.1 -OLD_LIBS+=usr/lib/libatf-c_p.a +OLD_FILES+=usr/lib/libatf-c_p.a OLD_LIBS+=usr/lib/private/libatf-c.so.0 OLD_LIBS+=usr/lib/private/libatf-c++.so.1 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" @@ -4878,11 +4878,11 @@ OLD_FILES+=usr/include/atf-c++/tests.hpp OLD_FILES+=usr/include/atf-c++/utils.hpp OLD_FILES+=usr/include/atf-c++.hpp OLD_FILES+=usr/lib/libatf-c_p.a -OLD_FILES+=usr/lib/libatf-c.so.1 +OLD_LIBS+=usr/lib/libatf-c.so.1 OLD_FILES+=usr/lib/libatf-c.so OLD_FILES+=usr/lib/libatf-c++.a OLD_FILES+=usr/lib/libatf-c++_p.a -OLD_FILES+=usr/lib/libatf-c++.so.1 +OLD_LIBS+=usr/lib/libatf-c++.so.1 OLD_FILES+=usr/lib/libatf-c++.so OLD_FILES+=usr/lib/libatf-c.a OLD_FILES+=usr/libexec/atf-check From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 14:36:19 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D9043730; Wed, 26 Nov 2014 14:36:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C381EAB; Wed, 26 Nov 2014 14:36:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQEaJjR084705; Wed, 26 Nov 2014 14:36:19 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQEa5v1084618; Wed, 26 Nov 2014 14:36:05 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411261436.sAQEa5v1084618@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 26 Nov 2014 14:36:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275122 - in projects/clang350-import: contrib/ipfilter contrib/llvm/lib/Target/Sparc/AsmParser contrib/llvm/lib/Target/Sparc/Disassembler contrib/llvm/lib/Target/Sparc/InstPrinter cont... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 14:36:19 -0000 Author: dim Date: Wed Nov 26 14:36:04 2014 New Revision: 275122 URL: https://svnweb.freebsd.org/changeset/base/275122 Log: After some horrible wrestling with Subversion's worthless merge implementation, merge ^/head r275078 through r275117. Note that all the extraneous mergeinfo is there because Subversion created it. I'll hopefully be able to remove it again when merging back to head. Modified: projects/clang350-import/contrib/ofed/libmlx4/src/cq.c projects/clang350-import/contrib/ofed/libmlx4/src/mlx4-abi.h projects/clang350-import/contrib/ofed/libmlx4/src/mlx4.c projects/clang350-import/contrib/ofed/libmlx4/src/mlx4.h projects/clang350-import/contrib/ofed/libmlx4/src/verbs.c projects/clang350-import/kerberos5/lib/libkrb5/Makefile projects/clang350-import/lib/libpam/libpam/tests/Makefile projects/clang350-import/release/picobsd/tinyware/login/Makefile projects/clang350-import/release/picobsd/tinyware/oinit/Makefile projects/clang350-import/release/picobsd/tinyware/passwd/Makefile projects/clang350-import/secure/lib/libssh/Makefile projects/clang350-import/secure/libexec/sftp-server/Makefile projects/clang350-import/secure/libexec/ssh-keysign/Makefile projects/clang350-import/secure/libexec/ssh-pkcs11-helper/Makefile projects/clang350-import/secure/usr.bin/scp/Makefile projects/clang350-import/secure/usr.bin/sftp/Makefile projects/clang350-import/secure/usr.bin/ssh-add/Makefile projects/clang350-import/secure/usr.bin/ssh-agent/Makefile projects/clang350-import/secure/usr.bin/ssh-keygen/Makefile projects/clang350-import/secure/usr.bin/ssh-keyscan/Makefile projects/clang350-import/secure/usr.bin/ssh/Makefile projects/clang350-import/secure/usr.sbin/sshd/Makefile projects/clang350-import/share/mk/bsd.libnames.mk projects/clang350-import/share/mk/src.libnames.mk projects/clang350-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/clang350-import/sys/dev/ahci/ahci_pci.c projects/clang350-import/sys/dev/ata/ata-pci.h projects/clang350-import/sys/dev/ata/chipsets/ata-intel.c projects/clang350-import/sys/dev/ichsmb/ichsmb_pci.c projects/clang350-import/sys/dev/ichwd/ichwd.c projects/clang350-import/sys/dev/ichwd/ichwd.h projects/clang350-import/sys/dev/isp/isp_library.c projects/clang350-import/sys/dev/sound/pci/hda/hdac.c projects/clang350-import/sys/dev/sound/pci/hda/hdac.h projects/clang350-import/sys/dev/uart/uart_bus_pci.c projects/clang350-import/sys/dev/usb/controller/ehci_pci.c projects/clang350-import/sys/dev/usb/controller/xhci_pci.c projects/clang350-import/sys/dev/usb/quirk/usb_quirk.c projects/clang350-import/sys/dev/usb/usbdevs projects/clang350-import/tools/tools/ath/athaggrstats/Makefile projects/clang350-import/tools/tools/ath/athstats/Makefile projects/clang350-import/tools/tools/mwl/mwlstats/Makefile projects/clang350-import/tools/tools/net80211/wlanstats/Makefile projects/clang350-import/tools/tools/npe/npestats/Makefile projects/clang350-import/usr.bin/svn/svn/Makefile projects/clang350-import/usr.bin/svn/svnadmin/Makefile projects/clang350-import/usr.bin/svn/svndumpfilter/Makefile projects/clang350-import/usr.bin/svn/svnlook/Makefile projects/clang350-import/usr.bin/svn/svnmucc/Makefile projects/clang350-import/usr.bin/svn/svnrdump/Makefile projects/clang350-import/usr.bin/svn/svnserve/Makefile projects/clang350-import/usr.bin/svn/svnsync/Makefile projects/clang350-import/usr.bin/svn/svnversion/Makefile Directory Properties: projects/clang350-import/ (props changed) projects/clang350-import/cddl/ (props changed) projects/clang350-import/cddl/contrib/opensolaris/ (props changed) projects/clang350-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/ (props changed) projects/clang350-import/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/clang350-import/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/clang350-import/contrib/apr/ (props changed) projects/clang350-import/contrib/apr-util/ (props changed) projects/clang350-import/contrib/atf/ (props changed) projects/clang350-import/contrib/binutils/ (props changed) projects/clang350-import/contrib/bmake/ (props changed) projects/clang350-import/contrib/byacc/ (props changed) projects/clang350-import/contrib/bzip2/ (props changed) projects/clang350-import/contrib/com_err/ (props changed) projects/clang350-import/contrib/compiler-rt/ (props changed) projects/clang350-import/contrib/dialog/ (props changed) projects/clang350-import/contrib/dtc/ (props changed) projects/clang350-import/contrib/ee/ (props changed) projects/clang350-import/contrib/expat/ (props changed) projects/clang350-import/contrib/file/ (props changed) projects/clang350-import/contrib/gcc/ (props changed) projects/clang350-import/contrib/gdb/ (props changed) projects/clang350-import/contrib/gdtoa/ (props changed) projects/clang350-import/contrib/groff/ (props changed) projects/clang350-import/contrib/ipfilter/ (props changed) projects/clang350-import/contrib/ipfilter/ml_ipl.c (props changed) projects/clang350-import/contrib/ipfilter/mlfk_ipl.c (props changed) projects/clang350-import/contrib/ipfilter/mlh_rule.c (props changed) projects/clang350-import/contrib/ipfilter/mli_ipl.c (props changed) projects/clang350-import/contrib/ipfilter/mln_ipl.c (props changed) projects/clang350-import/contrib/ipfilter/mls_ipl.c (props changed) projects/clang350-import/contrib/ldns/ (props changed) projects/clang350-import/contrib/less/ (props changed) projects/clang350-import/contrib/libarchive/ (props changed) projects/clang350-import/contrib/libarchive/cpio/ (props changed) projects/clang350-import/contrib/libarchive/libarchive/ (props changed) projects/clang350-import/contrib/libarchive/libarchive_fe/ (props changed) projects/clang350-import/contrib/libarchive/tar/ (props changed) projects/clang350-import/contrib/libc++/ (props changed) projects/clang350-import/contrib/libc-vis/ (props changed) projects/clang350-import/contrib/libcxxrt/ (props changed) projects/clang350-import/contrib/libexecinfo/ (props changed) projects/clang350-import/contrib/libpcap/ (props changed) projects/clang350-import/contrib/libstdc++/ (props changed) projects/clang350-import/contrib/libucl/ (props changed) projects/clang350-import/contrib/llvm/ (props changed) projects/clang350-import/contrib/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp (props changed) projects/clang350-import/contrib/llvm/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp (props changed) projects/clang350-import/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.cpp (props changed) projects/clang350-import/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.h (props changed) projects/clang350-import/contrib/llvm/tools/clang/ (props changed) projects/clang350-import/contrib/llvm/tools/lldb/ (props changed) projects/clang350-import/contrib/mdocml/ (props changed) projects/clang350-import/contrib/mtree/ (props changed) projects/clang350-import/contrib/ncurses/ (props changed) projects/clang350-import/contrib/netcat/ (props changed) projects/clang350-import/contrib/ntp/ (props changed) projects/clang350-import/contrib/nvi/ (props changed) projects/clang350-import/contrib/one-true-awk/ (props changed) projects/clang350-import/contrib/openbsm/ (props changed) projects/clang350-import/contrib/openpam/ (props changed) projects/clang350-import/contrib/openresolv/ (props changed) projects/clang350-import/contrib/pf/ (props changed) projects/clang350-import/contrib/sendmail/ (props changed) projects/clang350-import/contrib/serf/ (props changed) projects/clang350-import/contrib/sqlite3/ (props changed) projects/clang350-import/contrib/subversion/ (props changed) projects/clang350-import/contrib/tcpdump/ (props changed) projects/clang350-import/contrib/tcsh/ (props changed) projects/clang350-import/contrib/tnftp/ (props changed) projects/clang350-import/contrib/top/ (props changed) projects/clang350-import/contrib/top/install-sh (props changed) projects/clang350-import/contrib/tzcode/stdtime/ (props changed) projects/clang350-import/contrib/tzcode/zic/ (props changed) projects/clang350-import/contrib/tzdata/ (props changed) projects/clang350-import/contrib/unbound/ (props changed) projects/clang350-import/contrib/wpa/ (props changed) projects/clang350-import/contrib/xz/ (props changed) projects/clang350-import/crypto/heimdal/ (props changed) projects/clang350-import/crypto/openssh/ (props changed) projects/clang350-import/crypto/openssl/ (props changed) projects/clang350-import/etc/ (props changed) projects/clang350-import/gnu/lib/ (props changed) projects/clang350-import/gnu/usr.bin/binutils/ (props changed) projects/clang350-import/gnu/usr.bin/cc/cc_tools/ (props changed) projects/clang350-import/gnu/usr.bin/gdb/ (props changed) projects/clang350-import/include/ (props changed) projects/clang350-import/lib/libc/ (props changed) projects/clang350-import/lib/libc/stdtime/ (props changed) projects/clang350-import/lib/libutil/ (props changed) projects/clang350-import/lib/libvmmapi/ (props changed) projects/clang350-import/lib/libz/ (props changed) projects/clang350-import/sbin/ (props changed) projects/clang350-import/sbin/dumpon/ (props changed) projects/clang350-import/sbin/ipfw/ (props changed) projects/clang350-import/share/ (props changed) projects/clang350-import/share/examples/kld/random_adaptor/random_adaptor_example.c (props changed) projects/clang350-import/share/man/man4/ (props changed) projects/clang350-import/share/man/man4/bhyve.4 (props changed) projects/clang350-import/share/mk/bsd.arch.inc.mk (props changed) projects/clang350-import/share/zoneinfo/ (props changed) projects/clang350-import/sys/ (props changed) projects/clang350-import/sys/amd64/include/vmm.h (props changed) projects/clang350-import/sys/amd64/include/vmm_dev.h (props changed) projects/clang350-import/sys/amd64/include/vmm_instruction_emul.h (props changed) projects/clang350-import/sys/amd64/include/xen/ (props changed) projects/clang350-import/sys/amd64/vmm/ (props changed) projects/clang350-import/sys/amd64/vmm/amd/npt.c (props changed) projects/clang350-import/sys/amd64/vmm/amd/npt.h (props changed) projects/clang350-import/sys/amd64/vmm/amd/svm.c (props changed) projects/clang350-import/sys/amd64/vmm/amd/svm.h (props changed) projects/clang350-import/sys/amd64/vmm/amd/svm_genassym.c (props changed) projects/clang350-import/sys/amd64/vmm/amd/svm_msr.c (props changed) projects/clang350-import/sys/amd64/vmm/amd/svm_msr.h (props changed) projects/clang350-import/sys/amd64/vmm/amd/svm_softc.h (props changed) projects/clang350-import/sys/amd64/vmm/amd/svm_support.S (props changed) projects/clang350-import/sys/amd64/vmm/amd/vmcb.c (props changed) projects/clang350-import/sys/amd64/vmm/amd/vmcb.h (props changed) projects/clang350-import/sys/boot/ (props changed) projects/clang350-import/sys/boot/i386/efi/ (props changed) projects/clang350-import/sys/boot/powerpc/boot1.chrp/ (props changed) projects/clang350-import/sys/boot/powerpc/ofw/ (props changed) projects/clang350-import/sys/cddl/contrib/opensolaris/ (props changed) projects/clang350-import/sys/conf/ (props changed) projects/clang350-import/sys/contrib/dev/acpica/ (props changed) projects/clang350-import/sys/contrib/dev/acpica/changes.txt (props changed) projects/clang350-import/sys/contrib/dev/acpica/common/ (props changed) projects/clang350-import/sys/contrib/dev/acpica/compiler/ (props changed) projects/clang350-import/sys/contrib/dev/acpica/components/debugger/ (props changed) projects/clang350-import/sys/contrib/dev/acpica/components/disassembler/ (props changed) projects/clang350-import/sys/contrib/dev/acpica/components/dispatcher/ (props changed) projects/clang350-import/sys/contrib/dev/acpica/components/events/ (props changed) projects/clang350-import/sys/contrib/dev/acpica/components/executer/ (props changed) projects/clang350-import/sys/contrib/dev/acpica/components/hardware/ (props changed) projects/clang350-import/sys/contrib/dev/acpica/components/namespace/ (props changed) projects/clang350-import/sys/contrib/dev/acpica/components/parser/ (props changed) projects/clang350-import/sys/contrib/dev/acpica/components/resources/ (props changed) projects/clang350-import/sys/contrib/dev/acpica/components/tables/ (props changed) projects/clang350-import/sys/contrib/dev/acpica/components/utilities/ (props changed) projects/clang350-import/sys/contrib/dev/acpica/include/ (props changed) projects/clang350-import/sys/contrib/dev/acpica/os_specific/ (props changed) projects/clang350-import/sys/contrib/ipfilter/ (props changed) projects/clang350-import/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c (props changed) projects/clang350-import/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c (props changed) projects/clang350-import/sys/contrib/libfdt/ (props changed) projects/clang350-import/sys/contrib/octeon-sdk/ (props changed) projects/clang350-import/sys/contrib/x86emu/ (props changed) projects/clang350-import/sys/contrib/xz-embedded/ (props changed) projects/clang350-import/sys/dev/bvm/ (props changed) projects/clang350-import/sys/dev/hyperv/ (props changed) projects/clang350-import/sys/gnu/dts/ (props changed) projects/clang350-import/sys/gnu/dts/arm/ (props changed) projects/clang350-import/sys/gnu/dts/include/dt-bindings/ (props changed) projects/clang350-import/sys/mips/beri/fdt_ic_if.m (props changed) projects/clang350-import/sys/modules/hyperv/ (props changed) projects/clang350-import/sys/modules/vmm/ (props changed) projects/clang350-import/sys/x86/include/acpica_machdep.h (props changed) projects/clang350-import/usr.bin/calendar/ (props changed) projects/clang350-import/usr.bin/mkimg/ (props changed) projects/clang350-import/usr.bin/procstat/ (props changed) projects/clang350-import/usr.sbin/bhyve/ (props changed) projects/clang350-import/usr.sbin/bhyvectl/ (props changed) projects/clang350-import/usr.sbin/bhyveload/ (props changed) projects/clang350-import/usr.sbin/jail/ (props changed) projects/clang350-import/usr.sbin/ndiscvt/ (props changed) projects/clang350-import/usr.sbin/rtadvctl/ (props changed) projects/clang350-import/usr.sbin/rtadvd/ (props changed) projects/clang350-import/usr.sbin/rtsold/ (props changed) projects/clang350-import/usr.sbin/zic/ (props changed) Modified: projects/clang350-import/contrib/ofed/libmlx4/src/cq.c ============================================================================== --- projects/clang350-import/contrib/ofed/libmlx4/src/cq.c Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/contrib/ofed/libmlx4/src/cq.c Wed Nov 26 14:36:04 2014 (r275122) @@ -109,15 +109,16 @@ struct mlx4_err_cqe { static struct mlx4_cqe *get_cqe(struct mlx4_cq *cq, int entry) { - return cq->buf.buf + entry * MLX4_CQ_ENTRY_SIZE; + return cq->buf.buf + entry * cq->cqe_size; } static void *get_sw_cqe(struct mlx4_cq *cq, int n) { struct mlx4_cqe *cqe = get_cqe(cq, n & cq->ibv_cq.cqe); + struct mlx4_cqe *tcqe = cq->cqe_size == 64 ? cqe + 1 : cqe; - return (!!(cqe->owner_sr_opcode & MLX4_CQE_OWNER_MASK) ^ - !!(n & (cq->ibv_cq.cqe + 1))) ? NULL : cqe; + return (!!(tcqe->owner_sr_opcode & MLX4_CQE_OWNER_MASK) ^ + !!(n & (cq->ibv_cq.cqe + 1))) ? NULL : tcqe; } static struct mlx4_cqe *next_cqe_sw(struct mlx4_cq *cq) @@ -402,6 +403,7 @@ void __mlx4_cq_clean(struct mlx4_cq *cq, uint8_t owner_bit; int nfreed = 0; int is_xrc_srq = 0; + int cqe_inc = cq->cqe_size == 64 ? 1 : 0; if (srq && srq->ibv_srq.xrc_cq) is_xrc_srq = 1; @@ -423,6 +425,7 @@ void __mlx4_cq_clean(struct mlx4_cq *cq, */ while ((int) --prod_index - (int) cq->cons_index >= 0) { cqe = get_cqe(cq, prod_index & cq->ibv_cq.cqe); + cqe += cqe_inc; if (is_xrc_srq && (ntohl(cqe->g_mlpath_rqpn & 0xffffff) == srq->srqn) && !(cqe->owner_sr_opcode & MLX4_CQE_IS_SEND_MASK)) { @@ -434,6 +437,7 @@ void __mlx4_cq_clean(struct mlx4_cq *cq, ++nfreed; } else if (nfreed) { dest = get_cqe(cq, (prod_index + nfreed) & cq->ibv_cq.cqe); + dest += cqe_inc; owner_bit = dest->owner_sr_opcode & MLX4_CQE_OWNER_MASK; memcpy(dest, cqe, sizeof *cqe); dest->owner_sr_opcode = owner_bit | @@ -473,28 +477,32 @@ void mlx4_cq_resize_copy_cqes(struct mlx { struct mlx4_cqe *cqe; int i; + int cqe_inc = cq->cqe_size == 64 ? 1 : 0; i = cq->cons_index; cqe = get_cqe(cq, (i & old_cqe)); + cqe += cqe_inc; while ((cqe->owner_sr_opcode & MLX4_CQE_OPCODE_MASK) != MLX4_CQE_OPCODE_RESIZE) { cqe->owner_sr_opcode = (cqe->owner_sr_opcode & ~MLX4_CQE_OWNER_MASK) | (((i + 1) & (cq->ibv_cq.cqe + 1)) ? MLX4_CQE_OWNER_MASK : 0); - memcpy(buf + ((i + 1) & cq->ibv_cq.cqe) * MLX4_CQ_ENTRY_SIZE, - cqe, MLX4_CQ_ENTRY_SIZE); + memcpy(buf + ((i + 1) & cq->ibv_cq.cqe) * cq->cqe_size, + cqe - cqe_inc, cq->cqe_size); ++i; cqe = get_cqe(cq, (i & old_cqe)); + cqe += cqe_inc; } ++cq->cons_index; } -int mlx4_alloc_cq_buf(struct mlx4_device *dev, struct mlx4_buf *buf, int nent) +int mlx4_alloc_cq_buf(struct mlx4_device *dev, struct mlx4_buf *buf, int nent, + int entry_size) { - if (mlx4_alloc_buf(buf, align(nent * MLX4_CQ_ENTRY_SIZE, dev->page_size), + if (mlx4_alloc_buf(buf, align(nent * entry_size, dev->page_size), dev->page_size)) return -1; - memset(buf->buf, 0, nent * MLX4_CQ_ENTRY_SIZE); + memset(buf->buf, 0, nent * entry_size); return 0; } Modified: projects/clang350-import/contrib/ofed/libmlx4/src/mlx4-abi.h ============================================================================== --- projects/clang350-import/contrib/ofed/libmlx4/src/mlx4-abi.h Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/contrib/ofed/libmlx4/src/mlx4-abi.h Wed Nov 26 14:36:04 2014 (r275122) @@ -40,9 +40,11 @@ struct mlx4_alloc_ucontext_resp { struct ibv_get_context_resp ibv_resp; + __u32 dev_caps; __u32 qp_tab_size; __u16 bf_reg_size; __u16 bf_regs_per_page; + __u32 cqe_size; }; struct mlx4_alloc_pd_resp { Modified: projects/clang350-import/contrib/ofed/libmlx4/src/mlx4.c ============================================================================== --- projects/clang350-import/contrib/ofed/libmlx4/src/mlx4.c Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/contrib/ofed/libmlx4/src/mlx4.c Wed Nov 26 14:36:04 2014 (r275122) @@ -201,6 +201,7 @@ static struct ibv_context *mlx4_alloc_co context->bf_buf_size = 0; } + context->cqe_size = resp.cqe_size; pthread_spin_init(&context->uar_lock, PTHREAD_PROCESS_PRIVATE); context->ibv_ctx.ops = mlx4_ctx_ops; Modified: projects/clang350-import/contrib/ofed/libmlx4/src/mlx4.h ============================================================================== --- projects/clang350-import/contrib/ofed/libmlx4/src/mlx4.h Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/contrib/ofed/libmlx4/src/mlx4.h Wed Nov 26 14:36:04 2014 (r275122) @@ -103,10 +103,6 @@ #endif enum { - MLX4_CQ_ENTRY_SIZE = 0x20 -}; - -enum { MLX4_STAT_RATE_OFFSET = 5 }; @@ -192,6 +188,7 @@ struct mlx4_context { int max_qp_wr; int max_sge; int max_cqe; + int cqe_size; struct { struct mlx4_srq **table; @@ -226,6 +223,7 @@ struct mlx4_cq { uint32_t *set_ci_db; uint32_t *arm_db; int arm_sn; + int cqe_size; }; struct mlx4_srq { @@ -369,7 +367,8 @@ int mlx4_dereg_mr(struct ibv_mr *mr); struct ibv_cq *mlx4_create_cq(struct ibv_context *context, int cqe, struct ibv_comp_channel *channel, int comp_vector); -int mlx4_alloc_cq_buf(struct mlx4_device *dev, struct mlx4_buf *buf, int nent); +int mlx4_alloc_cq_buf(struct mlx4_device *dev, struct mlx4_buf *buf, int nent, + int entry_size); int mlx4_resize_cq(struct ibv_cq *cq, int cqe); int mlx4_destroy_cq(struct ibv_cq *cq); int mlx4_poll_cq(struct ibv_cq *cq, int ne, struct ibv_wc *wc); Modified: projects/clang350-import/contrib/ofed/libmlx4/src/verbs.c ============================================================================== --- projects/clang350-import/contrib/ofed/libmlx4/src/verbs.c Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/contrib/ofed/libmlx4/src/verbs.c Wed Nov 26 14:36:04 2014 (r275122) @@ -168,6 +168,7 @@ struct ibv_cq *mlx4_create_cq(struct ibv struct mlx4_create_cq_resp resp; struct mlx4_cq *cq; int ret; + struct mlx4_context *mctx = to_mctx(context); /* Sanity check CQ size before proceeding */ if (cqe > 0x3fffff) @@ -184,9 +185,11 @@ struct ibv_cq *mlx4_create_cq(struct ibv cqe = align_queue_size(cqe + 1); - if (mlx4_alloc_cq_buf(to_mdev(context->device), &cq->buf, cqe)) + if (mlx4_alloc_cq_buf(to_mdev(context->device), &cq->buf, cqe, mctx->cqe_size)) goto err; + cq->cqe_size = mctx->cqe_size; + cq->set_ci_db = mlx4_alloc_db(to_mctx(context), MLX4_DB_TYPE_CQ); if (!cq->set_ci_db) goto err_buf; @@ -247,7 +250,8 @@ int mlx4_resize_cq(struct ibv_cq *ibcq, goto out; } - ret = mlx4_alloc_cq_buf(to_mdev(ibcq->context->device), &buf, cqe); + ret = mlx4_alloc_cq_buf(to_mdev(ibcq->context->device), &buf, cqe, + cq->cqe_size); if (ret) goto out; Modified: projects/clang350-import/kerberos5/lib/libkrb5/Makefile ============================================================================== --- projects/clang350-import/kerberos5/lib/libkrb5/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/kerberos5/lib/libkrb5/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -626,4 +626,3 @@ CFLAGS+= -I${KRB5DIR}/lib/krb5 \ .include .PATH: ${KRB5DIR}/lib/krb5 ${KRB5DIR}/lib/asn1 ${KRB5DIR}/include ${.CURDIR}/../../include ${KRB5DIR}/doc/doxyout/krb5/man/man3/ -USEPRIVATELIB= heimipcc Modified: projects/clang350-import/lib/libpam/libpam/tests/Makefile ============================================================================== --- projects/clang350-import/lib/libpam/libpam/tests/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/lib/libpam/libpam/tests/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -13,7 +13,6 @@ SRCS.${test} = ${test}.c ${COMMONSRC} CFLAGS +=-I${OPENPAM}/include -I${OPENPAM}/lib/libpam -I${OPENPAM}/t WARNS ?= 6 -DPADD = ${LIBPAM} -LDADD = ${MINUSLPAM} +LIBADD = pam .include Modified: projects/clang350-import/release/picobsd/tinyware/login/Makefile ============================================================================== --- projects/clang350-import/release/picobsd/tinyware/login/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/release/picobsd/tinyware/login/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -11,13 +11,11 @@ MAN= login.1 CFLAGS+=-DLOGALL -DPADD= ${LIBUTIL} ${LIBCRYPT} -LDADD= -lutil -lcrypt +LIBADD= util crypt .if ${MK_PAM_SUPPORT} != "no" CFLAGS+= -DUSE_PAM -DPADD+= ${LIBPAM} -LDADD+= ${MINUSLPAM} +LIBADD+= pam .endif BINOWN= root Modified: projects/clang350-import/release/picobsd/tinyware/oinit/Makefile ============================================================================== --- projects/clang350-import/release/picobsd/tinyware/oinit/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/release/picobsd/tinyware/oinit/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -14,7 +14,7 @@ CFLAGS= -DSH_PATH=\"${SH_PATH}\" -DSH_N #CFLAGS+= -DOINIT_RC=\"/etc/oinit.rc\" #LDADD= -lutil -ledit -ltermcap -LDADD=-lutil +LIBADD= util MAN= .include Modified: projects/clang350-import/release/picobsd/tinyware/passwd/Makefile ============================================================================== --- projects/clang350-import/release/picobsd/tinyware/passwd/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/release/picobsd/tinyware/passwd/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -11,8 +11,7 @@ GENSRCS=yp.h yp_clnt.c yppasswd.h yppass yppasswd_private.h yppasswd_private_clnt.c yppasswd_private_xdr.c CFLAGS+=-Wall -DPADD= ${LIBCRYPT} ${LIBUTIL} -LDADD= -lcrypt -lutil +LIBADD= crypt util .PATH: ${.CURDIR}/../../../../usr.bin/chpass \ # ${.CURDIR}/../../../../usr.sbin/vipw \ # ${.CURDIR}/../../../../usr.bin/passwd Modified: projects/clang350-import/secure/lib/libssh/Makefile ============================================================================== --- projects/clang350-import/secure/lib/libssh/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/secure/lib/libssh/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -41,7 +41,6 @@ CFLAGS+= -I${SSHDIR} -include ssh_namesp .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -include krb5_config.h -LIBADD+= gssapi krb5 hx509 asn1 com_err md roken .endif .if ${MK_OPENSSH_NONE_CIPHER} != "no" Modified: projects/clang350-import/secure/libexec/sftp-server/Makefile ============================================================================== --- projects/clang350-import/secure/libexec/sftp-server/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/secure/libexec/sftp-server/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -21,8 +21,6 @@ CFLAGS+= -DHAVE_LDNS=1 #USEPRIVATELIB+= ldns .endif -LIBADD+= crypto crypto z - .include .PATH: ${SSHDIR} Modified: projects/clang350-import/secure/libexec/ssh-keysign/Makefile ============================================================================== --- projects/clang350-import/secure/libexec/ssh-keysign/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/secure/libexec/ssh-keysign/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -17,7 +17,7 @@ CFLAGS+= -DHAVE_LDNS=1 #USEPRIVATELIB+= ldns .endif -LIBADD+= crypt crypto z +LIBADD+= crypto .include Modified: projects/clang350-import/secure/libexec/ssh-pkcs11-helper/Makefile ============================================================================== --- projects/clang350-import/secure/libexec/ssh-pkcs11-helper/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/secure/libexec/ssh-pkcs11-helper/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -21,7 +21,7 @@ CFLAGS+= -DHAVE_LDNS=1 #USEPRIVATELIB+= ldns .endif -LIBADD+= crypt crypto z +LIBADD+= crypto .include Modified: projects/clang350-import/secure/usr.bin/scp/Makefile ============================================================================== --- projects/clang350-import/secure/usr.bin/scp/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/secure/usr.bin/scp/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -20,8 +20,6 @@ CFLAGS+= -DHAVE_LDNS=1 #USEPRIVATELIB+= ldns .endif -LIBADD+= crypt crypto z - .include .PATH: ${SSHDIR} Modified: projects/clang350-import/secure/usr.bin/sftp/Makefile ============================================================================== --- projects/clang350-import/secure/usr.bin/sftp/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/secure/usr.bin/sftp/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -20,8 +20,6 @@ CFLAGS+= -DHAVE_LDNS=1 #USEPRIVATELIB+= ldns .endif -LIABDD+= crypt crypto z - .include .PATH: ${SSHDIR} Modified: projects/clang350-import/secure/usr.bin/ssh-add/Makefile ============================================================================== --- projects/clang350-import/secure/usr.bin/ssh-add/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/secure/usr.bin/ssh-add/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -20,8 +20,6 @@ CFLAGS+= -DHAVE_LDNS=1 #USEPRIVATELIB+= ldns .endif -LIBADD+= crypt crypto z - .include .PATH: ${SSHDIR} Modified: projects/clang350-import/secure/usr.bin/ssh-agent/Makefile ============================================================================== --- projects/clang350-import/secure/usr.bin/ssh-agent/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/secure/usr.bin/ssh-agent/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -20,7 +20,7 @@ CFLAGS+= -DHAVE_LDNS=1 #USEPRIVATELIB+= ldns .endif -LIBADD+= crypt crypto z +LIBADD+= crypto .include Modified: projects/clang350-import/secure/usr.bin/ssh-keygen/Makefile ============================================================================== --- projects/clang350-import/secure/usr.bin/ssh-keygen/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/secure/usr.bin/ssh-keygen/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -15,10 +15,9 @@ LIBADD= ssh .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 -LIBADD+= ldns .endif -LIBADD+= crypt crypto z +LIBADD+= crypto .include Modified: projects/clang350-import/secure/usr.bin/ssh-keyscan/Makefile ============================================================================== --- projects/clang350-import/secure/usr.bin/ssh-keyscan/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/secure/usr.bin/ssh-keyscan/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -15,8 +15,6 @@ CFLAGS+= -DHAVE_LDNS=1 #USEPRIVATELIB+= ldns .endif -LIBADD+= crypt crypto z - .include .PATH: ${SSHDIR} Modified: projects/clang350-import/secure/usr.bin/ssh/Makefile ============================================================================== --- projects/clang350-import/secure/usr.bin/ssh/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/secure/usr.bin/ssh/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -15,11 +15,10 @@ SRCS= ssh.c readconf.c clientloop.c ssht # gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile SRCS+= gss-genr.c -LIBADD= ssh util +LIBADD= ssh .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 -LIBADD+= ldns .endif .if ${MK_KERBEROS_SUPPORT} != "no" @@ -31,7 +30,7 @@ LIBADD+= gssapi CFLAGS+= -DNONE_CIPHER_ENABLED .endif -LIBADD+= crypt crypto z +LIBADD+= crypto .if defined(LOCALBASE) CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\" Modified: projects/clang350-import/secure/usr.sbin/sshd/Makefile ============================================================================== --- projects/clang350-import/secure/usr.sbin/sshd/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/secure/usr.sbin/sshd/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -25,7 +25,8 @@ SRCS+= gss-genr.c MAN= sshd.8 sshd_config.5 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h -LIBADD= ssh util wrap pam +# pam should always happen before ssh here for static linking +LIBADD= pam ssh util wrap .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 @@ -41,25 +42,14 @@ LIBADD+= bsm .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -include krb5_config.h -LIBADD+= gssapi_krb5 gssapi krb5 hx509 asn1 com_err roken wind heimbase \ - heimipcc +LIBADD+= gssapi_krb5 gssapi krb5 .endif .if ${MK_OPENSSH_NONE_CIPHER} != "no" CFLAGS+= -DNONE_CIPHER_ENABLED .endif -LIBADD+= crypt crypto z - -# Fix the order of NEEDED entries for libthr and libc. The libthr -# needs to interpose libc symbols, leaving the libthr loading as -# dependency of krb causes reversed order and broken interposing. Put -# the threading library last on the linker command line, just before -# the -lc added by a compiler driver. -# XXX In theory the framework now takes care of that, it needs to be checked -.if ${MK_KERBEROS_SUPPORT} != "no" -LIBADD+= pthread -.endif +LIBADD+= crypto .if defined(LOCALBASE) CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\" Modified: projects/clang350-import/share/mk/bsd.libnames.mk ============================================================================== --- projects/clang350-import/share/mk/bsd.libnames.mk Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/share/mk/bsd.libnames.mk Wed Nov 26 14:36:04 2014 (r275122) @@ -91,33 +91,7 @@ LIBNGATM?= ${DESTDIR}${LIBDIR}/libngatm. LIBNV?= ${DESTDIR}${LIBDIR}/libnv.a LIBNVPAIR?= ${DESTDIR}${LIBDIR}/libnvpair.a LIBOPIE?= ${DESTDIR}${LIBDIR}/libopie.a - -# The static PAM library doesn't know its secondary dependencies, -# so we have to specify them explicitly. Ths is an unfortunate, -# but necessary departure from testing MK_ flags to define -# values here. LIBPAM?= ${DESTDIR}${LIBDIR}/libpam.a -MINUSLPAM= -lpam -.if defined(LDFLAGS) && !empty(LDFLAGS:M-static) -.if ${MK_KERBEROS} != "no" -LIBPAM+= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} \ - ${LIBROKEN} ${LIBCOM_ERR} -MINUSLPAM+= -lkrb5 -lhx509 -lasn1 -lcrypto -lcrypt -lroken -lcom_err -.endif -LIBPAM+= ${LIBRADIUS} ${LIBTACPLUS} ${LIBCRYPT} \ - ${LIBUTIL} ${LIBOPIE} ${LIBMD} -MINUSLPAM+= -lradius -ltacplus -lcrypt \ - -lutil -lopie -lmd -.if ${MK_OPENSSH} != "no" -LIBPAM+= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} -MINUSLPAM+= -lssh -lcrypto -lcrypt -.endif -.if ${MK_NIS} != "no" -LIBPAM+= ${LIBYPCLNT} -MINUSLPAM+= -lypclnt -.endif -.endif - LIBPANEL?= ${DESTDIR}${LIBDIR}/libpanel.a LIBPCAP?= ${DESTDIR}${LIBDIR}/libpcap.a LIBPJDLOG?= ${DESTDIR}${LIBDIR}/libpjdlog.a Modified: projects/clang350-import/share/mk/src.libnames.mk ============================================================================== --- projects/clang350-import/share/mk/src.libnames.mk Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/share/mk/src.libnames.mk Wed Nov 26 14:36:04 2014 (r275122) @@ -159,6 +159,9 @@ _DP_archive+= md .endif _DP_ssl= crypto _DP_ssh= crypto crypt +.if ${MK_LDNS} != "no" +_DP_ssh+= ldns z +.endif _DP_edit= ncursesw .if ${MK_OPENSSL} != "no" _DP_bsnmp= crypto @@ -214,7 +217,9 @@ _DP_pam+= ssh .if ${MK_NIS} != "no" _DP_pam+= ypclnt .endif -_DP_krb5+= asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc +_DP_krb5+= asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc \ + pthread +_DP_gssapi_krb5+= gssapi krb5 crypto roken asn1 com_err # Define spacial cases LDADD_supcplusplus= -lsupc++ @@ -256,6 +261,10 @@ DPADD_hdb+= ${DPADD_pthread} LDADD_hdb+= ${LDADD_pthread} DPADD_kadm5srv+= ${DPADD_pthread} LDADD_kadm5srv+= ${LDADD_pthread} +DPADD_krb5+= ${DPADD_pthread} +LDADD_krb5+= ${LDADD_pthread} +DPADD_gssapi_krb5+= ${DPADD_pthread} +LDADD_gssapi_krb5+= ${LDADD_pthread} .for _l in ${LIBADD} .if ${_PRIVATELIBS:M${_l}} @@ -278,54 +287,42 @@ LDATF_CXX?= ${LIBATF_CXXDIR}/libatf-c++. LIBATF_CXX?= ${LIBATF_CXXDIR}/libatf-c++.a LIBBSDSTATDIR= ${ROOTOBJDIR}/lib/libbsdstat -LDBSDSTAT?= ${LIBBSDSTATDIR}/libbsdstat.so LIBBSDSTAT?= ${LIBBSDSTATDIR}/libbsdstat.a LIBEVENTDIR= ${ROOTOBJDIR}/lib/libevent -LDEVENT?= ${LIBEVENTDIR}/libevent.a LIBEVENT?= ${LIBEVENTDIR}/libevent.a LIBHEIMIPCCDIR= ${ROOTOBJDIR}/kerberos5/lib/libheimipcc -LDHEIMIPCC?= ${LIBHEIMIPCCDIR}/libheimipcc.so LIBHEIMIPCC?= ${LIBHEIMIPCCDIR}/libheimipcc.a LIBHEIMIPCSDIR= ${ROOTOBJDIR}/kerberos5/lib/libheimipcs -LDHEIMIPCS?= ${LIBHEIMIPCSDIR}/libheimipcs.so LIBHEIMIPCS?= ${LIBHEIMIPCSDIR}/libheimipcs.a LIBLDNSDIR= ${ROOTOBJDIR}/lib/libldns -LDLDNS?= ${LIBLDNSDIR}/libldns.so LIBLDNS?= ${LIBLDNSDIR}/libldns.a LIBSSHDIR= ${ROOTOBJDIR}/secure/lib/libssh -LDSSH?= ${LIBSSHDIR}/libssh.so LIBSSH?= ${LIBSSHDIR}/libssh.a LIBUNBOUNDDIR= ${ROOTOBJDIR}/lib/libunbound -LDUNBOUND?= ${LIBUNBOUNDDIR}/libunbound.so LIBUNBOUND?= ${LIBUNBOUNDDIR}/libunbound.a LIBUCLDIR= ${ROOTOBJDIR}/lib/libucl -LDUCL?= ${LIBUCLDIR}/libucl.so LIBUCL?= ${LIBUCLDIR}/libucl.a LIBREADLINEDIR= ${ROOTOBJDIR}/gnu/lib/libreadline/readline -LDREADLINE?= ${LIBREADLINEDIR}/libreadline.a LIBREADLINE?= ${LIBREADLINEDIR}/libreadline.a LIBOHASHDIR= ${ROOTOBJDIR}/lib/libohash -LDOHASH?= ${LIBOHASHDIR}/libohash.a LIBOHASH?= ${LIBOHASHDIR}/libohash.a LIBSQLITE3DIR= ${ROOTOBJDIR}/lib/libsqlite3 -LDSQLITE3?= ${LIBSQLITE3DIR}/libsqlite3.so LIBSQLITE3?= ${LIBSQLITE3DIR}/libsqlite3.a LIBMANDOCDIR= ${ROOTOBJDIR}/lib/libmandoc LIBMANDOC?= ${LIBMANDOCDIR}/libmandoc.a LIBSMDIR= ${ROOTOBJDIR}/lib/libsm -LDSM?= ${LIBSMDIR}/libsm.a LIBSM?= ${LIBSMDIR}/libsm.a LIBSMDBDIR= ${ROOTOBJDIR}/lib/libsmdb @@ -372,3 +369,4 @@ LIBBSNMPTOOLS?= ${LIBBSNMPTOOLSDIR}/libb LIBAMUDIR= ${ROOTOBJDIR}/usr.sbin/amd/libamu LIBAMU?= ${LIBAMUDIR}/libamu/libamu.a + Modified: projects/clang350-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c ============================================================================== --- projects/clang350-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Wed Nov 26 14:36:04 2014 (r275122) @@ -5274,7 +5274,7 @@ l2arc_write_buffers(spa_t *spa, l2arc_de ARCSTAT_INCR(arcstat_l2_write_bytes, write_asize); ARCSTAT_INCR(arcstat_l2_size, write_sz); ARCSTAT_INCR(arcstat_l2_asize, write_asize); - vdev_space_update(dev->l2ad_vdev, write_psize, 0, 0); + vdev_space_update(dev->l2ad_vdev, write_asize, 0, 0); /* * Bump device hand to the device start if it is approaching the end. Modified: projects/clang350-import/sys/dev/ahci/ahci_pci.c ============================================================================== --- projects/clang350-import/sys/dev/ahci/ahci_pci.c Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/sys/dev/ahci/ahci_pci.c Wed Nov 26 14:36:04 2014 (r275122) @@ -148,6 +148,14 @@ static struct { {0x8c078086, 0x00, "Intel Lynx Point (RAID)", 0}, {0x8c0e8086, 0x00, "Intel Lynx Point (RAID)", 0}, {0x8c0f8086, 0x00, "Intel Lynx Point (RAID)", 0}, + {0x8c828086, 0x00, "Intel Wildcat Point", 0}, + {0x8c838086, 0x00, "Intel Wildcat Point", 0}, + {0x8c848086, 0x00, "Intel Wildcat Point (RAID)", 0}, + {0x8c858086, 0x00, "Intel Wildcat Point (RAID)", 0}, + {0x8c868086, 0x00, "Intel Wildcat Point (RAID)", 0}, + {0x8c878086, 0x00, "Intel Wildcat Point (RAID)", 0}, + {0x8c8e8086, 0x00, "Intel Wildcat Point (RAID)", 0}, + {0x8c8f8086, 0x00, "Intel Wildcat Point (RAID)", 0}, {0x8d028086, 0x00, "Intel Wellsburg", 0}, {0x8d048086, 0x00, "Intel Wellsburg (RAID)", 0}, {0x8d068086, 0x00, "Intel Wellsburg (RAID)", 0}, Modified: projects/clang350-import/sys/dev/ata/ata-pci.h ============================================================================== --- projects/clang350-import/sys/dev/ata/ata-pci.h Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/sys/dev/ata/ata-pci.h Wed Nov 26 14:36:04 2014 (r275122) @@ -275,6 +275,19 @@ struct ata_pci_controller { #define ATA_LPT_R5 0x8c0e8086 #define ATA_LPT_R6 0x8c0f8086 +#define ATA_WCPT_S1 0x8c808086 +#define ATA_WCPT_S2 0x8c818086 +#define ATA_WCPT_AH1 0x8c828086 +#define ATA_WCPT_AH2 0x8c838086 +#define ATA_WCPT_R1 0x8c848086 +#define ATA_WCPT_R2 0x8c858086 +#define ATA_WCPT_R3 0x8c868086 +#define ATA_WCPT_R4 0x8c878086 +#define ATA_WCPT_S3 0x8c888086 +#define ATA_WCPT_S4 0x8c898086 +#define ATA_WCPT_R5 0x8c8e8086 +#define ATA_WCPT_R6 0x8c8f8086 + #define ATA_WELLS_S1 0x8d008086 #define ATA_WELLS_S2 0x8d088086 #define ATA_WELLS_S3 0x8d608086 Modified: projects/clang350-import/sys/dev/ata/chipsets/ata-intel.c ============================================================================== --- projects/clang350-import/sys/dev/ata/chipsets/ata-intel.c Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/sys/dev/ata/chipsets/ata-intel.c Wed Nov 26 14:36:04 2014 (r275122) @@ -227,6 +227,18 @@ ata_intel_probe(device_t dev) { ATA_LPT_S4, 0, INTEL_6CH2, 0, ATA_SA300, "Lynx Point" }, { ATA_LPT_R5, 0, INTEL_AHCI, 0, ATA_SA300, "Lynx Point" }, { ATA_LPT_R6, 0, INTEL_AHCI, 0, ATA_SA300, "Lynx Point" }, + { ATA_WCPT_S1, 0, INTEL_6CH, 0, ATA_SA300, "Wildcat Point" }, + { ATA_WCPT_S2, 0, INTEL_6CH, 0, ATA_SA300, "Wildcat Point" }, + { ATA_WCPT_AH1, 0, INTEL_AHCI, 0, ATA_SA300, "Wildcat Point" }, + { ATA_WCPT_AH2, 0, INTEL_AHCI, 0, ATA_SA300, "Wildcat Point" }, + { ATA_WCPT_R1, 0, INTEL_AHCI, 0, ATA_SA300, "Wildcat Point" }, + { ATA_WCPT_R2, 0, INTEL_AHCI, 0, ATA_SA300, "Wildcat Point" }, + { ATA_WCPT_R3, 0, INTEL_AHCI, 0, ATA_SA300, "Wildcat Point" }, + { ATA_WCPT_R4, 0, INTEL_AHCI, 0, ATA_SA300, "Wildcat Point" }, + { ATA_WCPT_S3, 0, INTEL_6CH2, 0, ATA_SA300, "Wildcat Point" }, + { ATA_WCPT_S4, 0, INTEL_6CH2, 0, ATA_SA300, "Wildcat Point" }, + { ATA_WCPT_R5, 0, INTEL_AHCI, 0, ATA_SA300, "Wildcat Point" }, + { ATA_WCPT_R6, 0, INTEL_AHCI, 0, ATA_SA300, "Wildcat Point" }, { ATA_WELLS_S1, 0, INTEL_6CH, 0, ATA_SA300, "Wellsburg" }, { ATA_WELLS_S2, 0, INTEL_6CH2, 0, ATA_SA300, "Wellsburg" }, { ATA_WELLS_S3, 0, INTEL_6CH, 0, ATA_SA300, "Wellsburg" }, Modified: projects/clang350-import/sys/dev/ichsmb/ichsmb_pci.c ============================================================================== --- projects/clang350-import/sys/dev/ichsmb/ichsmb_pci.c Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/sys/dev/ichsmb/ichsmb_pci.c Wed Nov 26 14:36:04 2014 (r275122) @@ -88,6 +88,7 @@ __FBSDID("$FreeBSD$"); #define ID_AVOTON 0x1f3c8086 #define ID_COLETOCRK 0x23B08086 #define ID_LPT 0x8c228086 +#define ID_WCPT 0x8ca28086 #define PCIS_SERIALBUS_SMBUS_PROGIF 0x00 @@ -197,6 +198,9 @@ ichsmb_pci_probe(device_t dev) case ID_LPT: device_set_desc(dev, "Intel Lynx Point SMBus controller"); break; + case ID_WCPT: + device_set_desc(dev, "Intel Wildcat Point SMBus controller"); + break; case ID_COLETOCRK: device_set_desc(dev, "Intel Coleto Creek SMBus controller"); break; Modified: projects/clang350-import/sys/dev/ichwd/ichwd.c ============================================================================== --- projects/clang350-import/sys/dev/ichwd/ichwd.c Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/sys/dev/ichwd/ichwd.c Wed Nov 26 14:36:04 2014 (r275122) @@ -194,6 +194,9 @@ static struct ichwd_device ichwd_devices { DEVICEID_LPT0, "Intel Lynx Point watchdog timer", 10 }, { DEVICEID_LPT1, "Intel Lynx Point watchdog timer", 10 }, { DEVICEID_LPT2, "Intel Lynx Point watchdog timer", 10 }, + { DEVICEID_WCPT2, "Intel Wildcat Point watchdog timer", 10 }, + { DEVICEID_WCPT4, "Intel Wildcat Point watchdog timer", 10 }, + { DEVICEID_WCPT6, "Intel Wildcat Point watchdog timer", 10 }, { DEVICEID_DH89XXCC_LPC, "Intel DH89xxCC watchdog timer", 10 }, { DEVICEID_COLETOCRK_LPC, "Intel Coleto Creek watchdog timer", 10 }, { 0, NULL, 0 }, Modified: projects/clang350-import/sys/dev/ichwd/ichwd.h ============================================================================== --- projects/clang350-import/sys/dev/ichwd/ichwd.h Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/sys/dev/ichwd/ichwd.h Wed Nov 26 14:36:04 2014 (r275122) @@ -210,6 +210,9 @@ struct ichwd_softc { #define DEVICEID_LPT29 0x8c5d #define DEVICEID_LPT30 0x8c5e #define DEVICEID_LPT31 0x8c5f +#define DEVICEID_WCPT2 0x8cc2 +#define DEVICEID_WCPT4 0x8cc4 +#define DEVICEID_WCPT6 0x8cc6 /* ICH LPC Interface Bridge Registers (ICH5 and older) */ #define ICH_GEN_STA 0xd4 Modified: projects/clang350-import/sys/dev/isp/isp_library.c ============================================================================== --- projects/clang350-import/sys/dev/isp/isp_library.c Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/sys/dev/isp/isp_library.c Wed Nov 26 14:36:04 2014 (r275122) @@ -2369,7 +2369,7 @@ isp_find_pdb_by_wwn(ispsoftc_t *isp, int if (chan < isp->isp_nchan) { fcp = FCPARAM(isp, chan); - for (i = 0; i < MAX_FC_TARG; i++) { + for (i = MAX_FC_TARG - 1; i >= 0; i--) { fcportdb_t *lp = &fcp->portdb[i]; if (lp->target_mode == 0) { @@ -2392,7 +2392,7 @@ isp_find_pdb_by_loopid(ispsoftc_t *isp, if (chan < isp->isp_nchan) { fcp = FCPARAM(isp, chan); - for (i = 0; i < MAX_FC_TARG; i++) { + for (i = MAX_FC_TARG - 1; i >= 0; i--) { fcportdb_t *lp = &fcp->portdb[i]; if (lp->target_mode == 0) { @@ -2418,7 +2418,7 @@ isp_find_pdb_by_sid(ispsoftc_t *isp, int } fcp = FCPARAM(isp, chan); - for (i = 0; i < MAX_FC_TARG; i++) { + for (i = MAX_FC_TARG - 1; i >= 0; i--) { fcportdb_t *lp = &fcp->portdb[i]; if (lp->target_mode == 0) { Modified: projects/clang350-import/sys/dev/sound/pci/hda/hdac.c ============================================================================== --- projects/clang350-import/sys/dev/sound/pci/hda/hdac.c Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/sys/dev/sound/pci/hda/hdac.c Wed Nov 26 14:36:04 2014 (r275122) @@ -86,6 +86,7 @@ static const struct { { HDA_INTEL_PPT1, "Intel Panther Point", 0, 0 }, { HDA_INTEL_LPT1, "Intel Lynx Point", 0, 0 }, { HDA_INTEL_LPT2, "Intel Lynx Point", 0, 0 }, + { HDA_INTEL_WCPT, "Intel Wildcat Point", 0, 0 }, { HDA_INTEL_WELLS1, "Intel Wellsburg", 0, 0 }, { HDA_INTEL_WELLS2, "Intel Wellsburg", 0, 0 }, { HDA_INTEL_LPTLP1, "Intel Lynx Point-LP", 0, 0 }, Modified: projects/clang350-import/sys/dev/sound/pci/hda/hdac.h ============================================================================== --- projects/clang350-import/sys/dev/sound/pci/hda/hdac.h Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/sys/dev/sound/pci/hda/hdac.h Wed Nov 26 14:36:04 2014 (r275122) @@ -62,6 +62,7 @@ #define HDA_INTEL_SCH HDA_MODEL_CONSTRUCT(INTEL, 0x811b) #define HDA_INTEL_LPT1 HDA_MODEL_CONSTRUCT(INTEL, 0x8c20) #define HDA_INTEL_LPT2 HDA_MODEL_CONSTRUCT(INTEL, 0x8c21) +#define HDA_INTEL_WCPT HDA_MODEL_CONSTRUCT(INTEL, 0x8ca0) #define HDA_INTEL_WELLS1 HDA_MODEL_CONSTRUCT(INTEL, 0x8d20) #define HDA_INTEL_WELLS2 HDA_MODEL_CONSTRUCT(INTEL, 0x8d21) #define HDA_INTEL_LPTLP1 HDA_MODEL_CONSTRUCT(INTEL, 0x9c20) Modified: projects/clang350-import/sys/dev/uart/uart_bus_pci.c ============================================================================== --- projects/clang350-import/sys/dev/uart/uart_bus_pci.c Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/sys/dev/uart/uart_bus_pci.c Wed Nov 26 14:36:04 2014 (r275122) @@ -127,6 +127,7 @@ static const struct pci_id pci_ns8250_id { 0x8086, 0x8813, 0xffff, 0, "Intel EG20T Serial Port 2", 0x10 }, { 0x8086, 0x8814, 0xffff, 0, "Intel EG20T Serial Port 3", 0x10 }, { 0x8086, 0x8c3d, 0xffff, 0, "Intel Lynx Point KT Controller", 0x10 }, +{ 0x8086, 0x8cbd, 0xffff, 0, "Intel Wildcat Point KT Controller", 0x10 }, { 0x9710, 0x9820, 0x1000, 1, "NetMos NM9820 Serial Port", 0x10 }, { 0x9710, 0x9835, 0x1000, 1, "NetMos NM9835 Serial Port", 0x10 }, { 0x9710, 0x9865, 0xa000, 0x1000, "NetMos NM9865 Serial Port", 0x10 }, Modified: projects/clang350-import/sys/dev/usb/controller/ehci_pci.c ============================================================================== --- projects/clang350-import/sys/dev/usb/controller/ehci_pci.c Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/sys/dev/usb/controller/ehci_pci.c Wed Nov 26 14:36:04 2014 (r275122) @@ -164,6 +164,10 @@ ehci_pci_match(device_t self) return ("Intel Lynx Point USB 2.0 controller USB-A"); case 0x8c2d8086: return ("Intel Lynx Point USB 2.0 controller USB-B"); + case 0x8ca68086: + return ("Intel Wildcat Point USB 2.0 controller USB-A"); + case 0x8cad8086: + return ("Intel Wildcat Point USB 2.0 controller USB-B"); case 0x00e01033: return ("NEC uPD 720100 USB 2.0 controller"); Modified: projects/clang350-import/sys/dev/usb/controller/xhci_pci.c ============================================================================== --- projects/clang350-import/sys/dev/usb/controller/xhci_pci.c Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/sys/dev/usb/controller/xhci_pci.c Wed Nov 26 14:36:04 2014 (r275122) @@ -109,6 +109,8 @@ xhci_pci_match(device_t self) return ("Intel Panther Point USB 3.0 controller"); case 0x8c318086: return ("Intel Lynx Point USB 3.0 controller"); + case 0x8cb18086: + return ("Intel Wildcat Point USB 3.0 controller"); default: break; Modified: projects/clang350-import/sys/dev/usb/quirk/usb_quirk.c ============================================================================== --- projects/clang350-import/sys/dev/usb/quirk/usb_quirk.c Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/sys/dev/usb/quirk/usb_quirk.c Wed Nov 26 14:36:04 2014 (r275122) @@ -253,6 +253,7 @@ static struct usb_quirk_entry usb_quirks USB_QUIRK(LEXAR, CF_READER, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_INQUIRY), USB_QUIRK(LEXAR, JUMPSHOT, 0x0000, 0xffff, UQ_MSC_FORCE_PROTO_SCSI), + USB_QUIRK(LEXAR, JUMPDRIVE, 0x0000, 0xffff, UQ_MSC_NO_INQUIRY), USB_QUIRK(LOGITEC, LDR_H443SU2, 0x0000, 0xffff, UQ_MSC_FORCE_PROTO_SCSI), USB_QUIRK(LOGITEC, LDR_H443U2, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI,), Modified: projects/clang350-import/sys/dev/usb/usbdevs ============================================================================== --- projects/clang350-import/sys/dev/usb/usbdevs Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/sys/dev/usb/usbdevs Wed Nov 26 14:36:04 2014 (r275122) @@ -2604,6 +2604,7 @@ product LENOVO ETHERNET 0x7203 USB 2.0 /* Lexar products */ product LEXAR JUMPSHOT 0x0001 jumpSHOT CompactFlash Reader product LEXAR CF_READER 0xb002 USB CF Reader +product LEXAR JUMPDRIVE 0xa833 USB Jumpdrive Flash Drive /* Lexmark products */ product LEXMARK S2450 0x0009 Optra S 2450 Modified: projects/clang350-import/tools/tools/ath/athaggrstats/Makefile ============================================================================== --- projects/clang350-import/tools/tools/ath/athaggrstats/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/tools/tools/ath/athaggrstats/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -12,8 +12,7 @@ CLEANFILES+= opt_ah.h CFLAGS+=-DATH_SUPPORT_ANI CFLAGS+=-DATH_SUPPORT_TDMA -USEPRIVATELIB= bsdstat -LDADD= ${LDBSDSTAT} +LIBADD+= bsdstat opt_ah.h: echo "#define AH_DEBUG 1" > opt_ah.h Modified: projects/clang350-import/tools/tools/ath/athstats/Makefile ============================================================================== --- projects/clang350-import/tools/tools/ath/athstats/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/tools/tools/ath/athstats/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -23,9 +23,7 @@ CFLAGS+=-DATH_SUPPORT_TDMA CFLAGS.clang+= -fbracket-depth=512 -USEPRIVATELIB= bsdstat - -LDADD= ${LDBSDSTAT} +LIBADD= bsdstat opt_ah.h: echo "#define AH_DEBUG 1" > opt_ah.h Modified: projects/clang350-import/tools/tools/mwl/mwlstats/Makefile ============================================================================== --- projects/clang350-import/tools/tools/mwl/mwlstats/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/tools/tools/mwl/mwlstats/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -5,8 +5,7 @@ BINDIR= /usr/local/bin MAN= SRCS= main.c mwlstats.c -USEPRIVATELIB= -LDADD=-lbsdstat +LIBADD= bsdstat .include Modified: projects/clang350-import/tools/tools/net80211/wlanstats/Makefile ============================================================================== --- projects/clang350-import/tools/tools/net80211/wlanstats/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/tools/tools/net80211/wlanstats/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -5,8 +5,7 @@ PROG= wlanstats BINDIR= /usr/local/bin MAN= -USEPRIVATELIB= bsdstat -LDADD= ${LDBSDSTAT} +LIBADD= bsdstat SRCS= wlanstats.c main.c Modified: projects/clang350-import/tools/tools/npe/npestats/Makefile ============================================================================== --- projects/clang350-import/tools/tools/npe/npestats/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/tools/tools/npe/npestats/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -4,7 +4,6 @@ PROG= npestats SRCS= main.c npestats.c BINDIR= /usr/local/bin MAN= -USEPRIVATELIB= -LDADD= -lbsdstat +LIBADD= bsdstat .include Modified: projects/clang350-import/usr.bin/svn/svn/Makefile ============================================================================== --- projects/clang350-import/usr.bin/svn/svn/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/usr.bin/svn/svn/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -39,18 +39,14 @@ LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_clien -L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBSERFDIR} -lserf \ -L${LIBAPR_UTILDIR} -lapr-util \ - -lbsdxml \ - -L${LIBAPRDIR} -lapr \ - ${LDSQLITE3} \ - -lz -lcrypt -lmagic -lcrypto -lssl -lpthread + -L${LIBAPRDIR} -lapr +LIBADD+= bsdxml sqlite3 z magic crypto ssl pthread DPADD= ${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \ ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} ${LIBSVN_REPOS} \ ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} \ ${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \ - ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \ - ${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD} -USEPRIVATELIB= sqlite3 + ${LIBAPR} CLEANFILES+= svnlite.1 .if(defined(ORGANIZATION) && !empty(ORGANIZATION)) Modified: projects/clang350-import/usr.bin/svn/svnadmin/Makefile ============================================================================== --- projects/clang350-import/usr.bin/svn/svnadmin/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/usr.bin/svn/svnadmin/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -25,15 +25,11 @@ LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos -L${LIBSVN_DELTADIR} -lsvn_delta \ -L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBAPR_UTILDIR} -lapr-util \ - -lbsdxml \ - -L${LIBAPRDIR} -lapr \ - ${LDSQLITE3} \ - -lz -lcrypt -lpthread + -L${LIBAPRDIR} -lapr +LIBADD+= bsdxml sqlite3 z pthread DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \ - ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBPTHREAD} - -USEPRIVATELIB= sqlite3 + ${LIBAPR} .include Modified: projects/clang350-import/usr.bin/svn/svndumpfilter/Makefile ============================================================================== --- projects/clang350-import/usr.bin/svn/svndumpfilter/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/usr.bin/svn/svndumpfilter/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -25,14 +25,11 @@ LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos -L${LIBSVN_DELTADIR} -lsvn_delta \ -L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBAPR_UTILDIR} -lapr-util \ - -lbsdxml \ - -L${LIBAPRDIR} -lapr \ - ${LDSQLITE3} \ - -lz -lcrypt -lpthread + -L${LIBAPRDIR} -lapr +LIBADD+= bsdxml sqlite3 z crypt pthread DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \ - ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBPTHREAD} -USEPRIVATELIB= sqlite3 + ${LIBAPR} .include Modified: projects/clang350-import/usr.bin/svn/svnlook/Makefile ============================================================================== --- projects/clang350-import/usr.bin/svn/svnlook/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/usr.bin/svn/svnlook/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -26,14 +26,11 @@ LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos -L${LIBSVN_DIFFDIR} -lsvn_diff \ -L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBAPR_UTILDIR} -lapr-util \ - -lbsdxml \ - -L${LIBAPRDIR} -lapr \ - ${LDSQLITE3} \ - -lz -lcrypt -lpthread + -L${LIBAPRDIR} -lapr +LIBADD+= bsdxml sqlite3 z pthread DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ ${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \ - ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBPTHREAD} -USEPRIVATELIB= sqlite3 + ${LIBAPR} .include Modified: projects/clang350-import/usr.bin/svn/svnmucc/Makefile ============================================================================== --- projects/clang350-import/usr.bin/svn/svnmucc/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/usr.bin/svn/svnmucc/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -31,16 +31,12 @@ LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_clien -L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBSERFDIR} -lserf \ -L${LIBAPR_UTILDIR} -lapr-util \ - -lbsdxml \ - -L${LIBAPRDIR} -lapr \ - ${LDSQLITE3} \ - -lz -lcrypt -lmagic -lcrypto -lssl -lpthread + -L${LIBAPRDIR} -lapr +LIBADD+= bsdxml sqlite3 z crypto ssl pthread DPADD= ${LIBSVN_CLIENT} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} \ ${LIBSVN_RA_SERF} ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} \ ${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBSERF} \ - ${LIBAPR_UTIL} ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} \ - ${LIBCRYPT} ${LIBMAGIC} ${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD} -USEPRIVATELIB= sqlite3 + ${LIBAPR_UTIL} ${LIBAPR} .include Modified: projects/clang350-import/usr.bin/svn/svnrdump/Makefile ============================================================================== --- projects/clang350-import/usr.bin/svn/svnrdump/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/usr.bin/svn/svnrdump/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -33,17 +33,13 @@ LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_clien -L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBSERFDIR} -lserf \ -L${LIBAPR_UTILDIR} -lapr-util \ - -lbsdxml \ - -L${LIBAPRDIR} -lapr \ - ${LDSQLITE3} \ - -lz -lcrypt -lmagic -lcrypto -lssl -lpthread + -L${LIBAPRDIR} -lapr +LIBADD+= bsdxml sqlite3 z crypto ssl pthread DPADD= ${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \ ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} ${LIBSVN_REPOS} \ ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} \ ${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \ - ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \ - ${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD} -USEPRIVATELIB= sqlite3 + ${LIBAPR} .include Modified: projects/clang350-import/usr.bin/svn/svnserve/Makefile ============================================================================== --- projects/clang350-import/usr.bin/svn/svnserve/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/usr.bin/svn/svnserve/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -30,16 +30,12 @@ LDADD= -L${LIBSVN_RADIR} -lsvn_ra \ -L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBSERFDIR} -lserf \ -L${LIBAPR_UTILDIR} -lapr-util \ - -lbsdxml \ - -L${LIBAPRDIR} -lapr \ - ${LDSQLITE3} \ - -lz -lcrypt -lmagic -lcrypto -lssl -lpthread + -L${LIBAPRDIR} -lapr +LIBADD= bsdxml sqlite3 z pthread DPADD= ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} \ ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \ - ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \ - ${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD} -USEPRIVATELIB= sqlite3 + ${LIBAPR} .include Modified: projects/clang350-import/usr.bin/svn/svnsync/Makefile ============================================================================== --- projects/clang350-import/usr.bin/svn/svnsync/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/usr.bin/svn/svnsync/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -30,16 +30,12 @@ LDADD= -L${LIBSVN_RADIR} -lsvn_ra \ -L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBSERFDIR} -lserf \ -L${LIBAPR_UTILDIR} -lapr-util \ - -lbsdxml \ - -L${LIBAPRDIR} -lapr \ - ${LDSQLITE3} \ - -lz -lcrypt -lmagic -lcrypto -lssl -lpthread + -L${LIBAPRDIR} -lapr +LIBADD= bsdxml sqlite3 z crypto ssl pthread DPADD= ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} \ ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \ - ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \ - ${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD} -USEPRIVATELIB= sqlite3 + ${LIBAPR} .include Modified: projects/clang350-import/usr.bin/svn/svnversion/Makefile ============================================================================== --- projects/clang350-import/usr.bin/svn/svnversion/Makefile Wed Nov 26 14:10:00 2014 (r275121) +++ projects/clang350-import/usr.bin/svn/svnversion/Makefile Wed Nov 26 14:36:04 2014 (r275122) @@ -23,14 +23,10 @@ LDADD= -L${LIBSVN_WCDIR} -lsvn_wc \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 16:23:33 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5CFC8335; Wed, 26 Nov 2014 16:23:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3E265E18; Wed, 26 Nov 2014 16:23:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQGNX4X035409; Wed, 26 Nov 2014 16:23:33 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQGNWq1035405; Wed, 26 Nov 2014 16:23:32 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201411261623.sAQGNWq1035405@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 26 Nov 2014 16:23:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275125 - in projects/clang350-import/contrib/llvm/tools/lldb/source: Expression Symbol X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 16:23:33 -0000 Author: emaste Date: Wed Nov 26 16:23:32 2014 New Revision: 275125 URL: https://svnweb.freebsd.org/changeset/base/275125 Log: Revert Clang 3.4 API compatibility changes Re-apply previously reverted changes to restore LLDB to parity with the last update as of upstream revision 202189. This is the first step an LLDB update to correspond with the Clang 3.5 import and re-applies the following upstream revisions: SVN git 199408 3ad0a1a1 199689 05be72c3 200085 9ad47a93 Sponsored by: DARPA, AFRL Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/ClangASTSource.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/ClangASTSource.cpp ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/ClangASTSource.cpp Wed Nov 26 16:05:01 2014 (r275124) +++ projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/ClangASTSource.cpp Wed Nov 26 16:23:32 2014 (r275125) @@ -1778,14 +1778,14 @@ NameSearchContext::AddFunDecl (const Cla if (func_proto_type) { - unsigned NumArgs = func_proto_type->getNumArgs(); + unsigned NumArgs = func_proto_type->getNumParams(); unsigned ArgIndex; SmallVector parm_var_decls; for (ArgIndex = 0; ArgIndex < NumArgs; ++ArgIndex) { - QualType arg_qual_type (func_proto_type->getArgType(ArgIndex)); + QualType arg_qual_type (func_proto_type->getParamType(ArgIndex)); parm_var_decls.push_back(ParmVarDecl::Create (*ast, const_cast(m_decl_context), Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp Wed Nov 26 16:05:01 2014 (r275124) +++ projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp Wed Nov 26 16:23:32 2014 (r275125) @@ -414,7 +414,7 @@ ClangASTType::GetNumberOfFunctionArgumen QualType qual_type (GetCanonicalQualType()); const FunctionProtoType* func = dyn_cast(qual_type.getTypePtr()); if (func) - return func->getNumArgs(); + return func->getNumParams(); } return 0; } @@ -428,8 +428,8 @@ ClangASTType::GetFunctionArgumentAtIndex const FunctionProtoType* func = dyn_cast(qual_type.getTypePtr()); if (func) { - if (index < func->getNumArgs()) - return ClangASTType(m_ast, func->getArgType(index).getAsOpaquePtr()); + if (index < func->getNumParams()) + return ClangASTType(m_ast, func->getParamType(index).getAsOpaquePtr()); } } return ClangASTType(); @@ -1596,7 +1596,7 @@ ClangASTType::GetFunctionArgumentCount ( { const FunctionProtoType* func = dyn_cast(GetCanonicalQualType()); if (func) - return func->getNumArgs(); + return func->getNumParams(); } return -1; } @@ -1609,9 +1609,9 @@ ClangASTType::GetFunctionArgumentTypeAtI const FunctionProtoType* func = dyn_cast(GetCanonicalQualType()); if (func) { - const uint32_t num_args = func->getNumArgs(); + const uint32_t num_args = func->getNumParams(); if (idx < num_args) - return ClangASTType(m_ast, func->getArgType(idx)); + return ClangASTType(m_ast, func->getParamType(idx)); } } return ClangASTType(); @@ -1625,7 +1625,7 @@ ClangASTType::GetFunctionReturnType () c QualType qual_type(GetCanonicalQualType()); const FunctionProtoType* func = dyn_cast(qual_type.getTypePtr()); if (func) - return ClangASTType(m_ast, func->getResultType()); + return ClangASTType(m_ast, func->getReturnType()); } return ClangASTType(); } @@ -4648,7 +4648,7 @@ ClangASTType::AddMethodToCXXRecordType ( if (!method_function_prototype) return NULL; - unsigned int num_params = method_function_prototype->getNumArgs(); + unsigned int num_params = method_function_prototype->getNumParams(); CXXDestructorDecl *cxx_dtor_decl(NULL); CXXConstructorDecl *cxx_ctor_decl(NULL); @@ -4715,7 +4715,7 @@ ClangASTType::AddMethodToCXXRecordType ( cxx_method_decl = CXXConversionDecl::Create (*m_ast, cxx_record_decl, SourceLocation(), - DeclarationNameInfo (m_ast->DeclarationNames.getCXXConversionFunctionName (m_ast->getCanonicalType (function_type->getResultType())), SourceLocation()), + DeclarationNameInfo (m_ast->DeclarationNames.getCXXConversionFunctionName (m_ast->getCanonicalType (function_type->getReturnType())), SourceLocation()), method_qual_type, NULL, // TypeSourceInfo * is_inline, @@ -4746,7 +4746,7 @@ ClangASTType::AddMethodToCXXRecordType ( cxx_method_decl->setVirtualAsWritten (is_virtual); if (is_attr_used) - cxx_method_decl->addAttr(::new (*m_ast) UsedAttr(SourceRange(), *m_ast)); + cxx_method_decl->addAttr(clang::UsedAttr::CreateImplicit(*m_ast)); // Populate the method decl with parameter decls @@ -4761,7 +4761,7 @@ ClangASTType::AddMethodToCXXRecordType ( SourceLocation(), SourceLocation(), NULL, // anonymous - method_function_prototype->getArgType(param_index), + method_function_prototype->getParamType(param_index), NULL, SC_None, NULL)); @@ -5134,7 +5134,7 @@ ClangASTType::AddMethodToObjCObjectType bool is_defined = false; ObjCMethodDecl::ImplementationControl imp_control = ObjCMethodDecl::None; - const unsigned num_args = method_function_prototype->getNumArgs(); + const unsigned num_args = method_function_prototype->getNumParams(); if (num_args != num_selectors_with_args) return NULL; // some debug information is corrupt. We are not going to deal with it. @@ -5143,7 +5143,7 @@ ClangASTType::AddMethodToObjCObjectType SourceLocation(), // beginLoc, SourceLocation(), // endLoc, method_selector, - method_function_prototype->getResultType(), + method_function_prototype->getReturnType(), NULL, // TypeSourceInfo *ResultTInfo, GetDeclContextForType (), name[0] == '-', @@ -5169,7 +5169,7 @@ ClangASTType::AddMethodToObjCObjectType SourceLocation(), SourceLocation(), NULL, // anonymous - method_function_prototype->getArgType(param_index), + method_function_prototype->getParamType(param_index), NULL, SC_Auto, NULL)); From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 16:48:20 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 761FEED3; Wed, 26 Nov 2014 16:48:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5DB3211B; Wed, 26 Nov 2014 16:48:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQGmKG0045177; Wed, 26 Nov 2014 16:48:20 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQGmDMU045138; Wed, 26 Nov 2014 16:48:13 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201411261648.sAQGmDMU045138@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 26 Nov 2014 16:48:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275126 - in projects/clang350-import/contrib/llvm/tools/lldb: include/lldb include/lldb/API include/lldb/Breakpoint include/lldb/Core include/lldb/DataFormatters include/lldb/Expressio... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 16:48:20 -0000 Author: emaste Date: Wed Nov 26 16:48:12 2014 New Revision: 275126 URL: https://svnweb.freebsd.org/changeset/base/275126 Log: Update LLDB snapshot to upstream r216948 (git 50f7fe44) This is approximately "LLDB 3.5" although with a little bit of skew, and will go along with the Clang 3.5 import. Sponsored by: DARPA, AFRL Added: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBTypeEnumMember.h - copied unchanged from r275125, vendor/lldb/dist/include/lldb/API/SBTypeEnumMember.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBUnixSignals.h - copied unchanged from r275125, vendor/lldb/dist/include/lldb/API/SBUnixSignals.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/StructuredData.h - copied unchanged from r275125, vendor/lldb/dist/include/lldb/Core/StructuredData.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Host/FileCache.h - copied unchanged from r275125, vendor/lldb/dist/include/lldb/Host/FileCache.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Host/FileSystem.h - copied unchanged from r275125, vendor/lldb/dist/include/lldb/Host/FileSystem.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Host/HostInfo.h - copied unchanged from r275125, vendor/lldb/dist/include/lldb/Host/HostInfo.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Host/HostInfoBase.h - copied unchanged from r275125, vendor/lldb/dist/include/lldb/Host/HostInfoBase.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Host/HostProcess.h - copied unchanged from r275125, vendor/lldb/dist/include/lldb/Host/HostProcess.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Host/IOObject.h - copied unchanged from r275125, vendor/lldb/dist/include/lldb/Host/IOObject.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Host/Pipe.h - copied unchanged from r275125, vendor/lldb/dist/include/lldb/Host/Pipe.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Host/Socket.h - copied unchanged from r275125, vendor/lldb/dist/include/lldb/Host/Socket.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Host/freebsd/HostInfoFreeBSD.h - copied unchanged from r275125, vendor/lldb/dist/include/lldb/Host/freebsd/HostInfoFreeBSD.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Host/posix/ - copied from r275125, vendor/lldb/dist/include/lldb/Host/posix/ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Interpreter/CommandOptionValidators.h - copied unchanged from r275125, vendor/lldb/dist/include/lldb/Interpreter/CommandOptionValidators.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/FileAction.h - copied unchanged from r275125, vendor/lldb/dist/include/lldb/Target/FileAction.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/JITLoader.h - copied unchanged from r275125, vendor/lldb/dist/include/lldb/Target/JITLoader.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/JITLoaderList.h - copied unchanged from r275125, vendor/lldb/dist/include/lldb/Target/JITLoaderList.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/MemoryRegionInfo.h - copied unchanged from r275125, vendor/lldb/dist/include/lldb/Target/MemoryRegionInfo.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/NativeRegisterContext.h - copied unchanged from r275125, vendor/lldb/dist/include/lldb/Target/NativeRegisterContext.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/NativeRegisterContextRegisterInfo.h - copied unchanged from r275125, vendor/lldb/dist/include/lldb/Target/NativeRegisterContextRegisterInfo.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/ProcessInfo.h - copied unchanged from r275125, vendor/lldb/dist/include/lldb/Target/ProcessInfo.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/ProcessLaunchInfo.h - copied unchanged from r275125, vendor/lldb/dist/include/lldb/Target/ProcessLaunchInfo.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Utility/SafeMachO.h - copied unchanged from r275125, vendor/lldb/dist/include/lldb/Utility/SafeMachO.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Utility/StringLexer.h - copied unchanged from r275125, vendor/lldb/dist/include/lldb/Utility/StringLexer.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/lldb-private-forward.h - copied unchanged from r275125, vendor/lldb/dist/include/lldb/lldb-private-forward.h projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBTypeEnumMember.cpp - copied unchanged from r275125, vendor/lldb/dist/source/API/SBTypeEnumMember.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBUnixSignals.cpp - copied unchanged from r275125, vendor/lldb/dist/source/API/SBUnixSignals.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/FastDemangle.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Core/FastDemangle.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/StructuredData.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Core/StructuredData.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Host/common/FileCache.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Host/common/FileCache.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Host/common/HostInfoBase.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Host/common/HostInfoBase.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Host/common/IOObject.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Host/common/IOObject.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Host/common/NativeBreakpoint.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Host/common/NativeBreakpoint.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Host/common/NativeBreakpoint.h - copied unchanged from r275125, vendor/lldb/dist/source/Host/common/NativeBreakpoint.h projects/clang350-import/contrib/llvm/tools/lldb/source/Host/common/NativeBreakpointList.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Host/common/NativeBreakpointList.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Host/common/NativeBreakpointList.h - copied unchanged from r275125, vendor/lldb/dist/source/Host/common/NativeBreakpointList.h projects/clang350-import/contrib/llvm/tools/lldb/source/Host/common/NativeProcessProtocol.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Host/common/NativeProcessProtocol.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Host/common/NativeProcessProtocol.h - copied unchanged from r275125, vendor/lldb/dist/source/Host/common/NativeProcessProtocol.h projects/clang350-import/contrib/llvm/tools/lldb/source/Host/common/NativeThreadProtocol.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Host/common/NativeThreadProtocol.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Host/common/NativeThreadProtocol.h - copied unchanged from r275125, vendor/lldb/dist/source/Host/common/NativeThreadProtocol.h projects/clang350-import/contrib/llvm/tools/lldb/source/Host/common/Pipe.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Host/common/Pipe.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Host/common/Socket.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Host/common/Socket.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Host/common/SoftwareBreakpoint.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Host/common/SoftwareBreakpoint.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Host/common/SoftwareBreakpoint.h - copied unchanged from r275125, vendor/lldb/dist/source/Host/common/SoftwareBreakpoint.h projects/clang350-import/contrib/llvm/tools/lldb/source/Host/freebsd/HostInfoFreeBSD.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Host/freebsd/HostInfoFreeBSD.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Host/posix/ - copied from r275125, vendor/lldb/dist/source/Host/posix/ projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/CommandOptionValidators.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Interpreter/CommandOptionValidators.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-arm64/ - copied from r275125, vendor/lldb/dist/source/Plugins/ABI/MacOSX-arm64/ projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-hexagon/ - copied from r275125, vendor/lldb/dist/source/Plugins/ABI/SysV-hexagon/ projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/Hexagon-DYLD/ - copied from r275125, vendor/lldb/dist/source/Plugins/DynamicLoader/Hexagon-DYLD/ projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM64/ - copied from r275125, vendor/lldb/dist/source/Plugins/Instruction/ARM64/ projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/JITLoader/ - copied from r275125, vendor/lldb/dist/source/Plugins/JITLoader/ projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/JIT/ - copied from r275125, vendor/lldb/dist/source/Plugins/ObjectFile/JIT/ projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_arm64.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_arm64.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_arm64.h - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_arm64.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/FreeBSDSignals.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/FreeBSDSignals.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/FreeBSDSignals.h - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/FreeBSDSignals.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/LinuxSignals.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/LinuxSignals.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/LinuxSignals.h - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/LinuxSignals.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm64.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextDarwin_arm64.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm64.h - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextDarwin_arm64.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_i386.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextFreeBSD_i386.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_i386.h - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextFreeBSD_i386.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_mips64.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextFreeBSD_mips64.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_mips64.h - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextFreeBSD_mips64.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_x86_64.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextFreeBSD_x86_64.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_x86_64.h - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextFreeBSD_x86_64.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLinux_arm64.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextLinux_arm64.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLinux_arm64.h - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextLinux_arm64.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLinux_i386.h - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextLinux_i386.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLinux_x86_64.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextLinux_x86_64.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLinux_x86_64.h - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextLinux_x86_64.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX.h - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextPOSIX.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_arm64.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextPOSIX_arm64.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_arm64.h - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextPOSIX_arm64.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_mips64.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextPOSIX_mips64.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_mips64.h - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextPOSIX_mips64.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_x86.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextPOSIX_x86.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_x86.h - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextPOSIX_x86.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContext_mips64.h - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContext_mips64.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContext_x86.h - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContext_x86.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterInfoInterface.h - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterInfoInterface.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64.h - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterInfos_arm64.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterInfos_i386.h - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterInfos_i386.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterInfos_mips64.h - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterInfos_mips64.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64.h - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterInfos_x86_64.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/lldb-x86-register-enums.h - copied unchanged from r275125, vendor/lldb/dist/source/Plugins/Process/Utility/lldb-x86-register-enums.h projects/clang350-import/contrib/llvm/tools/lldb/source/Target/FileAction.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Target/FileAction.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/JITLoader.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Target/JITLoader.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/JITLoaderList.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Target/JITLoaderList.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/NativeRegisterContext.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Target/NativeRegisterContext.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/NativeRegisterContextRegisterInfo.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Target/NativeRegisterContextRegisterInfo.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/ProcessInfo.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Target/ProcessInfo.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/ProcessLaunchInfo.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Target/ProcessLaunchInfo.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Utility/ARM64_DWARF_Registers.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Utility/ARM64_DWARF_Registers.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Utility/ARM64_DWARF_Registers.h - copied unchanged from r275125, vendor/lldb/dist/source/Utility/ARM64_DWARF_Registers.h projects/clang350-import/contrib/llvm/tools/lldb/source/Utility/ARM64_GCC_Registers.h - copied unchanged from r275125, vendor/lldb/dist/source/Utility/ARM64_GCC_Registers.h projects/clang350-import/contrib/llvm/tools/lldb/source/Utility/StringLexer.cpp - copied unchanged from r275125, vendor/lldb/dist/source/Utility/StringLexer.cpp projects/clang350-import/contrib/llvm/tools/lldb/tools/lldb-mi/ - copied from r275125, vendor/lldb/dist/tools/lldb-mi/ Deleted: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Host/DynamicLibrary.h projects/clang350-import/contrib/llvm/tools/lldb/source/Host/common/DynamicLibrary.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_i386.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_i386.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_mips64.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_mips64.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_x86_64.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_x86_64.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_i386.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_i386.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_x86_64.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_x86_64.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX_mips64.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX_mips64.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX_x86.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX_x86.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContext_mips64.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContext_x86.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterInfos_i386.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterInfos_mips64.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterInfos_x86_64.h Modified: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBBreakpoint.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBBreakpointLocation.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBDefines.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBError.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBExpressionOptions.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBFileSpec.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBFrame.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBHostOS.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBListener.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBProcess.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBQueue.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBQueueItem.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBStream.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBTarget.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBThread.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBType.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBValue.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Breakpoint/Breakpoint.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointLocationList.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointOptions.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointSite.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Breakpoint/Watchpoint.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/Address.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/AddressRange.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/ArchSpec.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/ClangForward.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/Communication.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/ConnectionFileDescriptor.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/ConstString.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/DataBuffer.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/DataBufferHeap.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/DataBufferMemoryMap.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/DataEncoder.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/Debugger.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/EmulateInstruction.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/Error.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/IOHandler.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/Listener.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/Mangled.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/Module.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/ModuleList.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/ModuleSpec.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/PluginManager.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/RegisterValue.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/RegularExpression.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/Section.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/SourceManager.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/Stream.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/UserID.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/Value.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/ValueObject.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/ValueObjectChild.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/ValueObjectConstResult.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/ValueObjectDynamicValue.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/ValueObjectMemory.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/ValueObjectRegister.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/ValueObjectSyntheticFilter.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/ValueObjectVariable.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/dwarf.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/DataFormatters/CXXFormatterFunctions.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatManager.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeFormat.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeSummary.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/DataFormatters/ValueObjectPrinter.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Expression/ASTStructExtractor.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Expression/ClangExpressionDeclMap.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Expression/ClangExpressionParser.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Expression/ClangExpressionVariable.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Expression/ClangFunction.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Expression/ClangUserExpression.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Expression/ClangUtilityFunction.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Expression/DWARFExpression.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Expression/ExpressionSourceCode.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Expression/IRExecutionUnit.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Expression/IRForTarget.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Expression/IRMemoryMap.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Host/Condition.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Host/Config.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Host/Debug.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Host/Editline.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Host/Endian.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Host/File.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Host/FileSpec.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Host/Host.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Host/HostGetOpt.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Host/OptionParser.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Host/Predicate.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Host/SocketAddress.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Host/Symbols.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Host/Terminal.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Host/TimeValue.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Interpreter/Args.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Interpreter/CommandCompletions.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Interpreter/CommandInterpreter.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Interpreter/CommandObject.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Interpreter/CommandReturnObject.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Interpreter/Options.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Interpreter/PythonDataObjects.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Interpreter/ScriptInterpreter.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Interpreter/ScriptInterpreterPython.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Symbol/Block.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Symbol/ClangASTContext.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Symbol/ClangASTImporter.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Symbol/ClangASTType.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Symbol/ClangExternalASTSourceCommon.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Symbol/CompileUnit.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Symbol/DWARFCallFrameInfo.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Symbol/Declaration.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Symbol/FuncUnwinders.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Symbol/Function.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Symbol/LineEntry.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Symbol/LineTable.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Symbol/ObjectContainer.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Symbol/ObjectFile.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Symbol/Symbol.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Symbol/SymbolContext.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Symbol/SymbolContextScope.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Symbol/SymbolFile.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Symbol/SymbolVendor.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Symbol/Symtab.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Symbol/Type.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Symbol/UnwindPlan.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Symbol/UnwindTable.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Symbol/VariableList.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/ABI.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/CPPLanguageRuntime.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/ExecutionContext.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/ExecutionContextScope.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/ObjCLanguageRuntime.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/PathMappingList.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/Platform.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/Process.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/Queue.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/QueueItem.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/QueueList.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/RegisterContext.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/StackFrame.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/StopInfo.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/SystemRuntime.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/Target.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/TargetList.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/Thread.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlan.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanCallFunction.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanCallUserExpression.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanShouldStopHere.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanStepInRange.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanStepInstruction.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanStepOut.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanStepOverRange.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanStepRange.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Target/UnwindAssembly.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Utility/CleanUp.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Utility/PseudoTerminal.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Utility/SharedCluster.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Utility/SharingPtr.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/lldb-defines.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/lldb-enumerations.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/lldb-forward.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/lldb-private-enumerations.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/lldb-private-interfaces.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/lldb-private-log.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/lldb-private-types.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/lldb-python.h projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/lldb-types.h projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBAddress.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBBreakpoint.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBBreakpointLocation.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBBroadcaster.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBCommandInterpreter.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBCommandReturnObject.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBCommunication.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBCompileUnit.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBData.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBDebugger.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBDeclaration.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBError.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBEvent.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBExpressionOptions.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBFileSpec.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBFileSpecList.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBFrame.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBFunction.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBHostOS.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBLineEntry.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBListener.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBModule.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBProcess.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBQueue.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBQueueItem.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBStream.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBSymbol.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBSymbolContext.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBTarget.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBThread.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBType.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBValue.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBValueList.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/API/SBWatchpoint.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Breakpoint/Breakpoint.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointID.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointList.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocation.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocationList.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointOptions.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointResolverName.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointSite.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointSiteList.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Breakpoint/WatchpointList.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Commands/CommandCompletions.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Commands/CommandObjectArgs.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Commands/CommandObjectBreakpoint.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Commands/CommandObjectBreakpointCommand.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Commands/CommandObjectCommands.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Commands/CommandObjectDisassemble.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Commands/CommandObjectExpression.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Commands/CommandObjectExpression.h projects/clang350-import/contrib/llvm/tools/lldb/source/Commands/CommandObjectFrame.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Commands/CommandObjectHelp.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Commands/CommandObjectLog.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Commands/CommandObjectMemory.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Commands/CommandObjectPlatform.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Commands/CommandObjectProcess.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Commands/CommandObjectQuit.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Commands/CommandObjectRegister.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Commands/CommandObjectSettings.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Commands/CommandObjectSource.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Commands/CommandObjectTarget.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Commands/CommandObjectThread.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Commands/CommandObjectType.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Commands/CommandObjectWatchpoint.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Commands/CommandObjectWatchpointCommand.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/Address.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/AddressRange.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/AddressResolverName.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/ArchSpec.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/Broadcaster.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/Communication.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/ConnectionFileDescriptor.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/ConnectionMachPort.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/ConnectionSharedMemory.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/ConstString.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/DataBufferHeap.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/DataBufferMemoryMap.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/DataExtractor.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/Debugger.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/EmulateInstruction.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/Error.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/Event.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/IOHandler.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/Language.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/Listener.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/Log.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/Mangled.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/Module.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/ModuleList.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/Opcode.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/PluginManager.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/RegularExpression.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/Scalar.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/SearchFilter.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/Section.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/SourceManager.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/Stream.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/Value.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/ValueObject.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/ValueObjectChild.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/ValueObjectConstResult.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/ValueObjectConstResultImpl.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/ValueObjectDynamicValue.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/ValueObjectMemory.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/ValueObjectRegister.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/ValueObjectSyntheticFilter.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Core/ValueObjectVariable.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/DataFormatters/CF.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/DataFormatters/CXXFormatterFunctions.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/DataFormatters/Cocoa.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/DataFormatters/FormatManager.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/DataFormatters/LibCxx.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/DataFormatters/LibCxxList.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/DataFormatters/LibCxxMap.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/DataFormatters/LibCxxUnorderedMap.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/DataFormatters/LibStdcpp.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/DataFormatters/NSArray.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/DataFormatters/NSDictionary.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/DataFormatters/NSSet.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/DataFormatters/TypeFormat.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/DataFormatters/TypeSummary.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/DataFormatters/TypeSynthetic.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/DataFormatters/ValueObjectPrinter.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/ASTResultSynthesizer.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/ASTStructExtractor.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/ClangASTSource.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/ClangExpressionDeclMap.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/ClangExpressionParser.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/ClangExpressionVariable.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/ClangFunction.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/ClangUserExpression.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/ClangUtilityFunction.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/DWARFExpression.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/ExpressionSourceCode.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/IRDynamicChecks.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/IRExecutionUnit.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/IRForTarget.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/IRInterpreter.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/IRMemoryMap.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/Materializer.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Host/common/Condition.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Host/common/Editline.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Host/common/File.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Host/common/FileSpec.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Host/common/Host.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Host/common/Mutex.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Host/common/OptionParser.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Host/common/SocketAddress.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Host/common/Terminal.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Host/freebsd/Host.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/Args.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/CommandHistory.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/CommandInterpreter.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/CommandObject.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/CommandObjectRegexCommand.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/CommandObjectScript.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/CommandReturnObject.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupArchitecture.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupBoolean.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupFile.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupFormat.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupOutputFile.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupPlatform.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupString.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupUInt64.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupUUID.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupValueObjectDisplay.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupVariable.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupWatchpoint.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/OptionValue.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/OptionValueArch.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/OptionValueArray.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/OptionValueBoolean.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/OptionValueDictionary.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/OptionValueEnumeration.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/OptionValueFileSpec.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/OptionValueFormat.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/OptionValueProperties.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/OptionValueUUID.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/Options.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/Property.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/PythonDataObjects.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/ScriptInterpreter.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/ScriptInterpreterPython.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Interpreter/embedded_interpreter.py projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ELFHeader.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ELFHeader.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_mips64.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_mips64.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_x86.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_x86.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/ARMDefines.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/ARMUtils.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/DynamicRegisterInfo.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryThread.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryUnwind.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/InstructionUtils.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_i386.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_i386.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextDummy.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextDummy.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextHistory.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextHistory.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextMemory.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextMemory.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextThreadMemory.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextThreadMemory.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/StopInfoMachException.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/UnwindLLDB.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/ProcessElfCore.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_mips64.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_mips64.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_x86_64.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/ThreadElfCore.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/ThreadElfCore.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ThreadGDBRemote.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ThreadGDBRemote.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFAbbreviationDeclaration.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFAbbreviationDeclaration.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugArangeSet.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnames.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugRanges.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDeclContext.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/HashedNameToDIE.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/LogChannelDWARF.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.h projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/Block.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTContext.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTImporter.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangExternalASTSourceCallbacks.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangExternalASTSourceCommon.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/CompileUnit.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/DWARFCallFrameInfo.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/FuncUnwinders.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/Function.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/LineTable.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ObjectFile.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/Symbol.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/SymbolContext.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/SymbolFile.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/SymbolVendor.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/Symtab.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/Type.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/TypeList.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/UnwindPlan.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/UnwindTable.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/Variable.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/ABI.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/LanguageRuntime.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/Memory.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/ObjCLanguageRuntime.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/PathMappingList.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/Platform.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/Process.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/Queue.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/QueueItem.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/RegisterContext.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/SectionLoadHistory.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/SectionLoadList.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/StackFrame.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/StackFrameList.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/StackID.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/StopInfo.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/Target.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/TargetList.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/Thread.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/ThreadList.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/ThreadPlan.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/ThreadPlanBase.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallFunction.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallUserExpression.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/ThreadPlanRunToAddress.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/ThreadPlanShouldStopHere.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepInRange.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepInstruction.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepOut.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepOverRange.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepRange.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepUntil.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Target/ThreadPlanTracer.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Utility/ARM_DWARF_Registers.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Utility/PseudoTerminal.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Utility/SharingPtr.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Utility/StringExtractor.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Utility/StringExtractor.h projects/clang350-import/contrib/llvm/tools/lldb/source/Utility/StringExtractorGDBRemote.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Utility/StringExtractorGDBRemote.h projects/clang350-import/contrib/llvm/tools/lldb/source/Utility/TimeSpecTimeout.h projects/clang350-import/contrib/llvm/tools/lldb/source/lldb-log.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/lldb.cpp projects/clang350-import/contrib/llvm/tools/lldb/tools/driver/Driver.cpp projects/clang350-import/contrib/llvm/tools/lldb/tools/driver/Driver.h projects/clang350-import/contrib/llvm/tools/lldb/tools/driver/Platform.cpp projects/clang350-import/contrib/llvm/tools/lldb/tools/driver/Platform.h projects/clang350-import/contrib/llvm/tools/lldb/tools/lldb-platform/lldb-platform.cpp Directory Properties: projects/clang350-import/contrib/llvm/tools/lldb/ (props changed) Modified: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBBreakpoint.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBBreakpoint.h Wed Nov 26 16:23:32 2014 (r275125) +++ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBBreakpoint.h Wed Nov 26 16:48:12 2014 (r275126) @@ -117,7 +117,13 @@ public: void SetCallback (BreakpointHitCallback callback, void *baton); - + + void + SetScriptCallbackFunction (const char *callback_function_name); + + SBError + SetScriptCallbackBody (const char *script_body_text); + size_t GetNumResolvedLocations() const; Modified: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBBreakpointLocation.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBBreakpointLocation.h Wed Nov 26 16:23:32 2014 (r275125) +++ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBBreakpointLocation.h Wed Nov 26 16:48:12 2014 (r275126) @@ -59,6 +59,12 @@ public: GetCondition (); void + SetScriptCallbackFunction (const char *callback_function_name); + + SBError + SetScriptCallbackBody (const char *script_body_text); + + void SetThreadID (lldb::tid_t sb_thread_id); lldb::tid_t Modified: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBDefines.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBDefines.h Wed Nov 26 16:23:32 2014 (r275125) +++ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBDefines.h Wed Nov 26 16:48:12 2014 (r275126) @@ -21,62 +21,71 @@ #include "lldb/lldb-types.h" #include "lldb/lldb-versioning.h" -// Forward Declarations +#ifdef SWIG +#define LLDB_API +#endif +// Forward Declarations namespace lldb { -class SBAddress; -class SBBlock; -class SBBreakpoint; -class SBBreakpointLocation; -class SBBroadcaster; -class SBCommand; -class SBCommandInterpreter; -class SBCommandPluginInterface; -class SBCommandReturnObject; -class SBCommunication; -class SBCompileUnit; -class SBData; -class SBDebugger; -class SBDeclaration; -class SBError; -class SBEvent; -class SBEventList; -class SBExpressionOptions; -class SBFileSpec; -class SBFileSpecList; -class SBFrame; -class SBFunction; -class SBHostOS; -class SBInstruction; -class SBInstructionList; -class SBLineEntry; -class SBListener; -class SBModule; -class SBModuleSpec; -class SBModuleSpecList; -class SBProcess; -class SBSourceManager; -class SBStream; -class SBStringList; -class SBSymbol; -class SBSymbolContext; -class SBSymbolContextList; -class SBTarget; -class SBThread; -class SBType; -class SBTypeCategory; -class SBTypeFilter; -class SBTypeFormat; -class SBTypeNameSpecifier; -class SBTypeSummary; +class LLDB_API SBAddress; +class LLDB_API SBBlock; +class LLDB_API SBBreakpoint; +class LLDB_API SBBreakpointLocation; +class LLDB_API SBBroadcaster; +class LLDB_API SBCommand; +class LLDB_API SBCommandInterpreter; +class LLDB_API SBCommandPluginInterface; +class LLDB_API SBCommandReturnObject; +class LLDB_API SBCommunication; +class LLDB_API SBCompileUnit; +class LLDB_API SBData; +class LLDB_API SBDebugger; +class LLDB_API SBDeclaration; +class LLDB_API SBError; +class LLDB_API SBEvent; +class LLDB_API SBEventList; +class LLDB_API SBExpressionOptions; +class LLDB_API SBFileSpec; +class LLDB_API SBFileSpecList; +class LLDB_API SBFrame; +class LLDB_API SBFunction; +class LLDB_API SBHostOS; +class LLDB_API SBInstruction; +class LLDB_API SBInstructionList; +class LLDB_API SBLineEntry; +class LLDB_API SBListener; +class LLDB_API SBModule; +class LLDB_API SBModuleSpec; +class LLDB_API SBModuleSpecList; +class LLDB_API SBProcess; +class LLDB_API SBQueue; +class LLDB_API SBQueueItem; +class LLDB_API SBSection; +class LLDB_API SBSourceManager; +class LLDB_API SBStream; +class LLDB_API SBStringList; +class LLDB_API SBSymbol; +class LLDB_API SBSymbolContext; +class LLDB_API SBSymbolContextList; +class LLDB_API SBTarget; +class LLDB_API SBThread; +class LLDB_API SBType; +class LLDB_API SBTypeCategory; +class LLDB_API SBTypeEnumMember; +class LLDB_API SBTypeEnumMemberList; +class LLDB_API SBTypeFilter; +class LLDB_API SBTypeFormat; +class LLDB_API SBTypeNameSpecifier; +class LLDB_API SBTypeSummary; #ifndef LLDB_DISABLE_PYTHON -class SBTypeSynthetic; +class LLDB_API SBTypeSynthetic; #endif -class SBTypeList; -class SBValue; -class SBValueList; -class SBWatchpoint; +class LLDB_API SBTypeList; +class LLDB_API SBValue; +class LLDB_API SBValueList; +class LLDB_API SBWatchpoint; +class LLDB_API SBUnixSignals; } Modified: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBError.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBError.h Wed Nov 26 16:23:32 2014 (r275125) +++ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBError.h Wed Nov 26 16:48:12 2014 (r275126) @@ -77,6 +77,8 @@ protected: friend class SBTarget; friend class SBValue; friend class SBWatchpoint; + friend class SBBreakpoint; + friend class SBBreakpointLocation; lldb_private::Error * get(); Modified: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBExpressionOptions.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBExpressionOptions.h Wed Nov 26 16:23:32 2014 (r275125) +++ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBExpressionOptions.h Wed Nov 26 16:48:12 2014 (r275126) @@ -56,20 +56,54 @@ public: uint32_t GetTimeoutInMicroSeconds () const; + // Set the timeout for the expression, 0 means wait forever. void SetTimeoutInMicroSeconds (uint32_t timeout = 0); + uint32_t + GetOneThreadTimeoutInMicroSeconds () const; + + // Set the timeout for running on one thread, 0 means use the default behavior. + // If you set this higher than the overall timeout, you'll get an error when you + // try to run the expression. + void + SetOneThreadTimeoutInMicroSeconds (uint32_t timeout = 0); + bool GetTryAllThreads () const; void SetTryAllThreads (bool run_others = true); + + bool + GetStopOthers() const; + + void + SetStopOthers(bool stop_others = true); bool GetTrapExceptions () const; void SetTrapExceptions (bool trap_exceptions = true); + + void + SetLanguage (lldb::LanguageType language); + + void + SetCancelCallback (lldb::ExpressionCancelCallback callback, void *baton); + + bool + GetGenerateDebugInfo (); + + void + SetGenerateDebugInfo (bool b = true); + + bool + GetSuppressPersistentResult (); + + void + SetSuppressPersistentResult (bool b = false); protected: Modified: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBFileSpec.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBFileSpec.h Wed Nov 26 16:23:32 2014 (r275125) +++ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBFileSpec.h Wed Nov 26 16:48:12 2014 (r275126) @@ -21,7 +21,7 @@ public: SBFileSpec (const lldb::SBFileSpec &rhs); - SBFileSpec (const char *path);// Deprected, use SBFileSpec (const char *path, bool resolve) + SBFileSpec (const char *path);// Deprecated, use SBFileSpec (const char *path, bool resolve) SBFileSpec (const char *path, bool resolve); Modified: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBFrame.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBFrame.h Wed Nov 26 16:23:32 2014 (r275125) +++ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBFrame.h Wed Nov 26 16:48:12 2014 (r275126) @@ -75,7 +75,7 @@ public: /// Get the appropriate function name for this frame. Inlined functions in /// LLDB are represented by Blocks that have inlined function information, so /// just looking at the SBFunction or SBSymbol for a frame isn't enough. - /// This function will return the appriopriate function, symbol or inlined + /// This function will return the appropriate function, symbol or inlined /// function name for the frame. /// /// This function returns: Modified: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBHostOS.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBHostOS.h Wed Nov 26 16:23:32 2014 (r275125) +++ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBHostOS.h Wed Nov 26 16:48:12 2014 (r275126) @@ -25,12 +25,15 @@ public: static lldb::SBFileSpec GetLLDBPythonPath (); + static lldb::SBFileSpec + GetLLDBPath (lldb::PathType path_type); + static void ThreadCreated (const char *name); static lldb::thread_t ThreadCreate (const char *name, - thread_func_t thread_function, + lldb::thread_func_t thread_function, void *thread_arg, lldb::SBError *err); @@ -43,7 +46,7 @@ public: lldb::SBError *err); static bool ThreadJoin (lldb::thread_t thread, - thread_result_t *result, + lldb::thread_result_t *result, lldb::SBError *err); Modified: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBListener.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBListener.h Wed Nov 26 16:23:32 2014 (r275125) +++ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBListener.h Wed Nov 26 16:48:12 2014 (r275126) @@ -55,7 +55,7 @@ public: StopListeningForEvents (const lldb::SBBroadcaster& broadcaster, uint32_t event_mask); - // Returns true if an event was recieved, false if we timed out. + // Returns true if an event was received, false if we timed out. bool WaitForEvent (uint32_t num_seconds, lldb::SBEvent &event); Modified: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBProcess.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBProcess.h Wed Nov 26 16:23:32 2014 (r275125) +++ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBProcess.h Wed Nov 26 16:48:12 2014 (r275126) @@ -221,6 +221,9 @@ public: lldb::SBError Signal (int signal); + lldb::SBUnixSignals + GetUnixSignals(); + void SendAsyncInterrupt(); @@ -279,6 +282,9 @@ public: lldb::SBError UnloadImage (uint32_t image_token); + lldb::SBError + SendEventData (const char *data); + //------------------------------------------------------------------ /// Return the number of different thread-origin extended backtraces /// this process can support. Modified: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBQueue.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBQueue.h Wed Nov 26 16:23:32 2014 (r275125) +++ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBQueue.h Wed Nov 26 16:48:12 2014 (r275126) @@ -14,7 +14,6 @@ #include "lldb/lldb-forward.h" #include "lldb/API/SBDefines.h" -#include "lldb/API/SBQueueItem.h" namespace lldb { @@ -62,8 +61,15 @@ public: lldb::SBQueueItem GetPendingItemAtIndex (uint32_t); + uint32_t + GetNumRunningItems (); + + lldb::QueueKind + GetKind (); + protected: friend class SBProcess; + friend class SBThread; void SetQueue (const lldb::QueueSP& queue_sp); Modified: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBQueueItem.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBQueueItem.h Wed Nov 26 16:23:32 2014 (r275125) +++ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBQueueItem.h Wed Nov 26 16:48:12 2014 (r275126) @@ -12,7 +12,6 @@ #include "lldb/API/SBDefines.h" #include "lldb/API/SBAddress.h" -#include "lldb/API/SBThread.h" namespace lldb { Modified: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBStream.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBStream.h Wed Nov 26 16:23:32 2014 (r275125) +++ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBStream.h Wed Nov 26 16:48:12 2014 (r275126) @@ -51,7 +51,7 @@ public: RedirectToFileDescriptor (int fd, bool transfer_fh_ownership); // If the stream is redirected to a file, forget about the file and if - // ownership of the file was transfered to this object, close the file. + // ownership of the file was transferred to this object, close the file. // If the stream is backed by a local cache, clear this cache. void Clear (); @@ -86,6 +86,7 @@ protected: friend class SBTarget; friend class SBThread; friend class SBType; + friend class SBTypeEnumMember; friend class SBTypeMember; friend class SBValue; friend class SBWatchpoint; Modified: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBTarget.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBTarget.h Wed Nov 26 16:23:32 2014 (r275125) +++ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBTarget.h Wed Nov 26 16:48:12 2014 (r275126) @@ -47,6 +47,35 @@ public: void SetGroupID (uint32_t gid); + SBFileSpec + GetExecutableFile (); + + //---------------------------------------------------------------------- + /// Set the executable file that will be used to launch the process and + /// optionally set it as the first argument in the argument vector. + /// + /// This only needs to be specified if clients wish to carefully control + /// the exact path will be used to launch a binary. If you create a + /// target with a symlink, that symlink will get resolved in the target + /// and the resolved path will get used to launch the process. Calling + /// this function can help you still launch your process using the + /// path of your choice. + /// + /// If this function is not called prior to launching with + /// SBTarget::Launch(...), the target will use the resolved executable + /// path that was used to create the target. + /// + /// @param[in] exe_file + /// The override path to use when launching the executable. + /// + /// @param[in] add_as_first_arg + /// If true, then the path will be inserted into the argument vector + /// prior to launching. Otherwise the argument vector will be left + /// alone. + //---------------------------------------------------------------------- + void + SetExecutableFile (SBFileSpec exe_file, bool add_as_first_arg); + uint32_t GetNumArguments (); @@ -110,6 +139,18 @@ public: bool AddSuppressFileAction (int fd, bool read, bool write); + void + SetLaunchEventData (const char *data); + + const char * + GetLaunchEventData () const; + + bool + GetDetachOnError() const; + + void + SetDetachOnError(bool enable); + protected: friend class SBTarget; @@ -331,7 +372,7 @@ public: /// Some launch options specified by logical OR'ing /// lldb::LaunchFlags enumeration values together. /// - /// @param[in] stop_at_endtry + /// @param[in] stop_at_entry /// If false do not stop the inferior at the entry point. /// /// @param[out] @@ -580,7 +621,7 @@ public: //------------------------------------------------------------------ - /// The the section base load addresses for all sections in a module. + /// Clear the section base load addresses for all sections in a module. /// /// @param[in] module /// The module to unload. Modified: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBThread.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBThread.h Wed Nov 26 16:23:32 2014 (r275125) +++ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBThread.h Wed Nov 26 16:48:12 2014 (r275126) @@ -41,6 +41,9 @@ public: ~SBThread(); + lldb::SBQueue + GetQueue () const; + bool IsValid() const; @@ -97,6 +100,9 @@ public: lldb::queue_id_t GetQueueID() const; + bool + GetInfoItemByPathAsString ( const char *path, SBStream &strm); + void StepOver (lldb::RunMode stop_other_threads = lldb::eOnlyDuringStepping); @@ -136,8 +142,8 @@ public: /// the other threads in a process are allowed to run. So when /// SBProcess::Continue() is called, any threads that aren't suspended will /// be allowed to run. If any of the SBThread functions for stepping are - /// called (StepOver, StepInto, StepOut, StepInstruction, RunToAddres), the - /// thread will not be allowed to run and these funtions will simply return. + /// called (StepOver, StepInto, StepOut, StepInstruction, RunToAddress), the + /// thread will not be allowed to run and these functions will simply return. /// /// Eventually we plan to add support for thread centric debugging where /// each thread is controlled individually and each thread would broadcast @@ -207,6 +213,9 @@ public: uint32_t GetExtendedBacktraceOriginatingIndexID (); + bool + SafeToCallFunctions (); + protected: friend class SBBreakpoint; friend class SBBreakpointLocation; Modified: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBType.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBType.h Wed Nov 26 16:23:32 2014 (r275125) +++ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBType.h Wed Nov 26 16:48:12 2014 (r275126) @@ -143,6 +143,9 @@ public: lldb::SBTypeMember GetVirtualBaseClassAtIndex (uint32_t idx); + lldb::SBTypeEnumMemberList + GetEnumMembers(); + uint32_t GetNumberOfTemplateArguments (); @@ -161,6 +164,9 @@ public: const char* GetName(); + const char * + GetDisplayTypeName (); + lldb::TypeClass GetTypeClass (); @@ -199,6 +205,8 @@ protected: friend class SBFunction; friend class SBModule; friend class SBTarget; + friend class SBTypeEnumMember; + friend class SBTypeEnumMemberList; friend class SBTypeNameSpecifier; friend class SBTypeMember; friend class SBTypeList; Copied: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBTypeEnumMember.h (from r275125, vendor/lldb/dist/include/lldb/API/SBTypeEnumMember.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBTypeEnumMember.h Wed Nov 26 16:48:12 2014 (r275126, copy of r275125, vendor/lldb/dist/include/lldb/API/SBTypeEnumMember.h) @@ -0,0 +1,98 @@ + +//===-- SBTypeEnumMember.h --------------------------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#ifndef LLDB_SBTypeEnumMember_h_ +#define LLDB_SBTypeEnumMember_h_ + +#include "lldb/API/SBDefines.h" + +namespace lldb { + +class SBTypeEnumMember +{ +public: + SBTypeEnumMember (); + + SBTypeEnumMember (const SBTypeEnumMember& rhs); + + ~SBTypeEnumMember(); + + SBTypeEnumMember& + operator = (const SBTypeEnumMember& rhs); + + bool + IsValid() const; + + int64_t + GetValueAsSigned(); + + uint64_t + GetValueAsUnsigned(); + + const char * + GetName (); + + lldb::SBType + GetType (); + + bool + GetDescription (lldb::SBStream &description, + lldb::DescriptionLevel description_level); + +protected: + friend class SBType; + friend class SBTypeEnumMemberList; + + void + reset (lldb_private::TypeEnumMemberImpl *); + + lldb_private::TypeEnumMemberImpl & + ref (); + + const lldb_private::TypeEnumMemberImpl & + ref () const; + + lldb::TypeEnumMemberImplSP m_opaque_sp; + + SBTypeEnumMember (const lldb::TypeEnumMemberImplSP &); +}; + +class SBTypeEnumMemberList +{ +public: + SBTypeEnumMemberList(); + + SBTypeEnumMemberList(const SBTypeEnumMemberList& rhs); + + ~SBTypeEnumMemberList(); + + SBTypeEnumMemberList& + operator = (const SBTypeEnumMemberList& rhs); + + bool + IsValid(); + + void + Append (SBTypeEnumMember entry); + + SBTypeEnumMember + GetTypeEnumMemberAtIndex (uint32_t index); + + uint32_t + GetSize(); + + +private: + std::unique_ptr m_opaque_ap; +}; + +} // namespace lldb + +#endif // LLDB_SBTypeEnumMember_h_ Copied: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBUnixSignals.h (from r275125, vendor/lldb/dist/include/lldb/API/SBUnixSignals.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBUnixSignals.h Wed Nov 26 16:48:12 2014 (r275126, copy of r275125, vendor/lldb/dist/include/lldb/API/SBUnixSignals.h) @@ -0,0 +1,84 @@ +//===-- SBUnixSignals.h -----------------------------------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#ifndef LLDB_SBUnixSignals_h_ +#define LLDB_SBUnixSignals_h_ + +#include "lldb/API/SBDefines.h" + +namespace lldb { + +class SBUnixSignals { +public: + SBUnixSignals (); + + SBUnixSignals (const lldb::SBUnixSignals &rhs); + + ~SBUnixSignals(); + + const SBUnixSignals & + operator =(const lldb::SBUnixSignals &rhs); + + void + Clear (); + + bool + IsValid () const; + + const char * + GetSignalAsCString (int32_t signo) const; + + int32_t + GetSignalNumberFromName (const char *name) const; + + bool + GetShouldSuppress (int32_t signo) const; + + bool + SetShouldSuppress (int32_t signo, + bool value); + + bool + GetShouldStop (int32_t signo) const; + + bool + SetShouldStop (int32_t signo, + bool value); + + bool + GetShouldNotify (int32_t signo) const; + + bool + SetShouldNotify (int32_t signo, bool value); + + int32_t + GetNumSignals () const; + + int32_t + GetSignalAtIndex (int32_t index) const; + +protected: + friend class SBProcess; + + SBUnixSignals (lldb::ProcessSP &process_sp); + + lldb::ProcessSP + GetSP() const; + + void + SetSP (const lldb::ProcessSP &process_sp); + +private: + lldb::ProcessWP m_opaque_wp; +}; + + +} // namespace lldb + +#endif // LLDB_SBUnixSignals_h_ Modified: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBValue.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBValue.h Wed Nov 26 16:23:32 2014 (r275125) +++ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/API/SBValue.h Wed Nov 26 16:48:12 2014 (r275126) @@ -50,6 +50,9 @@ public: const char * GetTypeName (); + + const char * + GetDisplayTypeName (); size_t GetByteSize (); @@ -173,7 +176,7 @@ public: //------------------------------------------------------------------ /// Get a child value by index from a value. /// - /// Structs, unions, classes, arrays and and pointers have child + /// Structs, unions, classes, arrays and pointers have child /// values that can be access by index. /// /// Structs and unions access child members using a zero based index @@ -208,7 +211,7 @@ public: /// The index of the child value to get /// /// @param[in] use_dynamic - /// An enumeration that specifies wether to get dynamic values, + /// An enumeration that specifies whether to get dynamic values, /// and also if the target can be run to figure out the dynamic /// type of the child value. /// Modified: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Breakpoint/Breakpoint.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Breakpoint/Breakpoint.h Wed Nov 26 16:23:32 2014 (r275125) +++ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Breakpoint/Breakpoint.h Wed Nov 26 16:48:12 2014 (r275126) @@ -431,7 +431,7 @@ public: /// @param[in] is_synchronous /// If \b true the callback will be run on the private event thread /// before the stop event gets reported. If false, the callback will get - /// handled on the public event thead after the stop has been posted. + /// handled on the public event thread after the stop has been posted. /// /// @return /// \b true if the process should stop when you hit the breakpoint. Modified: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointLocationList.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointLocationList.h Wed Nov 26 16:23:32 2014 (r275125) +++ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointLocationList.h Wed Nov 26 16:48:12 2014 (r275126) @@ -143,7 +143,7 @@ public: ClearAllBreakpointSites (); //------------------------------------------------------------------ - /// Tells all the breakopint locations in this list to attempt to + /// Tells all the breakpoint locations in this list to attempt to /// resolve any possible breakpoint sites. //------------------------------------------------------------------ void Modified: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointOptions.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointOptions.h Wed Nov 26 16:23:32 2014 (r275125) +++ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointOptions.h Wed Nov 26 16:48:12 2014 (r275126) @@ -145,7 +145,8 @@ public: /// @return /// The synchronicity of our callback. //------------------------------------------------------------------ - bool IsCallbackSynchronous () { + bool IsCallbackSynchronous () const + { return m_callback_is_synchronous; } @@ -280,7 +281,7 @@ public: /// Returns true if the breakpoint option has a callback set. //------------------------------------------------------------------ bool - HasCallback(); + HasCallback() const; //------------------------------------------------------------------ /// This is the default empty callback. Modified: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointSite.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointSite.h Wed Nov 26 16:23:32 2014 (r275125) +++ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointSite.h Wed Nov 26 16:48:12 2014 (r275126) @@ -19,6 +19,7 @@ // Project includes #include "lldb/lldb-private.h" +#include "lldb/Host/Mutex.h" #include "lldb/Core/UserID.h" #include "lldb/Breakpoint/StoppointLocation.h" #include "lldb/Breakpoint/BreakpointLocationCollection.h" @@ -33,7 +34,7 @@ namespace lldb_private { /// The BreakpointSite class handles the physical breakpoint that is /// actually inserted in the target program. As such, it is also the /// one that gets hit, when the program stops. It keeps a list of all -/// BreakpointLocations that share this phsyical site. When the +/// BreakpointLocations that share this physical site. When the /// breakpoint is hit, all the locations are informed by the breakpoint /// site. Breakpoint sites are owned by the process. //---------------------------------------------------------------------- @@ -50,7 +51,7 @@ public: // and m_trap_opcode contain the saved and written opcode. eHardware, // Breakpoint site is set as a hardware breakpoint eExternal // Breakpoint site is managed by an external debug nub or - // debug interface where memory reads trasparently will not + // debug interface where memory reads transparently will not // display any breakpoint opcodes. }; @@ -123,7 +124,7 @@ public: /// Sets whether the current breakpoint site is enabled or not /// /// @param[in] enabled - /// \b true if the breakoint is enabled, \b false otherwise. + /// \b true if the breakpoint is enabled, \b false otherwise. //------------------------------------------------------------------ void SetEnabled (bool enabled); @@ -172,7 +173,7 @@ public: GetNumberOfOwners (); //------------------------------------------------------------------ - /// This method returns the the breakpoint location at index \a index + /// This method returns the breakpoint location at index \a index /// located at this breakpoint site. The owners are listed ordinally /// from 0 to GetNumberOfOwners() - 1 so you can use this method to iterate /// over the owners @@ -257,6 +258,7 @@ public: private: friend class Process; + friend class BreakpointLocation; //------------------------------------------------------------------ /// The method removes the owner at \a break_loc_id from this breakpoint list. @@ -276,6 +278,7 @@ private: // Consider adding an optimization where if there is only one // owner, we don't store a list. The usual case will be only one owner... BreakpointLocationCollection m_owners; ///< This has the BreakpointLocations that share this breakpoint site. + Mutex m_owners_mutex; ///< This mutex protects the owners collection. static lldb::break_id_t GetNextID(); Modified: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Breakpoint/Watchpoint.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Breakpoint/Watchpoint.h Wed Nov 26 16:23:32 2014 (r275125) +++ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Breakpoint/Watchpoint.h Wed Nov 26 16:48:12 2014 (r275126) @@ -134,7 +134,7 @@ public: /// @param[in] is_synchronous /// If \b true the callback will be run on the private event thread /// before the stop event gets reported. If false, the callback will get - /// handled on the public event thead after the stop has been posted. + /// handled on the public event thread after the stop has been posted. /// /// @return /// \b true if the process should stop when you hit the watchpoint. @@ -215,7 +215,7 @@ private: // undergoing a pair of temporary disable/enable actions to avoid recursively // triggering further watchpoint events. uint32_t m_disabled_count; // Keep track of the count that the watchpoint is disabled while in ephemeral mode. - // At the end of the ephemeral mode when the watchpoint is to be enabled agian, + // At the end of the ephemeral mode when the watchpoint is to be enabled again, // we check the count, if it is more than 1, it means the user-supplied actions // actually want the watchpoint to be disabled! uint32_t m_watch_read:1, // 1 if we stop when the watched data is read from Modified: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/Address.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/Address.h Wed Nov 26 16:23:32 2014 (r275125) +++ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/Address.h Wed Nov 26 16:48:12 2014 (r275126) @@ -230,7 +230,7 @@ public: /// offset based address, and \a style lets the user choose. /// /// @param[in] s - /// The stream to which to dump the object descripton. + /// The stream to which to dump the object description. /// /// @param[in] style /// The display style for the address. @@ -310,7 +310,7 @@ public: /// /// This function will first resolve its address to a load address. /// Then, if the address turns out to be in code address, return the - /// load address for a an opcode. This address object might have + /// load address for an opcode. This address object might have /// extra bits set (bit zero will be set to Thumb functions for an /// ARM target) that are required for changing the program counter /// and this function will remove any bits that are intended for @@ -362,7 +362,7 @@ public: /// offset (for absolute addresses that have no section). /// /// @return - /// Returns \b true if the the offset is valid, \b false + /// Returns \b true if the offset is valid, \b false /// otherwise. //------------------------------------------------------------------ bool Modified: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/AddressRange.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/AddressRange.h Wed Nov 26 16:23:32 2014 (r275125) +++ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/AddressRange.h Wed Nov 26 16:48:12 2014 (r275126) @@ -189,7 +189,7 @@ public: /// how the base address gets displayed. /// /// @param[in] s - /// The stream to which to dump the object descripton. + /// The stream to which to dump the object description. /// /// @param[in] style /// The display style for the address. @@ -215,7 +215,7 @@ public: /// and pointer values, reference counts, etc. /// /// @param[in] s - /// The stream to which to dump the object descripton. + /// The stream to which to dump the object description. //------------------------------------------------------------------ void DumpDebug (Stream *s) const; Modified: projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/ArchSpec.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/ArchSpec.h Wed Nov 26 16:23:32 2014 (r275125) +++ projects/clang350-import/contrib/llvm/tools/lldb/include/lldb/Core/ArchSpec.h Wed Nov 26 16:48:12 2014 (r275126) @@ -50,6 +50,7 @@ public: eCore_arm_armv7m, eCore_arm_armv7em, eCore_arm_xscale, + eCore_thumb, eCore_thumbv4t, eCore_thumbv5, @@ -57,11 +58,14 @@ public: eCore_thumbv6, eCore_thumbv6m, eCore_thumbv7, - eCore_thumbv7f, eCore_thumbv7s, eCore_thumbv7k, + eCore_thumbv7f, eCore_thumbv7m, eCore_thumbv7em, + eCore_arm_arm64, + eCore_arm_armv8, + eCore_arm_aarch64, eCore_mips64, @@ -89,6 +93,7 @@ public: eCore_x86_32_i386, eCore_x86_32_i486, eCore_x86_32_i486sx, + eCore_x86_32_i686, eCore_x86_64_x86_64, eCore_x86_64_x86_64h, // Haswell enabled x86_64 @@ -98,6 +103,12 @@ public: eCore_uknownMach32, eCore_uknownMach64, + + eCore_kalimba, + eCore_kalimba3, + eCore_kalimba4, + eCore_kalimba5, + kNumCores, kCore_invalid, @@ -107,6 +118,7 @@ public: kCore_ppc_any, kCore_ppc64_any, kCore_x86_32_any, + kCore_x86_64_any, kCore_hexagon_any, kCore_arm_first = eCore_arm_generic, @@ -122,10 +134,16 @@ public: kCore_ppc64_last = eCore_ppc64_ppc970_64, kCore_x86_32_first = eCore_x86_32_i386, - kCore_x86_32_last = eCore_x86_32_i486sx, + kCore_x86_32_last = eCore_x86_32_i686, + + kCore_x86_64_first = eCore_x86_64_x86_64, + kCore_x86_64_last = eCore_x86_64_x86_64h, kCore_hexagon_first = eCore_hexagon_generic, - kCore_hexagon_last = eCore_hexagon_hexagonv5 + kCore_hexagon_last = eCore_hexagon_hexagonv5, + + kCore_kalimba_first = eCore_kalimba, + kCore_kalimba_last = eCore_kalimba5 }; //------------------------------------------------------------------ @@ -228,7 +246,7 @@ public: /// /// This will be something like "ubuntu", "fedora", etc. on Linux. /// This should be the same value returned by - /// Host::GetDistributionId (). + /// HostInfo::GetDistributionId (). ///------------------------------------------------------------------ void SetDistributionId (const char* distribution_id); @@ -302,7 +320,7 @@ public: /// /// @param[in] cpu The required CPU type. /// - /// @return True if the object and CPU type were sucessfully set. + /// @return True if the object and CPU type were successfully set. //------------------------------------------------------------------ bool SetArchitecture (ArchitectureType arch_type, @@ -351,6 +369,24 @@ public: GetMachOCPUSubType () const; //------------------------------------------------------------------ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 17:09:59 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A1FA285B; Wed, 26 Nov 2014 17:09:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8E0BD3A7; Wed, 26 Nov 2014 17:09:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQH9xHo054864; Wed, 26 Nov 2014 17:09:59 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQH9wAG054855; Wed, 26 Nov 2014 17:09:58 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201411261709.sAQH9wAG054855@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 26 Nov 2014 17:09:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275127 - in projects/clang350-import/contrib/llvm/tools/lldb/source: Expression Symbol X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 17:09:59 -0000 Author: emaste Date: Wed Nov 26 17:09:58 2014 New Revision: 275127 URL: https://svnweb.freebsd.org/changeset/base/275127 Log: Revert LLDB changes for Clang/LLVM 3.5 API compatibility This reverts the following upstream revisions: SVN git 214501 26d6f063 215969 a083c0db 216603 ee9cd340 216810 f534f503 Sponsored by: DARPA, AFRL Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/ClangExpressionParser.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/IRExecutionUnit.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTContext.cpp Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/ClangExpressionParser.cpp ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/ClangExpressionParser.cpp Wed Nov 26 16:48:12 2014 (r275126) +++ projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/ClangExpressionParser.cpp Wed Nov 26 17:09:58 2014 (r275127) @@ -333,8 +333,8 @@ ClangExpressionParser::Parse (Stream &st if (!created_main_file) { - std::unique_ptr memory_buffer = MemoryBuffer::getMemBufferCopy(expr_text, __FUNCTION__); - SourceMgr.setMainFileID(SourceMgr.createFileID(std::move(memory_buffer))); + MemoryBuffer *memory_buffer = MemoryBuffer::getMemBufferCopy(expr_text, __FUNCTION__); + SourceMgr.setMainFileID(SourceMgr.createFileID(memory_buffer)); } diag_buf->BeginSourceFile(m_compiler->getLangOpts(), &m_compiler->getPreprocessor()); Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/IRExecutionUnit.cpp ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/IRExecutionUnit.cpp Wed Nov 26 16:48:12 2014 (r275126) +++ projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/IRExecutionUnit.cpp Wed Nov 26 17:09:58 2014 (r275127) @@ -295,7 +295,7 @@ IRExecutionUnit::GetRunnableInfo(Error & m_module_ap->getContext().setInlineAsmDiagnosticHandler(ReportInlineAsmError, &error); - llvm::EngineBuilder builder(std::move(m_module_ap)); + llvm::EngineBuilder builder(m_module_ap.get()); builder.setEngineKind(llvm::EngineKind::JIT) .setErrorStr(&error_string) @@ -326,6 +326,10 @@ IRExecutionUnit::GetRunnableInfo(Error & error.SetErrorStringWithFormat("Couldn't JIT the function: %s", error_string.c_str()); return; } + else + { + m_module_ap.release(); // ownership was transferred + } // Make sure we see all sections, including ones that don't have relocations... m_execution_engine_ap->setProcessAllSections(true); Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTContext.cpp ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTContext.cpp Wed Nov 26 16:48:12 2014 (r275126) +++ projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTContext.cpp Wed Nov 26 17:09:58 2014 (r275127) @@ -1778,10 +1778,12 @@ ClangASTContext::CreateFunctionType (AST // TODO: Detect calling convention in DWARF? FunctionProtoType::ExtProtoInfo proto_info; proto_info.Variadic = is_variadic; - proto_info.ExceptionSpec = EST_None; + proto_info.ExceptionSpecType = EST_None; proto_info.TypeQuals = type_quals; proto_info.RefQualifier = RQ_None; - + proto_info.NumExceptions = 0; + proto_info.Exceptions = nullptr; + return ClangASTType (ast, ast->getFunctionType (result_type.GetQualType(), qual_type_args, proto_info).getAsOpaquePtr()); From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 17:22:38 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A1231C08; Wed, 26 Nov 2014 17:22:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8DB577B8; Wed, 26 Nov 2014 17:22:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQHMcvL063254; Wed, 26 Nov 2014 17:22:38 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQHMcj4063253; Wed, 26 Nov 2014 17:22:38 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201411261722.sAQHMcj4063253@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 26 Nov 2014 17:22:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275128 - projects/clang350-import/contrib/llvm/tools/lldb/source/DataFormatters X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 17:22:38 -0000 Author: emaste Date: Wed Nov 26 17:22:37 2014 New Revision: 275128 URL: https://svnweb.freebsd.org/changeset/base/275128 Log: Avoid need for AppleObjCRuntime on FreeBSD Since it is unlikely to provide much value to us, just #if 0 it away Sponsored by: DARPA, AFRL Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/DataFormatters/NSArray.cpp Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/DataFormatters/NSArray.cpp ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/source/DataFormatters/NSArray.cpp Wed Nov 26 17:09:58 2014 (r275127) +++ projects/clang350-import/contrib/llvm/tools/lldb/source/DataFormatters/NSArray.cpp Wed Nov 26 17:22:37 2014 (r275128) @@ -611,6 +611,8 @@ lldb_private::formatters::NSArrayISynthe SyntheticChildrenFrontEnd* lldb_private::formatters::NSArraySyntheticFrontEndCreator (CXXSyntheticChildren*, lldb::ValueObjectSP valobj_sp) { + return nullptr; // Avoid need for AppleObjCRuntime on FreeBSD +#if 0 if (!valobj_sp) return nullptr; @@ -657,6 +659,7 @@ SyntheticChildrenFrontEnd* lldb_private: { return (new NSArrayCodeRunningSyntheticFrontEnd(valobj_sp)); } +#endif } lldb_private::formatters::NSArrayCodeRunningSyntheticFrontEnd::NSArrayCodeRunningSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp) : From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 17:24:13 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 28E71D03; Wed, 26 Nov 2014 17:24:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 15EE97C6; Wed, 26 Nov 2014 17:24:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQHOCMu063486; Wed, 26 Nov 2014 17:24:12 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQHOCiM063485; Wed, 26 Nov 2014 17:24:12 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201411261724.sAQHOCiM063485@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 26 Nov 2014 17:24:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275129 - projects/clang350-import/contrib/llvm/tools/lldb/source/Host/posix X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 17:24:13 -0000 Author: emaste Date: Wed Nov 26 17:24:12 2014 New Revision: 275129 URL: https://svnweb.freebsd.org/changeset/base/275129 Log: There is no Python in the FreeBSD base system Replaced: projects/clang350-import/contrib/llvm/tools/lldb/source/Host/posix/ - copied from r275075, vendor/lldb/dist/source/Host/posix/ Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/Host/posix/HostInfoPosix.cpp Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/Host/posix/HostInfoPosix.cpp ============================================================================== --- vendor/lldb/dist/source/Host/posix/HostInfoPosix.cpp Tue Nov 25 21:08:31 2014 (r275075) +++ projects/clang350-import/contrib/llvm/tools/lldb/source/Host/posix/HostInfoPosix.cpp Wed Nov 26 17:24:12 2014 (r275129) @@ -173,6 +173,8 @@ HostInfoPosix::ComputeHeaderDirectory(Fi bool HostInfoPosix::ComputePythonDirectory(FileSpec &file_spec) { + return false; // No Python in FreeBSD base system +#if 0 FileSpec lldb_file_spec; if (!GetLLDBPath(lldb::ePathTypeLLDBShlibDir, lldb_file_spec)) return false; @@ -190,4 +192,5 @@ HostInfoPosix::ComputePythonDirectory(Fi file_spec.GetDirectory().SetCString(raw_path); return true; +#endif } From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 17:29:02 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D2531D4; Wed, 26 Nov 2014 17:29:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A4D08818; Wed, 26 Nov 2014 17:29:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQHT2XZ064093; Wed, 26 Nov 2014 17:29:02 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQHT2Ev064088; Wed, 26 Nov 2014 17:29:02 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201411261729.sAQHT2Ev064088@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 26 Nov 2014 17:29:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275130 - in projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process: POSIX Utility X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 17:29:02 -0000 Author: emaste Date: Wed Nov 26 17:29:01 2014 New Revision: 275130 URL: https://svnweb.freebsd.org/changeset/base/275130 Log: Update paths for FreeBSD build infrastructure This same change was applied upstream in a later verison. Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.h projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64.h Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.h Wed Nov 26 17:24:12 2014 (r275129) +++ projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.h Wed Nov 26 17:29:01 2014 (r275130) @@ -17,7 +17,7 @@ // Other libraries and framework includes #include "lldb/Target/Thread.h" -#include "RegisterContextPOSIX.h" +#include "Plugins/Process/Utility/RegisterContextPOSIX.h" class ProcessMessage; class ProcessMonitor; Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64.h ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64.h Wed Nov 26 17:24:12 2014 (r275129) +++ projects/clang350-import/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64.h Wed Nov 26 17:29:01 2014 (r275130) @@ -15,8 +15,8 @@ #include "lldb/lldb-defines.h" #include "lldb/lldb-enumerations.h" -#include "ARM64_GCC_Registers.h" -#include "ARM64_DWARF_Registers.h" +#include "Utility/ARM64_GCC_Registers.h" +#include "Utility/ARM64_DWARF_Registers.h" #ifndef GPR_OFFSET #error GPR_OFFSET must be defined before including this header file From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 17:32:21 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 299AE231; Wed, 26 Nov 2014 17:32:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F0CA58EB; Wed, 26 Nov 2014 17:32:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQHWKP2068027; Wed, 26 Nov 2014 17:32:20 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQHWKxM068026; Wed, 26 Nov 2014 17:32:20 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201411261732.sAQHWKxM068026@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 26 Nov 2014 17:32:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275131 - projects/clang350-import/contrib/llvm/tools/lldb/source X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 17:32:21 -0000 Author: emaste Date: Wed Nov 26 17:32:20 2014 New Revision: 275131 URL: https://svnweb.freebsd.org/changeset/base/275131 Log: Remove LLDB platform support not currently of interest to us Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/lldb.cpp Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/lldb.cpp ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/source/lldb.cpp Wed Nov 26 17:29:01 2014 (r275130) +++ projects/clang350-import/contrib/llvm/tools/lldb/source/lldb.cpp Wed Nov 26 17:32:20 2014 (r275131) @@ -27,7 +27,6 @@ #include "llvm/ADT/StringRef.h" #include "llvm/Support/TargetSelect.h" -#include "Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.h" #include "Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h" #include "Plugins/Disassembler/llvm/DisassemblerLLVMC.h" #include "Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h" @@ -37,14 +36,9 @@ #include "Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h" #include "Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h" #include "Plugins/ObjectFile/ELF/ObjectFileELF.h" -#include "Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h" #include "Plugins/Platform/FreeBSD/PlatformFreeBSD.h" -#include "Plugins/Platform/Linux/PlatformLinux.h" #include "Plugins/Platform/POSIX/PlatformPOSIX.h" -#include "Plugins/Platform/Windows/PlatformWindows.h" -#include "Plugins/Platform/Kalimba/PlatformKalimba.h" #include "Plugins/Process/elf-core/ProcessElfCore.h" -#include "Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.h" #include "Plugins/SymbolVendor/ELF/SymbolVendorELF.h" #include "Plugins/SymbolFile/DWARF/SymbolFileDWARF.h" #include "Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h" @@ -121,7 +115,6 @@ lldb_private::Initialize () llvm::install_fatal_error_handler(fatal_error_handler, 0); // Initialize plug-ins - ABIMacOSX_arm64::Initialize(); ABISysV_x86_64::Initialize(); DisassemblerLLVMC::Initialize(); ObjectContainerBSDArchive::Initialize(); @@ -205,7 +198,6 @@ lldb_private::Terminate () // Terminate and unload and loaded system or user LLDB plug-ins PluginManager::Terminate(); - ABIMacOSX_arm64::Terminate(); ABISysV_x86_64::Terminate(); DisassemblerLLVMC::Terminate(); ObjectContainerBSDArchive::Terminate(); From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 17:40:10 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 74C31438; Wed, 26 Nov 2014 17:40:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5F813950; Wed, 26 Nov 2014 17:40:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQHeAL6069072; Wed, 26 Nov 2014 17:40:10 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQHe4Xa069042; Wed, 26 Nov 2014 17:40:04 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201411261740.sAQHe4Xa069042@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 26 Nov 2014 17:40:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275132 - in projects/clang350-import: lib/clang lib/clang/liblldb lib/clang/liblldbAPI lib/clang/liblldbBreakpoint lib/clang/liblldbCommands lib/clang/liblldbCore lib/clang/liblldbData... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 17:40:10 -0000 Author: emaste Date: Wed Nov 26 17:40:03 2014 New Revision: 275132 URL: https://svnweb.freebsd.org/changeset/base/275132 Log: Update build for LLDB snapshot at upstream rev 216948 Sponsored by: DARPA, AFRL Added: projects/clang350-import/lib/clang/liblldbHostPOSIX/ projects/clang350-import/lib/clang/liblldbHostPOSIX/Makefile (contents, props changed) projects/clang350-import/lib/clang/liblldbPluginInstructionARM64/ projects/clang350-import/lib/clang/liblldbPluginInstructionARM64/Makefile (contents, props changed) projects/clang350-import/lib/clang/liblldbPluginJITLoaderGDB/ projects/clang350-import/lib/clang/liblldbPluginJITLoaderGDB/Makefile (contents, props changed) projects/clang350-import/lib/clang/liblldbPluginObjectFileJIT/ projects/clang350-import/lib/clang/liblldbPluginObjectFileJIT/Makefile (contents, props changed) Modified: projects/clang350-import/lib/clang/Makefile projects/clang350-import/lib/clang/liblldb/Makefile projects/clang350-import/lib/clang/liblldbAPI/Makefile projects/clang350-import/lib/clang/liblldbBreakpoint/Makefile projects/clang350-import/lib/clang/liblldbCommands/Makefile projects/clang350-import/lib/clang/liblldbCore/Makefile projects/clang350-import/lib/clang/liblldbDataFormatters/Makefile projects/clang350-import/lib/clang/liblldbHostCommon/Makefile projects/clang350-import/lib/clang/liblldbHostFreeBSD/Makefile projects/clang350-import/lib/clang/liblldbInterpreter/Makefile projects/clang350-import/lib/clang/liblldbPluginPlatformFreeBSD/Makefile projects/clang350-import/lib/clang/liblldbPluginPlatformGDB/Makefile projects/clang350-import/lib/clang/liblldbPluginProcessGDBRemote/Makefile projects/clang350-import/lib/clang/liblldbPluginProcessPOSIX/Makefile projects/clang350-import/lib/clang/liblldbPluginProcessUtility/Makefile projects/clang350-import/lib/clang/liblldbPluginSymbolFileDWARF/Makefile projects/clang350-import/lib/clang/liblldbTarget/Makefile projects/clang350-import/lib/clang/liblldbUtility/Makefile projects/clang350-import/usr.bin/clang/lldb/Makefile Modified: projects/clang350-import/lib/clang/Makefile ============================================================================== --- projects/clang350-import/lib/clang/Makefile Wed Nov 26 17:32:20 2014 (r275131) +++ projects/clang350-import/lib/clang/Makefile Wed Nov 26 17:40:03 2014 (r275132) @@ -112,6 +112,7 @@ SUBDIR+=liblldb \ liblldbExpression \ liblldbHostCommon \ liblldbHostFreeBSD \ + liblldbHostPOSIX \ liblldbInterpreter \ liblldbSymbol \ liblldbTarget \ @@ -123,8 +124,11 @@ SUBDIR+=liblldb \ liblldbPluginDynamicLoaderStatic \ liblldbPluginDynamicLoaderPosixDYLD \ liblldbPluginInstructionARM \ + liblldbPluginInstructionARM64 \ + liblldbPluginJITLoaderGDB \ liblldbPluginObjectContainerBSDArchive \ liblldbPluginObjectFileELF \ + liblldbPluginObjectFileJIT \ liblldbPluginPlatformFreeBSD \ liblldbPluginPlatformGDB \ liblldbPluginProcessElfCore \ Modified: projects/clang350-import/lib/clang/liblldb/Makefile ============================================================================== --- projects/clang350-import/lib/clang/liblldb/Makefile Wed Nov 26 17:32:20 2014 (r275131) +++ projects/clang350-import/lib/clang/liblldb/Makefile Wed Nov 26 17:40:03 2014 (r275132) @@ -10,7 +10,9 @@ SRCDIR= tools/lldb/source SRCS= lldb.cpp \ lldb-log.cpp -TGHDRS= DiagnosticCommonKinds \ +TGHDRS= AttrList \ + Attrs \ + DiagnosticCommonKinds \ DeclNodes \ StmtNodes \ CommentCommandList Modified: projects/clang350-import/lib/clang/liblldbAPI/Makefile ============================================================================== --- projects/clang350-import/lib/clang/liblldbAPI/Makefile Wed Nov 26 17:32:20 2014 (r275131) +++ projects/clang350-import/lib/clang/liblldbAPI/Makefile Wed Nov 26 17:40:03 2014 (r275132) @@ -46,16 +46,20 @@ SRCS= SBAddress.cpp \ SBThread.cpp \ SBType.cpp \ SBTypeCategory.cpp \ + SBTypeEnumMember.cpp \ SBTypeFilter.cpp \ SBTypeFormat.cpp \ SBTypeNameSpecifier.cpp \ SBTypeSummary.cpp \ SBTypeSynthetic.cpp \ + SBUnixSignals.cpp \ SBValue.cpp \ SBValueList.cpp \ SBWatchpoint.cpp -TGHDRS= DiagnosticCommonKinds \ +TGHDRS= AttrList \ + Attrs \ + DiagnosticCommonKinds \ DeclNodes \ StmtNodes \ CommentCommandList Modified: projects/clang350-import/lib/clang/liblldbBreakpoint/Makefile ============================================================================== --- projects/clang350-import/lib/clang/liblldbBreakpoint/Makefile Wed Nov 26 17:32:20 2014 (r275131) +++ projects/clang350-import/lib/clang/liblldbBreakpoint/Makefile Wed Nov 26 17:40:03 2014 (r275132) @@ -27,7 +27,9 @@ SRCS= Breakpoint.cpp \ WatchpointList.cpp \ WatchpointOptions.cpp -TGHDRS= DiagnosticCommonKinds \ +TGHDRS= AttrList \ + Attrs \ + DiagnosticCommonKinds \ DeclNodes \ StmtNodes \ CommentCommandList Modified: projects/clang350-import/lib/clang/liblldbCommands/Makefile ============================================================================== --- projects/clang350-import/lib/clang/liblldbCommands/Makefile Wed Nov 26 17:32:20 2014 (r275131) +++ projects/clang350-import/lib/clang/liblldbCommands/Makefile Wed Nov 26 17:40:03 2014 (r275132) @@ -34,7 +34,9 @@ SRCS= CommandCompletions.cpp \ CommandObjectWatchpoint.cpp \ CommandObjectWatchpointCommand.cpp -TGHDRS= DiagnosticCommonKinds \ +TGHDRS= AttrList \ + Attrs \ + DiagnosticCommonKinds \ DeclNodes \ StmtNodes \ CommentCommandList Modified: projects/clang350-import/lib/clang/liblldbCore/Makefile ============================================================================== --- projects/clang350-import/lib/clang/liblldbCore/Makefile Wed Nov 26 17:32:20 2014 (r275131) +++ projects/clang350-import/lib/clang/liblldbCore/Makefile Wed Nov 26 17:40:03 2014 (r275132) @@ -29,6 +29,7 @@ SRCS= Address.cpp \ EmulateInstruction.cpp \ Error.cpp \ Event.cpp \ + FastDemangle.cpp \ FileLineResolver.cpp \ FileSpecList.cpp \ History.cpp \ @@ -56,6 +57,7 @@ SRCS= Address.cpp \ StreamGDBRemote.cpp \ StreamString.cpp \ StringList.cpp \ + StructuredData.cpp \ Timer.cpp \ UserID.cpp \ UserSettingsController.cpp \ @@ -75,7 +77,9 @@ SRCS= Address.cpp \ ValueObjectVariable.cpp \ VMRange.cpp -TGHDRS= DiagnosticCommonKinds \ +TGHDRS= AttrList \ + Attrs \ + DiagnosticCommonKinds \ DeclNodes \ StmtNodes \ CommentCommandList Modified: projects/clang350-import/lib/clang/liblldbDataFormatters/Makefile ============================================================================== --- projects/clang350-import/lib/clang/liblldbDataFormatters/Makefile Wed Nov 26 17:32:20 2014 (r275131) +++ projects/clang350-import/lib/clang/liblldbDataFormatters/Makefile Wed Nov 26 17:40:03 2014 (r275132) @@ -27,7 +27,9 @@ SRCS= CF.cpp \ TypeSynthetic.cpp \ ValueObjectPrinter.cpp -TGHDRS= DiagnosticCommonKinds \ +TGHDRS= AttrList \ + Attrs \ + DiagnosticCommonKinds \ DeclNodes \ StmtNodes \ CommentCommandList Modified: projects/clang350-import/lib/clang/liblldbHostCommon/Makefile ============================================================================== --- projects/clang350-import/lib/clang/liblldbHostCommon/Makefile Wed Nov 26 17:32:20 2014 (r275131) +++ projects/clang350-import/lib/clang/liblldbHostCommon/Makefile Wed Nov 26 17:40:03 2014 (r275132) @@ -6,20 +6,26 @@ LIB= lldbHostCommon SRCDIR= tools/lldb/source/Host/common SRCS= Condition.cpp \ - DynamicLibrary.cpp \ Editline.cpp \ File.cpp \ FileSpec.cpp \ Host.cpp \ + HostInfoBase.cpp \ + IOObject.cpp \ Mutex.cpp \ OptionParser.cpp \ + Pipe.cpp \ ProcessRunLock.cpp \ + Socket.cpp \ SocketAddress.cpp \ + SoftwareBreakpoint.cpp \ Symbols.cpp \ Terminal.cpp \ TimeValue.cpp -TGHDRS= DiagnosticCommonKinds \ +TGHDRS= AttrList \ + Attrs \ + DiagnosticCommonKinds \ DeclNodes \ StmtNodes \ CommentCommandList Modified: projects/clang350-import/lib/clang/liblldbHostFreeBSD/Makefile ============================================================================== --- projects/clang350-import/lib/clang/liblldbHostFreeBSD/Makefile Wed Nov 26 17:32:20 2014 (r275131) +++ projects/clang350-import/lib/clang/liblldbHostFreeBSD/Makefile Wed Nov 26 17:40:03 2014 (r275132) @@ -5,7 +5,8 @@ LIB= lldbHostFreeBSD SRCDIR= tools/lldb/source/Host/freebsd -SRCS= Host.cpp +SRCS= Host.cpp \ + HostInfoFreeBSD.cpp TGHDRS= DiagnosticCommonKinds \ DeclNodes \ Added: projects/clang350-import/lib/clang/liblldbHostPOSIX/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/lib/clang/liblldbHostPOSIX/Makefile Wed Nov 26 17:40:03 2014 (r275132) @@ -0,0 +1,12 @@ +# $FreeBSD$ + +.include + +LIB= lldbHostPOSIX + +SRCDIR= tools/lldb/source/Host/posix +SRCS= FileSystem.cpp \ + HostInfoPosix.cpp \ + HostProcessPosix.cpp + +.include "../lldb.lib.mk" Modified: projects/clang350-import/lib/clang/liblldbInterpreter/Makefile ============================================================================== --- projects/clang350-import/lib/clang/liblldbInterpreter/Makefile Wed Nov 26 17:32:20 2014 (r275131) +++ projects/clang350-import/lib/clang/liblldbInterpreter/Makefile Wed Nov 26 17:40:03 2014 (r275132) @@ -11,6 +11,7 @@ SRCS= Args.cpp \ CommandObject.cpp \ CommandObjectRegexCommand.cpp \ CommandObjectScript.cpp \ + CommandOptionValidators.cpp \ CommandReturnObject.cpp \ OptionGroupArchitecture.cpp \ OptionGroupBoolean.cpp \ @@ -48,7 +49,9 @@ SRCS= Args.cpp \ ScriptInterpreterNone.cpp \ ScriptInterpreterPython.cpp -TGHDRS= DiagnosticCommonKinds \ +TGHDRS= AttrList \ + Attrs \ + DiagnosticCommonKinds \ DeclNodes \ StmtNodes \ CommentCommandList Added: projects/clang350-import/lib/clang/liblldbPluginInstructionARM64/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/lib/clang/liblldbPluginInstructionARM64/Makefile Wed Nov 26 17:40:03 2014 (r275132) @@ -0,0 +1,10 @@ +# $FreeBSD$ + +.include + +LIB= lldbPluginInstructionARM64 + +SRCDIR= tools/lldb/source/Plugins/Instruction/ARM64 +SRCS= EmulateInstructionARM64.cpp + +.include "../lldb.lib.mk" Added: projects/clang350-import/lib/clang/liblldbPluginJITLoaderGDB/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/lib/clang/liblldbPluginJITLoaderGDB/Makefile Wed Nov 26 17:40:03 2014 (r275132) @@ -0,0 +1,15 @@ +# $FreeBSD$ + +.include + +LIB= lldbPluginJITLoaderGDB + +SRCDIR= tools/lldb/source/Plugins/JITLoader/GDB +SRCS= JITLoaderGDB.cpp + +TGHDRS= DiagnosticCommonKinds \ + DeclNodes \ + StmtNodes \ + CommentCommandList + +.include "../lldb.lib.mk" Added: projects/clang350-import/lib/clang/liblldbPluginObjectFileJIT/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/lib/clang/liblldbPluginObjectFileJIT/Makefile Wed Nov 26 17:40:03 2014 (r275132) @@ -0,0 +1,17 @@ +# $FreeBSD$ + +.include + +LIB= lldbPluginObjectFileJIT + +SRCDIR= tools/lldb/source/Plugins/ObjectFile/JIT +SRCS= ObjectFileJIT.cpp + +TGHDRS= AttrList \ + Attrs \ + DiagnosticCommonKinds \ + DeclNodes \ + StmtNodes \ + CommentCommandList + +.include "../lldb.lib.mk" Modified: projects/clang350-import/lib/clang/liblldbPluginPlatformFreeBSD/Makefile ============================================================================== --- projects/clang350-import/lib/clang/liblldbPluginPlatformFreeBSD/Makefile Wed Nov 26 17:32:20 2014 (r275131) +++ projects/clang350-import/lib/clang/liblldbPluginPlatformFreeBSD/Makefile Wed Nov 26 17:40:03 2014 (r275132) @@ -7,7 +7,9 @@ LIB= lldbPluginPlatformFreeBSD SRCDIR= tools/lldb/source/Plugins/Platform/FreeBSD SRCS= PlatformFreeBSD.cpp -TGHDRS= DiagnosticCommonKinds \ +TGHDRS= AttrList \ + Attrs \ + DiagnosticCommonKinds \ DeclNodes \ StmtNodes \ CommentCommandList Modified: projects/clang350-import/lib/clang/liblldbPluginPlatformGDB/Makefile ============================================================================== --- projects/clang350-import/lib/clang/liblldbPluginPlatformGDB/Makefile Wed Nov 26 17:32:20 2014 (r275131) +++ projects/clang350-import/lib/clang/liblldbPluginPlatformGDB/Makefile Wed Nov 26 17:40:03 2014 (r275132) @@ -7,7 +7,9 @@ LIB= lldbPluginPlatformGDB SRCDIR= tools/lldb/source/Plugins/Platform/gdb-server SRCS= PlatformRemoteGDBServer.cpp -TGHDRS= DiagnosticCommonKinds \ +TGHDRS= AttrList \ + Attrs \ + DiagnosticCommonKinds \ DeclNodes \ StmtNodes \ CommentCommandList Modified: projects/clang350-import/lib/clang/liblldbPluginProcessGDBRemote/Makefile ============================================================================== --- projects/clang350-import/lib/clang/liblldbPluginProcessGDBRemote/Makefile Wed Nov 26 17:32:20 2014 (r275131) +++ projects/clang350-import/lib/clang/liblldbPluginProcessGDBRemote/Makefile Wed Nov 26 17:40:03 2014 (r275132) @@ -13,7 +13,9 @@ SRCS= GDBRemoteCommunication.cpp \ ProcessGDBRemoteLog.cpp \ ThreadGDBRemote.cpp -TGHDRS= DiagnosticCommonKinds \ +TGHDRS= AttrList \ + Attrs \ + DiagnosticCommonKinds \ DeclNodes \ StmtNodes \ CommentCommandList Modified: projects/clang350-import/lib/clang/liblldbPluginProcessPOSIX/Makefile ============================================================================== --- projects/clang350-import/lib/clang/liblldbPluginProcessPOSIX/Makefile Wed Nov 26 17:32:20 2014 (r275131) +++ projects/clang350-import/lib/clang/liblldbPluginProcessPOSIX/Makefile Wed Nov 26 17:40:03 2014 (r275132) @@ -15,17 +15,13 @@ SRCS= POSIXStopInfo.cpp \ ProcessMessage.cpp \ ProcessPOSIX.cpp \ ProcessPOSIXLog.cpp \ - RegisterContextFreeBSD_i386.cpp \ - RegisterContextFreeBSD_mips64.cpp \ - RegisterContextFreeBSD_x86_64.cpp \ - RegisterContextLinux_i386.cpp \ - RegisterContextLinux_x86_64.cpp \ + RegisterContextPOSIXProcessMonitor_arm64.cpp \ RegisterContextPOSIXProcessMonitor_mips64.cpp \ - RegisterContextPOSIXProcessMonitor_x86.cpp \ - RegisterContextPOSIX_mips64.cpp \ - RegisterContextPOSIX_x86.cpp + RegisterContextPOSIXProcessMonitor_x86.cpp -TGHDRS= DiagnosticCommonKinds \ +TGHDRS= AttrList \ + Attrs \ + DiagnosticCommonKinds \ DeclNodes \ StmtNodes \ CommentCommandList Modified: projects/clang350-import/lib/clang/liblldbPluginProcessUtility/Makefile ============================================================================== --- projects/clang350-import/lib/clang/liblldbPluginProcessUtility/Makefile Wed Nov 26 17:32:20 2014 (r275131) +++ projects/clang350-import/lib/clang/liblldbPluginProcessUtility/Makefile Wed Nov 26 17:40:03 2014 (r275132) @@ -6,27 +6,41 @@ LIB= lldbPluginProcessUtility SRCDIR= tools/lldb/source/Plugins/Process/Utility SRCS= DynamicRegisterInfo.cpp \ + FreeBSDSignals.cpp \ HistoryThread.cpp \ HistoryUnwind.cpp \ InferiorCallPOSIX.cpp \ + LinuxSignals.cpp \ RegisterContextDarwin_arm.cpp \ + RegisterContextDarwin_arm64.cpp \ RegisterContextDarwin_i386.cpp \ RegisterContextDarwin_x86_64.cpp \ RegisterContextDummy.cpp \ + RegisterContextFreeBSD_i386.cpp \ + RegisterContextFreeBSD_mips64.cpp \ + RegisterContextFreeBSD_x86_64.cpp \ RegisterContextHistory.cpp \ + RegisterContextLinux_arm64.cpp \ + RegisterContextLinux_i386.cpp \ + RegisterContextLinux_x86_64.cpp \ RegisterContextLLDB.cpp \ RegisterContextMach_arm.cpp \ RegisterContextMach_i386.cpp \ RegisterContextMach_x86_64.cpp \ RegisterContextMacOSXFrameBackchain.cpp \ RegisterContextMemory.cpp \ + RegisterContextPOSIX_arm64.cpp \ + RegisterContextPOSIX_mips64.cpp \ + RegisterContextPOSIX_x86.cpp \ RegisterContextThreadMemory.cpp \ StopInfoMachException.cpp \ ThreadMemory.cpp \ UnwindLLDB.cpp \ UnwindMacOSXFrameBackchain.cpp -TGHDRS= DiagnosticCommonKinds \ +TGHDRS= AttrList \ + Attrs \ + DiagnosticCommonKinds \ DeclNodes \ StmtNodes \ CommentCommandList Modified: projects/clang350-import/lib/clang/liblldbPluginSymbolFileDWARF/Makefile ============================================================================== --- projects/clang350-import/lib/clang/liblldbPluginSymbolFileDWARF/Makefile Wed Nov 26 17:32:20 2014 (r275131) +++ projects/clang350-import/lib/clang/liblldbPluginSymbolFileDWARF/Makefile Wed Nov 26 17:40:03 2014 (r275132) @@ -31,7 +31,9 @@ SRCS= DWARFAbbreviationDeclaration.cpp \ SymbolFileDWARFDebugMap.cpp \ UniqueDWARFASTType.cpp -TGHDRS= DiagnosticCommonKinds \ +TGHDRS= AttrList \ + Attrs \ + DiagnosticCommonKinds \ DeclNodes \ StmtNodes \ CommentCommandList \ Modified: projects/clang350-import/lib/clang/liblldbTarget/Makefile ============================================================================== --- projects/clang350-import/lib/clang/liblldbTarget/Makefile Wed Nov 26 17:32:20 2014 (r275131) +++ projects/clang350-import/lib/clang/liblldbTarget/Makefile Wed Nov 26 17:40:03 2014 (r275132) @@ -10,13 +10,20 @@ SRCDIR= tools/lldb/source/Target SRCS= ABI.cpp \ CPPLanguageRuntime.cpp \ ExecutionContext.cpp \ + FileAction.cpp \ + JITLoader.cpp \ + JITLoaderList.cpp \ LanguageRuntime.cpp \ Memory.cpp \ + NativeRegisterContext.cpp \ + NativeRegisterContextRegisterInfo.cpp \ ObjCLanguageRuntime.cpp \ OperatingSystem.cpp \ PathMappingList.cpp \ Platform.cpp \ Process.cpp \ + ProcessInfo.cpp \ + ProcessLaunchInfo.cpp \ Queue.cpp \ QueueItem.cpp \ QueueList.cpp \ @@ -51,7 +58,9 @@ SRCS= ABI.cpp \ UnixSignals.cpp \ UnwindAssembly.cpp -TGHDRS= DiagnosticCommonKinds \ +TGHDRS= AttrList \ + Attrs \ + DiagnosticCommonKinds \ DeclNodes \ StmtNodes \ CommentCommandList Modified: projects/clang350-import/lib/clang/liblldbUtility/Makefile ============================================================================== --- projects/clang350-import/lib/clang/liblldbUtility/Makefile Wed Nov 26 17:32:20 2014 (r275131) +++ projects/clang350-import/lib/clang/liblldbUtility/Makefile Wed Nov 26 17:40:03 2014 (r275132) @@ -5,13 +5,15 @@ LIB= lldbUtility SRCDIR= tools/lldb/source/Utility -SRCS= ARM_DWARF_Registers.cpp \ +SRCS= ARM64_DWARF_Registers.cpp \ + ARM_DWARF_Registers.cpp \ KQueue.cpp \ PseudoTerminal.cpp \ Range.cpp \ SharingPtr.cpp \ StringExtractor.cpp \ StringExtractorGDBRemote.cpp \ + StringLexer.cpp \ TimeSpecTimeout.cpp .include "../lldb.lib.mk" Modified: projects/clang350-import/usr.bin/clang/lldb/Makefile ============================================================================== --- projects/clang350-import/usr.bin/clang/lldb/Makefile Wed Nov 26 17:32:20 2014 (r275131) +++ projects/clang350-import/usr.bin/clang/lldb/Makefile Wed Nov 26 17:40:03 2014 (r275132) @@ -16,8 +16,8 @@ SRCS= Driver.cpp \ lldb.1: ln -fs ${LLDB_SRCS}/docs/lldb.1 ${.TARGET} -DPADD= ${LIBEDIT} ${LIBNCURSESW} ${LIBEXECINFO} ${LIBPANEL} -LDADD= -ledit -lncursesw -lexecinfo -lpanel +DPADD= ${LIBEDIT} ${LIBNCURSESW} ${LIBEXECINFO} ${LIBPANEL} ${LIBZ} +LDADD= -ledit -lncursesw -lexecinfo -lpanel -lz LLDB_LIBS=\ lldb \ @@ -30,6 +30,7 @@ LLDB_LIBS=\ lldbExpression \ lldbHostFreeBSD \ lldbHostCommon \ + lldbHostPOSIX \ lldbInterpreter \ lldbSymbol \ lldbTarget \ @@ -39,12 +40,15 @@ LLDB_LIBS=\ lldbPluginCXXItaniumABI \ lldbPluginDisassemblerLLVM \ lldbPluginInstructionARM \ + lldbPluginInstructionARM64 \ + lldbPluginJITLoaderGDB \ lldbPluginSymbolFileDWARF \ lldbPluginSymbolFileSymtab \ lldbPluginDynamicLoaderStatic \ lldbPluginDynamicLoaderPosixDYLD \ lldbPluginObjectContainerBSDArchive \ lldbPluginObjectFileELF \ + lldbPluginObjectFileJIT \ lldbPluginSymbolVendorELF \ lldbPluginPlatformFreeBSD \ lldbPluginPlatformGDB \ @@ -98,7 +102,6 @@ LIBDEPS=\ llvmselectiondag \ llvmipo \ llvmbitwriter \ - llvmbitreader \ llvmasmparser \ llvminterpreter \ llvmjit \ @@ -109,6 +112,8 @@ LIBDEPS=\ llvmpowerpcdesc \ llvmpowerpcinstprinter \ llvmpowerpcasmparser \ + llvmpowerpcdisassembler \ + llvmprofiledata \ llvmruntimedyld \ llvmvectorize \ llvmx86desc \ @@ -130,6 +135,7 @@ LIBDEPS=\ llvmx86info \ llvmx86utils \ llvmobject \ + llvmbitreader \ llvminstcombine \ llvmtransformutils \ llvmipa \ From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 18:02:23 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7A9DE981; Wed, 26 Nov 2014 18:02:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6648EC1D; Wed, 26 Nov 2014 18:02:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQI2N3h082170; Wed, 26 Nov 2014 18:02:23 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQI2NQq082169; Wed, 26 Nov 2014 18:02:23 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201411261802.sAQI2NQq082169@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 26 Nov 2014 18:02:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275134 - projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 18:02:23 -0000 Author: emaste Date: Wed Nov 26 18:02:22 2014 New Revision: 275134 URL: https://svnweb.freebsd.org/changeset/base/275134 Log: Revert LLDB changes for Clang/LLVM 3.5 API compatibility This reverts the following upstream revisions: SVN git 214335 59a1f270 214340 42f16b1e Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp Wed Nov 26 17:44:49 2014 (r275133) +++ projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp Wed Nov 26 18:02:22 2014 (r275134) @@ -3294,9 +3294,9 @@ ClangASTType::GetChildClangTypeAtIndex ( child_name.assign(superclass_interface_decl->getNameAsString().c_str()); - clang::TypeInfo ivar_type_info = m_ast->getTypeInfo(ivar_qual_type.getTypePtr()); + std::pair ivar_type_info = m_ast->getTypeInfo(ivar_qual_type.getTypePtr()); - child_byte_size = ivar_type_info.Width / 8; + child_byte_size = ivar_type_info.first / 8; child_byte_offset = 0; child_is_base_class = true; @@ -3326,9 +3326,9 @@ ClangASTType::GetChildClangTypeAtIndex ( child_name.assign(ivar_decl->getNameAsString().c_str()); - clang::TypeInfo ivar_type_info = m_ast->getTypeInfo(ivar_qual_type.getTypePtr()); + std::pair ivar_type_info = m_ast->getTypeInfo(ivar_qual_type.getTypePtr()); - child_byte_size = ivar_type_info.Width / 8; + child_byte_size = ivar_type_info.first / 8; // Figure out the field offset within the current struct/union/class type // For ObjC objects, we can't trust the bit offset we get from the Clang AST, since @@ -5825,7 +5825,7 @@ ClangASTType::DumpValue (ExecutionContex // Indent and print the base class type name s->Printf("\n%*s%s ", depth + DEPTH_INCREMENT, "", base_class_type_name.c_str()); - clang::TypeInfo base_class_type_info = m_ast->getTypeInfo(base_class_qual_type); + std::pair base_class_type_info = m_ast->getTypeInfo(base_class_qual_type); // Dump the value of the member ClangASTType base_clang_type(m_ast, base_class_qual_type); @@ -5834,7 +5834,7 @@ ClangASTType::DumpValue (ExecutionContex base_clang_type.GetFormat(), // The format with which to display the member data, // Data buffer containing all bytes for this type data_byte_offset + field_byte_offset,// Offset into "data" where to grab value from - base_class_type_info.Width / 8, // Size of this type in bytes + base_class_type_info.first / 8, // Size of this type in bytes 0, // Bitfield bit size 0, // Bitfield bit offset show_types, // Boolean indicating if we should show the variable types @@ -5864,7 +5864,7 @@ ClangASTType::DumpValue (ExecutionContex // Print the member type if requested // Figure out the type byte size (field_type_info.first) and // alignment (field_type_info.second) from the AST context. - clang::TypeInfo field_type_info = m_ast->getTypeInfo(field_type); + std::pair field_type_info = m_ast->getTypeInfo(field_type); assert(field_idx < record_layout.getFieldCount()); // Figure out the field offset within the current struct/union/class type field_bit_offset = record_layout.getFieldOffset (field_idx); @@ -5893,7 +5893,7 @@ ClangASTType::DumpValue (ExecutionContex field_clang_type.GetFormat(), // The format with which to display the member data, // Data buffer containing all bytes for this type data_byte_offset + field_byte_offset,// Offset into "data" where to grab value from - field_type_info.Width / 8, // Size of this type in bytes + field_type_info.first / 8, // Size of this type in bytes field_bitfield_bit_size, // Bitfield bit size field_bitfield_bit_offset, // Bitfield bit offset show_types, // Boolean indicating if we should show the variable types @@ -5943,11 +5943,11 @@ ClangASTType::DumpValue (ExecutionContex const uint64_t element_count = array->getSize().getLimitedValue(); - clang::TypeInfo field_type_info = m_ast->getTypeInfo(element_qual_type); + std::pair field_type_info = m_ast->getTypeInfo(element_qual_type); uint32_t element_idx = 0; uint32_t element_offset = 0; - uint64_t element_byte_size = field_type_info.Width / 8; + uint64_t element_byte_size = field_type_info.first / 8; uint32_t element_stride = element_byte_size; if (is_array_of_characters) @@ -6006,8 +6006,8 @@ ClangASTType::DumpValue (ExecutionContex ClangASTType typedef_clang_type (m_ast, typedef_qual_type); lldb::Format typedef_format = typedef_clang_type.GetFormat(); - clang::TypeInfo typedef_type_info = m_ast->getTypeInfo(typedef_qual_type); - uint64_t typedef_byte_size = typedef_type_info.Width / 8; + std::pair typedef_type_info = m_ast->getTypeInfo(typedef_qual_type); + uint64_t typedef_byte_size = typedef_type_info.first / 8; return typedef_clang_type.DumpValue (exe_ctx, s, // Stream to dump to @@ -6029,8 +6029,8 @@ ClangASTType::DumpValue (ExecutionContex clang::QualType elaborated_qual_type = llvm::cast(qual_type)->getNamedType(); ClangASTType elaborated_clang_type (m_ast, elaborated_qual_type); lldb::Format elaborated_format = elaborated_clang_type.GetFormat(); - clang::TypeInfo elaborated_type_info = m_ast->getTypeInfo(elaborated_qual_type); - uint64_t elaborated_byte_size = elaborated_type_info.Width / 8; + std::pair elaborated_type_info = m_ast->getTypeInfo(elaborated_qual_type); + uint64_t elaborated_byte_size = elaborated_type_info.first / 8; return elaborated_clang_type.DumpValue (exe_ctx, s, // Stream to dump to @@ -6053,8 +6053,8 @@ ClangASTType::DumpValue (ExecutionContex ClangASTType desugar_clang_type (m_ast, desugar_qual_type); lldb::Format desugar_format = desugar_clang_type.GetFormat(); - clang::TypeInfo desugar_type_info = m_ast->getTypeInfo(desugar_qual_type); - uint64_t desugar_byte_size = desugar_type_info.Width / 8; + std::pair desugar_type_info = m_ast->getTypeInfo(desugar_qual_type); + uint64_t desugar_byte_size = desugar_type_info.first / 8; return desugar_clang_type.DumpValue (exe_ctx, s, // Stream to dump to @@ -6121,8 +6121,8 @@ ClangASTType::DumpTypeValue (Stream *s, ClangASTType typedef_clang_type (m_ast, typedef_qual_type); if (format == eFormatDefault) format = typedef_clang_type.GetFormat(); - clang::TypeInfo typedef_type_info = m_ast->getTypeInfo(typedef_qual_type); - uint64_t typedef_byte_size = typedef_type_info.Width / 8; + std::pair typedef_type_info = m_ast->getTypeInfo(typedef_qual_type); + uint64_t typedef_byte_size = typedef_type_info.first / 8; return typedef_clang_type.DumpTypeValue (s, format, // The format with which to display the element From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 18:03:26 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C7376A75; Wed, 26 Nov 2014 18:03:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9A5ACC2B; Wed, 26 Nov 2014 18:03:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQI3QkA082333; Wed, 26 Nov 2014 18:03:26 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQI3Q33082331; Wed, 26 Nov 2014 18:03:26 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201411261803.sAQI3Q33082331@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 26 Nov 2014 18:03:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275135 - in projects/clang350-import/contrib/llvm/tools/lldb/source: . DataFormatters X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 18:03:26 -0000 Author: emaste Date: Wed Nov 26 18:03:25 2014 New Revision: 275135 URL: https://svnweb.freebsd.org/changeset/base/275135 Log: Remove additional platform-specific LLDB code Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/DataFormatters/NSArray.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/lldb.cpp Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/DataFormatters/NSArray.cpp ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/source/DataFormatters/NSArray.cpp Wed Nov 26 18:02:22 2014 (r275134) +++ projects/clang350-import/contrib/llvm/tools/lldb/source/DataFormatters/NSArray.cpp Wed Nov 26 18:03:25 2014 (r275135) @@ -19,7 +19,6 @@ #include "lldb/Host/Endian.h" #include "lldb/Symbol/ClangASTContext.h" #include "lldb/Target/ObjCLanguageRuntime.h" -#include "Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h" #include "lldb/Target/Target.h" #include "clang/AST/ASTContext.h" Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/lldb.cpp ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/source/lldb.cpp Wed Nov 26 18:02:22 2014 (r275134) +++ projects/clang350-import/contrib/llvm/tools/lldb/source/lldb.cpp Wed Nov 26 18:03:25 2014 (r275135) @@ -128,7 +128,6 @@ lldb_private::Initialize () EmulateInstructionARM64::Initialize (); DynamicLoaderPOSIXDYLD::Initialize (); PlatformFreeBSD::Initialize(); - PlatformKalimba::Initialize(); SymbolFileDWARFDebugMap::Initialize(); ItaniumABILanguageRuntime::Initialize(); #ifndef LLDB_DISABLE_PYTHON @@ -211,7 +210,6 @@ lldb_private::Terminate () EmulateInstructionARM64::Terminate (); DynamicLoaderPOSIXDYLD::Terminate (); PlatformFreeBSD::Terminate(); - PlatformKalimba::Terminate(); SymbolFileDWARFDebugMap::Terminate(); ItaniumABILanguageRuntime::Terminate(); #ifndef LLDB_DISABLE_PYTHON From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 21:17:33 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A2561239; Wed, 26 Nov 2014 21:17:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8EB9E33F; Wed, 26 Nov 2014 21:17:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQLHXtl071719; Wed, 26 Nov 2014 21:17:33 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQLHXpG071718; Wed, 26 Nov 2014 21:17:33 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411262117.sAQLHXpG071718@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 26 Nov 2014 21:17:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275141 - projects/building-blocks/tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 21:17:33 -0000 Author: ngie Date: Wed Nov 26 21:17:32 2014 New Revision: 275141 URL: https://svnweb.freebsd.org/changeset/base/275141 Log: - Handle OLD_LIBS properly by looking for versioned .so's - Filter out /usr/libdata and /usr/libdata/pkgconfig from OLD_DIRS Modified: projects/building-blocks/tools/add-optional-obsolete-files-entries.sh Modified: projects/building-blocks/tools/add-optional-obsolete-files-entries.sh ============================================================================== --- projects/building-blocks/tools/add-optional-obsolete-files-entries.sh Wed Nov 26 20:56:08 2014 (r275140) +++ projects/building-blocks/tools/add-optional-obsolete-files-entries.sh Wed Nov 26 21:17:32 2014 (r275141) @@ -42,8 +42,10 @@ done # Enumerate all of the installed files/directories (cd $DESTDIR; - find -s . -type f -mindepth 1 | sed -e 's,^,OLD_FILES+=,'; + find -s . -type f -mindepth 1 | \ + sed -e 's,^,OLD_FILES+=,' \ + -e '/lib\/.*\.so\.[0-9]\.*/s/OLD_FILES+=/OLD_LIBS+=/g'; find -s . -type d -mindepth 1 -and \! -empty | \ - egrep -v '^\./(s*bin|libexec|usr|usr/include|usr/lib|usr/lib/private|usr/libexec|usr/s*bin|usr/share|usr/share/man|usr/share/man/man[0-9])$' | \ + grep -v '^\./(s*bin|libexec|usr|usr/include|usr/lib(data)?|usr/libdata/pkgconfig|usr/lib/private|usr/libexec|usr/s*bin|usr/share(/(examples|man))?|usr/share/man/man[0-9])$' | \ sed -e 's,^,OLD_DIRS+=,' ) | sed -e 's,+=\./,+=,' From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 21:18:54 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E6476329; Wed, 26 Nov 2014 21:18:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D0423349; Wed, 26 Nov 2014 21:18:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQLIsUl071928; Wed, 26 Nov 2014 21:18:54 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQLIrrb071922; Wed, 26 Nov 2014 21:18:53 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411262118.sAQLIrrb071922@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 26 Nov 2014 21:18:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275142 - in projects/building-blocks: include share/examples share/man/man4 share/man/man9 share/misc tools/build/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 21:18:55 -0000 Author: ngie Date: Wed Nov 26 21:18:52 2014 New Revision: 275142 URL: https://svnweb.freebsd.org/changeset/base/275142 Log: Clean up more usb related files when MK_USB == no when dealing with manpages, libraries, and binaries Modified: projects/building-blocks/include/Makefile projects/building-blocks/share/examples/Makefile projects/building-blocks/share/man/man4/Makefile projects/building-blocks/share/man/man9/Makefile projects/building-blocks/share/misc/Makefile projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/include/Makefile ============================================================================== --- projects/building-blocks/include/Makefile Wed Nov 26 21:17:32 2014 (r275141) +++ projects/building-blocks/include/Makefile Wed Nov 26 21:18:52 2014 (r275142) @@ -44,7 +44,7 @@ LSUBDIRS= cam/ata cam/scsi \ dev/hwpmc \ dev/ic dev/iicbus ${_dev_ieee488} dev/io dev/lmc dev/mfi dev/nvme \ dev/ofw dev/pbio dev/pci ${_dev_powermac_nvram} dev/ppbus dev/smbus \ - dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \ + dev/speaker dev/utopia dev/vkbd dev/wi \ fs/cuse \ fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/nullfs \ fs/procfs fs/smbfs fs/udf fs/unionfs \ @@ -57,6 +57,10 @@ LSUBDIRS= cam/ata cam/scsi \ security/mac_mls security/mac_partition \ ufs/ffs ufs/ufs +.if ${MK_USB} != "no" +LSUBDIRS+= dev/usb +.endif + LSUBSUBDIRS= dev/mpt/mpilib .if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64" Modified: projects/building-blocks/share/examples/Makefile ============================================================================== --- projects/building-blocks/share/examples/Makefile Wed Nov 26 21:17:32 2014 (r275141) +++ projects/building-blocks/share/examples/Makefile Wed Nov 26 21:18:52 2014 (r275142) @@ -18,7 +18,6 @@ LDIRS= BSD_daemon \ ipfw \ jails \ kld \ - libusb20 \ libvgl \ mdoc \ netgraph \ @@ -92,12 +91,6 @@ XFILES= BSD_daemon/FreeBSD.pfa \ kld/syscall/module/syscall.c \ kld/syscall/test/Makefile \ kld/syscall/test/call.c \ - libusb20/Makefile \ - libusb20/README \ - libusb20/util.c \ - libusb20/util.h \ - libusb20/bulk.c \ - libusb20/control.c \ libvgl/Makefile \ libvgl/demo.c \ mdoc/POSIX-copyright \ @@ -213,6 +206,16 @@ XFILES+= hast/ucarp.sh \ hast/vip-up.sh .endif +.if ${MK_USB} != "no" +LDIRS+= libusb20 +XFILES+= libusb20/Makefile \ + libusb20/README \ + libusb20/util.c \ + libusb20/util.h \ + libusb20/bulk.c \ + libusb20/control.c +.endif + beforeinstall: ${SHARED} etc-examples .ORDER: ${SHARED} etc-examples Modified: projects/building-blocks/share/man/man4/Makefile ============================================================================== --- projects/building-blocks/share/man/man4/Makefile Wed Nov 26 21:17:32 2014 (r275141) +++ projects/building-blocks/share/man/man4/Makefile Wed Nov 26 21:18:52 2014 (r275142) @@ -503,56 +503,6 @@ MAN= aac.4 \ tws.4 \ tx.4 \ txp.4 \ - u3g.4 \ - uark.4 \ - uart.4 \ - uath.4 \ - ubsa.4 \ - ubsec.4 \ - ubser.4 \ - ubtbcmfw.4 \ - uchcom.4 \ - ucom.4 \ - ucycom.4 \ - udav.4 \ - udbp.4 \ - udp.4 \ - udplite.4 \ - uep.4 \ - ufm.4 \ - ufoma.4 \ - uftdi.4 \ - ugen.4 \ - uhci.4 \ - uhid.4 \ - uhso.4 \ - uipaq.4 \ - ukbd.4 \ - uled.4 \ - ulpt.4 \ - umass.4 \ - umcs.4 \ - umct.4 \ - umodem.4 \ - umoscom.4 \ - ums.4 \ - unix.4 \ - upgt.4 \ - uplcom.4 \ - ural.4 \ - urio.4 \ - urndis.4 \ - ${_urtw.4} \ - urtwn.4 \ - urtwnfw.4 \ - usb.4 \ - usb_template.4 \ - usb_quirk.4 \ - uslcom.4 \ - usfs.4 \ - utopia.4 \ - uvisor.4 \ - uvscom.4 \ vale.4 \ vga.4 \ vge.4 \ @@ -733,13 +683,6 @@ MLINKS+=tl.4 if_tl.4 MLINKS+=tun.4 if_tun.4 MLINKS+=tx.4 if_tx.4 MLINKS+=txp.4 if_txp.4 -MLINKS+=u3g.4 u3gstub.4 -MLINKS+=uath.4 if_uath.4 -MLINKS+=udav.4 if_udav.4 -MLINKS+=upgt.4 if_upgt.4 -MLINKS+=ural.4 if_ural.4 -MLINKS+=urndis.4 if_urndis.4 -MLINKS+=${_urtw.4} ${_if_urtw.4} MLINKS+=vge.4 if_vge.4 MLINKS+=vlan.4 if_vlan.4 MLINKS+=vxlan.4 if_vxlan.4 @@ -876,4 +819,66 @@ _pflog.4= pflog.4 _pfsync.4= pfsync.4 .endif +.if ${MK_USB} != "no" +MAN+= \ + u3g.4 \ + uark.4 \ + uart.4 \ + uath.4 \ + ubsa.4 \ + ubsec.4 \ + ubser.4 \ + ubtbcmfw.4 \ + uchcom.4 \ + ucom.4 \ + ucycom.4 \ + udav.4 \ + udbp.4 \ + udp.4 \ + udplite.4 \ + uep.4 \ + ufm.4 \ + ufoma.4 \ + uftdi.4 \ + ugen.4 \ + uhci.4 \ + uhid.4 \ + uhso.4 \ + uipaq.4 \ + ukbd.4 \ + uled.4 \ + ulpt.4 \ + umass.4 \ + umcs.4 \ + umct.4 \ + umodem.4 \ + umoscom.4 \ + ums.4 \ + unix.4 \ + upgt.4 \ + uplcom.4 \ + ural.4 \ + urio.4 \ + urndis.4 \ + ${_urtw.4} \ + urtwn.4 \ + urtwnfw.4 \ + usb.4 \ + usb_quirk.4 \ + usb_template.4 \ + usfs.4 \ + uslcom.4 + utopia.4 \ + uvisor.4 \ + uvscom.4 \ + +MLINKS+=u3g.4 u3gstub.4 +MLINKS+=uath.4 if_uath.4 +MLINKS+=udav.4 if_udav.4 +MLINKS+=upgt.4 if_upgt.4 +MLINKS+=ural.4 if_ural.4 +MLINKS+=urndis.4 if_urndis.4 +MLINKS+=${_urtw.4} ${_if_urtw.4} +.endif + .include Modified: projects/building-blocks/share/man/man9/Makefile ============================================================================== --- projects/building-blocks/share/man/man9/Makefile Wed Nov 26 21:17:32 2014 (r275141) +++ projects/building-blocks/share/man/man9/Makefile Wed Nov 26 21:18:52 2014 (r275142) @@ -1,5 +1,7 @@ # $FreeBSD$ +.include + MAN= accept_filter.9 \ accf_data.9 \ accf_dns.9 \ @@ -272,7 +274,6 @@ MAN= accept_filter.9 \ uidinfo.9 \ uio.9 \ unr.9 \ - usbdi.9 \ utopia.9 \ vaccess.9 \ vaccess_acl_nfs4.9 \ @@ -1600,6 +1601,9 @@ MLINKS+=uidinfo.9 uifind.9 \ uidinfo.9 uihold.9 MLINKS+=uio.9 uiomove.9 \ uio.9 uiomove_nofault.9 + +.if ${MK_USB} != "no" +MAN+= usbdi.9 MLINKS+=usbdi.9 usbd_do_request.9 \ usbdi.9 usbd_do_request_flags.9 \ usbdi.9 usbd_errstr.9 \ @@ -1651,6 +1655,7 @@ MLINKS+=usbdi.9 usbd_do_request.9 \ usbdi.9 usb_fifo_reset.9 \ usbdi.9 usb_fifo_softc.9 \ usbdi.9 usb_fifo_wakeup.9 +.endif MLINKS+=vcount.9 count_dev.9 MLINKS+=vfsconf.9 vfs_modevent.9 \ vfsconf.9 vfs_register.9 \ Modified: projects/building-blocks/share/misc/Makefile ============================================================================== --- projects/building-blocks/share/misc/Makefile Wed Nov 26 21:17:32 2014 (r275141) +++ projects/building-blocks/share/misc/Makefile Wed Nov 26 21:18:52 2014 (r275142) @@ -1,15 +1,22 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/8/93 # $FreeBSD$ +.include + .PATH: ${.CURDIR}/../../sys/dev/usb FILES= ascii birthtoken bsd-family-tree committers-doc.dot committers-ports.dot \ committers-src.dot eqnchar flowers init.ee \ iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \ - scsi_modes usb_hid_usages usbdevs \ + scsi_modes \ organization.dot NO_OBJ= FILESDIR= ${BINDIR}/misc +.if ${MK_USB} != "no" +FILES+= usb_hid_usages +FILES+= usbdevs +.endif + .include Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 21:17:32 2014 (r275141) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 21:18:52 2014 (r275142) @@ -4946,6 +4946,377 @@ OLD_FILES+=usr/sbin/unbound-control-setu .if ${MK_USB} == no OLD_FILES+=etc/devd/uauth.conf OLD_FILES+=etc/devd/usb.conf +OLD_FILES+=usr/bin/usbhidaction +OLD_FILES+=usr/bin/usbhidctl +OLD_FILES+=usr/include/dev/usb/ufm_ioctl.h +OLD_FILES+=usr/include/dev/usb/uftdiio.h +OLD_FILES+=usr/include/dev/usb/uled_ioctl.h +OLD_FILES+=usr/include/dev/usb/usb.h +OLD_FILES+=usr/include/dev/usb/usb_bus.h +OLD_FILES+=usr/include/dev/usb/usb_busdma.h +OLD_FILES+=usr/include/dev/usb/usb_cdc.h +OLD_FILES+=usr/include/dev/usb/usb_compat_linux.h +OLD_FILES+=usr/include/dev/usb/usb_controller.h +OLD_FILES+=usr/include/dev/usb/usb_core.h +OLD_FILES+=usr/include/dev/usb/usb_debug.h +OLD_FILES+=usr/include/dev/usb/usb_dev.h +OLD_FILES+=usr/include/dev/usb/usb_device.h +OLD_FILES+=usr/include/dev/usb/usb_dynamic.h +OLD_FILES+=usr/include/dev/usb/usb_endian.h +OLD_FILES+=usr/include/dev/usb/usb_freebsd.h +OLD_FILES+=usr/include/dev/usb/usb_freebsd_loader.h +OLD_FILES+=usr/include/dev/usb/usb_generic.h +OLD_FILES+=usr/include/dev/usb/usb_hub.h +OLD_FILES+=usr/include/dev/usb/usb_ioctl.h +OLD_FILES+=usr/include/dev/usb/usb_mbuf.h +OLD_FILES+=usr/include/dev/usb/usb_msctest.h +OLD_FILES+=usr/include/dev/usb/usb_pci.h +OLD_FILES+=usr/include/dev/usb/usb_pf.h +OLD_FILES+=usr/include/dev/usb/usb_process.h +OLD_FILES+=usr/include/dev/usb/usb_request.h +OLD_FILES+=usr/include/dev/usb/usb_transfer.h +OLD_FILES+=usr/include/dev/usb/usb_util.h +OLD_FILES+=usr/include/dev/usb/usbdi.h +OLD_FILES+=usr/include/dev/usb/usbdi_util.h +OLD_FILES+=usr/include/dev/usb/usbhid.h +OLD_DIRS+=usr/include/dev/usb +OLD_FILES+=usr/include/libusb.h +OLD_FILES+=usr/include/libusb20.h +OLD_FILES+=usr/include/libusb20_desc.h +OLD_FILES+=usr/include/usb.h +OLD_FILES+=usr/include/usbhid.h +OLD_FILES+=usr/lib/libusb.a +OLD_LIBS+=usr/lib/libusb.so.3 +OLD_FILES+=usr/lib/libusb_p.a +OLD_FILES+=usr/lib/libusbhid.a +OLD_LIBS+=usr/lib/libusbhid.so.4 +OLD_FILES+=usr/lib/libusbhid_p.a +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" +OLD_FILES+=usr/lib32/libusb.a +OLD_LIBS+=usr/lib32/libusb.so.3 +OLD_FILES+=usr/lib32/libusbhid.a +OLD_LIBS+=usr/lib32/libusbhid.so.4 +.endif +OLD_FILES+=usr/libdata/pkgconfig/libusb-0.1.pc +OLD_FILES+=usr/libdata/pkgconfig/libusb-1.0.pc +OLD_FILES+=usr/libdata/pkgconfig/libusb-2.0.pc +OLD_FILES+=usr/sbin/usbconfig +OLD_FILES+=usr/sbin/usbdump +OLD_FILES+=usr/share/examples/libusb20/Makefile +OLD_FILES+=usr/share/examples/libusb20/README +OLD_FILES+=usr/share/examples/libusb20/bulk.c +OLD_FILES+=usr/share/examples/libusb20/control.c +OLD_FILES+=usr/share/examples/libusb20/util.c +OLD_FILES+=usr/share/examples/libusb20/util.h +OLD_DIRS+=usr/share/examples/libusb20 +OLD_FILES+=usr/share/man/man1/usbhidaction.1.gz +OLD_FILES+=usr/share/man/man1/usbhidctl.1.gz +OLD_FILES+=usr/share/man/man3/hid_dispose_report_desc.3.gz +OLD_FILES+=usr/share/man/man3/hid_end_parse.3.gz +OLD_FILES+=usr/share/man/man3/hid_get_data.3.gz +OLD_FILES+=usr/share/man/man3/hid_get_item.3.gz +OLD_FILES+=usr/share/man/man3/hid_get_report_desc.3.gz +OLD_FILES+=usr/share/man/man3/hid_init.3.gz +OLD_FILES+=usr/share/man/man3/hid_locate.3.gz +OLD_FILES+=usr/share/man/man3/hid_report_size.3.gz +OLD_FILES+=usr/share/man/man3/hid_set_data.3.gz +OLD_FILES+=usr/share/man/man3/hid_start_parse.3.gz +OLD_FILES+=usr/share/man/man3/hid_usage_in_page.3.gz +OLD_FILES+=usr/share/man/man3/hid_usage_page.3.gz +OLD_FILES+=usr/share/man/man3/libusb.3.gz +OLD_FILES+=usr/share/man/man3/libusb20.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_add_dev_quirk.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_alloc_default.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_dequeue_device.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_device_foreach.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_enqueue_device.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_free.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_get_dev_quirk.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_get_quirk_name.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_get_template.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_remove_dev_quirk.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_set_template.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_desc_foreach.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_alloc.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_alloc_config.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_check_connected.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_close.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_detach_kernel_driver.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_free.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_address.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_backend_name.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_bus_number.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_config_index.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_debug.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_desc.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_device_desc.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_fd.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_iface_desc.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_info.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_mode.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_parent_address.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_parent_port.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_port_path.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_power_mode.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_power_usage.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_speed.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_kernel_driver_active.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_open.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_process.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_req_string_simple_sync.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_req_string_sync.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_request_sync.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_reset.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_set_alt_index.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_set_config_index.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_set_debug.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_set_power_mode.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_wait_process.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_error_name.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_me_decode.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_me_encode.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_me_get_1.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_me_get_2.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_strerror.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_bulk_intr_sync.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_callback_wrapper.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_clear_stall_sync.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_close.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_drain.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_actual_frames.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_actual_length.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_length.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_max_frames.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_max_packet_length.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_max_total_length.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_pointer.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_priv_sc0.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_priv_sc1.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_status.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_time_complete.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_open.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_pending.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_set_buffer.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_set_callback.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_set_flags.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_set_length.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_set_priv_sc0.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_set_priv_sc1.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_set_timeout.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_set_total_frames.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_setup_bulk.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_setup_control.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_setup_intr.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_setup_isoc.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_start.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_stop.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_submit.3.gz +OLD_FILES+=usr/share/man/man3/libusb_alloc_transfer.3.gz +OLD_FILES+=usr/share/man/man3/libusb_attach_kernel_driver.3.gz +OLD_FILES+=usr/share/man/man3/libusb_bulk_transfer.3.gz +OLD_FILES+=usr/share/man/man3/libusb_cancel_transfer.3.gz +OLD_FILES+=usr/share/man/man3/libusb_check_connected.3.gz +OLD_FILES+=usr/share/man/man3/libusb_claim_interface.3.gz +OLD_FILES+=usr/share/man/man3/libusb_clear_halt.3.gz +OLD_FILES+=usr/share/man/man3/libusb_close.3.gz +OLD_FILES+=usr/share/man/man3/libusb_control_transfer.3.gz +OLD_FILES+=usr/share/man/man3/libusb_detach_kernel_driver.3.gz +OLD_FILES+=usr/share/man/man3/libusb_detach_kernel_driver_np.3.gz +OLD_FILES+=usr/share/man/man3/libusb_error_name.3.gz +OLD_FILES+=usr/share/man/man3/libusb_event_handler_active.3.gz +OLD_FILES+=usr/share/man/man3/libusb_event_handling_ok.3.gz +OLD_FILES+=usr/share/man/man3/libusb_exit.3.gz +OLD_FILES+=usr/share/man/man3/libusb_free_bos_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/libusb_free_config_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/libusb_free_device_list.3.gz +OLD_FILES+=usr/share/man/man3/libusb_free_ss_endpoint_comp.3.gz +OLD_FILES+=usr/share/man/man3/libusb_free_transfer.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_active_config_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_bus_number.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_config_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_config_descriptor_by_value.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_configuration.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_device.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_device_address.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_device_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_device_list.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_device_speed.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_driver.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_driver_np.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_max_iso_packet_size.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_max_packet_size.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_next_timeout.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_pollfds.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_string_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_string_descriptor_ascii.3.gz +OLD_FILES+=usr/share/man/man3/libusb_handle_events.3.gz +OLD_FILES+=usr/share/man/man3/libusb_handle_events_completed.3.gz +OLD_FILES+=usr/share/man/man3/libusb_handle_events_locked.3.gz +OLD_FILES+=usr/share/man/man3/libusb_handle_events_timeout.3.gz +OLD_FILES+=usr/share/man/man3/libusb_handle_events_timeout_completed.3.gz +OLD_FILES+=usr/share/man/man3/libusb_init.3.gz +OLD_FILES+=usr/share/man/man3/libusb_interrupt_transfer.3.gz +OLD_FILES+=usr/share/man/man3/libusb_kernel_driver_active.3.gz +OLD_FILES+=usr/share/man/man3/libusb_lock_event_waiters.3.gz +OLD_FILES+=usr/share/man/man3/libusb_lock_events.3.gz +OLD_FILES+=usr/share/man/man3/libusb_open.3.gz +OLD_FILES+=usr/share/man/man3/libusb_open_device_with_vid_pid.3.gz +OLD_FILES+=usr/share/man/man3/libusb_parse_bos_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/libusb_parse_ss_endpoint_comp.3.gz +OLD_FILES+=usr/share/man/man3/libusb_ref_device.3.gz +OLD_FILES+=usr/share/man/man3/libusb_release_interface.3.gz +OLD_FILES+=usr/share/man/man3/libusb_reset_device.3.gz +OLD_FILES+=usr/share/man/man3/libusb_set_configuration.3.gz +OLD_FILES+=usr/share/man/man3/libusb_set_debug.3.gz +OLD_FILES+=usr/share/man/man3/libusb_set_interface_alt_setting.3.gz +OLD_FILES+=usr/share/man/man3/libusb_set_pollfd_notifiers.3.gz +OLD_FILES+=usr/share/man/man3/libusb_strerror.3.gz +OLD_FILES+=usr/share/man/man3/libusb_submit_transfer.3.gz +OLD_FILES+=usr/share/man/man3/libusb_try_lock_events.3.gz +OLD_FILES+=usr/share/man/man3/libusb_unlock_event_waiters.3.gz +OLD_FILES+=usr/share/man/man3/libusb_unlock_events.3.gz +OLD_FILES+=usr/share/man/man3/libusb_unref_device.3.gz +OLD_FILES+=usr/share/man/man3/libusb_wait_for_event.3.gz +OLD_FILES+=usr/share/man/man3/libusbhid.3.gz +OLD_FILES+=usr/share/man/man3/usb.3.gz +OLD_FILES+=usr/share/man/man3/usb_bulk_read.3.gz +OLD_FILES+=usr/share/man/man3/usb_bulk_write.3.gz +OLD_FILES+=usr/share/man/man3/usb_check_connected.3.gz +OLD_FILES+=usr/share/man/man3/usb_claim_interface.3.gz +OLD_FILES+=usr/share/man/man3/usb_clear_halt.3.gz +OLD_FILES+=usr/share/man/man3/usb_close.3.gz +OLD_FILES+=usr/share/man/man3/usb_control_msg.3.gz +OLD_FILES+=usr/share/man/man3/usb_destroy_configuration.3.gz +OLD_FILES+=usr/share/man/man3/usb_device.3.gz +OLD_FILES+=usr/share/man/man3/usb_fetch_and_parse_descriptors.3.gz +OLD_FILES+=usr/share/man/man3/usb_find_busses.3.gz +OLD_FILES+=usr/share/man/man3/usb_find_devices.3.gz +OLD_FILES+=usr/share/man/man3/usb_get_busses.3.gz +OLD_FILES+=usr/share/man/man3/usb_get_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/usb_get_descriptor_by_endpoint.3.gz +OLD_FILES+=usr/share/man/man3/usb_get_string.3.gz +OLD_FILES+=usr/share/man/man3/usb_get_string_simple.3.gz +OLD_FILES+=usr/share/man/man3/usb_init.3.gz +OLD_FILES+=usr/share/man/man3/usb_interrupt_read.3.gz +OLD_FILES+=usr/share/man/man3/usb_interrupt_write.3.gz +OLD_FILES+=usr/share/man/man3/usb_open.3.gz +OLD_FILES+=usr/share/man/man3/usb_parse_configuration.3.gz +OLD_FILES+=usr/share/man/man3/usb_parse_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/usb_release_interface.3.gz +OLD_FILES+=usr/share/man/man3/usb_reset.3.gz +OLD_FILES+=usr/share/man/man3/usb_resetep.3.gz +OLD_FILES+=usr/share/man/man3/usb_set_altinterface.3.gz +OLD_FILES+=usr/share/man/man3/usb_set_configuration.3.gz +OLD_FILES+=usr/share/man/man3/usb_set_debug.3.gz +OLD_FILES+=usr/share/man/man3/usb_strerror.3.gz +OLD_FILES+=usr/share/man/man3/usbhid.3.gz +OLD_FILES+=usr/share/man/man4/u3g.4.gz +OLD_FILES+=usr/share/man/man4/u3gstub.4.gz +OLD_FILES+=usr/share/man/man4/uark.4.gz +OLD_FILES+=usr/share/man/man4/uart.4.gz +OLD_FILES+=usr/share/man/man4/uath.4.gz +OLD_FILES+=usr/share/man/man4/ubsa.4.gz +OLD_FILES+=usr/share/man/man4/ubsec.4.gz +OLD_FILES+=usr/share/man/man4/ubser.4.gz +OLD_FILES+=usr/share/man/man4/ubtbcmfw.4.gz +OLD_FILES+=usr/share/man/man4/uchcom.4.gz +OLD_FILES+=usr/share/man/man4/ucom.4.gz +OLD_FILES+=usr/share/man/man4/ucycom.4.gz +OLD_FILES+=usr/share/man/man4/udav.4.gz +OLD_FILES+=usr/share/man/man4/udbp.4.gz +OLD_FILES+=usr/share/man/man4/udp.4.gz +OLD_FILES+=usr/share/man/man4/udplite.4.gz +OLD_FILES+=usr/share/man/man4/uep.4.gz +OLD_FILES+=usr/share/man/man4/ufm.4.gz +OLD_FILES+=usr/share/man/man4/ufoma.4.gz +OLD_FILES+=usr/share/man/man4/uftdi.4.gz +OLD_FILES+=usr/share/man/man4/ugen.4.gz +OLD_FILES+=usr/share/man/man4/uhci.4.gz +OLD_FILES+=usr/share/man/man4/uhid.4.gz +OLD_FILES+=usr/share/man/man4/uhso.4.gz +OLD_FILES+=usr/share/man/man4/uipaq.4.gz +OLD_FILES+=usr/share/man/man4/ukbd.4.gz +OLD_FILES+=usr/share/man/man4/uled.4.gz +OLD_FILES+=usr/share/man/man4/ulpt.4.gz +OLD_FILES+=usr/share/man/man4/umass.4.gz +OLD_FILES+=usr/share/man/man4/umcs.4.gz +OLD_FILES+=usr/share/man/man4/umct.4.gz +OLD_FILES+=usr/share/man/man4/umodem.4.gz +OLD_FILES+=usr/share/man/man4/umoscom.4.gz +OLD_FILES+=usr/share/man/man4/ums.4.gz +OLD_FILES+=usr/share/man/man4/unix.4.gz +OLD_FILES+=usr/share/man/man4/upgt.4.gz +OLD_FILES+=usr/share/man/man4/uplcom.4.gz +OLD_FILES+=usr/share/man/man4/ural.4.gz +OLD_FILES+=usr/share/man/man4/urio.4.gz +OLD_FILES+=usr/share/man/man4/urndis.4.gz +OLD_FILES+=usr/share/man/man4/urtw.4.gz +OLD_FILES+=usr/share/man/man4/urtwn.4.gz +OLD_FILES+=usr/share/man/man4/urtwnfw.4.gz +OLD_FILES+=usr/share/man/man4/usb.4.gz +OLD_FILES+=usr/share/man/man4/usb_quirk.4.gz +OLD_FILES+=usr/share/man/man4/usb_template.4.gz +OLD_FILES+=usr/share/man/man4/usfs.4.gz +OLD_FILES+=usr/share/man/man4/uslcom.4.gz +OLD_FILES+=usr/share/man/man4/utopia.4.gz +OLD_FILES+=usr/share/man/man4/uvisor.4.gz +OLD_FILES+=usr/share/man/man4/uvscom.4.gz +OLD_FILES+=usr/share/man/man8/usbconfig.8.gz +OLD_FILES+=usr/share/man/man8/usbdump.8.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_alloc_buffer.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_attach.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_detach.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_free_buffer.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_get_data.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_get_data_buffer.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_get_data_error.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_get_data_linear.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_put_bytes_max.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_put_data.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_put_data_buffer.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_put_data_error.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_put_data_linear.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_reset.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_softc.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_wakeup.9.gz +OLD_FILES+=usr/share/man/man9/usbd_do_request.9.gz +OLD_FILES+=usr/share/man/man9/usbd_do_request_flags.9.gz +OLD_FILES+=usr/share/man/man9/usbd_errstr.9.gz +OLD_FILES+=usr/share/man/man9/usbd_lookup_id_by_info.9.gz +OLD_FILES+=usr/share/man/man9/usbd_lookup_id_by_uaa.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer_clear_stall.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer_drain.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer_pending.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer_poll.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer_setup.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer_start.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer_stop.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer_submit.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer_unsetup.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_clr_flag.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_frame_data.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_frame_len.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_get_frame.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_get_priv.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_is_stalled.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_max_framelen.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_max_frames.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_max_len.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_set_flag.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frame_data.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frame_len.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frame_offset.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frames.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_set_interval.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_set_priv.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_set_stall.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_set_timeout.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_softc.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_state.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_status.9.gz +OLD_FILES+=usr/share/man/man9/usbdi.9.gz +OLD_FILES+=usr/share/misc/usb_hid_usages +OLD_FILES+=usr/share/misc/usbdevs .endif .if ${MK_UTMPX} == no From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 21:32:13 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8E78B6B1; Wed, 26 Nov 2014 21:32:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7B0956E2; Wed, 26 Nov 2014 21:32:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQLWDxD080692; Wed, 26 Nov 2014 21:32:13 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQLWDQT080691; Wed, 26 Nov 2014 21:32:13 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411262132.sAQLWDQT080691@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 26 Nov 2014 21:32:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275143 - projects/building-blocks/share/man/man4 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 21:32:13 -0000 Author: ngie Date: Wed Nov 26 21:32:12 2014 New Revision: 275143 URL: https://svnweb.freebsd.org/changeset/base/275143 Log: Add missing line continuation Modified: projects/building-blocks/share/man/man4/Makefile Modified: projects/building-blocks/share/man/man4/Makefile ============================================================================== --- projects/building-blocks/share/man/man4/Makefile Wed Nov 26 21:18:52 2014 (r275142) +++ projects/building-blocks/share/man/man4/Makefile Wed Nov 26 21:32:12 2014 (r275143) @@ -867,7 +867,7 @@ MAN+= \ usb_quirk.4 \ usb_template.4 \ usfs.4 \ - uslcom.4 + uslcom.4 \ utopia.4 \ uvisor.4 \ uvscom.4 \ From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 21:53:54 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0FD24D1B; Wed, 26 Nov 2014 21:53:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F0329971; Wed, 26 Nov 2014 21:53:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQLrrmg090362; Wed, 26 Nov 2014 21:53:53 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQLrrRa090361; Wed, 26 Nov 2014 21:53:53 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411262153.sAQLrrRa090361@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 26 Nov 2014 21:53:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275144 - projects/building-blocks/tools/build/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 21:53:54 -0000 Author: ngie Date: Wed Nov 26 21:53:53 2014 New Revision: 275144 URL: https://svnweb.freebsd.org/changeset/base/275144 Log: Installing zzz(8) doesn't make sense when both ACPI and APM are disabled Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 21:32:12 2014 (r275143) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 21:53:53 2014 (r275144) @@ -58,6 +58,11 @@ OLD_FILES+=usr/share/man/man8/amd64/apm. OLD_FILES+=usr/share/man/man8/amd64/apmconf.8.gz .endif +.if ${MK_APM} == no && ${MK_ACPI} == no +OLD_FILES+=usr/sbin/zzz +OLD_FILES+=usr/share/man/man8/zzz.8.gz +.endif + .if ${MK_AT} == no OLD_FILES+=usr/bin/at OLD_FILES+=usr/bin/atq From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 22:26:23 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D3994434; Wed, 26 Nov 2014 22:26:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C075EC38; Wed, 26 Nov 2014 22:26:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQMQNcO004907; Wed, 26 Nov 2014 22:26:23 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQMQNhP004906; Wed, 26 Nov 2014 22:26:23 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411262226.sAQMQNhP004906@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 26 Nov 2014 22:26:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275145 - projects/building-blocks/tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 22:26:23 -0000 Author: ngie Date: Wed Nov 26 22:26:22 2014 New Revision: 275145 URL: https://svnweb.freebsd.org/changeset/base/275145 Log: - Fix egrep -> grep typo introduced in previous commit - Do depth-first search on OLD_DIRS so the list is logically sorted Modified: projects/building-blocks/tools/add-optional-obsolete-files-entries.sh Modified: projects/building-blocks/tools/add-optional-obsolete-files-entries.sh ============================================================================== --- projects/building-blocks/tools/add-optional-obsolete-files-entries.sh Wed Nov 26 21:53:53 2014 (r275144) +++ projects/building-blocks/tools/add-optional-obsolete-files-entries.sh Wed Nov 26 22:26:22 2014 (r275145) @@ -45,7 +45,7 @@ done find -s . -type f -mindepth 1 | \ sed -e 's,^,OLD_FILES+=,' \ -e '/lib\/.*\.so\.[0-9]\.*/s/OLD_FILES+=/OLD_LIBS+=/g'; - find -s . -type d -mindepth 1 -and \! -empty | \ - grep -v '^\./(s*bin|libexec|usr|usr/include|usr/lib(data)?|usr/libdata/pkgconfig|usr/lib/private|usr/libexec|usr/s*bin|usr/share(/(examples|man))?|usr/share/man/man[0-9])$' | \ + find -d -s . -type d -mindepth 1 -and \! -empty | \ + egrep -v '^\./(s*bin|libexec|usr|usr/include|usr/lib(data)?|usr/libdata/pkgconfig|usr/lib/private|usr/libexec|usr/s*bin|usr/share|usr/share/(examples|man)|usr/share/man/man[0-9])$' | \ sed -e 's,^,OLD_DIRS+=,' ) | sed -e 's,+=\./,+=,' From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 22:27:32 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BB0856BE; Wed, 26 Nov 2014 22:27:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A810DC4B; Wed, 26 Nov 2014 22:27:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQMRWd3005095; Wed, 26 Nov 2014 22:27:32 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQMRWa9005091; Wed, 26 Nov 2014 22:27:32 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411262227.sAQMRWa9005091@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 26 Nov 2014 22:27:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275146 - projects/building-blocks/usr.sbin X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 22:27:32 -0000 Author: ngie Date: Wed Nov 26 22:27:31 2014 New Revision: 275146 URL: https://svnweb.freebsd.org/changeset/base/275146 Log: Followup to r275144 -- don't traverse down usr.sbin/zzz if ACPI/APM are disabled Modified: projects/building-blocks/usr.sbin/Makefile.amd64 projects/building-blocks/usr.sbin/Makefile.i386 Modified: projects/building-blocks/usr.sbin/Makefile.amd64 ============================================================================== --- projects/building-blocks/usr.sbin/Makefile.amd64 Wed Nov 26 22:26:22 2014 (r275145) +++ projects/building-blocks/usr.sbin/Makefile.amd64 Wed Nov 26 22:27:31 2014 (r275146) @@ -32,4 +32,6 @@ SUBDIR+= ndiscvt .endif SUBDIR+= sicontrol SUBDIR+= spkrtest +.if ${MK_ACPI} != "no" || ${MK_APM} != "no" SUBDIR+= zzz +.endif Modified: projects/building-blocks/usr.sbin/Makefile.i386 ============================================================================== --- projects/building-blocks/usr.sbin/Makefile.i386 Wed Nov 26 22:26:22 2014 (r275145) +++ projects/building-blocks/usr.sbin/Makefile.i386 Wed Nov 26 22:27:31 2014 (r275146) @@ -23,7 +23,9 @@ SUBDIR+= ndiscvt SUBDIR+= pnpinfo SUBDIR+= sicontrol SUBDIR+= spkrtest +.if ${MK_ACPI} != "no" || ${MK_APM} != "no" SUBDIR+= zzz +.endif # Differentiate between FreeBSD/i386 and FreeBSD/pc98 .if ${MACHINE} == "i386" From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 22:41:52 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BFA4E943; Wed, 26 Nov 2014 22:41:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AA52ADDC; Wed, 26 Nov 2014 22:41:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQMfqVu013706; Wed, 26 Nov 2014 22:41:52 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQMfpSs013703; Wed, 26 Nov 2014 22:41:51 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411262241.sAQMfpSs013703@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 26 Nov 2014 22:41:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275147 - in projects/building-blocks: etc/rc.d share/man/man4 tools/build/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 22:41:52 -0000 Author: ngie Date: Wed Nov 26 22:41:51 2014 New Revision: 275147 URL: https://svnweb.freebsd.org/changeset/base/275147 Log: - Fill in MK_LEGACY_CONSOLE == no and SYSCONS == no - Don't install syscons(4) - Don't install the moused or syscons rc.d scripts if MK_LEGACY_CONSOLE == no Modified: projects/building-blocks/etc/rc.d/Makefile projects/building-blocks/share/man/man4/Makefile projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/etc/rc.d/Makefile ============================================================================== --- projects/building-blocks/etc/rc.d/Makefile Wed Nov 26 22:27:31 2014 (r275146) +++ projects/building-blocks/etc/rc.d/Makefile Wed Nov 26 22:41:51 2014 (r275147) @@ -80,7 +80,6 @@ FILES= DAEMON \ mdconfig \ mdconfig2 \ mountd \ - moused \ mroute6d \ mrouted \ msgs \ @@ -134,7 +133,6 @@ FILES= DAEMON \ stf \ swap \ swaplate \ - syscons \ sysctl \ syslogd \ tmp \ @@ -200,6 +198,11 @@ FILES+= iscsictl FILES+= iscsid .endif +.if ${MK_LEGACY_CONSOLE} != "no" +FILES+= moused +FILES+= syscons +.endif + .if ${MK_NS_CACHING} != "no" _nscd= nscd .endif Modified: projects/building-blocks/share/man/man4/Makefile ============================================================================== --- projects/building-blocks/share/man/man4/Makefile Wed Nov 26 22:27:31 2014 (r275146) +++ projects/building-blocks/share/man/man4/Makefile Wed Nov 26 22:41:51 2014 (r275147) @@ -481,7 +481,6 @@ MAN= aac.4 \ sym.4 \ syncache.4 \ syncer.4 \ - syscons.4 \ sysmouse.4 \ tap.4 \ targ.4 \ @@ -819,6 +818,10 @@ _pflog.4= pflog.4 _pfsync.4= pfsync.4 .endif +.if ${MK_SYSCONS} != "no" +MAN+= syscons.4 +.endif + .if ${MK_USB} != "no" MAN+= \ u3g.4 \ Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 22:27:31 2014 (r275146) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 22:41:51 2014 (r275147) @@ -3328,6 +3328,23 @@ OLD_FILES+=usr/bin/host OLD_FILES+=usr/share/man/man1/host.1.gz .endif +.if ${MK_LEGACY_CONSOLE} == no +OLD_FILES+=etc/rc.d/moused +OLD_FILES+=etc/rc.d/syscons +OLD_FILES+=usr/sbin/kbdcontrol +OLD_FILES+=usr/sbin/kbdmap +OLD_FILES+=usr/sbin/moused +OLD_FILES+=usr/sbin/vidcontrol +OLD_FILES+=usr/sbin/vidfont +OLD_FILES+=usr/share/man/man1/kbdcontrol.1.gz +OLD_FILES+=usr/share/man/man1/kbdmap.1.gz +OLD_FILES+=usr/share/man/man1/vidcontrol.1.gz +OLD_FILES+=usr/share/man/man1/vidfont.1.gz +OLD_FILES+=usr/share/man/man5/kbdmap.5.gz +OLD_FILES+=usr/share/man/man5/keymap.5.gz +OLD_FILES+=usr/share/man/man8/moused.8.g +.endif + #.if ${MK_LIB32} == no # to be filled in #.endif @@ -4295,9 +4312,195 @@ OLD_FILES+=usr/share/doc/pjdfstest/READM OLD_DIRS+=usr/share/doc/pjdfstest .endif -#.if ${MK_SYSCONS} == no -# to be filled in -#.endif +.if ${MK_SYSCONS} == no +OLD_FILES+=usr/share/man/man4/syscons.4.gz +OLD_FILES+=usr/share/syscons/fonts/INDEX.fonts +OLD_FILES+=usr/share/syscons/fonts/armscii8-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/armscii8-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/armscii8-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/cp1251-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/cp1251-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp1251-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/cp437-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/cp437-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp437-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/cp437-thin-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp437-thin-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/cp850-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/cp850-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp850-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/cp850-thin-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp850-thin-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/cp865-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/cp865-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp865-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/cp865-thin-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp865-thin-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/cp866-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/cp866-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp866-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/cp866b-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp866c-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp866u-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/cp866u-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp866u-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/haik8-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/haik8-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/haik8-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/iso-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/iso-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/iso-thin-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso02-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/iso02-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso02-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/iso04-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/iso04-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso04-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-wide-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso04-wide-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso05-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/iso05-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso05-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/iso07-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/iso07-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso07-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/iso08-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/iso08-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso08-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/iso09-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso15-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/iso15-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso15-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/iso15-thin-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/koi8-r-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/koi8-r-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/koi8-r-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/koi8-rb-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/koi8-rc-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/koi8-u-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/koi8-u-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/koi8-u-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/swiss-1131-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/swiss-1251-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/swiss-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/swiss-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/swiss-8x8.fnt +OLD_FILES+=usr/share/syscons/keymaps/INDEX.keymaps +OLD_FILES+=usr/share/syscons/keymaps/be.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/be.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/bg.bds.ctrlcaps.kbd +OLD_FILES+=usr/share/syscons/keymaps/bg.phonetic.ctrlcaps.kbd +OLD_FILES+=usr/share/syscons/keymaps/br275.cp850.kbd +OLD_FILES+=usr/share/syscons/keymaps/br275.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/br275.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/by.cp1131.kbd +OLD_FILES+=usr/share/syscons/keymaps/by.cp1251.kbd +OLD_FILES+=usr/share/syscons/keymaps/by.iso5.kbd +OLD_FILES+=usr/share/syscons/keymaps/ce.iso2.kbd +OLD_FILES+=usr/share/syscons/keymaps/colemak.iso15.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/cs.latin2.qwertz.kbd +OLD_FILES+=usr/share/syscons/keymaps/cz.iso2.kbd +OLD_FILES+=usr/share/syscons/keymaps/danish.cp865.kbd +OLD_FILES+=usr/share/syscons/keymaps/danish.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/danish.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/danish.iso.macbook.kbd +OLD_FILES+=usr/share/syscons/keymaps/dutch.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/eee_nordic.kbd +OLD_FILES+=usr/share/syscons/keymaps/el.iso07.kbd +OLD_FILES+=usr/share/syscons/keymaps/estonian.cp850.kbd +OLD_FILES+=usr/share/syscons/keymaps/estonian.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/estonian.iso15.kbd +OLD_FILES+=usr/share/syscons/keymaps/finnish.cp850.kbd +OLD_FILES+=usr/share/syscons/keymaps/finnish.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/fr.dvorak.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/fr.dvorak.kbd +OLD_FILES+=usr/share/syscons/keymaps/fr.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/fr.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/fr.macbook.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/fr_CA.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/german.cp850.kbd +OLD_FILES+=usr/share/syscons/keymaps/german.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/german.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/gr.elot.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/gr.us101.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/hr.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/hu.iso2.101keys.kbd +OLD_FILES+=usr/share/syscons/keymaps/hu.iso2.102keys.kbd +OLD_FILES+=usr/share/syscons/keymaps/hy.armscii-8.kbd +OLD_FILES+=usr/share/syscons/keymaps/icelandic.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/icelandic.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/it.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/iw.iso8.kbd +OLD_FILES+=usr/share/syscons/keymaps/jp.106.kbd +OLD_FILES+=usr/share/syscons/keymaps/jp.106x.kbd +OLD_FILES+=usr/share/syscons/keymaps/jp.pc98.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/jp.pc98.kbd +OLD_FILES+=usr/share/syscons/keymaps/kk.pt154.io.kbd +OLD_FILES+=usr/share/syscons/keymaps/kk.pt154.kst.kbd +OLD_FILES+=usr/share/syscons/keymaps/latinamerican.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/latinamerican.kbd +OLD_FILES+=usr/share/syscons/keymaps/lt.iso4.kbd +OLD_FILES+=usr/share/syscons/keymaps/norwegian.dvorak.kbd +OLD_FILES+=usr/share/syscons/keymaps/norwegian.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/pl_PL.ISO8859-2.kbd +OLD_FILES+=usr/share/syscons/keymaps/pl_PL.dvorak.kbd +OLD_FILES+=usr/share/syscons/keymaps/pt.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/pt.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/ru.cp866.kbd +OLD_FILES+=usr/share/syscons/keymaps/ru.iso5.kbd +OLD_FILES+=usr/share/syscons/keymaps/ru.koi8-r.kbd +OLD_FILES+=usr/share/syscons/keymaps/ru.koi8-r.shift.kbd +OLD_FILES+=usr/share/syscons/keymaps/ru.koi8-r.win.kbd +OLD_FILES+=usr/share/syscons/keymaps/si.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/sk.iso2.kbd +OLD_FILES+=usr/share/syscons/keymaps/spanish.dvorak.kbd +OLD_FILES+=usr/share/syscons/keymaps/spanish.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/spanish.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/spanish.iso15.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/swedish.cp850.kbd +OLD_FILES+=usr/share/syscons/keymaps/swedish.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/swissfrench.cp850.kbd +OLD_FILES+=usr/share/syscons/keymaps/swissfrench.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/swissfrench.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/swissgerman.cp850.kbd +OLD_FILES+=usr/share/syscons/keymaps/swissgerman.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/swissgerman.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/swissgerman.macbook.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/tr.iso9.q.kbd +OLD_FILES+=usr/share/syscons/keymaps/ua.iso5.kbd +OLD_FILES+=usr/share/syscons/keymaps/ua.koi8-u.kbd +OLD_FILES+=usr/share/syscons/keymaps/ua.koi8-u.shift.alt.kbd +OLD_FILES+=usr/share/syscons/keymaps/uk.cp850-ctrl.kbd +OLD_FILES+=usr/share/syscons/keymaps/uk.cp850.kbd +OLD_FILES+=usr/share/syscons/keymaps/uk.dvorak.kbd +OLD_FILES+=usr/share/syscons/keymaps/uk.iso-ctrl.kbd +OLD_FILES+=usr/share/syscons/keymaps/uk.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.dvorak.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.dvorakl.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.dvorakp.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.dvorakr.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.dvorakx.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.emacs.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.pc-ctrl.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.unix.kbd +OLD_FILES+=usr/share/syscons/scrnmaps/armscii8-2haik8.scm +OLD_FILES+=usr/share/syscons/scrnmaps/iso-8859-1_to_cp437.scm +OLD_FILES+=usr/share/syscons/scrnmaps/iso-8859-4_for_vga9.scm +OLD_FILES+=usr/share/syscons/scrnmaps/iso-8859-7_to_cp437.scm +OLD_FILES+=usr/share/syscons/scrnmaps/koi8-r2cp866.scm +OLD_FILES+=usr/share/syscons/scrnmaps/koi8-u2cp866u.scm +OLD_FILES+=usr/share/syscons/scrnmaps/us-ascii_to_cp437.scm +OLD_DIRS+=usr/share/syscons/fonts +OLD_DIRS+=usr/share/syscons/keymaps +OLD_DIRS+=usr/share/syscons/scrnmaps +OLD_DIRS+=usr/share/syscons +.endif .if ${MK_TALK} == no OLD_FILES+=usr/bin/talk From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 23:07:55 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 06FE7230; Wed, 26 Nov 2014 23:07:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E80DA88; Wed, 26 Nov 2014 23:07:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQN7sBm024466; Wed, 26 Nov 2014 23:07:54 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQN7sen024465; Wed, 26 Nov 2014 23:07:54 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411262307.sAQN7sen024465@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 26 Nov 2014 23:07:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275150 - projects/building-blocks/sys/modules X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 23:07:55 -0000 Author: ngie Date: Wed Nov 26 23:07:54 2014 New Revision: 275150 URL: https://svnweb.freebsd.org/changeset/base/275150 Log: Move hyperv/vmm under MK_HYPERV/MK_BHYVE, respectively Modified: projects/building-blocks/sys/modules/Makefile Modified: projects/building-blocks/sys/modules/Makefile ============================================================================== --- projects/building-blocks/sys/modules/Makefile Wed Nov 26 23:02:22 2014 (r275149) +++ projects/building-blocks/sys/modules/Makefile Wed Nov 26 23:07:54 2014 (r275150) @@ -389,6 +389,10 @@ SUBDIR= \ ${_zfs} \ zlib +.if ${MK_BHYVE} != "no" || defined(ALL_MODULES) +_vmm= vmm +.endif + .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) .if exists(${.CURDIR}/../opencrypto) _crypto= crypto @@ -399,6 +403,10 @@ _random= random .endif .endif +.if ${MK_HYPERV} != "no" || defined(ALL_MODULES) +_hyperv= hyperv +.endif + .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \ defined(ALL_MODULES) _carp= carp @@ -550,7 +558,6 @@ _hptmv= hptmv _hptnr= hptnr _hptrr= hptrr .endif -_hyperv= hyperv _ichwd= ichwd _ida= ida _iir= iir @@ -612,7 +619,6 @@ _qlxge= qlxge _qlxgb= qlxgb _qlxgbe= qlxgbe _sfxge= sfxge -_vmm= vmm .endif .if ${MACHINE_CPUARCH} == "i386" From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 23:28:16 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CED3ECF8; Wed, 26 Nov 2014 23:28:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BBEA12D9; Wed, 26 Nov 2014 23:28:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQNSGUu034759; Wed, 26 Nov 2014 23:28:16 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQNSG4V034758; Wed, 26 Nov 2014 23:28:16 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411262328.sAQNSG4V034758@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 26 Nov 2014 23:28:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275151 - projects/clang350-import/sys/conf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 23:28:16 -0000 Author: dim Date: Wed Nov 26 23:28:16 2014 New Revision: 275151 URL: https://svnweb.freebsd.org/changeset/base/275151 Log: Since for clang 3.5.0 ARM EHABI is now the default, the -mllvm -arm-enable-ehabi flag is no longer supported. Use it only for older versions of clang. Modified: projects/clang350-import/sys/conf/Makefile.arm Modified: projects/clang350-import/sys/conf/Makefile.arm ============================================================================== --- projects/clang350-import/sys/conf/Makefile.arm Wed Nov 26 23:07:54 2014 (r275150) +++ projects/clang350-import/sys/conf/Makefile.arm Wed Nov 26 23:28:16 2014 (r275151) @@ -47,8 +47,10 @@ CFLAGS.clang += -mfpu=none .if !empty(DDB_ENABLED) CFLAGS += -funwind-tables -# clang requires us to tell it to emit assembly with unwind information -CFLAGS.clang += -mllvm -arm-enable-ehabi +.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} < 30500 +# clang < 3.5.0 requires us to tell it to emit assembly with unwind information +CFLAGS += -mllvm -arm-enable-ehabi +.endif .endif # hack because genassym.c includes sys/bus.h which includes these. From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 23:53:00 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C6A703C3; Wed, 26 Nov 2014 23:53:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B3DC37AC; Wed, 26 Nov 2014 23:53:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQNr0J8048315; Wed, 26 Nov 2014 23:53:00 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQNr077048310; Wed, 26 Nov 2014 23:53:00 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411262353.sAQNr077048310@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 26 Nov 2014 23:53:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275152 - in projects/clang350-import/contrib/llvm: include/llvm/Support lib/Object X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 23:53:01 -0000 Author: dim Date: Wed Nov 26 23:52:59 2014 New Revision: 275152 URL: https://svnweb.freebsd.org/changeset/base/275152 Log: Pull in r215352 from upstream llvm trunk (by Tim Northover): AArch64: add support for dynamic-loader relocations LLD needs them, and it's good to be able to print them properly when our object dumpers encounter them. Patch by Daniel Stewart. This is needed for supporting the upgrade to a newer LLDB snapshot. Modified: projects/clang350-import/contrib/llvm/include/llvm/Support/ELF.h projects/clang350-import/contrib/llvm/lib/Object/ELF.cpp Modified: projects/clang350-import/contrib/llvm/include/llvm/Support/ELF.h ============================================================================== --- projects/clang350-import/contrib/llvm/include/llvm/Support/ELF.h Wed Nov 26 23:28:16 2014 (r275151) +++ projects/clang350-import/contrib/llvm/include/llvm/Support/ELF.h Wed Nov 26 23:52:59 2014 (r275152) @@ -653,6 +653,9 @@ enum { R_AARCH64_LDST128_ABS_LO12_NC = 0x12b, + R_AARCH64_GOTREL64 = 0x133, + R_AARCH64_GOTREL32 = 0x134, + R_AARCH64_ADR_GOT_PAGE = 0x137, R_AARCH64_LD64_GOT_LO12_NC = 0x138, @@ -700,7 +703,17 @@ enum { R_AARCH64_TLSDESC_LD64_LO12_NC = 0x233, R_AARCH64_TLSDESC_ADD_LO12_NC = 0x234, - R_AARCH64_TLSDESC_CALL = 0x239 + R_AARCH64_TLSDESC_CALL = 0x239, + + R_AARCH64_COPY = 0x400, + R_AARCH64_GLOB_DAT = 0x401, + R_AARCH64_JUMP_SLOT = 0x402, + R_AARCH64_RELATIVE = 0x403, + R_AARCH64_TLS_DTPREL64 = 0x404, + R_AARCH64_TLS_DTPMOD64 = 0x405, + R_AARCH64_TLS_TPREL64 = 0x406, + R_AARCH64_TLSDESC = 0x407, + R_AARCH64_IRELATIVE = 0x408 }; // ARM Specific e_flags Modified: projects/clang350-import/contrib/llvm/lib/Object/ELF.cpp ============================================================================== --- projects/clang350-import/contrib/llvm/lib/Object/ELF.cpp Wed Nov 26 23:28:16 2014 (r275151) +++ projects/clang350-import/contrib/llvm/lib/Object/ELF.cpp Wed Nov 26 23:52:59 2014 (r275152) @@ -223,6 +223,8 @@ StringRef getELFRelocationTypeName(uint3 LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_LDST32_ABS_LO12_NC); LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_LDST64_ABS_LO12_NC); LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_LDST128_ABS_LO12_NC); + LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_GOTREL64); + LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_GOTREL32); LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_ADR_GOT_PAGE); LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_LD64_GOT_LO12_NC); LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_TLSLD_MOVW_DTPREL_G2); @@ -266,6 +268,15 @@ StringRef getELFRelocationTypeName(uint3 LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_TLSDESC_LD64_LO12_NC); LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_TLSDESC_ADD_LO12_NC); LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_TLSDESC_CALL); + LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_COPY); + LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_GLOB_DAT); + LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_JUMP_SLOT); + LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_RELATIVE); + LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_TLS_DTPREL64); + LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_TLS_DTPMOD64); + LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_TLS_TPREL64); + LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_TLSDESC); + LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_IRELATIVE); default: break; } From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 23:53:36 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 779C84A9; Wed, 26 Nov 2014 23:53:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 64BB77AF; Wed, 26 Nov 2014 23:53:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQNraQU048435; Wed, 26 Nov 2014 23:53:36 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQNraGB048434; Wed, 26 Nov 2014 23:53:36 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411262353.sAQNraGB048434@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 26 Nov 2014 23:53:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275153 - projects/clang350-import/contrib/llvm/include/llvm/Support X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 23:53:36 -0000 Author: dim Date: Wed Nov 26 23:53:35 2014 New Revision: 275153 URL: https://svnweb.freebsd.org/changeset/base/275153 Log: Pull in r216571 from upstream llvm trunk (by Zachary Turner): Fix some semantic usability issues with DynamicLibrary. This patch allows invalid DynamicLibrary instances to be constructed, and fixes the const-correctness of the isValid() method. No functional change. This is needed for supporting the upgrade to a newer LLDB snapshot. Modified: projects/clang350-import/contrib/llvm/include/llvm/Support/DynamicLibrary.h Modified: projects/clang350-import/contrib/llvm/include/llvm/Support/DynamicLibrary.h ============================================================================== --- projects/clang350-import/contrib/llvm/include/llvm/Support/DynamicLibrary.h Wed Nov 26 23:52:59 2014 (r275152) +++ projects/clang350-import/contrib/llvm/include/llvm/Support/DynamicLibrary.h Wed Nov 26 23:53:35 2014 (r275153) @@ -43,10 +43,11 @@ namespace sys { // Opaque data used to interface with OS-specific dynamic library handling. void *Data; - explicit DynamicLibrary(void *data = &Invalid) : Data(data) {} public: + explicit DynamicLibrary(void *data = &Invalid) : Data(data) {} + /// Returns true if the object refers to a valid library. - bool isValid() { return Data != &Invalid; } + bool isValid() const { return Data != &Invalid; } /// Searches through the library for the symbol \p symbolName. If it is /// found, the address of that symbol is returned. If not, NULL is returned. From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 23:54:24 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8BAB059A; Wed, 26 Nov 2014 23:54:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7901A7B9; Wed, 26 Nov 2014 23:54:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQNsOEK048587; Wed, 26 Nov 2014 23:54:24 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQNsOcp048586; Wed, 26 Nov 2014 23:54:24 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411262354.sAQNsOcp048586@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 26 Nov 2014 23:54:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275154 - projects/clang350-import/contrib/llvm/tools/clang/lib/Basic X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 23:54:24 -0000 Author: dim Date: Wed Nov 26 23:54:23 2014 New Revision: 275154 URL: https://svnweb.freebsd.org/changeset/base/275154 Log: Pull in r221900 from upstream clang trunk (by Ed Maste): Hook up FreeBSD AArch64 support Patch from Andrew Turner. Modified: projects/clang350-import/contrib/llvm/tools/clang/lib/Basic/Targets.cpp Modified: projects/clang350-import/contrib/llvm/tools/clang/lib/Basic/Targets.cpp ============================================================================== --- projects/clang350-import/contrib/llvm/tools/clang/lib/Basic/Targets.cpp Wed Nov 26 23:53:35 2014 (r275153) +++ projects/clang350-import/contrib/llvm/tools/clang/lib/Basic/Targets.cpp Wed Nov 26 23:54:23 2014 (r275154) @@ -6036,6 +6036,8 @@ static TargetInfo *AllocateTarget(const return new DarwinAArch64TargetInfo(Triple); switch (os) { + case llvm::Triple::FreeBSD: + return new FreeBSDTargetInfo(Triple); case llvm::Triple::Linux: return new LinuxTargetInfo(Triple); case llvm::Triple::NetBSD: @@ -6047,6 +6049,8 @@ static TargetInfo *AllocateTarget(const case llvm::Triple::aarch64_be: case llvm::Triple::arm64_be: switch (os) { + case llvm::Triple::FreeBSD: + return new FreeBSDTargetInfo(Triple); case llvm::Triple::Linux: return new LinuxTargetInfo(Triple); case llvm::Triple::NetBSD: From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 23:57:13 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9BC096DB; Wed, 26 Nov 2014 23:57:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 87FF77D7; Wed, 26 Nov 2014 23:57:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQNvDn7049027; Wed, 26 Nov 2014 23:57:13 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQNvCo9049024; Wed, 26 Nov 2014 23:57:12 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411262357.sAQNvCo9049024@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 26 Nov 2014 23:57:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275155 - projects/clang350-import/contrib/llvm/patches X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 23:57:13 -0000 Author: dim Date: Wed Nov 26 23:57:12 2014 New Revision: 275155 URL: https://svnweb.freebsd.org/changeset/base/275155 Log: Add patch files for r275152, r275153 and r275154. Added: projects/clang350-import/contrib/llvm/patches/patch-14-llvm-r215352-aarch64-dyn-loader.diff projects/clang350-import/contrib/llvm/patches/patch-15-llvm-r216571-dynamiclib-usability.diff projects/clang350-import/contrib/llvm/patches/patch-16-clang-r221900-freebsd-aarch64.diff Added: projects/clang350-import/contrib/llvm/patches/patch-14-llvm-r215352-aarch64-dyn-loader.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/contrib/llvm/patches/patch-14-llvm-r215352-aarch64-dyn-loader.diff Wed Nov 26 23:57:12 2014 (r275155) @@ -0,0 +1,137 @@ +Pull in r215352 from upstream llvm trunk (by Tim Northover): + + AArch64: add support for dynamic-loader relocations + + LLD needs them, and it's good to be able to print them properly when + our object dumpers encounter them. + + Patch by Daniel Stewart. + +This is needed for supporting the upgrade to a newer LLDB snapshot. + +Introduced here: http://svnweb.freebsd.org/changeset/base/275152 + +Index: test/tools/llvm-readobj/Inputs/relocs.obj.elf-aarch64 +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/x-object +Index: test/tools/llvm-readobj/Inputs/relocs.py +=================================================================== +--- test/tools/llvm-readobj/Inputs/relocs.py (revision 14) ++++ test/tools/llvm-readobj/Inputs/relocs.py (revision 15) +@@ -617,6 +617,8 @@ class Relocs_Elf_AArch64(Enum): + R_AARCH64_LDST32_ABS_LO12_NC = 0x11d + R_AARCH64_LDST64_ABS_LO12_NC = 0x11e + R_AARCH64_LDST128_ABS_LO12_NC = 0x12b ++ R_AARCH64_GOTREL64 = 0x133 ++ R_AARCH64_GOTREL32 = 0x134 + R_AARCH64_ADR_GOT_PAGE = 0x137 + R_AARCH64_LD64_GOT_LO12_NC = 0x138 + R_AARCH64_TLSLD_MOVW_DTPREL_G2 = 0x20b +@@ -660,6 +662,15 @@ class Relocs_Elf_AArch64(Enum): + R_AARCH64_TLSDESC_LD64_LO12_NC = 0x233 + R_AARCH64_TLSDESC_ADD_LO12_NC = 0x234 + R_AARCH64_TLSDESC_CALL = 0x239 ++ R_AARCH64_COPY = 0x400 ++ R_AARCH64_GLOB_DAT = 0x401 ++ R_AARCH64_JUMP_SLOT = 0x402 ++ R_AARCH64_RELATIVE = 0x403 ++ R_AARCH64_TLS_DTPREL64 = 0x404 ++ R_AARCH64_TLS_DTPMOD64 = 0x405 ++ R_AARCH64_TLS_TPREL64 = 0x406 ++ R_AARCH64_TLSDESC = 0x407 ++ R_AARCH64_IRELATIVE = 0x408 + + class Relocs_Elf_ARM(Enum): + R_ARM_NONE = 0x00 +Index: test/tools/llvm-readobj/reloc-types.test +=================================================================== +--- test/tools/llvm-readobj/reloc-types.test (revision 14) ++++ test/tools/llvm-readobj/reloc-types.test (revision 15) +@@ -179,6 +179,8 @@ ELF-AARCH64: Type: R_AARCH64_LDST16_ABS_LO12_NC (2 + ELF-AARCH64: Type: R_AARCH64_LDST32_ABS_LO12_NC (285) + ELF-AARCH64: Type: R_AARCH64_LDST64_ABS_LO12_NC (286) + ELF-AARCH64: Type: R_AARCH64_LDST128_ABS_LO12_NC (299) ++ELF-AARCH64: Type: R_AARCH64_GOTREL64 (307) ++ELF-AARCH64: Type: R_AARCH64_GOTREL32 (308) + ELF-AARCH64: Type: R_AARCH64_ADR_GOT_PAGE (311) + ELF-AARCH64: Type: R_AARCH64_LD64_GOT_LO12_NC (312) + ELF-AARCH64: Type: R_AARCH64_TLSLD_MOVW_DTPREL_G2 (523) +@@ -222,6 +224,15 @@ ELF-AARCH64: Type: R_AARCH64_TLSDESC_ADR_PAGE (562 + ELF-AARCH64: Type: R_AARCH64_TLSDESC_LD64_LO12_NC (563) + ELF-AARCH64: Type: R_AARCH64_TLSDESC_ADD_LO12_NC (564) + ELF-AARCH64: Type: R_AARCH64_TLSDESC_CALL (569) ++ELF-AARCH64: Type: R_AARCH64_COPY (1024) ++ELF-AARCH64: Type: R_AARCH64_GLOB_DAT (1025) ++ELF-AARCH64: Type: R_AARCH64_JUMP_SLOT (1026) ++ELF-AARCH64: Type: R_AARCH64_RELATIVE (1027) ++ELF-AARCH64: Type: R_AARCH64_TLS_DTPREL64 (1028) ++ELF-AARCH64: Type: R_AARCH64_TLS_DTPMOD64 (1029) ++ELF-AARCH64: Type: R_AARCH64_TLS_TPREL64 (1030) ++ELF-AARCH64: Type: R_AARCH64_TLSDESC (1031) ++ELF-AARCH64: Type: R_AARCH64_IRELATIVE (1032) + + ELF-ARM: Type: R_ARM_NONE (0) + ELF-ARM: Type: R_ARM_PC24 (1) +Index: include/llvm/Support/ELF.h +=================================================================== +--- include/llvm/Support/ELF.h (revision 14) ++++ include/llvm/Support/ELF.h (revision 15) +@@ -653,6 +653,9 @@ enum { + + R_AARCH64_LDST128_ABS_LO12_NC = 0x12b, + ++ R_AARCH64_GOTREL64 = 0x133, ++ R_AARCH64_GOTREL32 = 0x134, ++ + R_AARCH64_ADR_GOT_PAGE = 0x137, + R_AARCH64_LD64_GOT_LO12_NC = 0x138, + +@@ -700,7 +703,17 @@ enum { + R_AARCH64_TLSDESC_LD64_LO12_NC = 0x233, + R_AARCH64_TLSDESC_ADD_LO12_NC = 0x234, + +- R_AARCH64_TLSDESC_CALL = 0x239 ++ R_AARCH64_TLSDESC_CALL = 0x239, ++ ++ R_AARCH64_COPY = 0x400, ++ R_AARCH64_GLOB_DAT = 0x401, ++ R_AARCH64_JUMP_SLOT = 0x402, ++ R_AARCH64_RELATIVE = 0x403, ++ R_AARCH64_TLS_DTPREL64 = 0x404, ++ R_AARCH64_TLS_DTPMOD64 = 0x405, ++ R_AARCH64_TLS_TPREL64 = 0x406, ++ R_AARCH64_TLSDESC = 0x407, ++ R_AARCH64_IRELATIVE = 0x408 + }; + + // ARM Specific e_flags +Index: lib/Object/ELF.cpp +=================================================================== +--- lib/Object/ELF.cpp (revision 14) ++++ lib/Object/ELF.cpp (revision 15) +@@ -223,6 +223,8 @@ StringRef getELFRelocationTypeName(uint32_t Machin + LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_LDST32_ABS_LO12_NC); + LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_LDST64_ABS_LO12_NC); + LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_LDST128_ABS_LO12_NC); ++ LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_GOTREL64); ++ LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_GOTREL32); + LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_ADR_GOT_PAGE); + LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_LD64_GOT_LO12_NC); + LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_TLSLD_MOVW_DTPREL_G2); +@@ -266,6 +268,15 @@ StringRef getELFRelocationTypeName(uint32_t Machin + LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_TLSDESC_LD64_LO12_NC); + LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_TLSDESC_ADD_LO12_NC); + LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_TLSDESC_CALL); ++ LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_COPY); ++ LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_GLOB_DAT); ++ LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_JUMP_SLOT); ++ LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_RELATIVE); ++ LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_TLS_DTPREL64); ++ LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_TLS_DTPMOD64); ++ LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_TLS_TPREL64); ++ LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_TLSDESC); ++ LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_IRELATIVE); + default: + break; + } Added: projects/clang350-import/contrib/llvm/patches/patch-15-llvm-r216571-dynamiclib-usability.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/contrib/llvm/patches/patch-15-llvm-r216571-dynamiclib-usability.diff Wed Nov 26 23:57:12 2014 (r275155) @@ -0,0 +1,32 @@ +Pull in r216571 from upstream llvm trunk (by Zachary Turner): + + Fix some semantic usability issues with DynamicLibrary. + + This patch allows invalid DynamicLibrary instances to be + constructed, and fixes the const-correctness of the isValid() + method. + + No functional change. + +This is needed for supporting the upgrade to a newer LLDB snapshot. + +Introduced here: http://svnweb.freebsd.org/changeset/base/275153 + +Index: include/llvm/Support/DynamicLibrary.h +=================================================================== +--- include/llvm/Support/DynamicLibrary.h (revision 15) ++++ include/llvm/Support/DynamicLibrary.h (revision 16) +@@ -43,10 +43,11 @@ namespace sys { + // Opaque data used to interface with OS-specific dynamic library handling. + void *Data; + ++ public: + explicit DynamicLibrary(void *data = &Invalid) : Data(data) {} +- public: ++ + /// Returns true if the object refers to a valid library. +- bool isValid() { return Data != &Invalid; } ++ bool isValid() const { return Data != &Invalid; } + + /// Searches through the library for the symbol \p symbolName. If it is + /// found, the address of that symbol is returned. If not, NULL is returned. Added: projects/clang350-import/contrib/llvm/patches/patch-16-clang-r221900-freebsd-aarch64.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/contrib/llvm/patches/patch-16-clang-r221900-freebsd-aarch64.diff Wed Nov 26 23:57:12 2014 (r275155) @@ -0,0 +1,251 @@ +Pull in r221900 from upstream clang trunk (by Ed Maste): + + Hook up FreeBSD AArch64 support + + Patch from Andrew Turner. + +Introduced here: http://svnweb.freebsd.org/changeset/base/275154 + +Index: tools/clang/test/Driver/freebsd.c +=================================================================== +--- tools/clang/test/Driver/freebsd.c (revision 16) ++++ tools/clang/test/Driver/freebsd.c (revision 17) +@@ -1,4 +1,12 @@ + // RUN: %clang -no-canonical-prefixes \ ++// RUN: -target aarch64-pc-freebsd11 %s \ ++// RUN: --sysroot=%S/Inputs/basic_freebsd64_tree -### 2>&1 \ ++// RUN: | FileCheck --check-prefix=CHECK-ARM64 %s ++// CHECK-ARM64: "-cc1" "-triple" "aarch64-pc-freebsd11" ++// CHECK-ARM64: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" ++// CHECK-ARM64: "--eh-frame-hdr" "-dynamic-linker" "{{.*}}ld-elf{{.*}}" "-o" "a.out" "{{.*}}crt1.o" "{{.*}}crti.o" "{{.*}}crtbegin.o" "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed" "-lc" "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed" "{{.*}}crtend.o" "{{.*}}crtn.o" ++// ++// RUN: %clang -no-canonical-prefixes \ + // RUN: -target powerpc-pc-freebsd8 %s \ + // RUN: --sysroot=%S/Inputs/basic_freebsd_tree -### 2>&1 \ + // RUN: | FileCheck --check-prefix=CHECK-PPC %s +Index: tools/clang/test/Preprocessor/init.c +=================================================================== +--- tools/clang/test/Preprocessor/init.c (revision 16) ++++ tools/clang/test/Preprocessor/init.c (revision 17) +@@ -802,6 +802,199 @@ + // AARCH64-NETBSD:#define __WINT_TYPE__ int + // AARCH64-NETBSD:#define __WINT_WIDTH__ 32 + // AARCH64-NETBSD:#define __aarch64__ 1 ++// ++// RUN: %clang_cc1 -E -dM -ffreestanding -triple=aarch64-freebsd11 < /dev/null | FileCheck -check-prefix AARCH64-FREEBSD %s ++// ++// AARCH64-FREEBSD:#define _LP64 1 ++// AARCH64-FREEBSD-NOT:#define __AARCH64EB__ 1 ++// AARCH64-FREEBSD:#define __AARCH64EL__ 1 ++// AARCH64-FREEBSD-NOT:#define __AARCH_BIG_ENDIAN 1 ++// AARCH64-FREEBSD:#define __ARM_64BIT_STATE 1 ++// AARCH64-FREEBSD:#define __ARM_ARCH 8 ++// AARCH64-FREEBSD:#define __ARM_ARCH_ISA_A64 1 ++// AARCH64-FREEBSD-NOT:#define __ARM_BIG_ENDIAN 1 ++// AARCH64-FREEBSD:#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__ ++// AARCH64-FREEBSD:#define __CHAR16_TYPE__ unsigned short ++// AARCH64-FREEBSD:#define __CHAR32_TYPE__ unsigned int ++// AARCH64-FREEBSD:#define __CHAR_BIT__ 8 ++// AARCH64-FREEBSD:#define __DBL_DENORM_MIN__ 4.9406564584124654e-324 ++// AARCH64-FREEBSD:#define __DBL_DIG__ 15 ++// AARCH64-FREEBSD:#define __DBL_EPSILON__ 2.2204460492503131e-16 ++// AARCH64-FREEBSD:#define __DBL_HAS_DENORM__ 1 ++// AARCH64-FREEBSD:#define __DBL_HAS_INFINITY__ 1 ++// AARCH64-FREEBSD:#define __DBL_HAS_QUIET_NAN__ 1 ++// AARCH64-FREEBSD:#define __DBL_MANT_DIG__ 53 ++// AARCH64-FREEBSD:#define __DBL_MAX_10_EXP__ 308 ++// AARCH64-FREEBSD:#define __DBL_MAX_EXP__ 1024 ++// AARCH64-FREEBSD:#define __DBL_MAX__ 1.7976931348623157e+308 ++// AARCH64-FREEBSD:#define __DBL_MIN_10_EXP__ (-307) ++// AARCH64-FREEBSD:#define __DBL_MIN_EXP__ (-1021) ++// AARCH64-FREEBSD:#define __DBL_MIN__ 2.2250738585072014e-308 ++// AARCH64-FREEBSD:#define __DECIMAL_DIG__ 36 ++// AARCH64-FREEBSD:#define __ELF__ 1 ++// AARCH64-FREEBSD:#define __FLT_DENORM_MIN__ 1.40129846e-45F ++// AARCH64-FREEBSD:#define __FLT_DIG__ 6 ++// AARCH64-FREEBSD:#define __FLT_EPSILON__ 1.19209290e-7F ++// AARCH64-FREEBSD:#define __FLT_EVAL_METHOD__ 0 ++// AARCH64-FREEBSD:#define __FLT_HAS_DENORM__ 1 ++// AARCH64-FREEBSD:#define __FLT_HAS_INFINITY__ 1 ++// AARCH64-FREEBSD:#define __FLT_HAS_QUIET_NAN__ 1 ++// AARCH64-FREEBSD:#define __FLT_MANT_DIG__ 24 ++// AARCH64-FREEBSD:#define __FLT_MAX_10_EXP__ 38 ++// AARCH64-FREEBSD:#define __FLT_MAX_EXP__ 128 ++// AARCH64-FREEBSD:#define __FLT_MAX__ 3.40282347e+38F ++// AARCH64-FREEBSD:#define __FLT_MIN_10_EXP__ (-37) ++// AARCH64-FREEBSD:#define __FLT_MIN_EXP__ (-125) ++// AARCH64-FREEBSD:#define __FLT_MIN__ 1.17549435e-38F ++// AARCH64-FREEBSD:#define __FLT_RADIX__ 2 ++// AARCH64-FREEBSD:#define __FreeBSD__ 11 ++// AARCH64-FREEBSD:#define __INT16_C_SUFFIX__ {{$}} ++// AARCH64-FREEBSD:#define __INT16_FMTd__ "hd" ++// AARCH64-FREEBSD:#define __INT16_FMTi__ "hi" ++// AARCH64-FREEBSD:#define __INT16_MAX__ 32767 ++// AARCH64-FREEBSD:#define __INT16_TYPE__ short ++// AARCH64-FREEBSD:#define __INT32_C_SUFFIX__ {{$}} ++// AARCH64-FREEBSD:#define __INT32_FMTd__ "d" ++// AARCH64-FREEBSD:#define __INT32_FMTi__ "i" ++// AARCH64-FREEBSD:#define __INT32_MAX__ 2147483647 ++// AARCH64-FREEBSD:#define __INT32_TYPE__ int ++// AARCH64-FREEBSD:#define __INT64_C_SUFFIX__ L ++// AARCH64-FREEBSD:#define __INT64_FMTd__ "ld" ++// AARCH64-FREEBSD:#define __INT64_FMTi__ "li" ++// AARCH64-FREEBSD:#define __INT64_MAX__ 9223372036854775807L ++// AARCH64-FREEBSD:#define __INT64_TYPE__ long int ++// AARCH64-FREEBSD:#define __INT8_C_SUFFIX__ {{$}} ++// AARCH64-FREEBSD:#define __INT8_FMTd__ "hhd" ++// AARCH64-FREEBSD:#define __INT8_FMTi__ "hhi" ++// AARCH64-FREEBSD:#define __INT8_MAX__ 127 ++// AARCH64-FREEBSD:#define __INT8_TYPE__ signed char ++// AARCH64-FREEBSD:#define __INTMAX_C_SUFFIX__ L ++// AARCH64-FREEBSD:#define __INTMAX_FMTd__ "ld" ++// AARCH64-FREEBSD:#define __INTMAX_FMTi__ "li" ++// AARCH64-FREEBSD:#define __INTMAX_MAX__ 9223372036854775807L ++// AARCH64-FREEBSD:#define __INTMAX_TYPE__ long int ++// AARCH64-FREEBSD:#define __INTMAX_WIDTH__ 64 ++// AARCH64-FREEBSD:#define __INTPTR_FMTd__ "ld" ++// AARCH64-FREEBSD:#define __INTPTR_FMTi__ "li" ++// AARCH64-FREEBSD:#define __INTPTR_MAX__ 9223372036854775807L ++// AARCH64-FREEBSD:#define __INTPTR_TYPE__ long int ++// AARCH64-FREEBSD:#define __INTPTR_WIDTH__ 64 ++// AARCH64-FREEBSD:#define __INT_FAST16_FMTd__ "hd" ++// AARCH64-FREEBSD:#define __INT_FAST16_FMTi__ "hi" ++// AARCH64-FREEBSD:#define __INT_FAST16_MAX__ 32767 ++// AARCH64-FREEBSD:#define __INT_FAST16_TYPE__ short ++// AARCH64-FREEBSD:#define __INT_FAST32_FMTd__ "d" ++// AARCH64-FREEBSD:#define __INT_FAST32_FMTi__ "i" ++// AARCH64-FREEBSD:#define __INT_FAST32_MAX__ 2147483647 ++// AARCH64-FREEBSD:#define __INT_FAST32_TYPE__ int ++// AARCH64-FREEBSD:#define __INT_FAST64_FMTd__ "ld" ++// AARCH64-FREEBSD:#define __INT_FAST64_FMTi__ "li" ++// AARCH64-FREEBSD:#define __INT_FAST64_MAX__ 9223372036854775807L ++// AARCH64-FREEBSD:#define __INT_FAST64_TYPE__ long int ++// AARCH64-FREEBSD:#define __INT_FAST8_FMTd__ "hhd" ++// AARCH64-FREEBSD:#define __INT_FAST8_FMTi__ "hhi" ++// AARCH64-FREEBSD:#define __INT_FAST8_MAX__ 127 ++// AARCH64-FREEBSD:#define __INT_FAST8_TYPE__ signed char ++// AARCH64-FREEBSD:#define __INT_LEAST16_FMTd__ "hd" ++// AARCH64-FREEBSD:#define __INT_LEAST16_FMTi__ "hi" ++// AARCH64-FREEBSD:#define __INT_LEAST16_MAX__ 32767 ++// AARCH64-FREEBSD:#define __INT_LEAST16_TYPE__ short ++// AARCH64-FREEBSD:#define __INT_LEAST32_FMTd__ "d" ++// AARCH64-FREEBSD:#define __INT_LEAST32_FMTi__ "i" ++// AARCH64-FREEBSD:#define __INT_LEAST32_MAX__ 2147483647 ++// AARCH64-FREEBSD:#define __INT_LEAST32_TYPE__ int ++// AARCH64-FREEBSD:#define __INT_LEAST64_FMTd__ "ld" ++// AARCH64-FREEBSD:#define __INT_LEAST64_FMTi__ "li" ++// AARCH64-FREEBSD:#define __INT_LEAST64_MAX__ 9223372036854775807L ++// AARCH64-FREEBSD:#define __INT_LEAST64_TYPE__ long int ++// AARCH64-FREEBSD:#define __INT_LEAST8_FMTd__ "hhd" ++// AARCH64-FREEBSD:#define __INT_LEAST8_FMTi__ "hhi" ++// AARCH64-FREEBSD:#define __INT_LEAST8_MAX__ 127 ++// AARCH64-FREEBSD:#define __INT_LEAST8_TYPE__ signed char ++// AARCH64-FREEBSD:#define __INT_MAX__ 2147483647 ++// AARCH64-FREEBSD:#define __LDBL_DENORM_MIN__ 6.47517511943802511092443895822764655e-4966L ++// AARCH64-FREEBSD:#define __LDBL_DIG__ 33 ++// AARCH64-FREEBSD:#define __LDBL_EPSILON__ 1.92592994438723585305597794258492732e-34L ++// AARCH64-FREEBSD:#define __LDBL_HAS_DENORM__ 1 ++// AARCH64-FREEBSD:#define __LDBL_HAS_INFINITY__ 1 ++// AARCH64-FREEBSD:#define __LDBL_HAS_QUIET_NAN__ 1 ++// AARCH64-FREEBSD:#define __LDBL_MANT_DIG__ 113 ++// AARCH64-FREEBSD:#define __LDBL_MAX_10_EXP__ 4932 ++// AARCH64-FREEBSD:#define __LDBL_MAX_EXP__ 16384 ++// AARCH64-FREEBSD:#define __LDBL_MAX__ 1.18973149535723176508575932662800702e+4932L ++// AARCH64-FREEBSD:#define __LDBL_MIN_10_EXP__ (-4931) ++// AARCH64-FREEBSD:#define __LDBL_MIN_EXP__ (-16381) ++// AARCH64-FREEBSD:#define __LDBL_MIN__ 3.36210314311209350626267781732175260e-4932L ++// AARCH64-FREEBSD:#define __LITTLE_ENDIAN__ 1 ++// AARCH64-FREEBSD:#define __LONG_LONG_MAX__ 9223372036854775807LL ++// AARCH64-FREEBSD:#define __LONG_MAX__ 9223372036854775807L ++// AARCH64-FREEBSD:#define __LP64__ 1 ++// AARCH64-FREEBSD:#define __POINTER_WIDTH__ 64 ++// AARCH64-FREEBSD:#define __PTRDIFF_TYPE__ long int ++// AARCH64-FREEBSD:#define __PTRDIFF_WIDTH__ 64 ++// AARCH64-FREEBSD:#define __SCHAR_MAX__ 127 ++// AARCH64-FREEBSD:#define __SHRT_MAX__ 32767 ++// AARCH64-FREEBSD:#define __SIG_ATOMIC_MAX__ 2147483647 ++// AARCH64-FREEBSD:#define __SIG_ATOMIC_WIDTH__ 32 ++// AARCH64-FREEBSD:#define __SIZEOF_DOUBLE__ 8 ++// AARCH64-FREEBSD:#define __SIZEOF_FLOAT__ 4 ++// AARCH64-FREEBSD:#define __SIZEOF_INT128__ 16 ++// AARCH64-FREEBSD:#define __SIZEOF_INT__ 4 ++// AARCH64-FREEBSD:#define __SIZEOF_LONG_DOUBLE__ 16 ++// AARCH64-FREEBSD:#define __SIZEOF_LONG_LONG__ 8 ++// AARCH64-FREEBSD:#define __SIZEOF_LONG__ 8 ++// AARCH64-FREEBSD:#define __SIZEOF_POINTER__ 8 ++// AARCH64-FREEBSD:#define __SIZEOF_PTRDIFF_T__ 8 ++// AARCH64-FREEBSD:#define __SIZEOF_SHORT__ 2 ++// AARCH64-FREEBSD:#define __SIZEOF_SIZE_T__ 8 ++// AARCH64-FREEBSD:#define __SIZEOF_WCHAR_T__ 4 ++// AARCH64-FREEBSD:#define __SIZEOF_WINT_T__ 4 ++// AARCH64-FREEBSD:#define __SIZE_MAX__ 18446744073709551615UL ++// AARCH64-FREEBSD:#define __SIZE_TYPE__ long unsigned int ++// AARCH64-FREEBSD:#define __SIZE_WIDTH__ 64 ++// AARCH64-FREEBSD:#define __UINT16_C_SUFFIX__ {{$}} ++// AARCH64-FREEBSD:#define __UINT16_MAX__ 65535 ++// AARCH64-FREEBSD:#define __UINT16_TYPE__ unsigned short ++// AARCH64-FREEBSD:#define __UINT32_C_SUFFIX__ U ++// AARCH64-FREEBSD:#define __UINT32_MAX__ 4294967295U ++// AARCH64-FREEBSD:#define __UINT32_TYPE__ unsigned int ++// AARCH64-FREEBSD:#define __UINT64_C_SUFFIX__ UL ++// AARCH64-FREEBSD:#define __UINT64_MAX__ 18446744073709551615UL ++// AARCH64-FREEBSD:#define __UINT64_TYPE__ long unsigned int ++// AARCH64-FREEBSD:#define __UINT8_C_SUFFIX__ {{$}} ++// AARCH64-FREEBSD:#define __UINT8_MAX__ 255 ++// AARCH64-FREEBSD:#define __UINT8_TYPE__ unsigned char ++// AARCH64-FREEBSD:#define __UINTMAX_C_SUFFIX__ UL ++// AARCH64-FREEBSD:#define __UINTMAX_MAX__ 18446744073709551615UL ++// AARCH64-FREEBSD:#define __UINTMAX_TYPE__ long unsigned int ++// AARCH64-FREEBSD:#define __UINTMAX_WIDTH__ 64 ++// AARCH64-FREEBSD:#define __UINTPTR_MAX__ 18446744073709551615UL ++// AARCH64-FREEBSD:#define __UINTPTR_TYPE__ long unsigned int ++// AARCH64-FREEBSD:#define __UINTPTR_WIDTH__ 64 ++// AARCH64-FREEBSD:#define __UINT_FAST16_MAX__ 65535 ++// AARCH64-FREEBSD:#define __UINT_FAST16_TYPE__ unsigned short ++// AARCH64-FREEBSD:#define __UINT_FAST32_MAX__ 4294967295U ++// AARCH64-FREEBSD:#define __UINT_FAST32_TYPE__ unsigned int ++// AARCH64-FREEBSD:#define __UINT_FAST64_MAX__ 18446744073709551615UL ++// AARCH64-FREEBSD:#define __UINT_FAST64_TYPE__ long unsigned int ++// AARCH64-FREEBSD:#define __UINT_FAST8_MAX__ 255 ++// AARCH64-FREEBSD:#define __UINT_FAST8_TYPE__ unsigned char ++// AARCH64-FREEBSD:#define __UINT_LEAST16_MAX__ 65535 ++// AARCH64-FREEBSD:#define __UINT_LEAST16_TYPE__ unsigned short ++// AARCH64-FREEBSD:#define __UINT_LEAST32_MAX__ 4294967295U ++// AARCH64-FREEBSD:#define __UINT_LEAST32_TYPE__ unsigned int ++// AARCH64-FREEBSD:#define __UINT_LEAST64_MAX__ 18446744073709551615UL ++// AARCH64-FREEBSD:#define __UINT_LEAST64_TYPE__ long unsigned int ++// AARCH64-FREEBSD:#define __UINT_LEAST8_MAX__ 255 ++// AARCH64-FREEBSD:#define __UINT_LEAST8_TYPE__ unsigned char ++// AARCH64-FREEBSD:#define __USER_LABEL_PREFIX__ ++// AARCH64-FREEBSD:#define __WCHAR_MAX__ 4294967295U ++// AARCH64-FREEBSD:#define __WCHAR_TYPE__ unsigned int ++// AARCH64-FREEBSD:#define __WCHAR_UNSIGNED__ 1 ++// AARCH64-FREEBSD:#define __WCHAR_WIDTH__ 32 ++// AARCH64-FREEBSD:#define __WINT_TYPE__ int ++// AARCH64-FREEBSD:#define __WINT_WIDTH__ 32 ++// AARCH64-FREEBSD:#define __aarch64__ 1 + + // RUN: %clang_cc1 -E -dM -ffreestanding -triple=arm-none-none < /dev/null | FileCheck -check-prefix ARM %s + // +Index: tools/clang/lib/Basic/Targets.cpp +=================================================================== +--- tools/clang/lib/Basic/Targets.cpp (revision 16) ++++ tools/clang/lib/Basic/Targets.cpp (revision 17) +@@ -6036,6 +6036,8 @@ static TargetInfo *AllocateTarget(const llvm::Trip + return new DarwinAArch64TargetInfo(Triple); + + switch (os) { ++ case llvm::Triple::FreeBSD: ++ return new FreeBSDTargetInfo(Triple); + case llvm::Triple::Linux: + return new LinuxTargetInfo(Triple); + case llvm::Triple::NetBSD: +@@ -6047,6 +6049,8 @@ static TargetInfo *AllocateTarget(const llvm::Trip + case llvm::Triple::aarch64_be: + case llvm::Triple::arm64_be: + switch (os) { ++ case llvm::Triple::FreeBSD: ++ return new FreeBSDTargetInfo(Triple); + case llvm::Triple::Linux: + return new LinuxTargetInfo(Triple); + case llvm::Triple::NetBSD: From owner-svn-src-projects@FreeBSD.ORG Thu Nov 27 00:02:43 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B15C38B6; Thu, 27 Nov 2014 00:02:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9EDBE8A1; Thu, 27 Nov 2014 00:02:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAR02h1c053819; Thu, 27 Nov 2014 00:02:43 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAR02hSA053818; Thu, 27 Nov 2014 00:02:43 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411270002.sAR02hSA053818@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 27 Nov 2014 00:02:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275156 - projects/building-blocks/sys/modules X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2014 00:02:43 -0000 Author: ngie Date: Thu Nov 27 00:02:42 2014 New Revision: 275156 URL: https://svnweb.freebsd.org/changeset/base/275156 Log: Only build iscsi/iscsi_initiator if MK_ISCSI != no Modified: projects/building-blocks/sys/modules/Makefile Modified: projects/building-blocks/sys/modules/Makefile ============================================================================== --- projects/building-blocks/sys/modules/Makefile Wed Nov 26 23:57:12 2014 (r275155) +++ projects/building-blocks/sys/modules/Makefile Thu Nov 27 00:02:42 2014 (r275156) @@ -171,8 +171,6 @@ SUBDIR= \ ${_ipw} \ ${_ipwfw} \ ${_isci} \ - iscsi \ - iscsi_initiator \ isp \ ${_ispfw} \ ${_iwi} \ @@ -425,6 +423,11 @@ _ipfw= ipfw _ipfilter= ipfilter .endif +.if ${MK_ISCSI} != "no" || defined(ALL_MODULES) +SUBDIR+= iscsi +SUBDIR+= iscsi_initiator +.endif + .if ${MK_NAND} != "no" || defined(ALL_MODULES) _nandfs= nandfs _nandsim= nandsim From owner-svn-src-projects@FreeBSD.ORG Thu Nov 27 00:10:17 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0E90BB1B; Thu, 27 Nov 2014 00:10:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EFCF48EB; Thu, 27 Nov 2014 00:10:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAR0AGoq055655; Thu, 27 Nov 2014 00:10:16 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAR0AGCs055654; Thu, 27 Nov 2014 00:10:16 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411270010.sAR0AGCs055654@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 27 Nov 2014 00:10:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275157 - projects/building-blocks/share/examples X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2014 00:10:17 -0000 Author: ngie Date: Thu Nov 27 00:10:16 2014 New Revision: 275157 URL: https://svnweb.freebsd.org/changeset/base/275157 Log: Honor MK_NETGRAPH for netgraph components Modified: projects/building-blocks/share/examples/Makefile Modified: projects/building-blocks/share/examples/Makefile ============================================================================== --- projects/building-blocks/share/examples/Makefile Thu Nov 27 00:02:42 2014 (r275156) +++ projects/building-blocks/share/examples/Makefile Thu Nov 27 00:10:16 2014 (r275157) @@ -20,7 +20,6 @@ LDIRS= BSD_daemon \ kld \ libvgl \ mdoc \ - netgraph \ perfmon \ ppi \ ppp \ @@ -99,13 +98,6 @@ XFILES= BSD_daemon/FreeBSD.pfa \ mdoc/example.3 \ mdoc/example.4 \ mdoc/example.9 \ - netgraph/ether.bridge \ - netgraph/frame_relay \ - netgraph/ngctl \ - netgraph/raw \ - netgraph/udp.tunnel \ - netgraph/virtual.chain \ - netgraph/virtual.lan \ perfmon/Makefile \ perfmon/README \ perfmon/perfmon.c \ @@ -206,6 +198,17 @@ XFILES+= hast/ucarp.sh \ hast/vip-up.sh .endif +.if ${MK_NETGRAPH} != "no" +LDIRS+= netgraph +XFILES+= netgraph/ether.bridge \ + netgraph/frame_relay \ + netgraph/ngctl \ + netgraph/raw \ + netgraph/udp.tunnel \ + netgraph/virtual.chain \ + netgraph/virtual.lan +.endif + .if ${MK_USB} != "no" LDIRS+= libusb20 XFILES+= libusb20/Makefile \ From owner-svn-src-projects@FreeBSD.ORG Thu Nov 27 00:11:00 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1F5DCBFF; Thu, 27 Nov 2014 00:11:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E697797A; Thu, 27 Nov 2014 00:10:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAR0AxUk056240; Thu, 27 Nov 2014 00:10:59 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAR0AxLB056239; Thu, 27 Nov 2014 00:10:59 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411270010.sAR0AxLB056239@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 27 Nov 2014 00:10:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275158 - projects/building-blocks/share/man/man4 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2014 00:11:00 -0000 Author: ngie Date: Thu Nov 27 00:10:59 2014 New Revision: 275158 URL: https://svnweb.freebsd.org/changeset/base/275158 Log: Honor MK_NETGRAPH for netgraph manpages Modified: projects/building-blocks/share/man/man4/Makefile Modified: projects/building-blocks/share/man/man4/Makefile ============================================================================== --- projects/building-blocks/share/man/man4/Makefile Thu Nov 27 00:10:16 2014 (r275157) +++ projects/building-blocks/share/man/man4/Makefile Thu Nov 27 00:10:59 2014 (r275158) @@ -290,65 +290,7 @@ MAN= aac.4 \ netmap.4 \ ${_nfe.4} \ ${_nfsmb.4} \ - ng_async.4 \ - ng_atm.4 \ - ngatmbase.4 \ - ng_atmllc.4 \ - ng_bluetooth.4 \ - ng_bpf.4 \ - ng_bridge.4 \ - ng_bt3c.4 \ - ng_btsocket.4 \ - ng_car.4 \ - ng_ccatm.4 \ - ng_cisco.4 \ - ng_deflate.4 \ - ng_device.4 \ nge.4 \ - ng_echo.4 \ - ng_eiface.4 \ - ng_etf.4 \ - ng_ether.4 \ - ng_ether_echo.4 \ - ng_frame_relay.4 \ - ng_gif.4 \ - ng_gif_demux.4 \ - ng_h4.4 \ - ng_hci.4 \ - ng_hole.4 \ - ng_hub.4 \ - ng_iface.4 \ - ng_ipfw.4 \ - ng_ip_input.4 \ - ng_ksocket.4 \ - ng_l2cap.4 \ - ng_l2tp.4 \ - ng_lmi.4 \ - ng_mppc.4 \ - ng_nat.4 \ - ng_netflow.4 \ - ng_one2many.4 \ - ng_patch.4 \ - ng_ppp.4 \ - ng_pppoe.4 \ - ng_pptpgre.4 \ - ng_pred1.4 \ - ng_rfc1490.4 \ - ng_socket.4 \ - ng_source.4 \ - ng_split.4 \ - ng_sppp.4 \ - ng_sscfu.4 \ - ng_sscop.4 \ - ng_tag.4 \ - ng_tcpmss.4 \ - ng_tee.4 \ - ng_tty.4 \ - ng_ubt.4 \ - ng_UI.4 \ - ng_uni.4 \ - ng_vjc.4 \ - ng_vlan.4 \ nmdm.4 \ nsp.4 \ ${_ntb.4} \ @@ -806,6 +748,68 @@ MAN+= iscsi.4 MAN+= iscsi_initiator.4 .endif +.if ${MK_NETGRAPH} != "no" +MAN+= \ + ng_async.4 \ + ng_atm.4 \ + ngatmbase.4 \ + ng_atmllc.4 \ + ng_bluetooth.4 \ + ng_bpf.4 \ + ng_bridge.4 \ + ng_bt3c.4 \ + ng_btsocket.4 \ + ng_car.4 \ + ng_ccatm.4 \ + ng_cisco.4 \ + ng_deflate.4 \ + ng_device.4 \ + ng_echo.4 \ + ng_eiface.4 \ + ng_etf.4 \ + ng_ether.4 \ + ng_ether_echo.4 \ + ng_frame_relay.4 \ + ng_gif.4 \ + ng_gif_demux.4 \ + ng_h4.4 \ + ng_hci.4 \ + ng_hole.4 \ + ng_hub.4 \ + ng_iface.4 \ + ng_ipfw.4 \ + ng_ip_input.4 \ + ng_ksocket.4 \ + ng_l2cap.4 \ + ng_l2tp.4 \ + ng_lmi.4 \ + ng_mppc.4 \ + ng_nat.4 \ + ng_netflow.4 \ + ng_one2many.4 \ + ng_patch.4 \ + ng_ppp.4 \ + ng_pppoe.4 \ + ng_pptpgre.4 \ + ng_pred1.4 \ + ng_rfc1490.4 \ + ng_socket.4 \ + ng_source.4 \ + ng_split.4 \ + ng_sppp.4 \ + ng_sscfu.4 \ + ng_sscop.4 \ + ng_tag.4 \ + ng_tcpmss.4 \ + ng_tee.4 \ + ng_tty.4 \ + ng_ubt.4 \ + ng_UI.4 \ + ng_uni.4 \ + ng_vjc.4 \ + ng_vlan.4 +.endif + .if ${MK_TESTS} != "no" ATF= ${.CURDIR}/../../../contrib/atf .PATH: ${ATF}/doc From owner-svn-src-projects@FreeBSD.ORG Thu Nov 27 00:33:31 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B7A219B; Thu, 27 Nov 2014 00:33:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 993A7B76; Thu, 27 Nov 2014 00:33:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAR0XVNZ068631; Thu, 27 Nov 2014 00:33:31 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAR0XVNu068629; Thu, 27 Nov 2014 00:33:31 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411270033.sAR0XVNu068629@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Thu, 27 Nov 2014 00:33:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275160 - projects/clang350-import/contrib/llvm/lib/Transforms/InstCombine X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2014 00:33:31 -0000 Author: dim Date: Thu Nov 27 00:33:31 2014 New Revision: 275160 URL: https://svnweb.freebsd.org/changeset/base/275160 Log: Pull in r222856 from upstream llvm trunk (by David Majnemer): Revert "Added inst combine transforms for single bit tests from Chris's note" This reverts commit r210006, it miscompiled libapr which is used in who knows how many projects. A test has been added to ensure that we don't regress again. This fixes a miscompilation in libapr, which caused problems in svnlite. Modified: projects/clang350-import/contrib/llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp Modified: projects/clang350-import/contrib/llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp ============================================================================== --- projects/clang350-import/contrib/llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp Thu Nov 27 00:27:39 2014 (r275159) +++ projects/clang350-import/contrib/llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp Thu Nov 27 00:33:31 2014 (r275160) @@ -387,15 +387,7 @@ static Value *SimplifyWithOpReplaced(Val /// 1. The icmp predicate is inverted /// 2. The select operands are reversed /// 3. The magnitude of C2 and C1 are flipped -/// -/// This also tries to turn -/// --- Single bit tests: -/// if ((x & C) == 0) x |= C to x |= C -/// if ((x & C) != 0) x ^= C to x &= ~C -/// if ((x & C) == 0) x ^= C to x |= C -/// if ((x & C) != 0) x &= ~C to x &= ~C -/// if ((x & C) == 0) x &= ~C to nothing -static Value *foldSelectICmpAndOr(SelectInst &SI, Value *TrueVal, +static Value *foldSelectICmpAndOr(const SelectInst &SI, Value *TrueVal, Value *FalseVal, InstCombiner::BuilderTy *Builder) { const ICmpInst *IC = dyn_cast(SI.getCondition()); @@ -414,25 +406,6 @@ static Value *foldSelectICmpAndOr(Select return nullptr; const APInt *C2; - if (match(TrueVal, m_Specific(X))) { - // if ((X & C) != 0) X ^= C becomes X &= ~C - if (match(FalseVal, m_Xor(m_Specific(X), m_APInt(C2))) && C1 == C2) - return Builder->CreateAnd(X, ~(*C1)); - // if ((X & C) != 0) X &= ~C becomes X &= ~C - if (match(FalseVal, m_And(m_Specific(X), m_APInt(C2))) && *C1 == ~(*C2)) - return FalseVal; - } else if (match(FalseVal, m_Specific(X))) { - // if ((X & C) == 0) X ^= C becomes X |= C - if (match(TrueVal, m_Xor(m_Specific(X), m_APInt(C2))) && C1 == C2) - return Builder->CreateOr(X, *C1); - // if ((X & C) == 0) X &= ~C becomes nothing - if (match(TrueVal, m_And(m_Specific(X), m_APInt(C2))) && *C1 == ~(*C2)) - return X; - // if ((X & C) == 0) X |= C becomes X |= C - if (match(TrueVal, m_Or(m_Specific(X), m_APInt(C2))) && C1 == C2) - return TrueVal; - } - bool OrOnTrueVal = false; bool OrOnFalseVal = match(FalseVal, m_Or(m_Specific(TrueVal), m_Power2(C2))); if (!OrOnFalseVal) From owner-svn-src-projects@FreeBSD.ORG Thu Nov 27 00:39:01 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D9F311F1; Thu, 27 Nov 2014 00:39:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C661DBB6; Thu, 27 Nov 2014 00:39:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAR0d1Tx069345; Thu, 27 Nov 2014 00:39:01 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAR0d1rs069344; Thu, 27 Nov 2014 00:39:01 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411270039.sAR0d1rs069344@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Thu, 27 Nov 2014 00:39:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275161 - projects/clang350-import/contrib/llvm/patches X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2014 00:39:01 -0000 Author: dim Date: Thu Nov 27 00:39:01 2014 New Revision: 275161 URL: https://svnweb.freebsd.org/changeset/base/275161 Log: Add patch file for r275160. Added: projects/clang350-import/contrib/llvm/patches/patch-17-llvm-r222856-libapr-miscompile.diff Added: projects/clang350-import/contrib/llvm/patches/patch-17-llvm-r222856-libapr-miscompile.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/contrib/llvm/patches/patch-17-llvm-r222856-libapr-miscompile.diff Thu Nov 27 00:39:01 2014 (r275161) @@ -0,0 +1,190 @@ +Pull in r222856 from upstream llvm trunk (by David Majnemer): + + Revert "Added inst combine transforms for single bit tests from Chris's note" + + This reverts commit r210006, it miscompiled libapr which is used in who + knows how many projects. + + A test has been added to ensure that we don't regress again. + +This fixes a miscompilation in libapr, which caused problems in svnlite. + +Introduced here: http://svnweb.freebsd.org/changeset/base/275160 + +Index: lib/Transforms/InstCombine/InstCombineSelect.cpp +=================================================================== +--- lib/Transforms/InstCombine/InstCombineSelect.cpp (revision 17) ++++ lib/Transforms/InstCombine/InstCombineSelect.cpp (revision 18) +@@ -387,15 +387,7 @@ static Value *SimplifyWithOpReplaced(Value *V, Val + /// 1. The icmp predicate is inverted + /// 2. The select operands are reversed + /// 3. The magnitude of C2 and C1 are flipped +-/// +-/// This also tries to turn +-/// --- Single bit tests: +-/// if ((x & C) == 0) x |= C to x |= C +-/// if ((x & C) != 0) x ^= C to x &= ~C +-/// if ((x & C) == 0) x ^= C to x |= C +-/// if ((x & C) != 0) x &= ~C to x &= ~C +-/// if ((x & C) == 0) x &= ~C to nothing +-static Value *foldSelectICmpAndOr(SelectInst &SI, Value *TrueVal, ++static Value *foldSelectICmpAndOr(const SelectInst &SI, Value *TrueVal, + Value *FalseVal, + InstCombiner::BuilderTy *Builder) { + const ICmpInst *IC = dyn_cast(SI.getCondition()); +@@ -414,25 +406,6 @@ static Value *SimplifyWithOpReplaced(Value *V, Val + return nullptr; + + const APInt *C2; +- if (match(TrueVal, m_Specific(X))) { +- // if ((X & C) != 0) X ^= C becomes X &= ~C +- if (match(FalseVal, m_Xor(m_Specific(X), m_APInt(C2))) && C1 == C2) +- return Builder->CreateAnd(X, ~(*C1)); +- // if ((X & C) != 0) X &= ~C becomes X &= ~C +- if (match(FalseVal, m_And(m_Specific(X), m_APInt(C2))) && *C1 == ~(*C2)) +- return FalseVal; +- } else if (match(FalseVal, m_Specific(X))) { +- // if ((X & C) == 0) X ^= C becomes X |= C +- if (match(TrueVal, m_Xor(m_Specific(X), m_APInt(C2))) && C1 == C2) +- return Builder->CreateOr(X, *C1); +- // if ((X & C) == 0) X &= ~C becomes nothing +- if (match(TrueVal, m_And(m_Specific(X), m_APInt(C2))) && *C1 == ~(*C2)) +- return X; +- // if ((X & C) == 0) X |= C becomes X |= C +- if (match(TrueVal, m_Or(m_Specific(X), m_APInt(C2))) && C1 == C2) +- return TrueVal; +- } +- + bool OrOnTrueVal = false; + bool OrOnFalseVal = match(FalseVal, m_Or(m_Specific(TrueVal), m_Power2(C2))); + if (!OrOnFalseVal) +Index: test/Transforms/InstCombine/select.ll +=================================================================== +--- test/Transforms/InstCombine/select.ll (revision 17) ++++ test/Transforms/InstCombine/select.ll (revision 18) +@@ -996,111 +996,6 @@ define <2 x i32> @select_icmp_eq_and_1_0_or_vector + ret <2 x i32> %select + } + +-; CHECK-LABEL: @select_icmp_and_8_eq_0_or_8( +-; CHECK-NEXT: [[OR:%[a-z0-9]+]] = or i32 %x, 8 +-; CHECK-NEXT: ret i32 [[OR]] +-define i32 @select_icmp_and_8_eq_0_or_8(i32 %x) { +- %and = and i32 %x, 8 +- %cmp = icmp eq i32 %and, 0 +- %or = or i32 %x, 8 +- %or.x = select i1 %cmp, i32 %or, i32 %x +- ret i32 %or.x +-} +- +-; CHECK-LABEL: @select_icmp_and_8_ne_0_xor_8( +-; CHECK-NEXT: [[AND:%[a-z0-9]+]] = and i32 %x, -9 +-; CHECK-NEXT: ret i32 [[AND]] +-define i32 @select_icmp_and_8_ne_0_xor_8(i32 %x) { +- %and = and i32 %x, 8 +- %cmp = icmp eq i32 %and, 0 +- %xor = xor i32 %x, 8 +- %x.xor = select i1 %cmp, i32 %x, i32 %xor +- ret i32 %x.xor +-} +- +-; CHECK-LABEL: @select_icmp_and_8_eq_0_xor_8( +-; CHECK-NEXT: [[OR:%[a-z0-9]+]] = or i32 %x, 8 +-; CHECK-NEXT: ret i32 [[OR]] +-define i32 @select_icmp_and_8_eq_0_xor_8(i32 %x) { +- %and = and i32 %x, 8 +- %cmp = icmp eq i32 %and, 0 +- %xor = xor i32 %x, 8 +- %xor.x = select i1 %cmp, i32 %xor, i32 %x +- ret i32 %xor.x +-} +- +-; CHECK-LABEL: @select_icmp_and_8_ne_0_and_not_8( +-; CHECK-NEXT: [[AND:%[a-z0-9]+]] = and i32 %x, -9 +-; CHECK-NEXT: ret i32 [[AND]] +-define i32 @select_icmp_and_8_ne_0_and_not_8(i32 %x) { +- %and = and i32 %x, 8 +- %cmp = icmp eq i32 %and, 0 +- %and1 = and i32 %x, -9 +- %x.and1 = select i1 %cmp, i32 %x, i32 %and1 +- ret i32 %x.and1 +-} +- +-; CHECK-LABEL: @select_icmp_and_8_eq_0_and_not_8( +-; CHECK-NEXT: ret i32 %x +-define i32 @select_icmp_and_8_eq_0_and_not_8(i32 %x) { +- %and = and i32 %x, 8 +- %cmp = icmp eq i32 %and, 0 +- %and1 = and i32 %x, -9 +- %and1.x = select i1 %cmp, i32 %and1, i32 %x +- ret i32 %and1.x +-} +- +-; CHECK-LABEL: @select_icmp_x_and_8_eq_0_y_xor_8( +-; CHECK: select i1 %cmp, i64 %y, i64 %xor +-define i64 @select_icmp_x_and_8_eq_0_y_xor_8(i32 %x, i64 %y) { +- %and = and i32 %x, 8 +- %cmp = icmp eq i32 %and, 0 +- %xor = xor i64 %y, 8 +- %y.xor = select i1 %cmp, i64 %y, i64 %xor +- ret i64 %y.xor +-} +- +-; CHECK-LABEL: @select_icmp_x_and_8_eq_0_y_and_not_8( +-; CHECK: select i1 %cmp, i64 %y, i64 %and1 +-define i64 @select_icmp_x_and_8_eq_0_y_and_not_8(i32 %x, i64 %y) { +- %and = and i32 %x, 8 +- %cmp = icmp eq i32 %and, 0 +- %and1 = and i64 %y, -9 +- %y.and1 = select i1 %cmp, i64 %y, i64 %and1 +- ret i64 %y.and1 +-} +- +-; CHECK-LABEL: @select_icmp_x_and_8_ne_0_y_xor_8( +-; CHECK: select i1 %cmp, i64 %xor, i64 %y +-define i64 @select_icmp_x_and_8_ne_0_y_xor_8(i32 %x, i64 %y) { +- %and = and i32 %x, 8 +- %cmp = icmp eq i32 %and, 0 +- %xor = xor i64 %y, 8 +- %xor.y = select i1 %cmp, i64 %xor, i64 %y +- ret i64 %xor.y +-} +- +-; CHECK-LABEL: @select_icmp_x_and_8_ne_0_y_and_not_8( +-; CHECK: select i1 %cmp, i64 %and1, i64 %y +-define i64 @select_icmp_x_and_8_ne_0_y_and_not_8(i32 %x, i64 %y) { +- %and = and i32 %x, 8 +- %cmp = icmp eq i32 %and, 0 +- %and1 = and i64 %y, -9 +- %and1.y = select i1 %cmp, i64 %and1, i64 %y +- ret i64 %and1.y +-} +- +-; CHECK-LABEL: @select_icmp_x_and_8_ne_0_y_or_8( +-; CHECK: xor i64 %1, 8 +-; CHECK: or i64 %2, %y +-define i64 @select_icmp_x_and_8_ne_0_y_or_8(i32 %x, i64 %y) { +- %and = and i32 %x, 8 +- %cmp = icmp eq i32 %and, 0 +- %or = or i64 %y, 8 +- %or.y = select i1 %cmp, i64 %or, i64 %y +- ret i64 %or.y +-} +- + define i32 @test65(i64 %x) { + %1 = and i64 %x, 16 + %2 = icmp ne i64 %1, 0 +@@ -1236,3 +1131,13 @@ define i32 @test75(i32 %x) { + ; CHECK-NEXT: [[SEL:%[a-z0-9]+]] = select i1 [[CMP]], i32 68, i32 %x + ; CHECK-NEXT: ret i32 [[SEL]] + } ++ ++define i32 @test87(i32 %x) { ++ %and = and i32 %x, 1 ++ %cmp = icmp ne i32 %and, 0 ++ %and1 = and i32 %x, -2 ++ %and1.x = select i1 %cmp, i32 %and1, i32 %x ++ ret i32 %and1.x ++; CHECK-LABEL: @test87( ++; CHECK: and i32 %x, -2 ++} From owner-svn-src-projects@FreeBSD.ORG Thu Nov 27 03:59:58 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AE616162; Thu, 27 Nov 2014 03:59:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9B4FF179; Thu, 27 Nov 2014 03:59:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAR3xwFv064000; Thu, 27 Nov 2014 03:59:58 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAR3xwsT063998; Thu, 27 Nov 2014 03:59:58 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411270359.sAR3xwsT063998@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 27 Nov 2014 03:59:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275164 - projects/building-blocks/share/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2014 03:59:58 -0000 Author: ngie Date: Thu Nov 27 03:59:57 2014 New Revision: 275164 URL: https://svnweb.freebsd.org/changeset/base/275164 Log: Implement knobs for MK_NETGRAPH_SUPPORT Modified: projects/building-blocks/share/mk/src.opts.mk Modified: projects/building-blocks/share/mk/src.opts.mk ============================================================================== --- projects/building-blocks/share/mk/src.opts.mk Thu Nov 27 02:15:35 2014 (r275163) +++ projects/building-blocks/share/mk/src.opts.mk Thu Nov 27 03:59:57 2014 (r275164) @@ -123,6 +123,7 @@ __DEFAULT_YES_OPTIONS = \ NDIS \ NETCAT \ NETGRAPH \ + NETGRAPH_SUPPORT \ NLS_CATALOGS \ NS_CACHING \ NTP \ @@ -306,6 +307,7 @@ MK_DMAGENT:= no .if ${MK_NETGRAPH} == "no" MK_ATM:= no MK_BLUETOOTH:= no +MK_NETGRAPH_SUPPORT:= no .endif .if ${MK_OPENSSL} == "no" From owner-svn-src-projects@FreeBSD.ORG Thu Nov 27 04:01:40 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 03C27270; Thu, 27 Nov 2014 04:01:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CB77C220; Thu, 27 Nov 2014 04:01:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAR41dfS067348; Thu, 27 Nov 2014 04:01:39 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAR41dcS067347; Thu, 27 Nov 2014 04:01:39 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411270401.sAR41dcS067347@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 27 Nov 2014 04:01:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275165 - projects/building-blocks/include X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2014 04:01:40 -0000 Author: ngie Date: Thu Nov 27 04:01:39 2014 New Revision: 275165 URL: https://svnweb.freebsd.org/changeset/base/275165 Log: Honor MK_ATM, MK_CUSE, and MK_NETGRAPH_SUPPORT Shuffle around conditionals so they're better sorted Modified: projects/building-blocks/include/Makefile Modified: projects/building-blocks/include/Makefile ============================================================================== --- projects/building-blocks/include/Makefile Thu Nov 27 03:59:57 2014 (r275164) +++ projects/building-blocks/include/Makefile Thu Nov 27 04:01:39 2014 (r275165) @@ -36,8 +36,8 @@ PHDRS= sched.h _semaphore.h LHDRS= aio.h errno.h fcntl.h linker_set.h poll.h stdatomic.h stdint.h \ syslog.h ucontext.h -LDIRS= bsm cam geom net net80211 netgraph netinet netinet6 \ - netipsec netnatm netsmb nfs nfsclient nfsserver sys vm +LDIRS= bsm cam geom net net80211 netinet netinet6 \ + netipsec netsmb nfs nfsclient nfsserver sys vm LSUBDIRS= cam/ata cam/scsi \ dev/acpica dev/agp dev/an dev/bktr dev/ciss dev/filemon dev/firewire \ @@ -45,24 +45,40 @@ LSUBDIRS= cam/ata cam/scsi \ dev/ic dev/iicbus ${_dev_ieee488} dev/io dev/lmc dev/mfi dev/nvme \ dev/ofw dev/pbio dev/pci ${_dev_powermac_nvram} dev/ppbus dev/smbus \ dev/speaker dev/utopia dev/vkbd dev/wi \ - fs/cuse \ fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/nullfs \ fs/procfs fs/smbfs fs/udf fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ geom/mirror geom/mountver geom/multipath geom/nop \ geom/raid geom/raid3 geom/shsec geom/stripe geom/virstor \ - netgraph/atm netgraph/netflow \ security/audit \ security/mac_biba security/mac_bsdextended security/mac_lomac \ security/mac_mls security/mac_partition \ ufs/ffs ufs/ufs +LSUBSUBDIRS= dev/mpt/mpilib + +.if ${MK_ATM} != "no" +LDIRS+= netnatm +LSUBDIRS+= netgraph/atm +.endif + +.if ${MK_BLUETOOTH} != "no" +LSUBSUBDIRS+= netgraph/bluetooth/include +.endif + +.if ${MK_CUSE} != "no" +LSUBDIRS+= fs/cuse +.endif + +.if ${MK_NETGRAPH_SUPPORT} != "no" +LDIRS+= netgraph +LSUBDIRS+= netgraph/netflow +.endif + .if ${MK_USB} != "no" LSUBDIRS+= dev/usb .endif -LSUBSUBDIRS= dev/mpt/mpilib - .if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64" _dev_powermac_nvram= dev/powermac_nvram .endif @@ -80,10 +96,6 @@ INCS+= gssapi.h INCS+= hesiod.h .endif -.if ${MK_BLUETOOTH} != "no" -LSUBSUBDIRS+= netgraph/bluetooth/include -.endif - # Handle the #define aliases for libiconv .if ${MK_ICONV} == "yes" INCS+= iconv.h From owner-svn-src-projects@FreeBSD.ORG Thu Nov 27 04:16:49 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3CC15615; Thu, 27 Nov 2014 04:16:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 29232364; Thu, 27 Nov 2014 04:16:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAR4GnH3073018; Thu, 27 Nov 2014 04:16:49 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAR4Gl5r073013; Thu, 27 Nov 2014 04:16:47 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411270416.sAR4Gl5r073013@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 27 Nov 2014 04:16:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275166 - in projects/building-blocks: . lib lib/libpam/modules share/mk tools/build/options X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2014 04:16:49 -0000 Author: ngie Date: Thu Nov 27 04:16:47 2014 New Revision: 275166 URL: https://svnweb.freebsd.org/changeset/base/275166 Log: Implement MK_RADIUS_SUPPORT to make libradius and assorted support optional Added: projects/building-blocks/tools/build/options/WITHOUT_RADIUS_SUPPORT (contents, props changed) Modified: projects/building-blocks/Makefile.inc1 projects/building-blocks/lib/Makefile projects/building-blocks/lib/libpam/modules/modules.inc projects/building-blocks/share/mk/src.opts.mk Modified: projects/building-blocks/Makefile.inc1 ============================================================================== --- projects/building-blocks/Makefile.inc1 Thu Nov 27 04:01:39 2014 (r275165) +++ projects/building-blocks/Makefile.inc1 Thu Nov 27 04:16:47 2014 (r275166) @@ -1605,7 +1605,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_lib_libcapsicum} \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ - lib/libradius lib/libsbuf lib/libtacplus \ + ${_lib_libradius} lib/libsbuf lib/libtacplus \ lib/libgeom \ ${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \ ${_cddl_lib_libuutil} \ @@ -1628,6 +1628,10 @@ lib/libgeom__L: lib/libexpat__L _lib_libthr= lib/libthr .endif +.if ${MK_RADIUS_SUPPORT} != "no" +_lib_libradius= lib/libradius +.endif + .if ${MK_OFED} != "no" _ofed_lib= contrib/ofed/usr.lib/ .endif Modified: projects/building-blocks/lib/Makefile ============================================================================== --- projects/building-blocks/lib/Makefile Thu Nov 27 04:01:39 2014 (r275165) +++ projects/building-blocks/lib/Makefile Thu Nov 27 04:16:47 2014 (r275166) @@ -80,7 +80,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ ${_libpmc} \ ${_libproc} \ libprocstat \ - libradius \ + ${_libradius} \ librpcsvc \ librt \ ${_librtld_db} \ @@ -140,7 +140,7 @@ SUBDIR_DEPEND_liblibrpcsec_gss= libgssap SUBDIR_DEPEND_libmagic= libz SUBDIR_DEPEND_libmemstat= libkvm SUBDIR_DEPEND_libopie= libmd -SUBDIR_DEPEND_libpam= libcrypt libopie libradius librpcsvc libtacplus libutil ${_libypclnt} ${_libcom_err} +SUBDIR_DEPEND_libpam= libcrypt libopie ${_libradius} librpcsvc libtacplus libutil ${_libypclnt} ${_libcom_err} SUBDIR_DEPEND_libpjdlog= libutil SUBDIR_DEPEND_libprocstat= libkvm libutil SUBDIR_DEPEND_libradius= libmd @@ -269,6 +269,10 @@ _libmp= libmp _libpmc= libpmc .endif +.if ${MK_RADIUS} != "no" +_libradius= libradius +.endif + .if ${MK_SENDMAIL} != "no" _libmilter= libmilter _libsm= libsm Modified: projects/building-blocks/lib/libpam/modules/modules.inc ============================================================================== --- projects/building-blocks/lib/libpam/modules/modules.inc Thu Nov 27 04:01:39 2014 (r275165) +++ projects/building-blocks/lib/libpam/modules/modules.inc Thu Nov 27 04:16:47 2014 (r275166) @@ -7,7 +7,9 @@ MODULES += pam_chroot MODULES += pam_deny MODULES += pam_echo MODULES += pam_exec +.if ${MK_FTP} != "no" MODULES += pam_ftpusers +.endif MODULES += pam_group MODULES += pam_guest .if ${MK_KERBEROS} != "no" @@ -21,7 +23,9 @@ MODULES += pam_opie MODULES += pam_opieaccess MODULES += pam_passwdqc MODULES += pam_permit +.if ${MK_RADIUS} != "no MODULES += pam_radius +.endif MODULES += pam_rhosts MODULES += pam_rootok MODULES += pam_securetty Modified: projects/building-blocks/share/mk/src.opts.mk ============================================================================== --- projects/building-blocks/share/mk/src.opts.mk Thu Nov 27 04:01:39 2014 (r275165) +++ projects/building-blocks/share/mk/src.opts.mk Thu Nov 27 04:16:47 2014 (r275166) @@ -136,6 +136,7 @@ __DEFAULT_YES_OPTIONS = \ PORTSNAP \ PPP \ QUOTAS \ + RADIUS_SUPPORT \ RCMDS \ RBOOTD \ RCS \ @@ -310,6 +311,10 @@ MK_BLUETOOTH:= no MK_NETGRAPH_SUPPORT:= no .endif +.if ${MK_NETGRAPH_SUPPORT} == "no" +MK_RADIUS_SUPPORT:= no +.endif + .if ${MK_OPENSSL} == "no" MK_OPENSSH:= no MK_KERBEROS:= no Added: projects/building-blocks/tools/build/options/WITHOUT_RADIUS_SUPPORT ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/build/options/WITHOUT_RADIUS_SUPPORT Thu Nov 27 04:16:47 2014 (r275166) @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build radius support into various applications, like +.Xr pam_radius 8 +and +.Xr ppp 8 . From owner-svn-src-projects@FreeBSD.ORG Thu Nov 27 04:19:02 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 248B270D; Thu, 27 Nov 2014 04:19:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0616E36F; Thu, 27 Nov 2014 04:19:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAR4J1wm073314; Thu, 27 Nov 2014 04:19:01 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAR4J198073313; Thu, 27 Nov 2014 04:19:01 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411270419.sAR4J198073313@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 27 Nov 2014 04:19:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275167 - projects/building-blocks/tools/build/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2014 04:19:02 -0000 Author: ngie Date: Thu Nov 27 04:19:01 2014 New Revision: 275167 URL: https://svnweb.freebsd.org/changeset/base/275167 Log: Populate MK_CUSE, MK_NETGRAPH, MK_NETGRAPH_SUPPORT, and MK_RADIUS_SUPPORT Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Thu Nov 27 04:16:47 2014 (r275166) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Thu Nov 27 04:19:01 2014 (r275167) @@ -753,6 +753,43 @@ OLD_FILES+=usr/share/man/man1/ctm_smail. OLD_FILES+=usr/share/man/man5/ctm.5.gz .endif +.if ${MK_CUSE} == no +OLD_FILES+=usr/include/fs/cuse/cuse_defs.h +OLD_FILES+=usr/include/fs/cuse/cuse_ioctl.h +OLD_FILES+=usr/include/cuse.h +OLD_FILES+=usr/lib/libcuse.a +OLD_LIBS+=usr/lib/libcuse.so.1 +OLD_FILES+=usr/lib/libcuse_p.a +OLD_FILES+=usr/share/man/man3/cuse.3.gz +OLD_FILES+=usr/share/man/man3/cuse_alloc_unit_number.3.gz +OLD_FILES+=usr/share/man/man3/cuse_alloc_unit_number_by_id.3.gz +OLD_FILES+=usr/share/man/man3/cuse_copy_in.3.gz +OLD_FILES+=usr/share/man/man3/cuse_copy_out.3.gz +OLD_FILES+=usr/share/man/man3/cuse_dev_create.3.gz +OLD_FILES+=usr/share/man/man3/cuse_dev_destroy.3.gz +OLD_FILES+=usr/share/man/man3/cuse_dev_get_current.3.gz +OLD_FILES+=usr/share/man/man3/cuse_dev_get_per_file_handle.3.gz +OLD_FILES+=usr/share/man/man3/cuse_dev_get_priv0.3.gz +OLD_FILES+=usr/share/man/man3/cuse_dev_get_priv1.3.gz +OLD_FILES+=usr/share/man/man3/cuse_dev_set_per_file_handle.3.gz +OLD_FILES+=usr/share/man/man3/cuse_dev_set_priv0.3.gz +OLD_FILES+=usr/share/man/man3/cuse_dev_set_priv1.3.gz +OLD_FILES+=usr/share/man/man3/cuse_free_unit_number.3.gz +OLD_FILES+=usr/share/man/man3/cuse_free_unit_number_by_id.3.gz +OLD_FILES+=usr/share/man/man3/cuse_get_local.3.gz +OLD_FILES+=usr/share/man/man3/cuse_got_peer_signal.3.gz +OLD_FILES+=usr/share/man/man3/cuse_init.3.gz +OLD_FILES+=usr/share/man/man3/cuse_is_vmalloc_addr.3.gz +OLD_FILES+=usr/share/man/man3/cuse_poll_wakeup.3.gz +OLD_FILES+=usr/share/man/man3/cuse_set_local.3.gz +OLD_FILES+=usr/share/man/man3/cuse_uninit.3.gz +OLD_FILES+=usr/share/man/man3/cuse_vmalloc.3.gz +OLD_FILES+=usr/share/man/man3/cuse_vmfree.3.gz +OLD_FILES+=usr/share/man/man3/cuse_vmoffset.3.gz +OLD_FILES+=usr/share/man/man3/cuse_wait_and_process.3.gz +OLD_DIRS+=usr/include/fs/cuse +.endif + # devd(8) not listed here on purpose .if ${MK_CXX} == no OLD_FILES+=usr/bin/CC @@ -1395,12 +1432,14 @@ OLD_FILES+=usr/share/man/man8/freebsd-up OLD_FILES+=usr/bin/ftp OLD_FILES+=usr/bin/gate-ftp OLD_FILES+=usr/bin/pftp +OLD_LIBS+=usr/lib/pam_ftpusers.so.5 OLD_FILES+=usr/libexec/ftpd OLD_FILES+=usr/share/man/man1/ftp.1.gz OLD_FILES+=usr/share/man/man1/gate-ftp.1.gz OLD_FILES+=usr/share/man/man1/pftp.1.gz OLD_FILES+=usr/share/man/man5/ftpchroot.5.gz OLD_FILES+=usr/share/man/man8/ftpd.8.gz +OLD_FILES+=usr/share/man/man8/pam_ftpusers.8.gz .endif .if ${MK_GAMES} == no @@ -3570,6 +3609,143 @@ OLD_FILES+=usr/bin/nc OLD_FILES+=usr/share/man/man1/nc.1.gz .endif +.if ${MK_NETGRAPH} == no +OLD_FILES+=usr/sbin/ngctl +OLD_FILES+=usr/sbin/nghook +OLD_FILES+=usr/share/examples/netgraph/ether.bridge +OLD_FILES+=usr/share/examples/netgraph/frame_relay +OLD_FILES+=usr/share/examples/netgraph/ngctl +OLD_FILES+=usr/share/examples/netgraph/raw +OLD_FILES+=usr/share/examples/netgraph/udp.tunnel +OLD_FILES+=usr/share/examples/netgraph/virtual.chain +OLD_FILES+=usr/share/examples/netgraph/virtual.lan +OLD_FILES+=usr/share/man/man4/ng_UI.4.gz +OLD_FILES+=usr/share/man/man4/ng_async.4.gz +OLD_FILES+=usr/share/man/man4/ng_atm.4.gz +OLD_FILES+=usr/share/man/man4/ng_atmllc.4.gz +OLD_FILES+=usr/share/man/man4/ng_bluetooth.4.gz +OLD_FILES+=usr/share/man/man4/ng_bpf.4.gz +OLD_FILES+=usr/share/man/man4/ng_bridge.4.gz +OLD_FILES+=usr/share/man/man4/ng_bt3c.4.gz +OLD_FILES+=usr/share/man/man4/ng_btsocket.4.gz +OLD_FILES+=usr/share/man/man4/ng_car.4.gz +OLD_FILES+=usr/share/man/man4/ng_ccatm.4.gz +OLD_FILES+=usr/share/man/man4/ng_cisco.4.gz +OLD_FILES+=usr/share/man/man4/ng_deflate.4.gz +OLD_FILES+=usr/share/man/man4/ng_device.4.gz +OLD_FILES+=usr/share/man/man4/ng_echo.4.gz +OLD_FILES+=usr/share/man/man4/ng_eiface.4.gz +OLD_FILES+=usr/share/man/man4/ng_etf.4.gz +OLD_FILES+=usr/share/man/man4/ng_ether.4.gz +OLD_FILES+=usr/share/man/man4/ng_ether_echo.4.gz +OLD_FILES+=usr/share/man/man4/ng_frame_relay.4.gz +OLD_FILES+=usr/share/man/man4/ng_gif.4.gz +OLD_FILES+=usr/share/man/man4/ng_gif_demux.4.gz +OLD_FILES+=usr/share/man/man4/ng_h4.4.gz +OLD_FILES+=usr/share/man/man4/ng_hci.4.gz +OLD_FILES+=usr/share/man/man4/ng_hole.4.gz +OLD_FILES+=usr/share/man/man4/ng_hub.4.gz +OLD_FILES+=usr/share/man/man4/ng_iface.4.gz +OLD_FILES+=usr/share/man/man4/ng_ip_input.4.gz +OLD_FILES+=usr/share/man/man4/ng_ipfw.4.gz +OLD_FILES+=usr/share/man/man4/ng_ksocket.4.gz +OLD_FILES+=usr/share/man/man4/ng_l2cap.4.gz +OLD_FILES+=usr/share/man/man4/ng_l2tp.4.gz +OLD_FILES+=usr/share/man/man4/ng_lmi.4.gz +OLD_FILES+=usr/share/man/man4/ng_mppc.4.gz +OLD_FILES+=usr/share/man/man4/ng_nat.4.gz +OLD_FILES+=usr/share/man/man4/ng_netflow.4.gz +OLD_FILES+=usr/share/man/man4/ng_one2many.4.gz +OLD_FILES+=usr/share/man/man4/ng_patch.4.gz +OLD_FILES+=usr/share/man/man4/ng_ppp.4.gz +OLD_FILES+=usr/share/man/man4/ng_pppoe.4.gz +OLD_FILES+=usr/share/man/man4/ng_pptpgre.4.gz +OLD_FILES+=usr/share/man/man4/ng_pred1.4.gz +OLD_FILES+=usr/share/man/man4/ng_rfc1490.4.gz +OLD_FILES+=usr/share/man/man4/ng_socket.4.gz +OLD_FILES+=usr/share/man/man4/ng_source.4.gz +OLD_FILES+=usr/share/man/man4/ng_split.4.gz +OLD_FILES+=usr/share/man/man4/ng_sppp.4.gz +OLD_FILES+=usr/share/man/man4/ng_sscfu.4.gz +OLD_FILES+=usr/share/man/man4/ng_sscop.4.gz +OLD_FILES+=usr/share/man/man4/ng_tag.4.gz +OLD_FILES+=usr/share/man/man4/ng_tcpmss.4.gz +OLD_FILES+=usr/share/man/man4/ng_tee.4.gz +OLD_FILES+=usr/share/man/man4/ng_tty.4.gz +OLD_FILES+=usr/share/man/man4/ng_ubt.4.gz +OLD_FILES+=usr/share/man/man4/ng_uni.4.gz +OLD_FILES+=usr/share/man/man4/ng_vjc.4.gz +OLD_FILES+=usr/share/man/man4/ng_vlan.4.gz +OLD_FILES+=usr/share/man/man8/ngctl.8.gz +OLD_FILES+=usr/share/man/man8/nghook.8.gz +OLD_DIRS+=usr/share/examples/netgraph +.endif + +.if ${MK_NETGRAPH_SUPPORT} == no +OLD_FILES+=usr/include/netgraph/atm/ng_atm.h +OLD_FILES+=usr/include/netgraph/atm/ng_ccatm.h +OLD_FILES+=usr/include/netgraph/atm/ng_sscfu.h +OLD_FILES+=usr/include/netgraph/atm/ng_sscop.h +OLD_FILES+=usr/include/netgraph/atm/ng_uni.h +OLD_FILES+=usr/include/netgraph/atm/ngatmbase.h +OLD_FILES+=usr/include/netgraph/netflow/netflow.h +OLD_FILES+=usr/include/netgraph/netflow/netflow_v9.h +OLD_FILES+=usr/include/netgraph/netflow/ng_netflow.h +OLD_FILES+=usr/include/netgraph/netgraph.h +OLD_FILES+=usr/include/netgraph/ng_UI.h +OLD_FILES+=usr/include/netgraph/ng_async.h +OLD_FILES+=usr/include/netgraph/ng_atmllc.h +OLD_FILES+=usr/include/netgraph/ng_bpf.h +OLD_FILES+=usr/include/netgraph/ng_bridge.h +OLD_FILES+=usr/include/netgraph/ng_car.h +OLD_FILES+=usr/include/netgraph/ng_cisco.h +OLD_FILES+=usr/include/netgraph/ng_deflate.h +OLD_FILES+=usr/include/netgraph/ng_device.h +OLD_FILES+=usr/include/netgraph/ng_echo.h +OLD_FILES+=usr/include/netgraph/ng_eiface.h +OLD_FILES+=usr/include/netgraph/ng_etf.h +OLD_FILES+=usr/include/netgraph/ng_ether.h +OLD_FILES+=usr/include/netgraph/ng_ether_echo.h +OLD_FILES+=usr/include/netgraph/ng_frame_relay.h +OLD_FILES+=usr/include/netgraph/ng_gif.h +OLD_FILES+=usr/include/netgraph/ng_gif_demux.h +OLD_FILES+=usr/include/netgraph/ng_hole.h +OLD_FILES+=usr/include/netgraph/ng_hub.h +OLD_FILES+=usr/include/netgraph/ng_iface.h +OLD_FILES+=usr/include/netgraph/ng_ip_input.h +OLD_FILES+=usr/include/netgraph/ng_ipfw.h +OLD_FILES+=usr/include/netgraph/ng_ksocket.h +OLD_FILES+=usr/include/netgraph/ng_l2tp.h +OLD_FILES+=usr/include/netgraph/ng_lmi.h +OLD_FILES+=usr/include/netgraph/ng_message.h +OLD_FILES+=usr/include/netgraph/ng_mppc.h +OLD_FILES+=usr/include/netgraph/ng_nat.h +OLD_FILES+=usr/include/netgraph/ng_one2many.h +OLD_FILES+=usr/include/netgraph/ng_parse.h +OLD_FILES+=usr/include/netgraph/ng_patch.h +OLD_FILES+=usr/include/netgraph/ng_pipe.h +OLD_FILES+=usr/include/netgraph/ng_ppp.h +OLD_FILES+=usr/include/netgraph/ng_pppoe.h +OLD_FILES+=usr/include/netgraph/ng_pptpgre.h +OLD_FILES+=usr/include/netgraph/ng_pred1.h +OLD_FILES+=usr/include/netgraph/ng_rfc1490.h +OLD_FILES+=usr/include/netgraph/ng_sample.h +OLD_FILES+=usr/include/netgraph/ng_socket.h +OLD_FILES+=usr/include/netgraph/ng_socketvar.h +OLD_FILES+=usr/include/netgraph/ng_source.h +OLD_FILES+=usr/include/netgraph/ng_split.h +OLD_FILES+=usr/include/netgraph/ng_sppp.h +OLD_FILES+=usr/include/netgraph/ng_tag.h +OLD_FILES+=usr/include/netgraph/ng_tcpmss.h +OLD_FILES+=usr/include/netgraph/ng_tee.h +OLD_FILES+=usr/include/netgraph/ng_tty.h +OLD_FILES+=usr/include/netgraph/ng_vjc.h +OLD_FILES+=usr/include/netgraph/ng_vlan.h +OLD_DIRS+=usr/include/netgraph/atm +OLD_DIRS+=usr/include/netgraph/netflow +OLD_DIRS+=usr/include/netgraph +.endif + .if ${MK_NIS} == no OLD_FILES+=usr/bin/ypcat OLD_FILES+=usr/bin/ypchfn @@ -4001,6 +4177,52 @@ OLD_FILES+=usr/lib/private/libldns_p.a OLD_FILES+=usr/lib/private/libssh_p.a .endif +.if ${MK_RADIUS_SUPPORT} == no +OLD_FILES+=usr/include/radlib.h +OLD_FILES+=usr/include/radlib_vs.h +OLD_FILES+=usr/lib/libradius.a +OLD_LIBS+=usr/lib/libradius.so.4 +OLD_LIBS+=usr/lib/pam_radius.so.5 +OLD_FILES+=usr/lib/libradius_p.a +OLD_FILES+=usr/share/man/man3/libradius.3.gz +OLD_FILES+=usr/share/man/man3/rad_acct_open.3.gz +OLD_FILES+=usr/share/man/man3/rad_add_server.3.gz +OLD_FILES+=usr/share/man/man3/rad_add_server_ex.3.gz +OLD_FILES+=usr/share/man/man3/rad_auth_open.3.gz +OLD_FILES+=usr/share/man/man3/rad_bind_to.3.gz +OLD_FILES+=usr/share/man/man3/rad_close.3.gz +OLD_FILES+=usr/share/man/man3/rad_config.3.gz +OLD_FILES+=usr/share/man/man3/rad_continue_send_request.3.gz +OLD_FILES+=usr/share/man/man3/rad_create_request.3.gz +OLD_FILES+=usr/share/man/man3/rad_create_response.3.gz +OLD_FILES+=usr/share/man/man3/rad_cvt_addr.3.gz +OLD_FILES+=usr/share/man/man3/rad_cvt_int.3.gz +OLD_FILES+=usr/share/man/man3/rad_cvt_string.3.gz +OLD_FILES+=usr/share/man/man3/rad_demangle.3.gz +OLD_FILES+=usr/share/man/man3/rad_demangle_mppe_key.3.gz +OLD_FILES+=usr/share/man/man3/rad_get_attr.3.gz +OLD_FILES+=usr/share/man/man3/rad_get_vendor_attr.3.gz +OLD_FILES+=usr/share/man/man3/rad_init_send_request.3.gz +OLD_FILES+=usr/share/man/man3/rad_put_addr.3.gz +OLD_FILES+=usr/share/man/man3/rad_put_attr.3.gz +OLD_FILES+=usr/share/man/man3/rad_put_int.3.gz +OLD_FILES+=usr/share/man/man3/rad_put_message_authentic.3.gz +OLD_FILES+=usr/share/man/man3/rad_put_string.3.gz +OLD_FILES+=usr/share/man/man3/rad_put_vendor_addr.3.gz +OLD_FILES+=usr/share/man/man3/rad_put_vendor_attr.3.gz +OLD_FILES+=usr/share/man/man3/rad_put_vendor_int.3.gz +OLD_FILES+=usr/share/man/man3/rad_put_vendor_string.3.gz +OLD_FILES+=usr/share/man/man3/rad_receive_request.3.gz +OLD_FILES+=usr/share/man/man3/rad_request_authenticator.3.gz +OLD_FILES+=usr/share/man/man3/rad_send_request.3.gz +OLD_FILES+=usr/share/man/man3/rad_send_response.3.gz +OLD_FILES+=usr/share/man/man3/rad_server_open.3.gz +OLD_FILES+=usr/share/man/man3/rad_server_secret.3.gz +OLD_FILES+=usr/share/man/man3/rad_strerror.3.gz +OLD_FILES+=usr/share/man/man5/radius.conf.5.gz +OLD_FILES+=usr/share/man/man8/pam_radius.8.gz +.endif + .if ${MK_RBOOTD} == no OLD_FILES+=usr/libexec/rbootd OLD_FILES+=usr/share/man/man8/rbootd.8.gz From owner-svn-src-projects@FreeBSD.ORG Thu Nov 27 04:23:01 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2DB77840; Thu, 27 Nov 2014 04:23:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1B157607; Thu, 27 Nov 2014 04:23:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAR4N0Zd077245; Thu, 27 Nov 2014 04:23:00 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAR4N0Fm077243; Thu, 27 Nov 2014 04:23:00 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411270423.sAR4N0Fm077243@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 27 Nov 2014 04:23:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275168 - in projects/building-blocks/lib: . libpam/modules X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2014 04:23:01 -0000 Author: ngie Date: Thu Nov 27 04:23:00 2014 New Revision: 275168 URL: https://svnweb.freebsd.org/changeset/base/275168 Log: Fix typos: MK_RADIUS -> MK_RADIUS_SUPPORT Modified: projects/building-blocks/lib/Makefile projects/building-blocks/lib/libpam/modules/modules.inc Modified: projects/building-blocks/lib/Makefile ============================================================================== --- projects/building-blocks/lib/Makefile Thu Nov 27 04:19:01 2014 (r275167) +++ projects/building-blocks/lib/Makefile Thu Nov 27 04:23:00 2014 (r275168) @@ -269,7 +269,7 @@ _libmp= libmp _libpmc= libpmc .endif -.if ${MK_RADIUS} != "no" +.if ${MK_RADIUS_SUPPORT} != "no" _libradius= libradius .endif Modified: projects/building-blocks/lib/libpam/modules/modules.inc ============================================================================== --- projects/building-blocks/lib/libpam/modules/modules.inc Thu Nov 27 04:19:01 2014 (r275167) +++ projects/building-blocks/lib/libpam/modules/modules.inc Thu Nov 27 04:23:00 2014 (r275168) @@ -23,7 +23,7 @@ MODULES += pam_opie MODULES += pam_opieaccess MODULES += pam_passwdqc MODULES += pam_permit -.if ${MK_RADIUS} != "no +.if ${MK_RADIUS_SUPPORT} != "no MODULES += pam_radius .endif MODULES += pam_rhosts From owner-svn-src-projects@FreeBSD.ORG Thu Nov 27 07:17:33 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E39BDCAC; Thu, 27 Nov 2014 07:17:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C4B086E3; Thu, 27 Nov 2014 07:17:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAR7HWlp056344; Thu, 27 Nov 2014 07:17:32 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAR7HWJW056343; Thu, 27 Nov 2014 07:17:32 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411270717.sAR7HWJW056343@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 27 Nov 2014 07:17:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275172 - projects/building-blocks/tools/build/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2014 07:17:33 -0000 Author: ngie Date: Thu Nov 27 07:17:32 2014 New Revision: 275172 URL: https://svnweb.freebsd.org/changeset/base/275172 Log: Fill in MK_BOOT for amd64 Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Thu Nov 27 06:42:34 2014 (r275171) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Thu Nov 27 07:17:32 2014 (r275172) @@ -156,8 +156,10 @@ OLD_FILES+=usr/share/man/man8/authpf-noi OLD_FILES+=usr/sbin/bhyve OLD_FILES+=usr/sbin/bhyvectl OLD_FILES+=usr/sbin/bhyveload +OLD_FILES+=usr/share/examples/bhyve/vmrun.sh OLD_FILES+=usr/share/man/man8/bhyve.8.gz OLD_FILES+=usr/share/man/man8/bhyveload.8.gz +OLD_DIRS+=usr/share/examples/bhyve .endif .if ${MK_BLUETOOTH} == no @@ -286,9 +288,65 @@ OLD_FILES+=usr/share/man/man8/sdpcontrol OLD_FILES+=usr/share/man/man8/sdpd.8.gz .endif -#.if ${MK_BOOT} == no -# to be filled in -#.endif +.if ${MK_BOOT} == no +OLD_FILES+=boot/beastie.4th +OLD_FILES+=boot/boot +OLD_FILES+=boot/boot0 +OLD_FILES+=boot/boot0sio +OLD_FILES+=boot/boot1 +OLD_FILES+=boot/boot1.efi +OLD_FILES+=boot/boot1.efifat +OLD_FILES+=boot/boot2 +OLD_FILES+=boot/brand.4th +OLD_FILES+=boot/cdboot +OLD_FILES+=boot/check-password.4th +OLD_FILES+=boot/color.4th +OLD_FILES+=boot/defaults/loader.conf +OLD_FILES+=boot/delay.4th +OLD_FILES+=boot/device.hints +OLD_FILES+=boot/frames.4th +OLD_FILES+=boot/gptboot +OLD_FILES+=boot/gptzfsboot +OLD_FILES+=boot/loader +OLD_FILES+=boot/loader.4th +OLD_FILES+=boot/loader.efi +OLD_FILES+=boot/loader.help +OLD_FILES+=boot/loader.rc +OLD_FILES+=boot/mbr +OLD_FILES+=boot/menu-commands.4th +OLD_FILES+=boot/menu.4th +OLD_FILES+=boot/menu.rc +OLD_FILES+=boot/menusets.4th +OLD_FILES+=boot/pcibios.4th +OLD_FILES+=boot/pmbr +OLD_FILES+=boot/pxeboot +OLD_FILES+=boot/screen.4th +OLD_FILES+=boot/shortcuts.4th +OLD_FILES+=boot/support.4th +OLD_FILES+=boot/userboot.so +OLD_FILES+=boot/version.4th +OLD_FILES+=boot/zfsboot +OLD_FILES+=boot/zfsloader +OLD_FILES+=usr/lib/kgzldr.o +OLD_FILES+=usr/share/man/man5/loader.conf.5.gz +OLD_FILES+=usr/share/man/man8/beastie.4th.8.gz +OLD_FILES+=usr/share/man/man8/brand.4th.8.gz +OLD_FILES+=usr/share/man/man8/check-password.4th.8.gz +OLD_FILES+=usr/share/man/man8/color.4th.8.gz +OLD_FILES+=usr/share/man/man8/delay.4th.8.gz +OLD_FILES+=usr/share/man/man8/gptboot.8.gz +OLD_FILES+=usr/share/man/man8/gptzfsboot.8.gz +OLD_FILES+=usr/share/man/man8/loader.4th.8.gz +OLD_FILES+=usr/share/man/man8/loader.8.gz +OLD_FILES+=usr/share/man/man8/menu.4th.8.gz +OLD_FILES+=usr/share/man/man8/menusets.4th.8.gz +OLD_FILES+=usr/share/man/man8/pxeboot.8.gz +OLD_FILES+=usr/share/man/man8/version.4th.8.gz +OLD_FILES+=usr/share/man/man8/zfsboot.8.gz +OLD_FILES+=usr/share/man/man8/zfsloader.8.gz +OLD_DIRS+=boot/defaults +OLD_DIRS+=boot +.endif .if ${MK_BOOTPARAMD} == no OLD_FILES+=rc.d/bootparams From owner-svn-src-projects@FreeBSD.ORG Thu Nov 27 07:19:38 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1E1B7DB1; Thu, 27 Nov 2014 07:19:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0B03D750; Thu, 27 Nov 2014 07:19:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAR7JbD9056606; Thu, 27 Nov 2014 07:19:37 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAR7Jb0L056605; Thu, 27 Nov 2014 07:19:37 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411270719.sAR7Jb0L056605@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 27 Nov 2014 07:19:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275173 - in projects/building-blocks/tools: . build/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2014 07:19:38 -0000 Author: ngie Date: Thu Nov 27 07:19:36 2014 New Revision: 275173 URL: https://svnweb.freebsd.org/changeset/base/275173 Log: Ignore boot and remove from MK_BOOT additions done in previous commit Modified: projects/building-blocks/tools/add-optional-obsolete-files-entries.sh projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/tools/add-optional-obsolete-files-entries.sh ============================================================================== --- projects/building-blocks/tools/add-optional-obsolete-files-entries.sh Thu Nov 27 07:17:32 2014 (r275172) +++ projects/building-blocks/tools/add-optional-obsolete-files-entries.sh Thu Nov 27 07:19:36 2014 (r275173) @@ -46,6 +46,6 @@ done sed -e 's,^,OLD_FILES+=,' \ -e '/lib\/.*\.so\.[0-9]\.*/s/OLD_FILES+=/OLD_LIBS+=/g'; find -d -s . -type d -mindepth 1 -and \! -empty | \ - egrep -v '^\./(s*bin|libexec|usr|usr/include|usr/lib(data)?|usr/libdata/pkgconfig|usr/lib/private|usr/libexec|usr/s*bin|usr/share|usr/share/(examples|man)|usr/share/man/man[0-9])$' | \ + egrep -v '^\./(boot|s*bin|libexec|usr|usr/include|usr/lib(data)?|usr/libdata/pkgconfig|usr/lib/private|usr/libexec|usr/s*bin|usr/share|usr/share/(examples|man)|usr/share/man/man[0-9])$' | \ sed -e 's,^,OLD_DIRS+=,' ) | sed -e 's,+=\./,+=,' Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Thu Nov 27 07:17:32 2014 (r275172) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Thu Nov 27 07:19:36 2014 (r275173) @@ -345,7 +345,6 @@ OLD_FILES+=usr/share/man/man8/version.4t OLD_FILES+=usr/share/man/man8/zfsboot.8.gz OLD_FILES+=usr/share/man/man8/zfsloader.8.gz OLD_DIRS+=boot/defaults -OLD_DIRS+=boot .endif .if ${MK_BOOTPARAMD} == no From owner-svn-src-projects@FreeBSD.ORG Thu Nov 27 07:26:21 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 88728FB7; Thu, 27 Nov 2014 07:26:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 757F2809; Thu, 27 Nov 2014 07:26:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAR7QLmW060832; Thu, 27 Nov 2014 07:26:21 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAR7QLIC060831; Thu, 27 Nov 2014 07:26:21 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411270726.sAR7QLIC060831@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 27 Nov 2014 07:26:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275174 - projects/building-blocks/etc/mtree X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2014 07:26:21 -0000 Author: ngie Date: Thu Nov 27 07:26:20 2014 New Revision: 275174 URL: https://svnweb.freebsd.org/changeset/base/275174 Log: Remove /etc/X11 entry from BSD.root.dist - FreeBSD hasn't packaged X11 with the distro since 8.x - X.org hasn't required xorg.conf [in /etc/X11] for some time now - X.org should work with ${LOCALBASE}/etc/X11 - This path should be included in the X.org package manifest Modified: projects/building-blocks/etc/mtree/BSD.root.dist Modified: projects/building-blocks/etc/mtree/BSD.root.dist ============================================================================== --- projects/building-blocks/etc/mtree/BSD.root.dist Thu Nov 27 07:19:36 2014 (r275173) +++ projects/building-blocks/etc/mtree/BSD.root.dist Thu Nov 27 07:26:20 2014 (r275174) @@ -24,8 +24,6 @@ dev mode=0555 .. etc - X11 - .. autofs .. bluetooth From owner-svn-src-projects@FreeBSD.ORG Thu Nov 27 07:33:51 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 54C992CF; Thu, 27 Nov 2014 07:33:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 419A58D4; Thu, 27 Nov 2014 07:33:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAR7XpR5065131; Thu, 27 Nov 2014 07:33:51 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAR7XppF065130; Thu, 27 Nov 2014 07:33:51 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411270733.sAR7XppF065130@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 27 Nov 2014 07:33:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275175 - projects/building-blocks/tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2014 07:33:51 -0000 Author: ngie Date: Thu Nov 27 07:33:50 2014 New Revision: 275175 URL: https://svnweb.freebsd.org/changeset/base/275175 Log: Until I teach bsd.*.mk to accept NO_ROOT, make this script only accept root users Modified: projects/building-blocks/tools/add-optional-obsolete-files-entries.sh Modified: projects/building-blocks/tools/add-optional-obsolete-files-entries.sh ============================================================================== --- projects/building-blocks/tools/add-optional-obsolete-files-entries.sh Thu Nov 27 07:26:20 2014 (r275174) +++ projects/building-blocks/tools/add-optional-obsolete-files-entries.sh Thu Nov 27 07:33:50 2014 (r275175) @@ -6,6 +6,12 @@ # # $FreeBSD$ +# NO_ROOT doesn't seem to work at a non-installworld, etc level yet +if [ $(id -u) -ne 0 ]; then + echo "${0##*/}: ERROR: this script must be run as root" + exit 1 +fi + : ${TMPDIR=/tmp} DESTDIR=$(mktemp -d $TMPDIR/tmp.XXXXXX) || exit From owner-svn-src-projects@FreeBSD.ORG Thu Nov 27 07:49:26 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2E92D4BD; Thu, 27 Nov 2014 07:49:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1B7879EF; Thu, 27 Nov 2014 07:49:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAR7nPkY070356; Thu, 27 Nov 2014 07:49:25 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAR7nPuT070355; Thu, 27 Nov 2014 07:49:25 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411270749.sAR7nPuT070355@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 27 Nov 2014 07:49:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275176 - projects/building-blocks/etc X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2014 07:49:26 -0000 Author: ngie Date: Thu Nov 27 07:49:25 2014 New Revision: 275176 URL: https://svnweb.freebsd.org/changeset/base/275176 Log: Only install libmap32.conf if MK_LIB32 != no Modified: projects/building-blocks/etc/Makefile Modified: projects/building-blocks/etc/Makefile ============================================================================== --- projects/building-blocks/etc/Makefile Thu Nov 27 07:33:50 2014 (r275175) +++ projects/building-blocks/etc/Makefile Thu Nov 27 07:49:25 2014 (r275176) @@ -53,10 +53,6 @@ BIN1= auto_master \ syslog.conf \ termcap.small -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64" -BIN1+= libmap32.conf -.endif - .if exists(${.CURDIR}/etc.${MACHINE}/ttys) BIN1+= etc.${MACHINE}/ttys .elif exists(${.CURDIR}/etc.${MACHINE_ARCH}/ttys) @@ -105,6 +101,10 @@ BIN1+= inetd.conf BIN1+= ${.CURDIR}/../usr.bin/locate/locate/locate.rc .endif +.if ${MK_LIB32} != "no" +BIN1+= libmap32.conf +.endif + .if ${MK_LPR} != "no" BIN1+= hosts.lpd printcap .endif From owner-svn-src-projects@FreeBSD.ORG Thu Nov 27 07:56:29 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 729B65F3; Thu, 27 Nov 2014 07:56:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5F888AA8; Thu, 27 Nov 2014 07:56:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAR7uTJS074595; Thu, 27 Nov 2014 07:56:29 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAR7uTWv074594; Thu, 27 Nov 2014 07:56:29 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411270756.sAR7uTWv074594@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 27 Nov 2014 07:56:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275177 - projects/building-blocks/usr.sbin/ppp X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2014 07:56:29 -0000 Author: ngie Date: Thu Nov 27 07:56:28 2014 New Revision: 275177 URL: https://svnweb.freebsd.org/changeset/base/275177 Log: Handle MK_RADIUS_SUPPORT in usr.sbin/ppp Modified: projects/building-blocks/usr.sbin/ppp/Makefile Modified: projects/building-blocks/usr.sbin/ppp/Makefile ============================================================================== --- projects/building-blocks/usr.sbin/ppp/Makefile Thu Nov 27 07:49:25 2014 (r275176) +++ projects/building-blocks/usr.sbin/ppp/Makefile Thu Nov 27 07:56:28 2014 (r275177) @@ -31,6 +31,9 @@ PPP_NO_NETGRAPH= .if ${MK_PAM_SUPPORT} == "no" PPP_NO_PAM= .endif +.if ${MK_RADIUS_SUPPORT} == "no" +PPP_NO_RADIUS= +.endif .if defined(PPP_NO_SUID) BINMODE=554 From owner-svn-src-projects@FreeBSD.ORG Thu Nov 27 08:31:20 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E0FCDC8A; Thu, 27 Nov 2014 08:31:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CD989E40; Thu, 27 Nov 2014 08:31:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAR8VKtg094566; Thu, 27 Nov 2014 08:31:20 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAR8VKxT094565; Thu, 27 Nov 2014 08:31:20 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411270831.sAR8VKxT094565@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 27 Nov 2014 08:31:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275178 - projects/building-blocks/usr.sbin/bsdconfig X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2014 08:31:21 -0000 Author: ngie Date: Thu Nov 27 08:31:20 2014 New Revision: 275178 URL: https://svnweb.freebsd.org/changeset/base/275178 Log: Honor MK_EXAMPLES Modified: projects/building-blocks/usr.sbin/bsdconfig/Makefile Modified: projects/building-blocks/usr.sbin/bsdconfig/Makefile ============================================================================== --- projects/building-blocks/usr.sbin/bsdconfig/Makefile Thu Nov 27 07:56:28 2014 (r275177) +++ projects/building-blocks/usr.sbin/bsdconfig/Makefile Thu Nov 27 08:31:20 2014 (r275178) @@ -1,10 +1,11 @@ # $FreeBSD$ +.include + SUBDIR= console \ diskmgmt \ docsinstall \ dot \ - examples \ include \ includes \ mouse \ @@ -25,4 +26,8 @@ SCRIPTS= bsdconfig MAN= bsdconfig.8 +.if ${MK_EXAMPLES} != "no" +SUBDIR+= examples +.endif + .include From owner-svn-src-projects@FreeBSD.ORG Thu Nov 27 09:40:37 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E151B99E; Thu, 27 Nov 2014 09:40:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CEA1C6E9; Thu, 27 Nov 2014 09:40:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAR9ebA3024236; Thu, 27 Nov 2014 09:40:37 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAR9ebvc024235; Thu, 27 Nov 2014 09:40:37 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411270940.sAR9ebvc024235@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 27 Nov 2014 09:40:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275181 - projects/building-blocks/tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2014 09:40:38 -0000 Author: ngie Date: Thu Nov 27 09:40:36 2014 New Revision: 275181 URL: https://svnweb.freebsd.org/changeset/base/275181 Log: Filter out /lib, /usr/lib32, and fold the /usr/lib* checks into one expression Modified: projects/building-blocks/tools/add-optional-obsolete-files-entries.sh Modified: projects/building-blocks/tools/add-optional-obsolete-files-entries.sh ============================================================================== --- projects/building-blocks/tools/add-optional-obsolete-files-entries.sh Thu Nov 27 09:17:42 2014 (r275180) +++ projects/building-blocks/tools/add-optional-obsolete-files-entries.sh Thu Nov 27 09:40:36 2014 (r275181) @@ -52,6 +52,6 @@ done sed -e 's,^,OLD_FILES+=,' \ -e '/lib\/.*\.so\.[0-9]\.*/s/OLD_FILES+=/OLD_LIBS+=/g'; find -d -s . -type d -mindepth 1 -and \! -empty | \ - egrep -v '^\./(boot|s*bin|libexec|usr|usr/include|usr/lib(data)?|usr/libdata/pkgconfig|usr/lib/private|usr/libexec|usr/s*bin|usr/share|usr/share/(examples|man)|usr/share/man/man[0-9])$' | \ + egrep -v '^\./(boot|s*bin|lib|libexec|usr|usr/include|usr/lib(32|data|exec)?|usr/libdata/pkgconfig|usr/lib/private|usr/s*bin|usr/share|usr/share/(examples|man)|usr/share/man/man[0-9])$' | \ sed -e 's,^,OLD_DIRS+=,' ) | sed -e 's,+=\./,+=,' From owner-svn-src-projects@FreeBSD.ORG Thu Nov 27 09:42:43 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 69F2FC80; Thu, 27 Nov 2014 09:42:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4B04C807; Thu, 27 Nov 2014 09:42:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAR9gh0t027687; Thu, 27 Nov 2014 09:42:43 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAR9gfF9027672; Thu, 27 Nov 2014 09:42:41 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411270942.sAR9gfF9027672@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 27 Nov 2014 09:42:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275182 - in projects/building-blocks: etc etc/rc.d share share/man/man5 share/mk tools/build/options usr.sbin X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2014 09:42:43 -0000 Author: ngie Date: Thu Nov 27 09:42:40 2014 New Revision: 275182 URL: https://svnweb.freebsd.org/changeset/base/275182 Log: Add WITHOUT_AUTOFS and WITHOUT_BSDCONFIG Added: projects/building-blocks/tools/build/options/WITHOUT_AUTOFS (contents, props changed) projects/building-blocks/tools/build/options/WITHOUT_BSDCONFIG (contents, props changed) Modified: projects/building-blocks/etc/Makefile projects/building-blocks/etc/rc.d/Makefile projects/building-blocks/share/Makefile projects/building-blocks/share/man/man5/Makefile projects/building-blocks/share/mk/src.opts.mk projects/building-blocks/usr.sbin/Makefile Modified: projects/building-blocks/etc/Makefile ============================================================================== --- projects/building-blocks/etc/Makefile Thu Nov 27 09:40:36 2014 (r275181) +++ projects/building-blocks/etc/Makefile Thu Nov 27 09:42:40 2014 (r275182) @@ -11,8 +11,7 @@ SUBDIR= sendmail SUBDIR+=tests .endif -BIN1= auto_master \ - crontab \ +BIN1= crontab \ devd.conf \ devfs.conf \ ddb.conf \ @@ -81,6 +80,10 @@ BIN1+= amd.map BIN1+= apmd.conf .endif +.if ${MK_AUTOFS} != "no" +BIN1+= auto_master +.endif + .if ${MK_BSNMP} != "no" BIN1+= snmpd.config .endif @@ -232,7 +235,9 @@ distribution: echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \ ) | ${METALOG.add} .endif +.if ${MK_AUTOFS} != "no" ${_+_}cd ${.CURDIR}/autofs; ${MAKE} install +.endif .if ${MK_BLUETOOTH} != "no" ${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install .endif Modified: projects/building-blocks/etc/rc.d/Makefile ============================================================================== --- projects/building-blocks/etc/rc.d/Makefile Thu Nov 27 09:40:36 2014 (r275181) +++ projects/building-blocks/etc/rc.d/Makefile Thu Nov 27 09:42:40 2014 (r275182) @@ -17,9 +17,6 @@ FILES= DAEMON \ atm3 \ auditd \ auditdistd \ - automount \ - automountd \ - autounmountd \ bgfsck \ ${_bluetooth} \ bridge \ @@ -162,6 +159,12 @@ FILES+= apm FILES+= apmd .endif +.if ${MK_AUTOFS} != "no" +FILES+= automount +FILES+= automountd +FILES+= autounmountd +.endif + .if ${MK_BLUETOOTH} != "no" _bluetooth= bluetooth _bthidd= bthidd Modified: projects/building-blocks/share/Makefile ============================================================================== --- projects/building-blocks/share/Makefile Thu Nov 27 09:40:36 2014 (r275181) +++ projects/building-blocks/share/Makefile Thu Nov 27 09:42:40 2014 (r275182) @@ -8,7 +8,7 @@ SUBDIR= ${_colldef} \ ${_dict} \ ${_doc} \ - dtrace \ + ${_dtrace} \ ${_examples} \ ${_i18n} \ keys \ @@ -37,6 +37,10 @@ SUBDIR= ${_colldef} \ _snmp= snmp .endif +.if ${MK_CDDL} != "no" +_dtrace= dtrace +.endif + .if ${MK_DICT} != "no" _dict= dict .endif Modified: projects/building-blocks/share/man/man5/Makefile ============================================================================== --- projects/building-blocks/share/man/man5/Makefile Thu Nov 27 09:40:36 2014 (r275181) +++ projects/building-blocks/share/man/man5/Makefile Thu Nov 27 09:42:40 2014 (r275182) @@ -7,7 +7,6 @@ MAN= acct.5 \ ar.5 \ a.out.5 \ - autofs.5 \ bluetooth.device.conf.5 \ bluetooth.hosts.5 \ bluetooth.protocols.5 \ @@ -80,6 +79,10 @@ MLINKS+=quota.user.5 quota.group.5 MLINKS+=rc.conf.5 rc.conf.local.5 MLINKS+=resolver.5 resolv.conf.5 +.if ${MK_AUTOFS} != "no" +MAN+= autofs.5 +.endif + .if ${MK_FREEBSD_UPDATE} != "no" MAN+= freebsd-update.conf.5 .endif Modified: projects/building-blocks/share/mk/src.opts.mk ============================================================================== --- projects/building-blocks/share/mk/src.opts.mk Thu Nov 27 09:40:36 2014 (r275181) +++ projects/building-blocks/share/mk/src.opts.mk Thu Nov 27 09:42:40 2014 (r275182) @@ -52,6 +52,7 @@ __DEFAULT_YES_OPTIONS = \ ATM \ AUDIT \ AUTHPF \ + AUTOFS \ BINUTILS \ BINUTILS_BOOTSTRAP \ BLUETOOTH \ @@ -59,6 +60,7 @@ __DEFAULT_YES_OPTIONS = \ BOOTPD \ BOOTPARAMD \ BSD_CPIO \ + BSDCONFIG \ BSDINSTALL \ BSNMP \ BZIP2 \ Added: projects/building-blocks/tools/build/options/WITHOUT_AUTOFS ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/build/options/WITHOUT_AUTOFS Thu Nov 27 09:42:40 2014 (r275182) @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr autofs 4 +related programs, libraries, and kernel modules. Added: projects/building-blocks/tools/build/options/WITHOUT_BSDCONFIG ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/build/options/WITHOUT_BSDCONFIG Thu Nov 27 09:42:40 2014 (r275182) @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build +.Xr bsdconfig 8 , +.Xr sysrc 8 , +and related programs. Modified: projects/building-blocks/usr.sbin/Makefile ============================================================================== --- projects/building-blocks/usr.sbin/Makefile Thu Nov 27 09:40:36 2014 (r275181) +++ projects/building-blocks/usr.sbin/Makefile Thu Nov 27 09:42:40 2014 (r275182) @@ -5,9 +5,7 @@ SUBDIR= adduser \ arp \ - autofs \ binmiscctl \ - bsdconfig \ cdcontrol \ chkgrp \ chown \ @@ -79,7 +77,6 @@ SUBDIR= adduser \ snapinfo \ spray \ syslogd \ - sysrc \ tcpdrop \ tcpdump \ traceroute \ @@ -117,6 +114,10 @@ SUBDIR+= praudit SUBDIR+= authpf .endif +.if ${MK_AUTOFS} != "no" +SUBDIR+= autofs +.endif + .if ${MK_BLUETOOTH} != "no" SUBDIR+= bluetooth .endif @@ -125,6 +126,11 @@ SUBDIR+= bluetooth SUBDIR+= bootparamd .endif +.if ${MK_BSDCONFIG} != "no" +SUBDIR+= bsdconfig +SUBDIR+= sysrc +.endif + .if ${MK_BSDINSTALL} != "no" SUBDIR+= bsdinstall .endif From owner-svn-src-projects@FreeBSD.ORG Thu Nov 27 09:50:13 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9001B1F0; Thu, 27 Nov 2014 09:50:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7D65686D; Thu, 27 Nov 2014 09:50:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAR9oDcO028837; Thu, 27 Nov 2014 09:50:13 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAR9oDIp028836; Thu, 27 Nov 2014 09:50:13 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411270950.sAR9oDIp028836@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 27 Nov 2014 09:50:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275183 - projects/building-blocks/sys/modules X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2014 09:50:13 -0000 Author: ngie Date: Thu Nov 27 09:50:12 2014 New Revision: 275183 URL: https://svnweb.freebsd.org/changeset/base/275183 Log: Honor MK_AUTOFS Modified: projects/building-blocks/sys/modules/Makefile Modified: projects/building-blocks/sys/modules/Makefile ============================================================================== --- projects/building-blocks/sys/modules/Makefile Thu Nov 27 09:42:40 2014 (r275182) +++ projects/building-blocks/sys/modules/Makefile Thu Nov 27 09:50:12 2014 (r275183) @@ -48,7 +48,7 @@ SUBDIR= \ ata \ ath \ ath_pci \ - autofs \ + ${_autofs} \ ${_auxio} \ ${_bce} \ bfe \ @@ -387,6 +387,10 @@ SUBDIR= \ ${_zfs} \ zlib +.if ${MK_AUTOFS} != "no" || defined(ALL_MODULES) +_autofs= autofs +.endif + .if ${MK_BHYVE} != "no" || defined(ALL_MODULES) _vmm= vmm .endif From owner-svn-src-projects@FreeBSD.ORG Thu Nov 27 09:53:17 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E66413FE; Thu, 27 Nov 2014 09:53:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C7853921; Thu, 27 Nov 2014 09:53:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAR9rHAM032577; Thu, 27 Nov 2014 09:53:17 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAR9rH7q032576; Thu, 27 Nov 2014 09:53:17 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411270953.sAR9rH7q032576@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 27 Nov 2014 09:53:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275184 - projects/building-blocks/tools/build/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2014 09:53:18 -0000 Author: ngie Date: Thu Nov 27 09:53:17 2014 New Revision: 275184 URL: https://svnweb.freebsd.org/changeset/base/275184 Log: Populate MK_AUTOFS and MK_BSDCONFIG; add more dtrace bits to MK_CDDL; add minimal bits to MK_LIB32 Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Thu Nov 27 09:50:12 2014 (r275183) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Thu Nov 27 09:53:17 2014 (r275184) @@ -152,6 +152,22 @@ OLD_FILES+=usr/share/man/man8/authpf.8.g OLD_FILES+=usr/share/man/man8/authpf-noip.8.gz .endif +.if ${MK_AUTOFS} == no +OLD_FILES+=etc/autofs/include_ldap +OLD_FILES+=etc/autofs/special_hosts +OLD_FILES+=etc/autofs/special_null +OLD_FILES+=etc/auto_master +OLD_FILES+=usr/sbin/automount +OLD_FILES+=usr/sbin/automountd +OLD_FILES+=usr/sbin/autounmountd +OLD_FILES+=usr/share/man/man5/autofs.5.gz +OLD_FILES+=usr/share/man/man5/auto_master.5.gz +OLD_FILES+=usr/share/man/man8/automount.8.gz +OLD_FILES+=usr/share/man/man8/automountd.8.gz +OLD_FILES+=usr/share/man/man8/autounmountd.8.gz +OLD_DIRS+=etc/autofs +.endif + .if ${MK_BHYVE} == no OLD_FILES+=usr/sbin/bhyve OLD_FILES+=usr/sbin/bhyvectl @@ -367,6 +383,201 @@ OLD_FILES+=usr/share/man/man8/bootpgw.8. OLD_FILES+=usr/share/man/man8/bootptest.8.gz .endif +.if ${MK_BSDCONFIG} == no +OLD_FILES+=usr/libexec/bsdconfig/020.docsinstall/INDEX +OLD_FILES+=usr/libexec/bsdconfig/020.docsinstall/USAGE +OLD_FILES+=usr/libexec/bsdconfig/020.docsinstall/docsinstall +OLD_FILES+=usr/libexec/bsdconfig/020.docsinstall/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/030.packages/INDEX +OLD_FILES+=usr/libexec/bsdconfig/030.packages/USAGE +OLD_FILES+=usr/libexec/bsdconfig/030.packages/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/030.packages/packages +OLD_FILES+=usr/libexec/bsdconfig/040.password/INDEX +OLD_FILES+=usr/libexec/bsdconfig/040.password/USAGE +OLD_FILES+=usr/libexec/bsdconfig/040.password/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/040.password/password +OLD_FILES+=usr/libexec/bsdconfig/050.diskmgmt/INDEX +OLD_FILES+=usr/libexec/bsdconfig/050.diskmgmt/USAGE +OLD_FILES+=usr/libexec/bsdconfig/050.diskmgmt/diskmgmt +OLD_FILES+=usr/libexec/bsdconfig/050.diskmgmt/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/INDEX +OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/USAGE +OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/groupadd +OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/groupdel +OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/groupedit +OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/include/usermgmt.hlp +OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/useradd +OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/userdel +OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/useredit +OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/usermgmt +OLD_FILES+=usr/libexec/bsdconfig/080.console/INDEX +OLD_FILES+=usr/libexec/bsdconfig/080.console/USAGE +OLD_FILES+=usr/libexec/bsdconfig/080.console/console +OLD_FILES+=usr/libexec/bsdconfig/080.console/font +OLD_FILES+=usr/libexec/bsdconfig/080.console/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/080.console/keymap +OLD_FILES+=usr/libexec/bsdconfig/080.console/repeat +OLD_FILES+=usr/libexec/bsdconfig/080.console/saver +OLD_FILES+=usr/libexec/bsdconfig/080.console/screenmap +OLD_FILES+=usr/libexec/bsdconfig/080.console/ttys +OLD_FILES+=usr/libexec/bsdconfig/090.timezone/INDEX +OLD_FILES+=usr/libexec/bsdconfig/090.timezone/USAGE +OLD_FILES+=usr/libexec/bsdconfig/090.timezone/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/090.timezone/timezone +OLD_FILES+=usr/libexec/bsdconfig/110.mouse/INDEX +OLD_FILES+=usr/libexec/bsdconfig/110.mouse/USAGE +OLD_FILES+=usr/libexec/bsdconfig/110.mouse/disable +OLD_FILES+=usr/libexec/bsdconfig/110.mouse/enable +OLD_FILES+=usr/libexec/bsdconfig/110.mouse/flags +OLD_FILES+=usr/libexec/bsdconfig/110.mouse/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/110.mouse/mouse +OLD_FILES+=usr/libexec/bsdconfig/110.mouse/port +OLD_FILES+=usr/libexec/bsdconfig/110.mouse/type +OLD_FILES+=usr/libexec/bsdconfig/120.networking/INDEX +OLD_FILES+=usr/libexec/bsdconfig/120.networking/USAGE +OLD_FILES+=usr/libexec/bsdconfig/120.networking/defaultrouter +OLD_FILES+=usr/libexec/bsdconfig/120.networking/devices +OLD_FILES+=usr/libexec/bsdconfig/120.networking/hostname +OLD_FILES+=usr/libexec/bsdconfig/120.networking/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/120.networking/nameservers +OLD_FILES+=usr/libexec/bsdconfig/120.networking/networking +OLD_FILES+=usr/libexec/bsdconfig/130.security/INDEX +OLD_FILES+=usr/libexec/bsdconfig/130.security/USAGE +OLD_FILES+=usr/libexec/bsdconfig/130.security/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/130.security/include/securelevel.hlp +OLD_FILES+=usr/libexec/bsdconfig/130.security/kern_securelevel +OLD_FILES+=usr/libexec/bsdconfig/130.security/security +OLD_FILES+=usr/libexec/bsdconfig/140.startup/INDEX +OLD_FILES+=usr/libexec/bsdconfig/140.startup/USAGE +OLD_FILES+=usr/libexec/bsdconfig/140.startup/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/140.startup/misc +OLD_FILES+=usr/libexec/bsdconfig/140.startup/rcadd +OLD_FILES+=usr/libexec/bsdconfig/140.startup/rcconf +OLD_FILES+=usr/libexec/bsdconfig/140.startup/rcdelete +OLD_FILES+=usr/libexec/bsdconfig/140.startup/rcedit +OLD_FILES+=usr/libexec/bsdconfig/140.startup/rcvar +OLD_FILES+=usr/libexec/bsdconfig/140.startup/startup +OLD_FILES+=usr/libexec/bsdconfig/150.ttys/INDEX +OLD_FILES+=usr/libexec/bsdconfig/150.ttys/USAGE +OLD_FILES+=usr/libexec/bsdconfig/150.ttys/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/150.ttys/ttys +OLD_FILES+=usr/libexec/bsdconfig/USAGE +OLD_FILES+=usr/libexec/bsdconfig/dot/INDEX +OLD_FILES+=usr/libexec/bsdconfig/dot/USAGE +OLD_FILES+=usr/libexec/bsdconfig/dot/dot +OLD_FILES+=usr/libexec/bsdconfig/dot/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/include/bsdconfig.hlp +OLD_FILES+=usr/libexec/bsdconfig/include/media.hlp +OLD_FILES+=usr/libexec/bsdconfig/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/include/network_device.hlp +OLD_FILES+=usr/libexec/bsdconfig/include/options.hlp +OLD_FILES+=usr/libexec/bsdconfig/include/tcp.hlp +OLD_FILES+=usr/libexec/bsdconfig/include/usage.hlp +OLD_FILES+=usr/libexec/bsdconfig/includes/INDEX +OLD_FILES+=usr/libexec/bsdconfig/includes/USAGE +OLD_FILES+=usr/libexec/bsdconfig/includes/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/includes/includes +OLD_FILES+=usr/sbin/bsdconfig +OLD_FILES+=usr/sbin/sysrc +OLD_FILES+=usr/share/bsdconfig/common.subr +OLD_FILES+=usr/share/bsdconfig/device.subr +OLD_FILES+=usr/share/bsdconfig/dialog.subr +OLD_FILES+=usr/share/bsdconfig/geom.subr +OLD_FILES+=usr/share/bsdconfig/keymap.subr +OLD_FILES+=usr/share/bsdconfig/media/any.subr +OLD_FILES+=usr/share/bsdconfig/media/cdrom.subr +OLD_FILES+=usr/share/bsdconfig/media/common.subr +OLD_FILES+=usr/share/bsdconfig/media/directory.subr +OLD_FILES+=usr/share/bsdconfig/media/dos.subr +OLD_FILES+=usr/share/bsdconfig/media/floppy.subr +OLD_FILES+=usr/share/bsdconfig/media/ftp.subr +OLD_FILES+=usr/share/bsdconfig/media/http.subr +OLD_FILES+=usr/share/bsdconfig/media/httpproxy.subr +OLD_FILES+=usr/share/bsdconfig/media/network.subr +OLD_FILES+=usr/share/bsdconfig/media/nfs.subr +OLD_FILES+=usr/share/bsdconfig/media/options.subr +OLD_FILES+=usr/share/bsdconfig/media/tcpip.subr +OLD_FILES+=usr/share/bsdconfig/media/ufs.subr +OLD_FILES+=usr/share/bsdconfig/media/usb.subr +OLD_FILES+=usr/share/bsdconfig/mustberoot.subr +OLD_FILES+=usr/share/bsdconfig/networking/common.subr +OLD_FILES+=usr/share/bsdconfig/networking/device.subr +OLD_FILES+=usr/share/bsdconfig/networking/hostname.subr +OLD_FILES+=usr/share/bsdconfig/networking/ipaddr.subr +OLD_FILES+=usr/share/bsdconfig/networking/media.subr +OLD_FILES+=usr/share/bsdconfig/networking/netmask.subr +OLD_FILES+=usr/share/bsdconfig/networking/resolv.subr +OLD_FILES+=usr/share/bsdconfig/networking/routing.subr +OLD_FILES+=usr/share/bsdconfig/networking/services.subr +OLD_FILES+=usr/share/bsdconfig/packages/categories.subr +OLD_FILES+=usr/share/bsdconfig/packages/index.subr +OLD_FILES+=usr/share/bsdconfig/packages/musthavepkg.subr +OLD_FILES+=usr/share/bsdconfig/packages/packages.subr +OLD_FILES+=usr/share/bsdconfig/password/password.subr +OLD_FILES+=usr/share/bsdconfig/script.subr +OLD_FILES+=usr/share/bsdconfig/startup/rcconf.subr +OLD_FILES+=usr/share/bsdconfig/startup/rcedit.subr +OLD_FILES+=usr/share/bsdconfig/startup/rcvar.subr +OLD_FILES+=usr/share/bsdconfig/strings.subr +OLD_FILES+=usr/share/bsdconfig/struct.subr +OLD_FILES+=usr/share/bsdconfig/sysrc.subr +OLD_FILES+=usr/share/bsdconfig/timezone/continents.subr +OLD_FILES+=usr/share/bsdconfig/timezone/countries.subr +OLD_FILES+=usr/share/bsdconfig/timezone/iso3166.subr +OLD_FILES+=usr/share/bsdconfig/timezone/menus.subr +OLD_FILES+=usr/share/bsdconfig/timezone/zones.subr +OLD_FILES+=usr/share/bsdconfig/usermgmt/group.subr +OLD_FILES+=usr/share/bsdconfig/usermgmt/group_input.subr +OLD_FILES+=usr/share/bsdconfig/usermgmt/user.subr +OLD_FILES+=usr/share/bsdconfig/usermgmt/user_input.subr +OLD_FILES+=usr/share/bsdconfig/variable.subr +OLD_FILES+=usr/share/examples/bsdconfig/add_some_packages.sh +OLD_FILES+=usr/share/examples/bsdconfig/browse_packages_http.sh +OLD_FILES+=usr/share/examples/bsdconfig/bsdconfigrc +OLD_FILES+=usr/share/man/man8/bsdconfig.8.gz +OLD_FILES+=usr/share/man/man8/sysrc.8.gz +OLD_DIRS+=usr/libexec/bsdconfig/020.docsinstall/include +OLD_DIRS+=usr/libexec/bsdconfig/020.docsinstall +OLD_DIRS+=usr/libexec/bsdconfig/030.packages/include +OLD_DIRS+=usr/libexec/bsdconfig/030.packages +OLD_DIRS+=usr/libexec/bsdconfig/040.password/include +OLD_DIRS+=usr/libexec/bsdconfig/040.password +OLD_DIRS+=usr/libexec/bsdconfig/050.diskmgmt/include +OLD_DIRS+=usr/libexec/bsdconfig/050.diskmgmt +OLD_DIRS+=usr/libexec/bsdconfig/070.usermgmt/include +OLD_DIRS+=usr/libexec/bsdconfig/070.usermgmt +OLD_DIRS+=usr/libexec/bsdconfig/080.console/include +OLD_DIRS+=usr/libexec/bsdconfig/080.console +OLD_DIRS+=usr/libexec/bsdconfig/090.timezone/include +OLD_DIRS+=usr/libexec/bsdconfig/090.timezone +OLD_DIRS+=usr/libexec/bsdconfig/110.mouse/include +OLD_DIRS+=usr/libexec/bsdconfig/110.mouse +OLD_DIRS+=usr/libexec/bsdconfig/120.networking/include +OLD_DIRS+=usr/libexec/bsdconfig/120.networking +OLD_DIRS+=usr/libexec/bsdconfig/130.security/include +OLD_DIRS+=usr/libexec/bsdconfig/130.security +OLD_DIRS+=usr/libexec/bsdconfig/140.startup/include +OLD_DIRS+=usr/libexec/bsdconfig/140.startup +OLD_DIRS+=usr/libexec/bsdconfig/150.ttys/include +OLD_DIRS+=usr/libexec/bsdconfig/150.ttys +OLD_DIRS+=usr/libexec/bsdconfig/dot/include +OLD_DIRS+=usr/libexec/bsdconfig/dot +OLD_DIRS+=usr/libexec/bsdconfig/include +OLD_DIRS+=usr/libexec/bsdconfig/includes/include +OLD_DIRS+=usr/libexec/bsdconfig/includes +OLD_DIRS+=usr/libexec/bsdconfig +OLD_DIRS+=usr/share/bsdconfig/media +OLD_DIRS+=usr/share/bsdconfig/networking +OLD_DIRS+=usr/share/bsdconfig/packages +OLD_DIRS+=usr/share/bsdconfig/password +OLD_DIRS+=usr/share/bsdconfig/startup +OLD_DIRS+=usr/share/bsdconfig/timezone +OLD_DIRS+=usr/share/bsdconfig/usermgmt +OLD_DIRS+=usr/share/bsdconfig +OLD_DIRS+=usr/share/examples/bsdconfig +.endif + .if ${MK_BSDINSTALL} == no OLD_FILES+=usr/libexec/bsdinstall/adduser OLD_FILES+=usr/libexec/bsdinstall/auto @@ -607,7 +818,6 @@ OLD_FILES+=usr/lib/dtrace/signal.d OLD_FILES+=usr/lib/dtrace/tcp.d OLD_FILES+=usr/lib/dtrace/udp.d OLD_FILES+=usr/lib/dtrace/unistd.d -OLD_DIRS+=usr/lib/dtrace OLD_FILES+=usr/lib/libavl.a OLD_FILES+=usr/lib/libavl.so OLD_FILES+=usr/lib/libavl_p.a @@ -628,7 +838,6 @@ OLD_FILES+=usr/lib/libuutil.so OLD_FILES+=usr/lib/libuutil_p.a .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_FILES+=usr/lib32/dtrace/drti.o -OLD_DIRS+=usr/lib32/dtrace OLD_FILES+=usr/lib32/libavl.a OLD_FILES+=usr/lib32/libavl.so OLD_LIBS+=usr/lib32/libavl.so.2 @@ -654,9 +863,24 @@ OLD_FILES+=usr/lib32/libuutil.so OLD_LIBS+=usr/lib32/libuutil.so.2 OLD_FILES+=usr/lib32/libuutil_p.a .endif +OLD_LIBS+=lib/libdtrace.so.2 OLD_FILES+=usr/sbin/dtrace OLD_FILES+=usr/sbin/lockstat OLD_FILES+=usr/share/man/man1/dtrace.1.gz +OLD_FILES+=usr/share/dtrace/disklatency +OLD_FILES+=usr/share/dtrace/disklatencycmd +OLD_FILES+=usr/share/dtrace/hotopen +OLD_FILES+=usr/share/dtrace/nfsclienttime +OLD_FILES+=usr/share/dtrace/toolkit/execsnoop +OLD_FILES+=usr/share/dtrace/toolkit/hotkernel +OLD_FILES+=usr/share/dtrace/toolkit/hotuser +OLD_FILES+=usr/share/dtrace/toolkit/opensnoop +OLD_FILES+=usr/share/dtrace/toolkit/procsystime +OLD_FILES+=usr/share/man/man1/dtrace.1.gz +OLD_DIRS+=usr/lib/dtrace +OLD_DIRS+=usr/lib32/dtrace +OLD_DIRS+=usr/share/dtrace/toolkit +OLD_DIRS+=usr/share/dtrace .endif .if ${MK_ZFS} == no @@ -3441,9 +3665,9 @@ OLD_FILES+=usr/share/man/man5/keymap.5.g OLD_FILES+=usr/share/man/man8/moused.8.g .endif -#.if ${MK_LIB32} == no -# to be filled in -#.endif +.if ${MK_LIB32} == no +OLD_FILES+=etc/libmap32.conf +.endif .if ${MK_LIBCPLUSPLUS} == no OLD_LIBS+=lib/libcxxrt.so.1 From owner-svn-src-projects@FreeBSD.ORG Thu Nov 27 23:42:33 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 534D76E8; Thu, 27 Nov 2014 23:42:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3F7FCE94; Thu, 27 Nov 2014 23:42:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sARNgXXe029195; Thu, 27 Nov 2014 23:42:33 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sARNgX1F029194; Thu, 27 Nov 2014 23:42:33 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411272342.sARNgX1F029194@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 27 Nov 2014 23:42:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275198 - projects/building-blocks/usr.bin/vi/catalog X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2014 23:42:33 -0000 Author: ngie Date: Thu Nov 27 23:42:32 2014 New Revision: 275198 URL: https://svnweb.freebsd.org/changeset/base/275198 Log: Use ${.TARGET} instead of hardcoding the name in the dump build rule Modified: projects/building-blocks/usr.bin/vi/catalog/Makefile Modified: projects/building-blocks/usr.bin/vi/catalog/Makefile ============================================================================== --- projects/building-blocks/usr.bin/vi/catalog/Makefile Thu Nov 27 23:10:03 2014 (r275197) +++ projects/building-blocks/usr.bin/vi/catalog/Makefile Thu Nov 27 23:42:32 2014 (r275198) @@ -101,7 +101,7 @@ english.base: dump ${SCAN} #Makefile dump: dump.c - ${CC} -o dump ${.ALLSRC} + ${CC} -o ${.TARGET} ${.ALLSRC} CLEANFILES+= dump ${CAT} english.base *.check __ck1 __ck2 From owner-svn-src-projects@FreeBSD.ORG Fri Nov 28 13:26:03 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7BAF460F; Fri, 28 Nov 2014 13:26:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 651A09F7; Fri, 28 Nov 2014 13:26:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sASDQ3FC014664; Fri, 28 Nov 2014 13:26:03 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sASDPw61014621; Fri, 28 Nov 2014 13:25:58 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411281325.sASDPw61014621@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Fri, 28 Nov 2014 13:25:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275210 - in projects/clang350-import: . contrib/elftoolchain/addr2line contrib/elftoolchain/cxxfilt contrib/elftoolchain/elfcopy contrib/elftoolchain/libelftc contrib/elftoolchain/nm c... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Nov 2014 13:26:03 -0000 Author: dim Date: Fri Nov 28 13:25:57 2014 New Revision: 275210 URL: https://svnweb.freebsd.org/changeset/base/275210 Log: Merge ^/head r275118 through r275209. Added: projects/clang350-import/contrib/elftoolchain/addr2line/ - copied from r275209, head/contrib/elftoolchain/addr2line/ projects/clang350-import/contrib/elftoolchain/cxxfilt/ - copied from r275209, head/contrib/elftoolchain/cxxfilt/ projects/clang350-import/contrib/elftoolchain/elfcopy/ - copied from r275209, head/contrib/elftoolchain/elfcopy/ projects/clang350-import/contrib/elftoolchain/libelftc/ - copied from r275209, head/contrib/elftoolchain/libelftc/ projects/clang350-import/contrib/elftoolchain/nm/ - copied from r275209, head/contrib/elftoolchain/nm/ projects/clang350-import/contrib/elftoolchain/size/ - copied from r275209, head/contrib/elftoolchain/size/ projects/clang350-import/contrib/elftoolchain/strings/ - copied from r275209, head/contrib/elftoolchain/strings/ projects/clang350-import/sbin/mdconfig/tests/mdconfig_test.sh - copied unchanged from r275209, head/sbin/mdconfig/tests/mdconfig_test.sh Deleted: projects/clang350-import/sbin/mdconfig/tests/legacy_test.sh projects/clang350-import/sbin/mdconfig/tests/mdconfig.test projects/clang350-import/sbin/mdconfig/tests/run.pl projects/clang350-import/sys/netipsec/ipip_var.h Modified: projects/clang350-import/ObsoleteFiles.inc projects/clang350-import/gnu/usr.bin/binutils/Makefile projects/clang350-import/lib/libc/net/base64.c projects/clang350-import/sbin/mdconfig/tests/Makefile projects/clang350-import/share/man/man5/src.conf.5 projects/clang350-import/share/misc/bsd-family-tree projects/clang350-import/sys/arm/arm/generic_timer.c projects/clang350-import/sys/boot/i386/boot2/boot2.c projects/clang350-import/sys/compat/linux/linux_misc.c projects/clang350-import/sys/compat/svr4/svr4_misc.c projects/clang350-import/sys/contrib/ipfilter/netinet/fil.c projects/clang350-import/sys/contrib/ipfilter/netinet/ip_frag.c projects/clang350-import/sys/dev/drm2/drm_drv.c projects/clang350-import/sys/dev/e1000/if_igb.c projects/clang350-import/sys/dev/hwpmc/hwpmc_mpc7xxx.c projects/clang350-import/sys/dev/hwpmc/hwpmc_ppc970.c projects/clang350-import/sys/dev/isp/isp.c projects/clang350-import/sys/dev/isp/isp_freebsd.c projects/clang350-import/sys/dev/isp/isp_freebsd.h projects/clang350-import/sys/dev/ixgbe/ixgbe.c projects/clang350-import/sys/dev/usb/controller/ehci_pci.c projects/clang350-import/sys/fs/procfs/procfs_status.c projects/clang350-import/sys/kern/init_main.c projects/clang350-import/sys/kern/kern_clock.c projects/clang350-import/sys/kern/kern_exit.c projects/clang350-import/sys/kern/kern_mutex.c projects/clang350-import/sys/kern/kern_proc.c projects/clang350-import/sys/kern/kern_racct.c projects/clang350-import/sys/kern/kern_resource.c projects/clang350-import/sys/kern/kern_sig.c projects/clang350-import/sys/kern/kern_thread.c projects/clang350-import/sys/kern/kern_time.c projects/clang350-import/sys/kern/subr_bus.c projects/clang350-import/sys/kern/subr_prof.c projects/clang350-import/sys/kern/sys_generic.c projects/clang350-import/sys/net/if_arcsubr.c projects/clang350-import/sys/net/if_ethersubr.c projects/clang350-import/sys/net/if_fddisubr.c projects/clang350-import/sys/net/if_fwsubr.c projects/clang350-import/sys/net/if_iso88025subr.c projects/clang350-import/sys/netinet/if_ether.c projects/clang350-import/sys/netinet/if_ether.h projects/clang350-import/sys/netinet/toecore.c projects/clang350-import/sys/netinet6/nd6.c projects/clang350-import/sys/netinet6/nd6.h projects/clang350-import/sys/netipsec/xform.h projects/clang350-import/sys/netipsec/xform_ipip.c projects/clang350-import/sys/ofed/drivers/infiniband/core/addr.c projects/clang350-import/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/clang350-import/sys/sys/bus.h projects/clang350-import/sys/sys/pmc.h projects/clang350-import/sys/sys/proc.h projects/clang350-import/sys/sys/resourcevar.h projects/clang350-import/tools/build/options/WITHOUT_CROSS_COMPILER projects/clang350-import/tools/build/options/WITHOUT_INCLUDES projects/clang350-import/tools/build/options/WITHOUT_RCS projects/clang350-import/tools/build/options/WITH_FMAKE projects/clang350-import/tools/tools/nanobsd/nanobsd.sh projects/clang350-import/usr.bin/dc/stack.c Directory Properties: projects/clang350-import/ (props changed) projects/clang350-import/gnu/usr.bin/binutils/ (props changed) projects/clang350-import/lib/libc/ (props changed) projects/clang350-import/sbin/ (props changed) projects/clang350-import/share/ (props changed) projects/clang350-import/sys/ (props changed) projects/clang350-import/sys/boot/ (props changed) projects/clang350-import/sys/contrib/ipfilter/ (props changed) Modified: projects/clang350-import/ObsoleteFiles.inc ============================================================================== --- projects/clang350-import/ObsoleteFiles.inc Fri Nov 28 12:14:59 2014 (r275209) +++ projects/clang350-import/ObsoleteFiles.inc Fri Nov 28 13:25:57 2014 (r275210) @@ -38,7 +38,7 @@ # xargs -n1 | sort | uniq -d; # done -# 20141124: new clang import which bumps version from 3.4.1 to 3.5.0. +# 20141128: new clang import which bumps version from 3.4.1 to 3.5.0. OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_aes.h OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_pclmul.h OLD_FILES+=usr/include/clang/3.4.1/altivec.h @@ -74,6 +74,12 @@ OLD_FILES+=usr/include/clang/3.4.1/x86in OLD_FILES+=usr/include/clang/3.4.1/xmmintrin.h OLD_FILES+=usr/include/clang/3.4.1/xopintrin.h OLD_DIRS+=usr/include/clang/3.4.1 +# 20141126: convert sbin/mdconfig/tests to ATF format tests +OLD_FILES+=usr/tests/sbin/mdconfig/legacy_test +OLD_FILES+=usr/tests/sbin/mdconfig/mdconfig.test +OLD_FILES+=usr/tests/sbin/mdconfig/run.pl +# 20141126: remove xform_ipip decapsulation fallback +OLD_FILES+=usr/include/netipsec/ipip_var.h # 20141109: faith/faithd removal OLD_FILES+=etc/rc.d/faith OLD_FILES+=usr/share/man/man4/faith.4.gz @@ -170,10 +176,12 @@ OLD_FILES+=usr/include/readline/chardefs OLD_FILES+=usr/include/readline/history.h OLD_FILES+=usr/include/readline/keymaps.h OLD_FILES+=usr/include/readline/readline.h +OLD_FILES+=usr/include/readline/tilde.h OLD_FILES+=usr/include/readline/rlconf.h OLD_FILES+=usr/include/readline/rlstdc.h OLD_FILES+=usr/include/readline/rltypedefs.h OLD_FILES+=usr/include/readline/rltypedefs.h +OLD_DIRS+=usr/include/readline OLD_FILES+=usr/share/info/readline.info.gz OLD_FILES+=usr/share/man/man3/readline.3.gz # 20140625: csup removal Modified: projects/clang350-import/gnu/usr.bin/binutils/Makefile ============================================================================== --- projects/clang350-import/gnu/usr.bin/binutils/Makefile Fri Nov 28 12:14:59 2014 (r275209) +++ projects/clang350-import/gnu/usr.bin/binutils/Makefile Fri Nov 28 13:25:57 2014 (r275210) @@ -1,7 +1,19 @@ # $FreeBSD$ -SUBDIR= libiberty libbfd libopcodes libbinutils \ - addr2line as ld nm objcopy objdump readelf \ - size strings strip doc +SUBDIR= libiberty \ + libbfd \ + libopcodes \ + libbinutils \ + addr2line \ + as \ + ld \ + nm \ + objcopy \ + objdump \ + readelf \ + size \ + strings \ + strip \ + doc .include Modified: projects/clang350-import/lib/libc/net/base64.c ============================================================================== --- projects/clang350-import/lib/libc/net/base64.c Fri Nov 28 12:14:59 2014 (r275209) +++ projects/clang350-import/lib/libc/net/base64.c Fri Nov 28 13:25:57 2014 (r275210) @@ -193,10 +193,7 @@ b64_ntop(u_char const *src, size_t srcle */ int -b64_pton(src, target, targsize) - char const *src; - u_char *target; - size_t targsize; +b64_pton(const char *src, u_char *target, size_t targsize) { int tarindex, state, ch; u_char nextbyte; Modified: projects/clang350-import/sbin/mdconfig/tests/Makefile ============================================================================== --- projects/clang350-import/sbin/mdconfig/tests/Makefile Fri Nov 28 12:14:59 2014 (r275209) +++ projects/clang350-import/sbin/mdconfig/tests/Makefile Fri Nov 28 13:25:57 2014 (r275210) @@ -2,12 +2,9 @@ TESTSDIR= ${TESTSBASE}/sbin/mdconfig -TAP_TESTS_SH= legacy_test -TAP_TESTS_SH_SED_legacy_test= 's,__PERL__,${TAP_PERL_INTERPRETER},g' -TEST_METADATA.legacy_test+= required_programs="${TAP_PERL_INTERPRETER}" +ATF_TESTS_SH= mdconfig_test -FILESDIR= ${TESTSDIR} -FILES= mdconfig.test -FILES+= run.pl + +TEST_METADATA.mdconfig_test+= required_user="root" .include Copied: projects/clang350-import/sbin/mdconfig/tests/mdconfig_test.sh (from r275209, head/sbin/mdconfig/tests/mdconfig_test.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/sbin/mdconfig/tests/mdconfig_test.sh Fri Nov 28 13:25:57 2014 (r275210, copy of r275209, head/sbin/mdconfig/tests/mdconfig_test.sh) @@ -0,0 +1,281 @@ +# Copyright (c) 2012 Edward Tomasz Napierała +# All rights reserved. +# +# 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. +# +# $FreeBSD$ +# + +check_diskinfo() +{ + local md=$1 + local mediasize_in_bytes=$2 + local mediasize_in_sectors=$3 + local sectorsize=${4:-512} + local stripesize=${5:-0} + local stripeoffset=${6:-0} + + atf_check -s exit:0 \ + -o match:"/dev/$md *$sectorsize *$mediasize_in_bytes *$mediasize_in_sectors *$stripesize *$stripeoffset" \ + -x "diskinfo /dev/$md | expand" +} + +cleanup_common() +{ + if [ -f mdconfig.out ]; then + mdconfig -d -u $(sed -e 's/md//' mdconfig.out) + fi +} + +atf_test_case attach_vnode_non_explicit_type cleanup +attach_vnode_non_explicit_type_head() +{ + atf_set "descr" "Tests out -a / -f without -t" +} +attach_vnode_non_explicit_type_body() +{ + local md + local size_in_mb=1024 + + atf_check -s exit:0 -x "truncate -s ${size_in_mb}m xxx" + atf_check -s exit:0 -o save:mdconfig.out -x 'mdconfig -af xxx' + md=$(cat mdconfig.out) + atf_check -s exit:0 -o match:'^md[0-9]+$' -x "echo $md" + check_diskinfo "$md" "1073741824" "2097152" + # This awk strips the file path. + atf_check -s exit:0 -o match:"^$md vnode ${size_in_mb}M$" \ + -x "mdconfig -lv | awk '\$1 == \"$md\" { print \$1, \$2, \$3 }'" +} +attach_vnode_non_explicit_type_cleanup() +{ + cleanup_common +} + +atf_test_case attach_vnode_implicit_a_f cleanup +attach_vnode_implicit_a_f_head() +{ + atf_set "descr" "Tests out implied -a / -f without -t" +} +attach_vnode_implicit_a_f_body() +{ + local md + local size_in_mb=1024 + + atf_check -s exit:0 -x "truncate -s ${size_in_mb}m xxx" + atf_check -s exit:0 -o save:mdconfig.out -x 'mdconfig xxx' + md=$(cat mdconfig.out) + atf_check -s exit:0 -o match:'^md[0-9]+$' -x "echo $md" + check_diskinfo "$md" "1073741824" "2097152" + # This awk strips the file path. + atf_check -s exit:0 -o match:"^$md vnode ${size_in_mb}M$" \ + -x "mdconfig -lv | awk '\$1 == \"$md\" { print \$1, \$2, \$3 }'" +} +attach_vnode_implicit_a_f_cleanup() +{ + cleanup_common +} + +atf_test_case attach_vnode_explicit_type cleanup +attach_vnode_explicit_type_head() +{ + atf_set "descr" "Tests out implied -a / -f with -t vnode" +} +attach_vnode_explicit_type_body() +{ + local md + local size_in_mb=1024 + + atf_check -s exit:0 -x "truncate -s ${size_in_mb}m xxx" + atf_check -s exit:0 -o save:mdconfig.out -x 'mdconfig -af xxx -t vnode' + md=$(cat mdconfig.out) + atf_check -s exit:0 -o match:'^md[0-9]+$' -x "echo $md" + check_diskinfo "$md" "1073741824" "2097152" + # This awk strips the file path. + atf_check -s exit:0 -o match:"^$md vnode ${size_in_mb}M$" \ + -x "mdconfig -lv | awk '\$1 == \"$md\" { print \$1, \$2, \$3 }'" +} +attach_vnode_explicit_type_cleanup() +{ + [ -f mdconfig.out ] && mdconfig -d -u $(sed -e 's/md//' mdconfig.out) + rm -f mdconfig.out xxx +} + +atf_test_case attach_vnode_smaller_than_file cleanup +attach_vnode_smaller_than_file_head() +{ + atf_set "descr" "Tests mdconfig -s with size less than the file size" +} +attach_vnode_smaller_than_file_body() +{ + local md + local size_in_mb=128 + + atf_check -s exit:0 -x "truncate -s 1024m xxx" + atf_check -s exit:0 -o save:mdconfig.out \ + -x "mdconfig -af xxx -s ${size_in_mb}m" + md=$(cat mdconfig.out) + atf_check -s exit:0 -o match:'^md[0-9]+$' -x "echo $md" + check_diskinfo "$md" "134217728" "262144" + # This awk strips the file path. + atf_check -s exit:0 -o match:"^$md vnode ${size_in_mb}M$" \ + -x "mdconfig -lv | awk '\$1 == \"$md\" { print \$1, \$2, \$3 }'" +} +attach_vnode_smaller_than_file_cleanup() +{ + cleanup_common +} + +atf_test_case attach_vnode_larger_than_file cleanup +attach_vnode_larger_than_file_head() +{ + atf_set "descr" "Tests mdconfig -s with size greater than the file size" +} +attach_vnode_larger_than_file_body() +{ + local md + local size_in_gb=128 + + atf_check -s exit:0 -x "truncate -s 1024m xxx" + atf_check -s exit:0 -o save:mdconfig.out \ + -x "mdconfig -af xxx -s ${size_in_gb}g" + md=$(cat mdconfig.out) + atf_check -s exit:0 -o match:'^md[0-9]+$' -x "echo $md" + check_diskinfo "$md" "137438953472" "268435456" + # This awk strips the file path. + atf_check -s exit:0 -o match:"^$md vnode ${size_in_gb}G$" \ + -x "mdconfig -lv | awk '\$1 == \"$md\" { print \$1, \$2, \$3 }'" +} +attach_vnode_larger_than_file_cleanup() +{ + cleanup_common +} + +atf_test_case attach_vnode_sector_size cleanup +attach_vnode_sector_size_head() +{ + atf_set "descr" "Tests mdconfig -s with size greater than the file size" +} +attach_vnode_sector_size_body() +{ + local md + local size_in_mb=1024 + + atf_check -s exit:0 -x "truncate -s ${size_in_mb}m xxx" + atf_check -s exit:0 -o save:mdconfig.out \ + -x "mdconfig -af xxx -S 2048" + md=$(cat mdconfig.out) + atf_check -s exit:0 -o match:'^md[0-9]+$' -x "echo $md" + check_diskinfo "$md" "1073741824" "524288" "2048" + # This awk strips the file path. + atf_check -s exit:0 -o match:"^$md vnode ${size_in_mb}M$" \ + -x "mdconfig -lv | awk '\$1 == \"$md\" { print \$1, \$2, \$3 }'" +} +attach_vnode_sector_size_cleanup() +{ + cleanup_common +} + +atf_test_case attach_malloc cleanup +attach_malloc_head() +{ + atf_set "descr" "Tests mdconfig with -t malloc" +} +attach_malloc_body() +{ + local md + local size_in_mb=1024 + + atf_check -s exit:0 -o save:mdconfig.out \ + -x 'mdconfig -a -t malloc -s 1g' + md=$(cat mdconfig.out) + atf_check -s exit:0 -o match:'^md[0-9]+$' -x "echo $md" + check_diskinfo "$md" "1073741824" "2097152" + # This awk strips the file path. + atf_check -s exit:0 -o match:"^$md malloc ${size_in_mb}M$" \ + -x "mdconfig -lv | awk '\$1 == \"$md\" { print \$1, \$2, \$3 }'" +} +attach_malloc_cleanup() +{ + cleanup_common +} + +atf_test_case attach_swap cleanup +attach_swap_head() +{ + atf_set "descr" "Tests mdconfig with -t swap" +} +attach_swap_body() +{ + local md + local size_in_mb=1024 + + atf_check -s exit:0 -o save:mdconfig.out \ + -x 'mdconfig -a -t swap -s 1g' + md=$(cat mdconfig.out) + atf_check -s exit:0 -o match:'^md[0-9]+$' -x "echo $md" + check_diskinfo "$md" "1073741824" "2097152" + # This awk strips the file path. + atf_check -s exit:0 -o match:"^$md swap ${size_in_mb}M$" \ + -x "mdconfig -lv | awk '\$1 == \"$md\" { print \$1, \$2, \$3 }'" +} +attach_swap_cleanup() +{ + cleanup_common +} + +atf_test_case attach_with_specific_unit_number cleanup +attach_with_specific_unit_number_head() +{ + atf_set "descr" "Tests mdconfig with a unit specified by -u" +} +attach_with_specific_unit_number_body() +{ + local md_unit=99 + local size_in_mb=10 + + local md="md${md_unit}" + + echo "$md" > mdconfig.out + + atf_check -s exit:0 -o empty \ + -x "mdconfig -a -t malloc -s ${size_in_mb}m -u $md_unit" + check_diskinfo "$md" "10485760" "20480" + # This awk strips the file path. + atf_check -s exit:0 -o match:"^$md malloc "$size_in_mb"M$" \ + -x "mdconfig -lv | awk '\$1 == \"$md\" { print \$1, \$2, \$3 }'" +} +attach_with_specific_unit_number_cleanup() +{ + cleanup_common +} + +atf_init_test_cases() +{ + atf_add_test_case attach_vnode_non_explicit_type + atf_add_test_case attach_vnode_explicit_type + atf_add_test_case attach_vnode_smaller_than_file + atf_add_test_case attach_vnode_larger_than_file + atf_add_test_case attach_vnode_sector_size + atf_add_test_case attach_malloc + atf_add_test_case attach_swap + atf_add_test_case attach_with_specific_unit_number +} Modified: projects/clang350-import/share/man/man5/src.conf.5 ============================================================================== --- projects/clang350-import/share/man/man5/src.conf.5 Fri Nov 28 12:14:59 2014 (r275209) +++ projects/clang350-import/share/man/man5/src.conf.5 Fri Nov 28 13:25:57 2014 (r275210) @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des .\" $FreeBSD$ -.Dd October 21, 2014 +.Dd November 26, 2014 .Dt SRC.CONF 5 .Os .Sh NAME @@ -267,17 +267,17 @@ amd64/amd64, arm/arm, arm/armv6, arm/arm Set to not build .Xr cpp 1 . .It Va WITHOUT_CROSS_COMPILER -.\" from FreeBSD: head/tools/build/options/WITHOUT_CROSS_COMPILER 264660 2014-04-18 17:03:58Z imp +.\" from FreeBSD: head/tools/build/options/WITHOUT_CROSS_COMPILER 275138 2014-11-26 20:43:09Z gjb Set to not build any cross compiler in the cross-tools stage of buildworld. If you are compiling a different version of -.Fx +.Fx than what is installed on the system, you will need to provide an alternate compiler with XCC to ensure success. If you are compiling with an identical version of -.Fx +.Fx to the host, this option may be safely used. This option may also be safe when the host version of -.Fx +.Fx is close to the sources being built, but all bets are off if there have been any changes to the toolchain between the versions. When set, it also enforces the following options: @@ -396,8 +396,8 @@ This includes the device tree compiler ( Set to not build or install programs for operating floppy disk driver. .It Va WITH_FMAKE -.\" from FreeBSD: head/tools/build/options/WITH_FMAKE 266752 2014-05-27 15:52:27Z gjb -Causes the old FreeBSD +.\" from FreeBSD: head/tools/build/options/WITH_FMAKE 275138 2014-11-26 20:43:09Z gjb +Causes the old FreeBSD .Xr make 1 program to be built and installed as fmake. .It Va WITHOUT_FMTREE @@ -490,8 +490,8 @@ This is the default on platforms where g It is a default setting on arm/armeb, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64. .It Va WITHOUT_GNU_GREP_COMPAT -.\" from FreeBSD: head/tools/build/options/WITHOUT_GNU_GREP_COMPAT 266752 2014-05-27 15:52:27Z gjb -Set this option to omit the gnu extentions to grep from being included in +.\" from FreeBSD: head/tools/build/options/WITHOUT_GNU_GREP_COMPAT 273421 2014-10-21 20:44:33Z emaste +Set this option to omit the gnu extensions to grep from being included in BSD grep. .It Va WITHOUT_GNU_SUPPORT .\" from FreeBSD: head/tools/build/options/WITHOUT_GNU_SUPPORT 156932 2006-03-21 07:50:50Z ru @@ -531,6 +531,14 @@ Set to not build or install HyperV utili .It Va WITHOUT_ICONV .\" from FreeBSD: head/tools/build/options/WITHOUT_ICONV 254919 2013-08-26 17:15:56Z antoine Set to not build iconv as part of libc. +.It Va WITHOUT_INCLUDES +.\" from FreeBSD: head/tools/build/options/WITHOUT_INCLUDES 275138 2014-11-26 20:43:09Z gjb +Set to not install header files. +This option used to be spelled +.Va NO_INCS . +.Bf -symbolic +The option does not work for build targets. +.Ef .It Va WITHOUT_INET .\" from FreeBSD: head/tools/build/options/WITHOUT_INET 221266 2011-04-30 17:58:28Z bz Set to not build programs and libraries related to IPv4 networking. @@ -668,8 +676,8 @@ Set to not build programs that support a and .Xr vidcontrol 8 . .It Va WITHOUT_LIB32 -.\" from FreeBSD: head/tools/build/options/WITHOUT_LIB32 156932 2006-03-21 07:50:50Z ru -On amd64, set to not build 32-bit library set and a +.\" from FreeBSD: head/tools/build/options/WITHOUT_LIB32 274664 2014-11-18 17:06:48Z imp +On 64-bit platforms, set to not build 32-bit library set and a .Nm ld-elf32.so.1 runtime linker. .It Va WITHOUT_LIBCPLUSPLUS @@ -938,12 +946,11 @@ This includes .Xr rsh 1 , etc. .It Va WITHOUT_RCS -.\" from FreeBSD: head/tools/build/options/WITHOUT_RCS 271401 2014-09-10 19:00:17Z asomers +.\" from FreeBSD: head/tools/build/options/WITHOUT_RCS 275138 2014-11-26 20:43:09Z gjb Set to not build -.Xr rcs 1 -, -.Xr etcupdate 8 -, and related utilities. +.Xr rcs 1 , +.Xr etcupdate 8 , +and related utilities. .It Va WITHOUT_RESCUE .\" from FreeBSD: head/tools/build/options/WITHOUT_RESCUE 156932 2006-03-21 07:50:50Z ru Set to not build @@ -1047,6 +1054,15 @@ See .Xr tests 7 for more details. This also disables the build of all test-related dependencies, including ATF. +When set, it also enforces the following options: +.Pp +.Bl -item -compact +.It +.Va WITHOUT_TESTS_SUPPORT +.El +.It Va WITHOUT_TESTS_SUPPORT +.\" from FreeBSD: head/tools/build/options/WITHOUT_TESTS_SUPPORT 274665 2014-11-18 17:06:50Z imp +Set to disables the build of all test-related dependencies, including ATF. .It Va WITHOUT_TEXTPROC .\" from FreeBSD: head/tools/build/options/WITHOUT_TEXTPROC 183242 2008-09-21 22:02:26Z sam Set to not build @@ -1080,6 +1096,8 @@ When set, it also enforces the following .Va WITHOUT_GCC .It .Va WITHOUT_GDB +.It +.Va WITHOUT_INCLUDES .El .It Va WITHOUT_UNBOUND .\" from FreeBSD: head/tools/build/options/WITHOUT_UNBOUND 255597 2013-09-15 14:51:23Z des @@ -1089,6 +1107,9 @@ and related programs. .It Va WITHOUT_USB .\" from FreeBSD: head/tools/build/options/WITHOUT_USB 156932 2006-03-21 07:50:50Z ru Set to not build USB-related programs and libraries. +.It Va WITHOUT_USB_GADGET_EXAMPLES +.\" from FreeBSD: head/tools/build/options/WITHOUT_USB_GADGET_EXAMPLES 274665 2014-11-18 17:06:50Z imp +Set to build USB gadget kernel modules. .It Va WITHOUT_UTMPX .\" from FreeBSD: head/tools/build/options/WITHOUT_UTMPX 231530 2012-02-11 20:28:42Z ed Set to not build user accounting tools such as Modified: projects/clang350-import/share/misc/bsd-family-tree ============================================================================== --- projects/clang350-import/share/misc/bsd-family-tree Fri Nov 28 12:14:59 2014 (r275209) +++ projects/clang350-import/share/misc/bsd-family-tree Fri Nov 28 13:25:57 2014 (r275210) @@ -296,30 +296,30 @@ FreeBSD 5.2 | | | \ | | | | | *--FreeBSD | | | NetBSD 6.1.3 | | | 10.0 | | | | | | - | | | | | | DragonFly 3.6.1 - | | | | | | | - | | | | | | | - | | | | | | DragonFly 3.6.2 - | | | | NetBSD 6.1.4 | | - | | | | | | - | | | | OpenBSD 5.5 | - | | | | | | - | | | | | DragonFly 3.8.0 - | | | | | | - | | | | | | - | | | | | DragonFly 3.8.1 - | | | | | | - | | | | | | - | | | | | DragonFly 3.6.3 - | | | | | | - | FreeBSD | | | | - | 9.3 | | | | - | | | | DragonFly 3.8.2 - | Mac OS X | | | - | 10.10 | | | - | | | | | - | | | | | - | | | | | + | | | | | | | DragonFly 3.6.1 + | | | | | | | | + | | | | | | | | + | | | | | | | DragonFly 3.6.2 + | | | | | NetBSD 6.1.4 | | + | | | | | | | | + | | | | | | OpenBSD 5.5 | + | | | | | | | | + | | | | | | | DragonFly 3.8.0 + | | | | | | | | + | | | | | | | | + | | | | | | | DragonFly 3.8.1 + | | | | | | | | + | | | | | | | | + | | | | | | | DragonFly 3.6.3 + | | | | | | | | + | | FreeBSD | | | | | + | | 9.3 | | | | | + | | | | NetBSD 6.1.5 | DragonFly 3.8.2 + | | Mac OS X | | | + | | 10.10 | | | + | | | | OpenBSD 5.6 | + | FreeBSD | | | | + | 10.1 | | | DragonFly 4.0.1 | | | | | | | | | | | | | | | @@ -655,7 +655,11 @@ DragonFly 3.8.1 2014-06-16 [DFB] DragonFly 3.6.3 2014-06-17 [DFB] FreeBSD 9.3 2014-07-05 [FBD] DragonFly 3.8.2 2014-08-08 [DFB] +NetBSD 6.1.5 2014-09-22 [NDB] Mac OS X 10.10 2014-10-16 [APL] +OpenBSD 5.6 2014-11-01 [OBD] +FreeBSD 10.1 2014-11-14 [FBD] +DragonFly 4.0.1 2014-11-25 [DFB] Bibliography ------------------------ Modified: projects/clang350-import/sys/arm/arm/generic_timer.c ============================================================================== --- projects/clang350-import/sys/arm/arm/generic_timer.c Fri Nov 28 12:14:59 2014 (r275209) +++ projects/clang350-import/sys/arm/arm/generic_timer.c Fri Nov 28 13:25:57 2014 (r275210) @@ -87,7 +87,7 @@ static struct resource_spec timer_spec[] { SYS_RES_IRQ, 0, RF_ACTIVE }, /* Secure */ { SYS_RES_IRQ, 1, RF_ACTIVE }, /* Non-secure */ { SYS_RES_IRQ, 2, RF_ACTIVE }, /* Virt */ - { SYS_RES_IRQ, 3, RF_ACTIVE }, /* Hyp */ + { SYS_RES_IRQ, 3, RF_ACTIVE | RF_OPTIONAL }, /* Hyp */ { -1, 0 } }; @@ -353,6 +353,8 @@ static devclass_t arm_tmr_devclass; EARLY_DRIVER_MODULE(timer, simplebus, arm_tmr_driver, arm_tmr_devclass, 0, 0, BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(timer, ofwbus, arm_tmr_driver, arm_tmr_devclass, 0, 0, + BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE); void DELAY(int usec) Modified: projects/clang350-import/sys/boot/i386/boot2/boot2.c ============================================================================== --- projects/clang350-import/sys/boot/i386/boot2/boot2.c Fri Nov 28 12:14:59 2014 (r275209) +++ projects/clang350-import/sys/boot/i386/boot2/boot2.c Fri Nov 28 13:25:57 2014 (r275210) @@ -394,9 +394,8 @@ parse() char *ep, *p, *q; const char *cp; unsigned int drv; - int c, j; + int c, i, j; size_t k; - uint8_t i; while ((c = *arg++)) { if (c == ' ' || c == '\t' || c == '\n') Modified: projects/clang350-import/sys/compat/linux/linux_misc.c ============================================================================== --- projects/clang350-import/sys/compat/linux/linux_misc.c Fri Nov 28 12:14:59 2014 (r275209) +++ projects/clang350-import/sys/compat/linux/linux_misc.c Fri Nov 28 13:25:57 2014 (r275210) @@ -690,9 +690,9 @@ linux_times(struct thread *td, struct li if (args->buf != NULL) { p = td->td_proc; PROC_LOCK(p); - PROC_SLOCK(p); + PROC_STATLOCK(p); calcru(p, &utime, &stime); - PROC_SUNLOCK(p); + PROC_STATUNLOCK(p); calccru(p, &cutime, &cstime); PROC_UNLOCK(p); Modified: projects/clang350-import/sys/compat/svr4/svr4_misc.c ============================================================================== --- projects/clang350-import/sys/compat/svr4/svr4_misc.c Fri Nov 28 12:14:59 2014 (r275209) +++ projects/clang350-import/sys/compat/svr4/svr4_misc.c Fri Nov 28 13:25:57 2014 (r275210) @@ -864,9 +864,9 @@ svr4_sys_times(td, uap) p = td->td_proc; PROC_LOCK(p); - PROC_SLOCK(p); + PROC_STATLOCK(p); calcru(p, &utime, &stime); - PROC_SUNLOCK(p); + PROC_STATUNLOCK(p); calccru(p, &cutime, &cstime); PROC_UNLOCK(p); @@ -1277,9 +1277,9 @@ loop: pid = p->p_pid; status = p->p_xstat; ru = p->p_ru; - PROC_SLOCK(p); + PROC_STATLOCK(p); calcru(p, &ru.ru_utime, &ru.ru_stime); - PROC_SUNLOCK(p); + PROC_STATUNLOCK(p); PROC_UNLOCK(p); sx_sunlock(&proctree_lock); @@ -1304,9 +1304,9 @@ loop: pid = p->p_pid; status = W_STOPCODE(p->p_xstat); ru = p->p_ru; - PROC_SLOCK(p); + PROC_STATLOCK(p); calcru(p, &ru.ru_utime, &ru.ru_stime); - PROC_SUNLOCK(p); + PROC_STATUNLOCK(p); PROC_UNLOCK(p); if (((uap->options & SVR4_WNOWAIT)) == 0) { @@ -1328,9 +1328,9 @@ loop: pid = p->p_pid; ru = p->p_ru; status = SIGCONT; - PROC_SLOCK(p); + PROC_STATLOCK(p); calcru(p, &ru.ru_utime, &ru.ru_stime); - PROC_SUNLOCK(p); + PROC_STATUNLOCK(p); PROC_UNLOCK(p); if (((uap->options & SVR4_WNOWAIT)) == 0) { Modified: projects/clang350-import/sys/contrib/ipfilter/netinet/fil.c ============================================================================== --- projects/clang350-import/sys/contrib/ipfilter/netinet/fil.c Fri Nov 28 12:14:59 2014 (r275209) +++ projects/clang350-import/sys/contrib/ipfilter/netinet/fil.c Fri Nov 28 13:25:57 2014 (r275210) @@ -252,7 +252,7 @@ static const struct optlist ipopts[20] = }; #ifdef USE_INET6 -static struct optlist ip6exthdr[] = { +static const struct optlist ip6exthdr[] = { { IPPROTO_HOPOPTS, 0x000001 }, { IPPROTO_IPV6, 0x000002 }, { IPPROTO_ROUTING, 0x000004 }, Modified: projects/clang350-import/sys/contrib/ipfilter/netinet/ip_frag.c ============================================================================== --- projects/clang350-import/sys/contrib/ipfilter/netinet/ip_frag.c Fri Nov 28 12:14:59 2014 (r275209) +++ projects/clang350-import/sys/contrib/ipfilter/netinet/ip_frag.c Fri Nov 28 13:25:57 2014 (r275210) @@ -112,7 +112,7 @@ static void ipf_frag_free __P((ipf_frag_ static frentry_t ipfr_block; -ipftuneable_t ipf_tuneables[] = { +const ipftuneable_t ipf_tuneables[] = { { { (void *)offsetof(ipf_frag_softc_t, ipfr_size) }, "frag_size", 1, 0x7fffffff, stsizeof(ipf_frag_softc_t, ipfr_size), Modified: projects/clang350-import/sys/dev/drm2/drm_drv.c ============================================================================== --- projects/clang350-import/sys/dev/drm2/drm_drv.c Fri Nov 28 12:14:59 2014 (r275209) +++ projects/clang350-import/sys/dev/drm2/drm_drv.c Fri Nov 28 13:25:57 2014 (r275210) @@ -905,7 +905,7 @@ int drm_ioctl(struct cdev *kdev, u_long if (ioctl->func == NULL && nr >= DRM_COMMAND_BASE) { /* The array entries begin at DRM_COMMAND_BASE ioctl nr */ nr -= DRM_COMMAND_BASE; - if (nr > dev->driver->max_ioctl) { + if (nr >= dev->driver->max_ioctl) { DRM_DEBUG("Bad driver ioctl number, 0x%x (of 0x%x)\n", nr, dev->driver->max_ioctl); return EINVAL; Modified: projects/clang350-import/sys/dev/e1000/if_igb.c ============================================================================== --- projects/clang350-import/sys/dev/e1000/if_igb.c Fri Nov 28 12:14:59 2014 (r275209) +++ projects/clang350-import/sys/dev/e1000/if_igb.c Fri Nov 28 13:25:57 2014 (r275210) @@ -188,6 +188,7 @@ static char *igb_strings[] = { /********************************************************************* * Function prototypes *********************************************************************/ +static int igb_per_unit_num_queues(SYSCTL_HANDLER_ARGS); static int igb_probe(device_t); static int igb_attach(device_t); static int igb_detach(device_t); @@ -493,6 +494,11 @@ igb_attach(device_t dev) OID_AUTO, "nvm", CTLTYPE_INT|CTLFLAG_RW, adapter, 0, igb_sysctl_nvm_info, "I", "NVM Information"); + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), + OID_AUTO, "num_queues", CTLTYPE_INT | CTLFLAG_RD, + adapter, 0, igb_per_unit_num_queues, "I", "Number of Queues"); + igb_set_sysctl_value(adapter, "enable_aim", "Interrupt Moderation", &adapter->enable_aim, igb_enable_aim); @@ -2831,6 +2837,7 @@ igb_setup_msix(struct adapter *adapter) { device_t dev = adapter->dev; int bar, want, queues, msgs, maxqueues; + int n_queues; /* tuneable override */ if (igb_enable_msix == 0) @@ -2858,8 +2865,18 @@ igb_setup_msix(struct adapter *adapter) goto msi; } - /* Figure out a reasonable auto config value */ - queues = (mp_ncpus > (msgs-1)) ? (msgs-1) : mp_ncpus; + n_queues = 0; + /* try more specific tunable, then global, then finally default to boot time tunable if set. */ + if (device_getenv_int(dev, "num_queues", &n_queues) != 0) { + device_printf(dev, "using specific tunable num_queues=%d", n_queues); + } else if (TUNABLE_INT_FETCH("hw.igb.num_queues", &n_queues) != 0) { + if (igb_num_queues != n_queues) { + device_printf(dev, "using global tunable hw.igb.num_queues=%d", n_queues); + igb_num_queues = n_queues; + } + } else { + n_queues = igb_num_queues; + } #ifdef RSS /* If we're doing RSS, clamp at the number of RSS buckets */ @@ -2867,10 +2884,12 @@ igb_setup_msix(struct adapter *adapter) queues = rss_getnumbuckets(); #endif - - /* Manual override */ - if (igb_num_queues != 0) - queues = igb_num_queues; + if (n_queues != 0) { + queues = n_queues; + } else { + /* Figure out a reasonable auto config value */ + queues = (mp_ncpus > (msgs-1)) ? (msgs-1) : mp_ncpus; + } /* Sanity check based on HW */ switch (adapter->hw.mac.type) { @@ -2893,12 +2912,17 @@ igb_setup_msix(struct adapter *adapter) maxqueues = 1; break; } - if (queues > maxqueues) + if (queues > maxqueues) { + device_printf(adapter->dev, "requested %d queues, but max for this adapter is %d\n", + queues, maxqueues); queues = maxqueues; - - /* Manual override */ - if (igb_num_queues != 0) - queues = igb_num_queues; + } else if (queues == 0) { + queues = 1; + } else if (queues < 0) { + device_printf(adapter->dev, "requested %d queues, but min for this adapter is %d\n", + queues, 1); + queues = 1; + } /* ** One vector (RX/TX pair) per queue @@ -6384,3 +6408,14 @@ igb_sysctl_eee(SYSCTL_HANDLER_ARGS) IGB_CORE_UNLOCK(adapter); return (0); } + +static int +igb_per_unit_num_queues(SYSCTL_HANDLER_ARGS) +{ + struct adapter *adapter; + + adapter = (struct adapter *) arg1; + + return sysctl_handle_int(oidp, &adapter->num_queues, 0, req); +} + Modified: projects/clang350-import/sys/dev/hwpmc/hwpmc_mpc7xxx.c ============================================================================== --- projects/clang350-import/sys/dev/hwpmc/hwpmc_mpc7xxx.c Fri Nov 28 12:14:59 2014 (r275209) +++ projects/clang350-import/sys/dev/hwpmc/hwpmc_mpc7xxx.c Fri Nov 28 13:25:57 2014 (r275210) @@ -578,9 +578,9 @@ mpc7xxx_pcpu_init(struct pmc_mdep *md, i } /* Clear the MMCRs, and set FC, to disable all PMCs. */ - mtspr(SPR_MMCR0, SPR_MMCR0_FC | SPR_MMCR0_PMXE | SPR_MMCR0_PMC1CE | SPR_MMCR0_PMCNCE); + mtspr(SPR_MMCR0, SPR_MMCR0_FC | SPR_MMCR0_PMXE | + SPR_MMCR0_FCECE | SPR_MMCR0_PMC1CE | SPR_MMCR0_PMCNCE); mtspr(SPR_MMCR1, 0); - mtmsr(mfmsr() | PSL_PMM); return 0; } @@ -667,7 +667,6 @@ mpc7xxx_intr(int cpu, struct trapframe * uint32_t config; struct pmc *pm; struct powerpc_cpu *pac; - pmc_value_t v; KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[powerpc,%d] out of range CPU %d", __LINE__, cpu)); @@ -679,8 +678,7 @@ mpc7xxx_intr(int cpu, struct trapframe * pac = powerpc_pcpu[cpu]; - config = mfspr(SPR_MMCR0); - mtspr(SPR_MMCR0, config | SPR_MMCR0_FC); + config = mfspr(SPR_MMCR0) & ~SPR_MMCR0_FC; /* * look for all PMCs that have interrupted: @@ -704,22 +702,22 @@ mpc7xxx_intr(int cpu, struct trapframe * if (pm->pm_state != PMC_STATE_RUNNING) continue; - /* Stop the PMC, reload count. */ - v = pm->pm_sc.pm_reloadcount; - mpc7xxx_pmcn_write(i, v); - - /* Restart the counter if logging succeeded. */ + /* Stop the counter if logging fails. */ error = pmc_process_interrupt(cpu, PMC_HR, pm, tf, TRAPF_USERMODE(tf)); if (error != 0) mpc7xxx_stop_pmc(cpu, i); - atomic_add_int(retval ? &pmc_stats.pm_intr_processed : - &pmc_stats.pm_intr_ignored, 1); + /* reload count. */ + mpc7xxx_write_pmc(cpu, i, pm->pm_sc.pm_reloadcount); } + atomic_add_int(retval ? &pmc_stats.pm_intr_processed : + &pmc_stats.pm_intr_ignored, 1); + /* Re-enable PERF exceptions. */ - mtspr(SPR_MMCR0, config | SPR_MMCR0_PMXE); + if (retval) + mtspr(SPR_MMCR0, config | SPR_MMCR0_PMXE); return (retval); } Modified: projects/clang350-import/sys/dev/hwpmc/hwpmc_ppc970.c ============================================================================== --- projects/clang350-import/sys/dev/hwpmc/hwpmc_ppc970.c Fri Nov 28 12:14:59 2014 (r275209) +++ projects/clang350-import/sys/dev/hwpmc/hwpmc_ppc970.c Fri Nov 28 13:25:57 2014 (r275210) @@ -481,7 +481,6 @@ ppc970_intr(int cpu, struct trapframe *t { struct pmc *pm; struct powerpc_cpu *pac; - pmc_value_t v; uint32_t config; int i, error, retval; @@ -503,8 +502,7 @@ ppc970_intr(int cpu, struct trapframe *t * If found, we call a helper to process the interrupt. */ - config = mfspr(SPR_970MMCR0); - mtspr(SPR_970MMCR0, config | SPR_MMCR0_FC); + config = mfspr(SPR_970MMCR0) & ~SPR_MMCR0_FC; for (i = 0; i < PPC970_MAX_PMCS; i++) { if ((pm = pac->pc_ppcpmcs[i].phw_pmc) == NULL || !PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm))) { @@ -519,24 +517,21 @@ ppc970_intr(int cpu, struct trapframe *t if (pm->pm_state != PMC_STATE_RUNNING) continue; - /* Stop the PMC, reload count. */ - v = pm->pm_sc.pm_reloadcount; - - ppc970_pmcn_write(i, v); - - /* Restart the counter if logging succeeded. */ error = pmc_process_interrupt(cpu, PMC_HR, pm, tf, TRAPF_USERMODE(tf)); - mtspr(SPR_970MMCR0, config); if (error != 0) ppc970_stop_pmc(cpu, i); - atomic_add_int(retval ? &pmc_stats.pm_intr_processed : - &pmc_stats.pm_intr_ignored, 1); + /* reload sampling count. */ + ppc970_write_pmc(cpu, i, pm->pm_sc.pm_reloadcount); } + atomic_add_int(retval ? &pmc_stats.pm_intr_processed : + &pmc_stats.pm_intr_ignored, 1); + /* Re-enable PERF exceptions. */ - mtspr(SPR_970MMCR0, mfspr(SPR_970MMCR0) | SPR_MMCR0_PMXE); + if (retval) + mtspr(SPR_970MMCR0, config | SPR_MMCR0_PMXE); return (retval); } @@ -572,10 +567,10 @@ ppc970_pcpu_init(struct pmc_mdep *md, in /* Clear the MMCRs, and set FC, to disable all PMCs. */ /* 970 PMC is not counted when set to 0x08 */ - mtspr(SPR_970MMCR0, SPR_MMCR0_FC | SPR_MMCR0_PMXE | SPR_MMCR0_PMC1CE | - SPR_MMCR0_PMCNCE | SPR_970MMCR0_PMC1SEL(0x8) | SPR_970MMCR0_PMC2SEL(0x8)); + mtspr(SPR_970MMCR0, SPR_MMCR0_FC | SPR_MMCR0_PMXE | + SPR_MMCR0_FCECE | SPR_MMCR0_PMC1CE | SPR_MMCR0_PMCNCE | + SPR_970MMCR0_PMC1SEL(0x8) | SPR_970MMCR0_PMC2SEL(0x8)); mtspr(SPR_970MMCR1, 0x4218420); - mtmsr(mfmsr() | PSL_PMM); return 0; } @@ -585,7 +580,6 @@ ppc970_pcpu_fini(struct pmc_mdep *md, in { register_t mmcr0 = mfspr(SPR_MMCR0); - mtmsr(mfmsr() & ~PSL_PMM); mmcr0 |= SPR_MMCR0_FC; mmcr0 &= ~SPR_MMCR0_PMXE; mtspr(SPR_MMCR0, mmcr0); Modified: projects/clang350-import/sys/dev/isp/isp.c ============================================================================== --- projects/clang350-import/sys/dev/isp/isp.c Fri Nov 28 12:14:59 2014 (r275209) +++ projects/clang350-import/sys/dev/isp/isp.c Fri Nov 28 13:25:57 2014 (r275210) @@ -1219,7 +1219,7 @@ isp_reset(ispsoftc_t *isp, int do_load_d * work for them). */ if (IS_FC(isp) && isp->isp_nchan > 1) { - if (!IS_24XX(isp) || (fwt & ISP2400_FW_ATTR_MULTIID) == 0) { + if (!ISP_CAP_MULTI_ID(isp)) { isp_prt(isp, ISP_LOGWARN, "non-MULTIID f/w loaded, only can enable 1 of %d channels", isp->isp_nchan); isp->isp_nchan = 1; } Modified: projects/clang350-import/sys/dev/isp/isp_freebsd.c ============================================================================== --- projects/clang350-import/sys/dev/isp/isp_freebsd.c Fri Nov 28 12:14:59 2014 (r275209) +++ projects/clang350-import/sys/dev/isp/isp_freebsd.c Fri Nov 28 13:25:57 2014 (r275210) @@ -894,7 +894,7 @@ is_lun_enabled(ispsoftc_t *isp, int bus, ISP_GET_PC_ADDR(isp, bus, lun_hash[LUN_HASH_FUNC(lun)], lhp); SLIST_FOREACH(tptr, lhp, next) { - if (xpt_path_lun_id(tptr->owner) == lun) { + if (tptr->ts_lun == lun) { return (1); } } @@ -926,16 +926,13 @@ get_lun_statep(ispsoftc_t *isp, int bus, { tstate_t *tptr = NULL; struct tslist *lhp; - int i; if (bus < isp->isp_nchan) { - for (i = 0; i < LUN_HASH_SIZE; i++) { - ISP_GET_PC_ADDR(isp, bus, lun_hash[i], lhp); - SLIST_FOREACH(tptr, lhp, next) { - if (xpt_path_lun_id(tptr->owner) == lun) { - tptr->hold++; - return (tptr); - } + ISP_GET_PC_ADDR(isp, bus, lun_hash[LUN_HASH_FUNC(lun)], lhp); + SLIST_FOREACH(tptr, lhp, next) { + if (tptr->ts_lun == lun) { + tptr->hold++; + return (tptr); } } } @@ -1149,6 +1146,7 @@ create_lun_state(ispsoftc_t *isp, int bu if (tptr == NULL) { return (CAM_RESRC_UNAVAIL); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Nov 28 20:48:54 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C621874F; Fri, 28 Nov 2014 20:48:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B2B4B97; Fri, 28 Nov 2014 20:48:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sASKms39018711; Fri, 28 Nov 2014 20:48:54 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sASKms9u018710; Fri, 28 Nov 2014 20:48:54 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411282048.sASKms9u018710@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Fri, 28 Nov 2014 20:48:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275214 - projects/building-blocks/tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Nov 2014 20:48:54 -0000 Author: ngie Date: Fri Nov 28 20:48:53 2014 New Revision: 275214 URL: https://svnweb.freebsd.org/changeset/base/275214 Log: Ignore usr/share/nls Modified: projects/building-blocks/tools/add-optional-obsolete-files-entries.sh Modified: projects/building-blocks/tools/add-optional-obsolete-files-entries.sh ============================================================================== --- projects/building-blocks/tools/add-optional-obsolete-files-entries.sh Fri Nov 28 20:39:35 2014 (r275213) +++ projects/building-blocks/tools/add-optional-obsolete-files-entries.sh Fri Nov 28 20:48:53 2014 (r275214) @@ -52,6 +52,6 @@ done sed -e 's,^,OLD_FILES+=,' \ -e '/lib\/.*\.so\.[0-9]\.*/s/OLD_FILES+=/OLD_LIBS+=/g'; find -d -s . -type d -mindepth 1 -and \! -empty | \ - egrep -v '^\./(boot|s*bin|lib|libexec|usr|usr/include|usr/lib(32|data|exec)?|usr/libdata/pkgconfig|usr/lib/private|usr/s*bin|usr/share|usr/share/(examples|man)|usr/share/man/man[0-9])$' | \ + egrep -v '^\./(boot|s*bin|lib|libexec|usr|usr/include|usr/lib(32|data|exec)?|usr/libdata/pkgconfig|usr/lib/private|usr/s*bin|usr/share|usr/share/(examples|man|nls)|usr/share/man/man[0-9])$' | \ sed -e 's,^,OLD_DIRS+=,' ) | sed -e 's,+=\./,+=,' From owner-svn-src-projects@FreeBSD.ORG Fri Nov 28 22:07:18 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 37A0BDA9; Fri, 28 Nov 2014 22:07:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 22BF0A38; Fri, 28 Nov 2014 22:07:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sASM7IXM055799; Fri, 28 Nov 2014 22:07:18 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sASM7Gq7055794; Fri, 28 Nov 2014 22:07:16 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411282207.sASM7Gq7055794@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Fri, 28 Nov 2014 22:07:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275219 - projects/building-blocks/share/skel X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Nov 2014 22:07:18 -0000 Author: ngie Date: Fri Nov 28 22:07:16 2014 New Revision: 275219 URL: https://svnweb.freebsd.org/changeset/base/275219 Log: Install skeleton files based on the values of MK_MAIL and MK_TCSH Customize according to MK_GAMES and MK_VI, in particular comment out lines that would change behavior Change dot.cshrc and dot.profile to not check for /usr/games/fortune based on the new behavior in customizing the files Added: projects/building-blocks/share/skel/dot.cshrc.in - copied unchanged from r275063, projects/building-blocks/share/skel/dot.cshrc projects/building-blocks/share/skel/dot.login.in - copied, changed from r275063, projects/building-blocks/share/skel/dot.login projects/building-blocks/share/skel/dot.mailrc.in - copied unchanged from r275063, projects/building-blocks/share/skel/dot.mailrc projects/building-blocks/share/skel/dot.profile.in - copied, changed from r275063, projects/building-blocks/share/skel/dot.profile Deleted: projects/building-blocks/share/skel/dot.cshrc projects/building-blocks/share/skel/dot.login projects/building-blocks/share/skel/dot.mailrc projects/building-blocks/share/skel/dot.profile Modified: projects/building-blocks/share/skel/Makefile Modified: projects/building-blocks/share/skel/Makefile ============================================================================== --- projects/building-blocks/share/skel/Makefile Fri Nov 28 22:03:35 2014 (r275218) +++ projects/building-blocks/share/skel/Makefile Fri Nov 28 22:07:16 2014 (r275219) @@ -1,14 +1,52 @@ # @(#)Makefile 8.1 (Berkeley) 6/8/93 # $FreeBSD$ +.include + FILESGROUPS= FILES1 FILES2 -FILES1= dot.cshrc dot.login dot.login_conf dot.mailrc dot.profile \ - dot.shrc -FILES2= dot.mail_aliases dot.rhosts +FILES1= dot.login dot.login_conf dot.profile dot.shrc FILES1DIR= /usr/share/skel FILES2DIR= /usr/share/skel FILES1MODE= 0644 FILES2MODE= 0600 -NO_OBJ= + +.PATH: ${.OBJDIR} ${.CURDIR} + +.if ${MK_MAIL} != "no" +FILES1+= dot.mailrc +FILES2+= dot.mail_aliases +.endif + +.if ${MK_RCMDS} != "no" +FILES2+= dot.rhosts +.endif + +.if ${MK_TCSH} != "no" +FILES1+= dot.cshrc +.endif + +.if ${MK_GAMES} == "no" +dot.login_SED+= -e "/\/usr\/games\/fortune /s/^/\#/" +dot.profile_SED+= -e "/\/usr\/games\/fortune /s/^/\#/" +.endif + +.if ${MK_VI} == "no" +dot.cshrc_SED+= -e '/^setenv.*EDITOR.*vi$$/s/^/\#/' +dot.mailrc_SED+= -e '/^set EDITOR=vi$$/s/^/\#/' -e '/^set VISUAL=vi$$/s/^/\#/' +dot.profile_SED+= -e '/^EDITOR=vi; /s/^/\#/' +.endif + +.for f in dot.cshrc dot.login dot.mailrc dot.profile +.if empty(${f}_SED) +$f: $f.in + cp ${.ALLSRC} ${.TARGET} +.else +$f: $f.in + sed ${${f}_SED} < ${.ALLSRC} > ${.TARGET}.tmp + mv ${.TARGET}.tmp ${.TARGET} +CLEANFILES+= $f.tmp +.endif +CLEANFILES+= $f +.endfor .include Copied: projects/building-blocks/share/skel/dot.cshrc.in (from r275063, projects/building-blocks/share/skel/dot.cshrc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/share/skel/dot.cshrc.in Fri Nov 28 22:07:16 2014 (r275219, copy of r275063, projects/building-blocks/share/skel/dot.cshrc) @@ -0,0 +1,44 @@ +# $FreeBSD$ +# +# .cshrc - csh resource script, read at beginning of execution by each shell +# +# see also csh(1), environ(7). +# more examples available at /usr/share/examples/csh/ +# + +alias h history 25 +alias j jobs -l +alias la ls -aF +alias lf ls -FA +alias ll ls -lAF + +# These are normally set through /etc/login.conf. You may override them here +# if wanted. +# set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin $HOME/bin) +# setenv BLOCKSIZE K +# A righteous umask +# umask 22 + +setenv EDITOR vi +setenv PAGER more + +if ($?prompt) then + # An interactive shell -- set some stuff up + set prompt = "%N@%m:%~ %# " + set promptchars = "%#" + + set filec + set history = 1000 + set savehist = (1000 merge) + set autolist = ambiguous + # Use history to aid expansion + set autoexpand + set autorehash + set mail = (/var/mail/$USER) + if ( $?tcsh ) then + bindkey "^W" backward-delete-word + bindkey -k up history-search-backward + bindkey -k down history-search-forward + endif + +endif Copied and modified: projects/building-blocks/share/skel/dot.login.in (from r275063, projects/building-blocks/share/skel/dot.login) ============================================================================== --- projects/building-blocks/share/skel/dot.login Tue Nov 25 19:01:49 2014 (r275063, copy source) +++ projects/building-blocks/share/skel/dot.login.in Fri Nov 28 22:07:16 2014 (r275219) @@ -5,4 +5,4 @@ # see also csh(1), environ(7). # -if ( -x /usr/games/fortune ) /usr/games/fortune freebsd-tips +/usr/games/fortune freebsd-tips Copied: projects/building-blocks/share/skel/dot.mailrc.in (from r275063, projects/building-blocks/share/skel/dot.mailrc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/share/skel/dot.mailrc.in Fri Nov 28 22:07:16 2014 (r275219, copy of r275063, projects/building-blocks/share/skel/dot.mailrc) @@ -0,0 +1,17 @@ +# $FreeBSD$ +# +# .mailrc - mail resources +# +# see also mail(1) +# + +set append ask autoprint +set indentprefix="> " +set PAGER=more +set EDITOR=vi +set VISUAL=vi +set folder=Mail +retain bcc cc date from subject to + +# include your private mail aliases +source ~/.mail_aliases Copied and modified: projects/building-blocks/share/skel/dot.profile.in (from r275063, projects/building-blocks/share/skel/dot.profile) ============================================================================== --- projects/building-blocks/share/skel/dot.profile Tue Nov 25 19:01:49 2014 (r275063, copy source) +++ projects/building-blocks/share/skel/dot.profile.in Fri Nov 28 22:07:16 2014 (r275219) @@ -21,4 +21,4 @@ PAGER=more; export PAGER # set ENV to a file invoked each time sh is started for interactive use. ENV=$HOME/.shrc; export ENV -if [ -x /usr/games/fortune ] ; then /usr/games/fortune freebsd-tips ; fi +/usr/games/fortune freebsd-tips From owner-svn-src-projects@FreeBSD.ORG Fri Nov 28 22:08:51 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1CB3EEAD; Fri, 28 Nov 2014 22:08:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 09551A44; Fri, 28 Nov 2014 22:08:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sASM8oAb056010; Fri, 28 Nov 2014 22:08:50 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sASM8ojm056009; Fri, 28 Nov 2014 22:08:50 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411282208.sASM8ojm056009@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Fri, 28 Nov 2014 22:08:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275220 - projects/building-blocks/etc/root X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Nov 2014 22:08:51 -0000 Author: ngie Date: Fri Nov 28 22:08:50 2014 New Revision: 275220 URL: https://svnweb.freebsd.org/changeset/base/275220 Log: Remove the conditional Modified: projects/building-blocks/etc/root/dot.login Modified: projects/building-blocks/etc/root/dot.login ============================================================================== --- projects/building-blocks/etc/root/dot.login Fri Nov 28 22:07:16 2014 (r275219) +++ projects/building-blocks/etc/root/dot.login Fri Nov 28 22:08:50 2014 (r275220) @@ -6,4 +6,4 @@ # # Uncomment to display a random cookie each login: -# if ( -x /usr/games/fortune ) /usr/games/fortune -s +# /usr/games/fortune -s From owner-svn-src-projects@FreeBSD.ORG Sat Nov 29 01:53:28 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DBC6F7C9; Sat, 29 Nov 2014 01:53:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AEC3BDB; Sat, 29 Nov 2014 01:53:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAT1rShv064835; Sat, 29 Nov 2014 01:53:28 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAT1rS7h064833; Sat, 29 Nov 2014 01:53:28 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411290153.sAT1rS7h064833@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 29 Nov 2014 01:53:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275224 - in projects/building-blocks: . usr.bin/vi X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Nov 2014 01:53:29 -0000 Author: ngie Date: Sat Nov 29 01:53:27 2014 New Revision: 275224 URL: https://svnweb.freebsd.org/changeset/base/275224 Log: share/termcap requires ex from usr.bin/vi in order to compile, and since usr.bin comes after share in SUBDIR in Makefile.inc1, the build will fail when vi is not installed on the build host Run build-tools for usr.bin/vi and install ex, etc to WORLDTMP to enable building share/termcap on hosts that don't have nvi installed on them Modified: projects/building-blocks/Makefile.inc1 projects/building-blocks/usr.bin/vi/Makefile Modified: projects/building-blocks/Makefile.inc1 ============================================================================== --- projects/building-blocks/Makefile.inc1 Sat Nov 29 00:45:09 2014 (r275223) +++ projects/building-blocks/Makefile.inc1 Sat Nov 29 01:53:27 2014 (r275224) @@ -271,7 +271,9 @@ TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ BOOTSTRAPPING=${OSRELDATE} \ SSP_CFLAGS= \ -DNO_LINT \ - -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no MK_CLANG_FULL=no MK_LLDB=no MK_TESTS=no + -DNO_CPU_CFLAGS \ + MK_WARNS=no MK_CTF=no MK_CLANG_FULL=no MK_LLDB=no MK_MAN=no \ + MK_SHAREDOCS=no MK_TESTS=no # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ @@ -1386,6 +1388,14 @@ build-tools: .MAKE ${MAKE} DIRPRFX=${_tool}/ depend && \ ${MAKE} DIRPRFX=${_tool}/ all .endfor +.for _tool in \ + usr.bin/vi + ${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools,install)"; \ + cd ${.CURDIR}/${_tool} && \ + ${MAKE} DIRPRFX=${_tool}/ obj && \ + ${MAKE} DIRPRFX=${_tool}/ build-tools DESTDIR=${WORLDTMP}/ \ + MK_MAN=no +.endfor # # kernel-tools: Build kernel-building tools Modified: projects/building-blocks/usr.bin/vi/Makefile ============================================================================== --- projects/building-blocks/usr.bin/vi/Makefile Sat Nov 29 00:45:09 2014 (r275223) +++ projects/building-blocks/usr.bin/vi/Makefile Sat Nov 29 01:53:27 2014 (r275224) @@ -77,4 +77,9 @@ SRCS+= vs_line.c vs_msg.c vs_refresh.c v # Wide char regex SRCS+= regcomp.c regerror.c regexec.c regfree.c +build-tools: +.for t in obj depend all install + cd ${.CURDIR} && ${MAKE} $t SUBDIR= +.endfor + .include From owner-svn-src-projects@FreeBSD.ORG Sat Nov 29 01:53:56 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 878978B3; Sat, 29 Nov 2014 01:53:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 68A37E1; Sat, 29 Nov 2014 01:53:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAT1rucu064932; Sat, 29 Nov 2014 01:53:56 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAT1ruoT064931; Sat, 29 Nov 2014 01:53:56 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411290153.sAT1ruoT064931@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 29 Nov 2014 01:53:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275225 - projects/building-blocks/tools/build/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Nov 2014 01:53:56 -0000 Author: ngie Date: Sat Nov 29 01:53:55 2014 New Revision: 275225 URL: https://svnweb.freebsd.org/changeset/base/275225 Log: Fill in MK_VI == no Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Sat Nov 29 01:53:27 2014 (r275224) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Sat Nov 29 01:53:55 2014 (r275225) @@ -6046,6 +6046,99 @@ OLD_FILES+=usr/share/man/man8/lastlogin. OLD_FILES+=usr/share/man/man8/utx.8.gz .endif +.if ${MK_VI} == no +OLD_FILES+=usr/bin/ex +OLD_FILES+=usr/bin/nex +OLD_FILES+=usr/bin/nvi +OLD_FILES+=usr/bin/nview +OLD_FILES+=usr/bin/vi +OLD_FILES+=usr/bin/view +OLD_FILES+=usr/share/man/man1/ex.1.gz +OLD_FILES+=usr/share/man/man1/nex.1.gz +OLD_FILES+=usr/share/man/man1/nvi.1.gz +OLD_FILES+=usr/share/man/man1/nview.1.gz +OLD_FILES+=usr/share/man/man1/vi.1.gz +OLD_FILES+=usr/share/man/man1/view.1.gz +OLD_FILES+=usr/share/vi/catalog/C +OLD_FILES+=usr/share/vi/catalog/POSIX +OLD_FILES+=usr/share/vi/catalog/de_AT.ISO8859-1 +OLD_FILES+=usr/share/vi/catalog/de_AT.ISO8859-15 +OLD_FILES+=usr/share/vi/catalog/de_AT.UTF-8 +OLD_FILES+=usr/share/vi/catalog/de_CH.ISO8859-1 +OLD_FILES+=usr/share/vi/catalog/de_CH.ISO8859-15 +OLD_FILES+=usr/share/vi/catalog/de_CH.UTF-8 +OLD_FILES+=usr/share/vi/catalog/de_DE.ISO8859-1 +OLD_FILES+=usr/share/vi/catalog/de_DE.ISO8859-15 +OLD_FILES+=usr/share/vi/catalog/de_DE.UTF-8 +OLD_FILES+=usr/share/vi/catalog/dutch +OLD_FILES+=usr/share/vi/catalog/dutch.UTF-8 +OLD_FILES+=usr/share/vi/catalog/en_AU.ISO8859-1 +OLD_FILES+=usr/share/vi/catalog/en_AU.ISO8859-15 +OLD_FILES+=usr/share/vi/catalog/en_AU.US-ASCII +OLD_FILES+=usr/share/vi/catalog/en_AU.UTF-8 +OLD_FILES+=usr/share/vi/catalog/en_CA.ISO8859-1 +OLD_FILES+=usr/share/vi/catalog/en_CA.ISO8859-15 +OLD_FILES+=usr/share/vi/catalog/en_CA.US-ASCII +OLD_FILES+=usr/share/vi/catalog/en_CA.UTF-8 +OLD_FILES+=usr/share/vi/catalog/en_GB.ISO8859-1 +OLD_FILES+=usr/share/vi/catalog/en_GB.ISO8859-15 +OLD_FILES+=usr/share/vi/catalog/en_GB.US-ASCII +OLD_FILES+=usr/share/vi/catalog/en_GB.UTF-8 +OLD_FILES+=usr/share/vi/catalog/en_NZ.ISO8859-1 +OLD_FILES+=usr/share/vi/catalog/en_NZ.ISO8859-15 +OLD_FILES+=usr/share/vi/catalog/en_NZ.US-ASCII +OLD_FILES+=usr/share/vi/catalog/en_NZ.UTF-8 +OLD_FILES+=usr/share/vi/catalog/en_US.ISO8859-1 +OLD_FILES+=usr/share/vi/catalog/en_US.ISO8859-15 +OLD_FILES+=usr/share/vi/catalog/en_US.US-ASCII +OLD_FILES+=usr/share/vi/catalog/en_US.UTF-8 +OLD_FILES+=usr/share/vi/catalog/english +OLD_FILES+=usr/share/vi/catalog/es_ES.ISO8859-1 +OLD_FILES+=usr/share/vi/catalog/es_ES.ISO8859-15 +OLD_FILES+=usr/share/vi/catalog/es_ES.UTF-8 +OLD_FILES+=usr/share/vi/catalog/fr_BE.ISO8859-1 +OLD_FILES+=usr/share/vi/catalog/fr_BE.ISO8859-15 +OLD_FILES+=usr/share/vi/catalog/fr_BE.UTF-8 +OLD_FILES+=usr/share/vi/catalog/fr_CA.ISO8859-1 +OLD_FILES+=usr/share/vi/catalog/fr_CA.ISO8859-15 +OLD_FILES+=usr/share/vi/catalog/fr_CA.UTF-8 +OLD_FILES+=usr/share/vi/catalog/fr_CH.ISO8859-1 +OLD_FILES+=usr/share/vi/catalog/fr_CH.ISO8859-15 +OLD_FILES+=usr/share/vi/catalog/fr_CH.UTF-8 +OLD_FILES+=usr/share/vi/catalog/fr_FR.ISO8859-1 +OLD_FILES+=usr/share/vi/catalog/fr_FR.ISO8859-15 +OLD_FILES+=usr/share/vi/catalog/fr_FR.UTF-8 +OLD_FILES+=usr/share/vi/catalog/french +OLD_FILES+=usr/share/vi/catalog/french.UTF-8 +OLD_FILES+=usr/share/vi/catalog/german +OLD_FILES+=usr/share/vi/catalog/german.UTF-8 +OLD_FILES+=usr/share/vi/catalog/nl_NL.ISO8859-1 +OLD_FILES+=usr/share/vi/catalog/nl_NL.ISO8859-15 +OLD_FILES+=usr/share/vi/catalog/nl_NL.UTF-8 +OLD_FILES+=usr/share/vi/catalog/pl_PL.ISO8859-2 +OLD_FILES+=usr/share/vi/catalog/pl_PL.UTF-8 +OLD_FILES+=usr/share/vi/catalog/polish +OLD_FILES+=usr/share/vi/catalog/polish.UTF-8 +OLD_FILES+=usr/share/vi/catalog/ru_RU.KOI8-R +OLD_FILES+=usr/share/vi/catalog/ru_RU.UTF-8 +OLD_FILES+=usr/share/vi/catalog/spanish +OLD_FILES+=usr/share/vi/catalog/spanish.UTF-8 +OLD_FILES+=usr/share/vi/catalog/sv_SE.ISO8859-1 +OLD_FILES+=usr/share/vi/catalog/sv_SE.ISO8859-15 +OLD_FILES+=usr/share/vi/catalog/sv_SE.UTF-8 +OLD_FILES+=usr/share/vi/catalog/swedish +OLD_FILES+=usr/share/vi/catalog/swedish.UTF-8 +OLD_FILES+=usr/share/vi/catalog/uk_UA.KOI8-U +OLD_FILES+=usr/share/vi/catalog/uk_UA.UTF-8 +OLD_FILES+=usr/share/vi/catalog/zh_CN.GB18030 +OLD_FILES+=usr/share/vi/catalog/zh_CN.GB2312 +OLD_FILES+=usr/share/vi/catalog/zh_CN.GBK +OLD_FILES+=usr/share/vi/catalog/zh_CN.UTF-8 +OLD_FILES+=usr/share/vi/catalog/zh_CN.eucCN +OLD_DIRS+=usr/share/vi/catalog +OLD_DIRS+=usr/share/vi +.endif + .if ${MK_WIRELESS} == no OLD_FILES+=etc/regdomain.xml OLD_FILES+=usr/sbin/ancontrol From owner-svn-src-projects@FreeBSD.ORG Sat Nov 29 01:55:59 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E513E9A1; Sat, 29 Nov 2014 01:55:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D29FDE9; Sat, 29 Nov 2014 01:55:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAT1txqq065271; Sat, 29 Nov 2014 01:55:59 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAT1txVF065270; Sat, 29 Nov 2014 01:55:59 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411290155.sAT1txVF065270@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 29 Nov 2014 01:55:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275226 - projects/building-blocks/tools/build/options X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Nov 2014 01:56:00 -0000 Author: ngie Date: Sat Nov 29 01:55:59 2014 New Revision: 275226 URL: https://svnweb.freebsd.org/changeset/base/275226 Log: Implement mdoc cross references Modified: projects/building-blocks/tools/build/options/WITHOUT_VI Modified: projects/building-blocks/tools/build/options/WITHOUT_VI ============================================================================== --- projects/building-blocks/tools/build/options/WITHOUT_VI Sat Nov 29 01:53:55 2014 (r275225) +++ projects/building-blocks/tools/build/options/WITHOUT_VI Sat Nov 29 01:55:59 2014 (r275226) @@ -1,2 +1,6 @@ .\" $FreeBSD$ -Set to not build and install vi, view, ex and related programs. +Set to not build and install +.Xr vi 1 , +.Xr view 1 , +.Xr ex 1 , +and related programs. From owner-svn-src-projects@FreeBSD.ORG Sat Nov 29 01:58:53 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A3621B71; Sat, 29 Nov 2014 01:58:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8485AFE; Sat, 29 Nov 2014 01:58:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAT1wr5E065784; Sat, 29 Nov 2014 01:58:53 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAT1wqCM065780; Sat, 29 Nov 2014 01:58:52 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411290158.sAT1wqCM065780@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 29 Nov 2014 01:58:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275227 - in projects/building-blocks: share/mk tools/build/mk tools/build/options usr.bin X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Nov 2014 01:58:53 -0000 Author: ngie Date: Sat Nov 29 01:58:52 2014 New Revision: 275227 URL: https://svnweb.freebsd.org/changeset/base/275227 Log: Make ee(1) optional via MK_EE Added: projects/building-blocks/tools/build/options/WITHOUT_EE (contents, props changed) Modified: projects/building-blocks/share/mk/src.opts.mk projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc projects/building-blocks/usr.bin/Makefile Modified: projects/building-blocks/share/mk/src.opts.mk ============================================================================== --- projects/building-blocks/share/mk/src.opts.mk Sat Nov 29 01:55:59 2014 (r275226) +++ projects/building-blocks/share/mk/src.opts.mk Sat Nov 29 01:58:52 2014 (r275227) @@ -78,6 +78,7 @@ __DEFAULT_YES_OPTIONS = \ DMAGENT \ DYNAMICROOT \ ED_CRYPTO \ + EE \ EXAMPLES \ FDT \ FINGER \ Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Sat Nov 29 01:55:59 2014 (r275226) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Sat Nov 29 01:58:52 2014 (r275227) @@ -1686,6 +1686,23 @@ OLD_FILES+=usr/share/dict/words OLD_DIRS+=usr/share/dict .endif +.if ${MK_EE} == no +OLD_FILES+=usr/bin/edit +OLD_FILES+=usr/bin/ee +OLD_FILES+=usr/bin/ree +OLD_FILES+=usr/share/man/man1/edit.1.gz +OLD_FILES+=usr/share/man/man1/ee.1.gz +OLD_FILES+=usr/share/man/man1/ree.1.gz +OLD_FILES+=usr/share/nls/C/ee.cat +OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/ee.cat +OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/ee.cat +OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/ee.cat +OLD_FILES+=usr/share/nls/pl_PL.ISO8859-2/ee.cat +OLD_FILES+=usr/share/nls/pt_BR.ISO8859-1/ee.cat +OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/ee.cat +OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/ee.cat +.endif + #.if ${MK_EXAMPLES} == no # to be filled in #.endif Added: projects/building-blocks/tools/build/options/WITHOUT_EE ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/build/options/WITHOUT_EE Sat Nov 29 01:58:52 2014 (r275227) @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build and install +.Xr edit 1 , +.Xr ee 1 , +and related programs. Modified: projects/building-blocks/usr.bin/Makefile ============================================================================== --- projects/building-blocks/usr.bin/Makefile Sat Nov 29 01:55:59 2014 (r275226) +++ projects/building-blocks/usr.bin/Makefile Sat Nov 29 01:58:52 2014 (r275227) @@ -39,7 +39,6 @@ SUBDIR= alias \ dirname \ dpv \ du \ - ee \ elf2aout \ elfdump \ enigma \ @@ -231,6 +230,10 @@ SUBDIR+= calendar _clang= clang .endif +.if ${MK_EE} != "no" +SUBDIR+= ee +.endif + .if ${MK_FINGER} != "no" SUBDIR+= finger .endif From owner-svn-src-projects@FreeBSD.ORG Sat Nov 29 05:14:27 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 83C77852; Sat, 29 Nov 2014 05:14:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 551C1818; Sat, 29 Nov 2014 05:14:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAT5ER80059648; Sat, 29 Nov 2014 05:14:27 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAT5ER2r059647; Sat, 29 Nov 2014 05:14:27 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411290514.sAT5ER2r059647@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 29 Nov 2014 05:14:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275232 - projects/building-blocks/sys/conf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Nov 2014 05:14:27 -0000 Author: ngie Date: Sat Nov 29 05:14:26 2014 New Revision: 275232 URL: https://svnweb.freebsd.org/changeset/base/275232 Log: Adapt logic from src.opts.mk to kern.opts.mk to unbreak kernel builds when MODULES_OVERRIDE is not defined - Add MACHINE/MACHINE_ARCH logic from src.opts.mk - Add AUTOFS, BHYVE, HYPERV, and ISCSI Modified: projects/building-blocks/sys/conf/kern.opts.mk Modified: projects/building-blocks/sys/conf/kern.opts.mk ============================================================================== --- projects/building-blocks/sys/conf/kern.opts.mk Sat Nov 29 05:08:29 2014 (r275231) +++ projects/building-blocks/sys/conf/kern.opts.mk Sat Nov 29 05:14:26 2014 (r275232) @@ -23,10 +23,12 @@ # src tree. __DEFAULT_YES_OPTIONS = \ + AUTOFS \ BLUETOOTH \ CDDL \ CRYPT \ FORMAT_EXTENSIONS \ + ISCSI \ INET \ INET6 \ IPFILTER \ @@ -43,6 +45,42 @@ __DEFAULT_NO_OPTIONS = \ NAND \ OFED +# expanded inline from src.opts.mk to avoid share/mk dependency + +# +# Default behaviour of some options depends on the architecture. Unfortunately +# this means that we have to test TARGET_ARCH (the buildworld case) as well +# as MACHINE_ARCH (the non-buildworld case). Normally TARGET_ARCH is not +# used at all in bsd.*.mk, but we have to make an exception here if we want +# to allow defaults for some things like clang to vary by target architecture. +# Additional, per-target behavior should be rarely added only after much +# gnashing of teeth and grinding of gears. +# +.if defined(TARGET_ARCH) +__T=${TARGET_ARCH} +.else +__T=${MACHINE_ARCH} +.endif +.if defined(TARGET) +__TT=${TARGET} +.else +__TT=${MACHINE} +.endif + +# bhyve is only supported on amd64 +.if ${__T} == "amd64" +__DEFAULT_YES_OPTIONS+=BHYVE +.else +MK_BHYVE:= no +.endif + +# hyperv is only supported on amd64 and i386/i386 +.if ${__T} == "amd64" || (${__T} == "i386" && ${__TT} == "i386") +__DEFAULT_YES_OPTIONS+=HYPERV +.else +MK_HYPERV:= no +.endif + # expanded inline from bsd.mkopt.mk to avoid share/mk dependency # Those that default to yes From owner-svn-src-projects@FreeBSD.ORG Sat Nov 29 05:28:48 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 589B89B4; Sat, 29 Nov 2014 05:28:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 420A18FA; Sat, 29 Nov 2014 05:28:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAT5SmhY064753; Sat, 29 Nov 2014 05:28:48 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAT5SgE5064726; Sat, 29 Nov 2014 05:28:42 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411290528.sAT5SgE5064726@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 29 Nov 2014 05:28:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275233 - in projects/building-blocks: . bin/csh bin/df bin/ed bin/ls bin/pkill bin/ps bin/rmail bin/sh cddl/contrib/opensolaris/lib/libdtrace/common contrib/elftoolchain/addr2line cont... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Nov 2014 05:28:48 -0000 Author: ngie Date: Sat Nov 29 05:28:40 2014 New Revision: 275233 URL: https://svnweb.freebsd.org/changeset/base/275233 Log: MFHead @ r275232 Added: projects/building-blocks/contrib/elftoolchain/addr2line/ - copied from r275232, head/contrib/elftoolchain/addr2line/ projects/building-blocks/contrib/elftoolchain/cxxfilt/ - copied from r275232, head/contrib/elftoolchain/cxxfilt/ projects/building-blocks/contrib/elftoolchain/elfcopy/ - copied from r275232, head/contrib/elftoolchain/elfcopy/ projects/building-blocks/contrib/elftoolchain/libelftc/ - copied from r275232, head/contrib/elftoolchain/libelftc/ projects/building-blocks/contrib/elftoolchain/nm/ - copied from r275232, head/contrib/elftoolchain/nm/ projects/building-blocks/contrib/elftoolchain/size/ - copied from r275232, head/contrib/elftoolchain/size/ projects/building-blocks/contrib/elftoolchain/strings/ - copied from r275232, head/contrib/elftoolchain/strings/ projects/building-blocks/contrib/libucl/COPYING - copied unchanged from r275232, head/contrib/libucl/COPYING projects/building-blocks/contrib/libucl/doc/lua_api.md - copied unchanged from r275232, head/contrib/libucl/doc/lua_api.md projects/building-blocks/contrib/libucl/include/lua_ucl.h - copied unchanged from r275232, head/contrib/libucl/include/lua_ucl.h projects/building-blocks/contrib/libucl/lua/ - copied from r275232, head/contrib/libucl/lua/ projects/building-blocks/contrib/libucl/m4/ - copied from r275232, head/contrib/libucl/m4/ projects/building-blocks/contrib/libucl/tests/basic/12.in - copied unchanged from r275232, head/contrib/libucl/tests/basic/12.in projects/building-blocks/contrib/libucl/tests/basic/12.res - copied unchanged from r275232, head/contrib/libucl/tests/basic/12.res projects/building-blocks/contrib/libucl/tests/basic/13.in - copied unchanged from r275232, head/contrib/libucl/tests/basic/13.in projects/building-blocks/contrib/libucl/tests/basic/13.res - copied unchanged from r275232, head/contrib/libucl/tests/basic/13.res projects/building-blocks/contrib/libucl/tests/basic/comments.in - copied unchanged from r275232, head/contrib/libucl/tests/basic/comments.in projects/building-blocks/contrib/libucl/tests/basic/comments.res - copied unchanged from r275232, head/contrib/libucl/tests/basic/comments.res projects/building-blocks/contrib/libucl/tests/basic/include_dir/ - copied from r275232, head/contrib/libucl/tests/basic/include_dir/ projects/building-blocks/lib/libgpio/ - copied from r275232, head/lib/libgpio/ projects/building-blocks/sbin/mdconfig/tests/mdconfig_test.sh - copied unchanged from r275232, head/sbin/mdconfig/tests/mdconfig_test.sh projects/building-blocks/sys/dev/beri/virtio/virtio.c - copied unchanged from r275232, head/sys/dev/beri/virtio/virtio.c projects/building-blocks/sys/dev/beri/virtio/virtio.h - copied unchanged from r275232, head/sys/dev/beri/virtio/virtio.h projects/building-blocks/sys/dev/beri/virtio/virtio_block.c - copied unchanged from r275232, head/sys/dev/beri/virtio/virtio_block.c projects/building-blocks/sys/mips/conf/WZR-HPAG300H - copied unchanged from r275232, head/sys/mips/conf/WZR-HPAG300H projects/building-blocks/sys/mips/conf/WZR-HPAG300H.hints - copied unchanged from r275232, head/sys/mips/conf/WZR-HPAG300H.hints Replaced: projects/building-blocks/usr.sbin/cron/Makefile.inc - copied unchanged from r275232, head/usr.sbin/cron/Makefile.inc projects/building-blocks/usr.sbin/fifolog/Makefile.inc - copied unchanged from r275232, head/usr.sbin/fifolog/Makefile.inc Deleted: projects/building-blocks/sbin/mdconfig/tests/legacy_test.sh projects/building-blocks/sbin/mdconfig/tests/mdconfig.test projects/building-blocks/sbin/mdconfig/tests/run.pl projects/building-blocks/sys/netipsec/ipip_var.h Modified: projects/building-blocks/MAINTAINERS (contents, props changed) projects/building-blocks/ObsoleteFiles.inc projects/building-blocks/bin/csh/Makefile projects/building-blocks/bin/df/Makefile projects/building-blocks/bin/ed/Makefile projects/building-blocks/bin/ls/Makefile projects/building-blocks/bin/pkill/Makefile projects/building-blocks/bin/ps/Makefile projects/building-blocks/bin/rmail/Makefile projects/building-blocks/bin/sh/Makefile projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c projects/building-blocks/contrib/libucl/ChangeLog.md projects/building-blocks/contrib/libucl/Makefile.am projects/building-blocks/contrib/libucl/Makefile.w32 projects/building-blocks/contrib/libucl/README.md projects/building-blocks/contrib/libucl/cmake/CMakeLists.txt projects/building-blocks/contrib/libucl/configure.ac projects/building-blocks/contrib/libucl/include/ucl.h projects/building-blocks/contrib/libucl/libucl.pc.in projects/building-blocks/contrib/libucl/src/ucl_emitter.c projects/building-blocks/contrib/libucl/src/ucl_emitter_streamline.c projects/building-blocks/contrib/libucl/src/ucl_emitter_utils.c projects/building-blocks/contrib/libucl/src/ucl_hash.c projects/building-blocks/contrib/libucl/src/ucl_hash.h projects/building-blocks/contrib/libucl/src/ucl_internal.h projects/building-blocks/contrib/libucl/src/ucl_parser.c projects/building-blocks/contrib/libucl/src/ucl_util.c projects/building-blocks/contrib/libucl/tests/Makefile.am projects/building-blocks/contrib/libucl/tests/basic/4.res projects/building-blocks/contrib/libucl/tests/generate.res projects/building-blocks/contrib/libucl/tests/test_basic.c projects/building-blocks/contrib/libucl/tests/test_generate.c projects/building-blocks/contrib/libucl/tests/test_schema.c projects/building-blocks/contrib/libucl/utils/objdump.c projects/building-blocks/contrib/mdocml/lib.in projects/building-blocks/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c projects/building-blocks/contrib/ofed/libmlx4/src/cq.c projects/building-blocks/contrib/ofed/libmlx4/src/mlx4-abi.h projects/building-blocks/contrib/ofed/libmlx4/src/mlx4.c projects/building-blocks/contrib/ofed/libmlx4/src/mlx4.h projects/building-blocks/contrib/ofed/libmlx4/src/verbs.c projects/building-blocks/gnu/lib/libdialog/Makefile projects/building-blocks/gnu/lib/libgcc/Makefile projects/building-blocks/gnu/lib/libreadline/readline/Makefile projects/building-blocks/gnu/lib/libstdc++/Makefile projects/building-blocks/gnu/usr.bin/binutils/Makefile projects/building-blocks/gnu/usr.bin/dialog/Makefile projects/building-blocks/gnu/usr.bin/diff/Makefile projects/building-blocks/gnu/usr.bin/gdb/gdb/Makefile projects/building-blocks/gnu/usr.bin/gdb/gdbtui/Makefile projects/building-blocks/gnu/usr.bin/gdb/kgdb/Makefile projects/building-blocks/gnu/usr.bin/grep/Makefile projects/building-blocks/kerberos5/Makefile.inc projects/building-blocks/kerberos5/lib/libasn1/Makefile projects/building-blocks/kerberos5/lib/libgssapi_krb5/Makefile projects/building-blocks/kerberos5/lib/libgssapi_ntlm/Makefile projects/building-blocks/kerberos5/lib/libgssapi_spnego/Makefile projects/building-blocks/kerberos5/lib/libhdb/Makefile projects/building-blocks/kerberos5/lib/libheimbase/Makefile projects/building-blocks/kerberos5/lib/libheimipcc/Makefile projects/building-blocks/kerberos5/lib/libheimipcs/Makefile projects/building-blocks/kerberos5/lib/libheimntlm/Makefile projects/building-blocks/kerberos5/lib/libheimsqlite/Makefile projects/building-blocks/kerberos5/lib/libhx509/Makefile projects/building-blocks/kerberos5/lib/libkadm5clnt/Makefile projects/building-blocks/kerberos5/lib/libkadm5srv/Makefile projects/building-blocks/kerberos5/lib/libkafs5/Makefile projects/building-blocks/kerberos5/lib/libkdc/Makefile projects/building-blocks/kerberos5/lib/libkrb5/Makefile projects/building-blocks/kerberos5/lib/libroken/Makefile projects/building-blocks/kerberos5/lib/libwind/Makefile projects/building-blocks/kerberos5/libexec/digest-service/Makefile projects/building-blocks/kerberos5/libexec/hprop/Makefile projects/building-blocks/kerberos5/libexec/hpropd/Makefile projects/building-blocks/kerberos5/libexec/ipropd-master/Makefile projects/building-blocks/kerberos5/libexec/ipropd-slave/Makefile projects/building-blocks/kerberos5/libexec/kadmind/Makefile projects/building-blocks/kerberos5/libexec/kcm/Makefile projects/building-blocks/kerberos5/libexec/kdc/Makefile projects/building-blocks/kerberos5/libexec/kdigest/Makefile projects/building-blocks/kerberos5/libexec/kfd/Makefile projects/building-blocks/kerberos5/libexec/kimpersonate/Makefile projects/building-blocks/kerberos5/libexec/kpasswdd/Makefile projects/building-blocks/kerberos5/tools/asn1_compile/Makefile projects/building-blocks/kerberos5/tools/slc/Makefile projects/building-blocks/kerberos5/usr.bin/hxtool/Makefile projects/building-blocks/kerberos5/usr.bin/kadmin/Makefile projects/building-blocks/kerberos5/usr.bin/kcc/Makefile projects/building-blocks/kerberos5/usr.bin/kdestroy/Makefile projects/building-blocks/kerberos5/usr.bin/kf/Makefile projects/building-blocks/kerberos5/usr.bin/kgetcred/Makefile projects/building-blocks/kerberos5/usr.bin/kinit/Makefile projects/building-blocks/kerberos5/usr.bin/kpasswd/Makefile projects/building-blocks/kerberos5/usr.bin/ksu/Makefile projects/building-blocks/kerberos5/usr.bin/string2key/Makefile projects/building-blocks/kerberos5/usr.bin/verify_krb5_conf/Makefile projects/building-blocks/kerberos5/usr.sbin/iprop-log/Makefile projects/building-blocks/kerberos5/usr.sbin/kstash/Makefile projects/building-blocks/kerberos5/usr.sbin/ktutil/Makefile projects/building-blocks/lib/Makefile projects/building-blocks/lib/atf/libatf-c++/Makefile projects/building-blocks/lib/libarchive/Makefile projects/building-blocks/lib/libarchive/test/Makefile projects/building-blocks/lib/libbsnmp/libbsnmp/Makefile projects/building-blocks/lib/libc++/Makefile projects/building-blocks/lib/libc/Makefile projects/building-blocks/lib/libc/gen/errlst.c projects/building-blocks/lib/libc/gen/isnan.c projects/building-blocks/lib/libc/gen/syslog.c projects/building-blocks/lib/libc/gen/tls.c projects/building-blocks/lib/libc/include/errlst.h projects/building-blocks/lib/libc/net/base64.c projects/building-blocks/lib/libc/net/getifaddrs.3 projects/building-blocks/lib/libc/net/nsdispatch.c projects/building-blocks/lib/libc/sys/stack_protector.c projects/building-blocks/lib/libc/sys/stack_protector_compat.c projects/building-blocks/lib/libcam/Makefile projects/building-blocks/lib/libcapsicum/Makefile projects/building-blocks/lib/libcasper/Makefile projects/building-blocks/lib/libcrypt/tests/Makefile projects/building-blocks/lib/libcuse/Makefile projects/building-blocks/lib/libdevstat/Makefile projects/building-blocks/lib/libdpv/Makefile projects/building-blocks/lib/libdwarf/Makefile projects/building-blocks/lib/libedit/Makefile projects/building-blocks/lib/libexecinfo/Makefile projects/building-blocks/lib/libfetch/Makefile projects/building-blocks/lib/libgeom/Makefile projects/building-blocks/lib/libjail/jail.c projects/building-blocks/lib/libjail/jail_getid.c projects/building-blocks/lib/libkiconv/quirks.c projects/building-blocks/lib/libkiconv/xlat16_iconv.c projects/building-blocks/lib/libkiconv/xlat16_sysctl.c projects/building-blocks/lib/libldns/Makefile projects/building-blocks/lib/libmagic/Makefile projects/building-blocks/lib/libmd/rmd160c.c projects/building-blocks/lib/libmd/sha1c.c projects/building-blocks/lib/libmemstat/Makefile projects/building-blocks/lib/libmp/Makefile projects/building-blocks/lib/libmp/tests/Makefile projects/building-blocks/lib/libnv/tests/Makefile projects/building-blocks/lib/libopie/Makefile projects/building-blocks/lib/libpam/libpam/tests/Makefile projects/building-blocks/lib/libpam/modules/Makefile.inc projects/building-blocks/lib/libpam/modules/pam_krb5/Makefile projects/building-blocks/lib/libpam/modules/pam_ksu/Makefile projects/building-blocks/lib/libpam/modules/pam_nologin/Makefile projects/building-blocks/lib/libpam/modules/pam_opie/Makefile projects/building-blocks/lib/libpam/modules/pam_opieaccess/Makefile projects/building-blocks/lib/libpam/modules/pam_passwdqc/Makefile projects/building-blocks/lib/libpam/modules/pam_radius/Makefile projects/building-blocks/lib/libpam/modules/pam_ssh/Makefile projects/building-blocks/lib/libpam/modules/pam_tacplus/Makefile projects/building-blocks/lib/libpam/modules/pam_unix/Makefile projects/building-blocks/lib/libpjdlog/Makefile projects/building-blocks/lib/libproc/Makefile projects/building-blocks/lib/libprocstat/Makefile projects/building-blocks/lib/libradius/Makefile projects/building-blocks/lib/librpcsec_gss/Makefile projects/building-blocks/lib/librt/Makefile projects/building-blocks/lib/librt/tests/Makefile projects/building-blocks/lib/libsmb/Makefile projects/building-blocks/lib/libsqlite3/Makefile projects/building-blocks/lib/libstdthreads/Makefile projects/building-blocks/lib/libtacplus/Makefile projects/building-blocks/lib/libthr/thread/thr_exit.c projects/building-blocks/lib/libthr/thread/thr_private.h projects/building-blocks/lib/libucl/Makefile projects/building-blocks/lib/libulog/Makefile projects/building-blocks/lib/libunbound/Makefile projects/building-blocks/lib/libusb/Makefile projects/building-blocks/lib/libutil/tests/Makefile projects/building-blocks/lib/msun/src/s_isnan.c projects/building-blocks/lib/msun/tests/Makefile projects/building-blocks/lib/ncurses/form/Makefile projects/building-blocks/lib/ncurses/menu/Makefile projects/building-blocks/lib/ncurses/panel/Makefile projects/building-blocks/libexec/atf/atf-check/Makefile projects/building-blocks/libexec/atf/atf-sh/Makefile projects/building-blocks/libexec/atrun/Makefile projects/building-blocks/libexec/casper/dns/Makefile projects/building-blocks/libexec/casper/grp/Makefile projects/building-blocks/libexec/casper/pwd/Makefile projects/building-blocks/libexec/casper/random/Makefile projects/building-blocks/libexec/casper/sysctl/Makefile projects/building-blocks/libexec/dma/Makefile projects/building-blocks/libexec/fingerd/Makefile projects/building-blocks/libexec/ftpd/Makefile projects/building-blocks/libexec/getty/Makefile projects/building-blocks/libexec/mail.local/Makefile projects/building-blocks/libexec/pppoed/Makefile projects/building-blocks/libexec/rlogind/Makefile projects/building-blocks/libexec/rpc.rquotad/Makefile projects/building-blocks/libexec/rpc.rstatd/Makefile projects/building-blocks/libexec/rpc.rusersd/Makefile projects/building-blocks/libexec/rpc.rwalld/Makefile projects/building-blocks/libexec/rpc.sprayd/Makefile projects/building-blocks/libexec/rshd/Makefile projects/building-blocks/libexec/rtld-elf/Makefile projects/building-blocks/libexec/rtld-elf/rtld.c projects/building-blocks/libexec/smrsh/Makefile projects/building-blocks/libexec/tcpd/Makefile projects/building-blocks/libexec/telnetd/Makefile projects/building-blocks/libexec/tftpd/Makefile projects/building-blocks/libexec/ulog-helper/Makefile projects/building-blocks/libexec/ypxfr/Makefile projects/building-blocks/release/picobsd/tinyware/login/Makefile projects/building-blocks/release/picobsd/tinyware/oinit/Makefile projects/building-blocks/release/picobsd/tinyware/passwd/Makefile projects/building-blocks/sbin/atm/atmconfig/Makefile projects/building-blocks/sbin/badsect/Makefile projects/building-blocks/sbin/bsdlabel/Makefile projects/building-blocks/sbin/camcontrol/Makefile projects/building-blocks/sbin/casperd/Makefile projects/building-blocks/sbin/ccdconfig/Makefile projects/building-blocks/sbin/ddb/Makefile projects/building-blocks/sbin/devd/Makefile projects/building-blocks/sbin/dhclient/Makefile projects/building-blocks/sbin/dmesg/Makefile projects/building-blocks/sbin/dumpfs/Makefile projects/building-blocks/sbin/fdisk/Makefile projects/building-blocks/sbin/fdisk_pc98/Makefile projects/building-blocks/sbin/ffsinfo/Makefile projects/building-blocks/sbin/fsck_ffs/Makefile projects/building-blocks/sbin/fsck_ffs/dir.c projects/building-blocks/sbin/fsdb/Makefile projects/building-blocks/sbin/gbde/Makefile projects/building-blocks/sbin/geom/Makefile projects/building-blocks/sbin/geom/class/eli/Makefile projects/building-blocks/sbin/geom/class/journal/Makefile projects/building-blocks/sbin/geom/class/mirror/Makefile projects/building-blocks/sbin/geom/class/part/Makefile projects/building-blocks/sbin/geom/class/raid/Makefile projects/building-blocks/sbin/geom/class/raid3/Makefile projects/building-blocks/sbin/geom/core/Makefile projects/building-blocks/sbin/ggate/ggatec/Makefile projects/building-blocks/sbin/ggate/ggated/Makefile projects/building-blocks/sbin/ggate/ggatel/Makefile projects/building-blocks/sbin/growfs/Makefile projects/building-blocks/sbin/gvinum/Makefile projects/building-blocks/sbin/hastctl/Makefile projects/building-blocks/sbin/hastd/Makefile projects/building-blocks/sbin/ifconfig/Makefile projects/building-blocks/sbin/init/Makefile projects/building-blocks/sbin/ipf/Makefile.inc projects/building-blocks/sbin/ipf/ipf/Makefile projects/building-blocks/sbin/ipf/ipfstat/Makefile projects/building-blocks/sbin/ipf/ipsend/Makefile projects/building-blocks/sbin/ipfw/Makefile projects/building-blocks/sbin/iscontrol/Makefile projects/building-blocks/sbin/md5/Makefile projects/building-blocks/sbin/mdconfig/Makefile projects/building-blocks/sbin/mdconfig/tests/Makefile projects/building-blocks/sbin/mount/Makefile projects/building-blocks/sbin/mount_cd9660/Makefile projects/building-blocks/sbin/mount_msdosfs/Makefile projects/building-blocks/sbin/mount_udf/Makefile projects/building-blocks/sbin/nandfs/Makefile projects/building-blocks/sbin/natd/Makefile projects/building-blocks/sbin/newfs/Makefile projects/building-blocks/sbin/newfs_nandfs/Makefile projects/building-blocks/sbin/pfctl/Makefile projects/building-blocks/sbin/pflogd/Makefile projects/building-blocks/sbin/ping/Makefile projects/building-blocks/sbin/ping6/Makefile projects/building-blocks/sbin/quotacheck/Makefile projects/building-blocks/sbin/rcorder/Makefile projects/building-blocks/sbin/routed/Makefile projects/building-blocks/sbin/routed/rtquery/Makefile projects/building-blocks/sbin/savecore/Makefile projects/building-blocks/sbin/setkey/Makefile projects/building-blocks/sbin/sunlabel/Makefile projects/building-blocks/sbin/swapon/Makefile projects/building-blocks/sbin/tunefs/Makefile projects/building-blocks/secure/lib/libssh/Makefile projects/building-blocks/secure/lib/libssl/Makefile projects/building-blocks/secure/libexec/sftp-server/Makefile projects/building-blocks/secure/libexec/ssh-keysign/Makefile projects/building-blocks/secure/libexec/ssh-pkcs11-helper/Makefile projects/building-blocks/secure/usr.bin/bdes/Makefile projects/building-blocks/secure/usr.bin/openssl/Makefile projects/building-blocks/secure/usr.bin/scp/Makefile projects/building-blocks/secure/usr.bin/sftp/Makefile projects/building-blocks/secure/usr.bin/ssh-add/Makefile projects/building-blocks/secure/usr.bin/ssh-agent/Makefile projects/building-blocks/secure/usr.bin/ssh-keygen/Makefile projects/building-blocks/secure/usr.bin/ssh-keyscan/Makefile projects/building-blocks/secure/usr.bin/ssh/Makefile projects/building-blocks/secure/usr.sbin/sshd/Makefile projects/building-blocks/share/man/man5/src.conf.5 projects/building-blocks/share/man/man9/Makefile projects/building-blocks/share/man/man9/timeout.9 projects/building-blocks/share/misc/bsd-family-tree projects/building-blocks/share/mk/bsd.libnames.mk projects/building-blocks/share/mk/src.libnames.mk projects/building-blocks/sys/amd64/include/asm.h projects/building-blocks/sys/arm/altera/socfpga/files.socfpga projects/building-blocks/sys/arm/altera/socfpga/socfpga_machdep.c projects/building-blocks/sys/arm/arm/generic_timer.c projects/building-blocks/sys/arm/conf/SOCKIT-BERI projects/building-blocks/sys/arm/include/asm.h projects/building-blocks/sys/boot/fdt/dts/arm/socfpga-sockit-beri.dts projects/building-blocks/sys/boot/i386/boot2/boot2.c projects/building-blocks/sys/cam/ctl/ctl.c projects/building-blocks/sys/cam/ctl/ctl_backend_block.c projects/building-blocks/sys/cam/ctl/ctl_backend_ramdisk.c projects/building-blocks/sys/cam/ctl/ctl_frontend_iscsi.c projects/building-blocks/sys/cam/ctl/ctl_io.h projects/building-blocks/sys/cam/ctl/ctl_tpc.c projects/building-blocks/sys/cam/ctl/scsi_ctl.c projects/building-blocks/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/building-blocks/sys/compat/linux/linux_misc.c projects/building-blocks/sys/compat/svr4/svr4_misc.c projects/building-blocks/sys/conf/files projects/building-blocks/sys/conf/files.amd64 projects/building-blocks/sys/conf/files.i386 projects/building-blocks/sys/contrib/dev/ral/Makefile projects/building-blocks/sys/contrib/ipfilter/netinet/fil.c projects/building-blocks/sys/contrib/ipfilter/netinet/ip_frag.c projects/building-blocks/sys/dev/ahci/ahci_pci.c projects/building-blocks/sys/dev/ata/ata-pci.h projects/building-blocks/sys/dev/ata/chipsets/ata-intel.c projects/building-blocks/sys/dev/drm2/drm_drv.c projects/building-blocks/sys/dev/e1000/if_igb.c projects/building-blocks/sys/dev/hwpmc/hwpmc_mpc7xxx.c projects/building-blocks/sys/dev/hwpmc/hwpmc_ppc970.c projects/building-blocks/sys/dev/ichsmb/ichsmb_pci.c projects/building-blocks/sys/dev/ichwd/ichwd.c projects/building-blocks/sys/dev/ichwd/ichwd.h projects/building-blocks/sys/dev/isp/isp.c projects/building-blocks/sys/dev/isp/isp_freebsd.c projects/building-blocks/sys/dev/isp/isp_freebsd.h projects/building-blocks/sys/dev/isp/isp_library.c projects/building-blocks/sys/dev/ixgbe/ixgbe.c projects/building-blocks/sys/dev/sound/pci/hda/hdac.c projects/building-blocks/sys/dev/sound/pci/hda/hdac.h projects/building-blocks/sys/dev/uart/uart_bus_pci.c projects/building-blocks/sys/dev/usb/controller/ehci_pci.c projects/building-blocks/sys/dev/usb/controller/ohci_pci.c projects/building-blocks/sys/dev/usb/controller/xhci_pci.c projects/building-blocks/sys/dev/usb/quirk/usb_quirk.c projects/building-blocks/sys/dev/usb/usbdevs projects/building-blocks/sys/fs/procfs/procfs_status.c projects/building-blocks/sys/i386/i386/machdep.c projects/building-blocks/sys/i386/include/asm.h projects/building-blocks/sys/kern/init_main.c projects/building-blocks/sys/kern/kern_clock.c projects/building-blocks/sys/kern/kern_exit.c projects/building-blocks/sys/kern/kern_mutex.c projects/building-blocks/sys/kern/kern_proc.c projects/building-blocks/sys/kern/kern_racct.c projects/building-blocks/sys/kern/kern_resource.c projects/building-blocks/sys/kern/kern_sig.c projects/building-blocks/sys/kern/kern_thread.c projects/building-blocks/sys/kern/kern_time.c projects/building-blocks/sys/kern/subr_bus.c projects/building-blocks/sys/kern/subr_prof.c projects/building-blocks/sys/kern/sys_generic.c projects/building-blocks/sys/net/if_arcsubr.c projects/building-blocks/sys/net/if_ethersubr.c projects/building-blocks/sys/net/if_fddisubr.c projects/building-blocks/sys/net/if_fwsubr.c projects/building-blocks/sys/net/if_iso88025subr.c projects/building-blocks/sys/netinet/if_ether.c projects/building-blocks/sys/netinet/if_ether.h projects/building-blocks/sys/netinet/toecore.c projects/building-blocks/sys/netinet6/nd6.c projects/building-blocks/sys/netinet6/nd6.h projects/building-blocks/sys/netipsec/xform.h projects/building-blocks/sys/netipsec/xform_ipip.c projects/building-blocks/sys/ofed/drivers/infiniband/core/addr.c projects/building-blocks/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/building-blocks/sys/powerpc/include/asm.h projects/building-blocks/sys/powerpc/include/profile.h projects/building-blocks/sys/sparc64/include/asm.h projects/building-blocks/sys/sys/bus.h projects/building-blocks/sys/sys/callout.h projects/building-blocks/sys/sys/pmc.h projects/building-blocks/sys/sys/proc.h projects/building-blocks/sys/sys/resourcevar.h projects/building-blocks/tools/build/options/WITHOUT_CROSS_COMPILER projects/building-blocks/tools/build/options/WITHOUT_INCLUDES projects/building-blocks/tools/build/options/WITHOUT_RCS projects/building-blocks/tools/build/options/WITH_FMAKE projects/building-blocks/tools/tools/ath/athaggrstats/Makefile projects/building-blocks/tools/tools/ath/athstats/Makefile projects/building-blocks/tools/tools/mwl/mwlstats/Makefile projects/building-blocks/tools/tools/nanobsd/nanobsd.sh projects/building-blocks/tools/tools/net80211/wlanstats/Makefile projects/building-blocks/tools/tools/npe/npestats/Makefile projects/building-blocks/usr.bin/apply/Makefile projects/building-blocks/usr.bin/ar/Makefile projects/building-blocks/usr.bin/atm/sscop/Makefile projects/building-blocks/usr.bin/awk/Makefile projects/building-blocks/usr.bin/bc/Makefile projects/building-blocks/usr.bin/bluetooth/bthost/Makefile projects/building-blocks/usr.bin/bluetooth/btsockstat/Makefile projects/building-blocks/usr.bin/bluetooth/rfcomm_sppd/Makefile projects/building-blocks/usr.bin/bsdiff/bsdiff/Makefile projects/building-blocks/usr.bin/bsdiff/bspatch/Makefile projects/building-blocks/usr.bin/bzip2/Makefile projects/building-blocks/usr.bin/calendar/Makefile projects/building-blocks/usr.bin/chkey/Makefile projects/building-blocks/usr.bin/chpass/Makefile projects/building-blocks/usr.bin/colldef/Makefile projects/building-blocks/usr.bin/compile_et/Makefile projects/building-blocks/usr.bin/cpio/Makefile projects/building-blocks/usr.bin/cpio/test/Makefile projects/building-blocks/usr.bin/dc/Makefile projects/building-blocks/usr.bin/dc/stack.c projects/building-blocks/usr.bin/demandoc/Makefile projects/building-blocks/usr.bin/dpv/Makefile projects/building-blocks/usr.bin/drill/Makefile projects/building-blocks/usr.bin/du/Makefile projects/building-blocks/usr.bin/ee/Makefile projects/building-blocks/usr.bin/enigma/Makefile projects/building-blocks/usr.bin/fetch/Makefile projects/building-blocks/usr.bin/file/Makefile projects/building-blocks/usr.bin/fstat/Makefile projects/building-blocks/usr.bin/ftp/Makefile projects/building-blocks/usr.bin/gcore/Makefile projects/building-blocks/usr.bin/grep/Makefile projects/building-blocks/usr.bin/gzip/Makefile projects/building-blocks/usr.bin/host/Makefile projects/building-blocks/usr.bin/ipcrm/Makefile projects/building-blocks/usr.bin/ipcs/Makefile projects/building-blocks/usr.bin/iscsictl/Makefile projects/building-blocks/usr.bin/kdump/Makefile projects/building-blocks/usr.bin/keylogin/Makefile projects/building-blocks/usr.bin/killall/Makefile projects/building-blocks/usr.bin/ktrdump/Makefile projects/building-blocks/usr.bin/less/Makefile projects/building-blocks/usr.bin/limits/Makefile projects/building-blocks/usr.bin/lock/Makefile projects/building-blocks/usr.bin/login/Makefile projects/building-blocks/usr.bin/lzmainfo/Makefile projects/building-blocks/usr.bin/m4/Makefile projects/building-blocks/usr.bin/makewhatis/Makefile projects/building-blocks/usr.bin/mandoc/Makefile projects/building-blocks/usr.bin/minigzip/Makefile projects/building-blocks/usr.bin/ministat/Makefile projects/building-blocks/usr.bin/mkimg/Makefile projects/building-blocks/usr.bin/mkulzma/Makefile projects/building-blocks/usr.bin/mkuzip/Makefile projects/building-blocks/usr.bin/msgs/Makefile projects/building-blocks/usr.bin/nc/Makefile projects/building-blocks/usr.bin/ncal/Makefile projects/building-blocks/usr.bin/netstat/Makefile projects/building-blocks/usr.bin/newgrp/Makefile projects/building-blocks/usr.bin/newkey/Makefile projects/building-blocks/usr.bin/nfsstat/Makefile projects/building-blocks/usr.bin/opieinfo/Makefile projects/building-blocks/usr.bin/opiekey/Makefile projects/building-blocks/usr.bin/opiepasswd/Makefile projects/building-blocks/usr.bin/pamtest/Makefile projects/building-blocks/usr.bin/passwd/Makefile projects/building-blocks/usr.bin/procstat/Makefile projects/building-blocks/usr.bin/quota/Makefile projects/building-blocks/usr.bin/rctl/Makefile projects/building-blocks/usr.bin/rup/Makefile projects/building-blocks/usr.bin/rusers/Makefile projects/building-blocks/usr.bin/script/Makefile projects/building-blocks/usr.bin/seq/Makefile projects/building-blocks/usr.bin/smbutil/Makefile projects/building-blocks/usr.bin/sort/Makefile projects/building-blocks/usr.bin/split/Makefile projects/building-blocks/usr.bin/su/Makefile projects/building-blocks/usr.bin/svn/svn/Makefile projects/building-blocks/usr.bin/svn/svnadmin/Makefile projects/building-blocks/usr.bin/svn/svndumpfilter/Makefile projects/building-blocks/usr.bin/svn/svnlook/Makefile projects/building-blocks/usr.bin/svn/svnmucc/Makefile projects/building-blocks/usr.bin/svn/svnrdump/Makefile projects/building-blocks/usr.bin/svn/svnserve/Makefile projects/building-blocks/usr.bin/svn/svnsync/Makefile projects/building-blocks/usr.bin/svn/svnversion/Makefile projects/building-blocks/usr.bin/systat/Makefile projects/building-blocks/usr.bin/tabs/Makefile projects/building-blocks/usr.bin/talk/Makefile projects/building-blocks/usr.bin/tar/Makefile projects/building-blocks/usr.bin/telnet/Makefile projects/building-blocks/usr.bin/tftp/Makefile projects/building-blocks/usr.bin/top/Makefile projects/building-blocks/usr.bin/tput/Makefile projects/building-blocks/usr.bin/truncate/Makefile projects/building-blocks/usr.bin/tset/Makefile projects/building-blocks/usr.bin/ul/Makefile projects/building-blocks/usr.bin/units/Makefile projects/building-blocks/usr.bin/unzip/Makefile projects/building-blocks/usr.bin/usbhidaction/Makefile projects/building-blocks/usr.bin/usbhidctl/Makefile projects/building-blocks/usr.bin/vacation/Makefile projects/building-blocks/usr.bin/vi/Makefile projects/building-blocks/usr.bin/vmstat/Makefile projects/building-blocks/usr.bin/w/Makefile projects/building-blocks/usr.bin/wc/Makefile projects/building-blocks/usr.bin/xinstall/Makefile projects/building-blocks/usr.bin/xlint/lint1/Makefile projects/building-blocks/usr.bin/xo/Makefile projects/building-blocks/usr.bin/xz/Makefile projects/building-blocks/usr.bin/xzdec/Makefile projects/building-blocks/usr.sbin/acpi/acpidb/Makefile projects/building-blocks/usr.sbin/amd/Makefile.inc projects/building-blocks/usr.sbin/amd/amd/Makefile projects/building-blocks/usr.sbin/amd/amq/Makefile projects/building-blocks/usr.sbin/amd/fixmount/Makefile projects/building-blocks/usr.sbin/amd/fsinfo/Makefile projects/building-blocks/usr.sbin/amd/hlfsd/Makefile projects/building-blocks/usr.sbin/amd/mk-amd-map/Makefile projects/building-blocks/usr.sbin/amd/pawd/Makefile projects/building-blocks/usr.sbin/amd/wire-test/Makefile projects/building-blocks/usr.sbin/ancontrol/Makefile projects/building-blocks/usr.sbin/apmd/Makefile projects/building-blocks/usr.sbin/asf/Makefile projects/building-blocks/usr.sbin/audit/Makefile projects/building-blocks/usr.sbin/auditd/Makefile projects/building-blocks/usr.sbin/auditdistd/Makefile projects/building-blocks/usr.sbin/auditreduce/Makefile projects/building-blocks/usr.sbin/authpf/Makefile projects/building-blocks/usr.sbin/autofs/Makefile projects/building-blocks/usr.sbin/bhyve/Makefile projects/building-blocks/usr.sbin/bhyvectl/Makefile projects/building-blocks/usr.sbin/bhyveload/Makefile projects/building-blocks/usr.sbin/bluetooth/ath3kfw/Makefile projects/building-blocks/usr.sbin/bluetooth/bt3cfw/Makefile projects/building-blocks/usr.sbin/bluetooth/bthidcontrol/Makefile projects/building-blocks/usr.sbin/bluetooth/bthidd/Makefile projects/building-blocks/usr.sbin/bluetooth/btpand/Makefile projects/building-blocks/usr.sbin/bluetooth/hccontrol/Makefile projects/building-blocks/usr.sbin/bluetooth/hcsecd/Makefile projects/building-blocks/usr.sbin/bluetooth/hcseriald/Makefile projects/building-blocks/usr.sbin/bluetooth/l2control/Makefile projects/building-blocks/usr.sbin/bluetooth/l2ping/Makefile projects/building-blocks/usr.sbin/bluetooth/rfcomm_pppd/Makefile projects/building-blocks/usr.sbin/bluetooth/sdpcontrol/Makefile projects/building-blocks/usr.sbin/boot0cfg/Makefile projects/building-blocks/usr.sbin/boot98cfg/Makefile projects/building-blocks/usr.sbin/bsdinstall/distextract/Makefile projects/building-blocks/usr.sbin/bsdinstall/distfetch/Makefile projects/building-blocks/usr.sbin/bsdinstall/partedit/Makefile projects/building-blocks/usr.sbin/bsnmpd/bsnmpd/Makefile projects/building-blocks/usr.sbin/bsnmpd/modules/snmp_hast/Makefile projects/building-blocks/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile projects/building-blocks/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile projects/building-blocks/usr.sbin/bsnmpd/tools/bsnmptools/Makefile projects/building-blocks/usr.sbin/cdcontrol/Makefile projects/building-blocks/usr.sbin/ckdist/Makefile projects/building-blocks/usr.sbin/clear_locks/Makefile projects/building-blocks/usr.sbin/config/Makefile projects/building-blocks/usr.sbin/cron/cron/Makefile projects/building-blocks/usr.sbin/cron/crontab/Makefile projects/building-blocks/usr.sbin/ctladm/Makefile projects/building-blocks/usr.sbin/ctld/Makefile projects/building-blocks/usr.sbin/ctm/ctm/Makefile projects/building-blocks/usr.sbin/ctm/mkCTM/Makefile projects/building-blocks/usr.sbin/daemon/Makefile projects/building-blocks/usr.sbin/dconschat/Makefile projects/building-blocks/usr.sbin/devinfo/Makefile projects/building-blocks/usr.sbin/diskinfo/Makefile projects/building-blocks/usr.sbin/editmap/Makefile projects/building-blocks/usr.sbin/edquota/Makefile projects/building-blocks/usr.sbin/fifolog/fifolog_create/Makefile projects/building-blocks/usr.sbin/fifolog/fifolog_reader/Makefile projects/building-blocks/usr.sbin/fifolog/fifolog_writer/Makefile projects/building-blocks/usr.sbin/flowctl/Makefile projects/building-blocks/usr.sbin/ftp-proxy/Makefile projects/building-blocks/usr.sbin/gssd/Makefile projects/building-blocks/usr.sbin/gstat/Makefile projects/building-blocks/usr.sbin/ifmcstat/Makefile projects/building-blocks/usr.sbin/inetd/Makefile projects/building-blocks/usr.sbin/iostat/Makefile projects/building-blocks/usr.sbin/ipfwpcap/Makefile projects/building-blocks/usr.sbin/iscsid/Makefile projects/building-blocks/usr.sbin/jail/Makefile projects/building-blocks/usr.sbin/jail/command.c projects/building-blocks/usr.sbin/jail/jail.c projects/building-blocks/usr.sbin/jail/state.c projects/building-blocks/usr.sbin/jexec/Makefile projects/building-blocks/usr.sbin/jls/Makefile projects/building-blocks/usr.sbin/kbdcontrol/Makefile projects/building-blocks/usr.sbin/keyserv/Makefile projects/building-blocks/usr.sbin/kgmon/Makefile projects/building-blocks/usr.sbin/lmcconfig/Makefile projects/building-blocks/usr.sbin/lpr/Makefile.inc projects/building-blocks/usr.sbin/lpr/chkprintcap/Makefile projects/building-blocks/usr.sbin/lpr/lpc/Makefile projects/building-blocks/usr.sbin/lpr/lpd/Makefile projects/building-blocks/usr.sbin/lpr/lpq/Makefile projects/building-blocks/usr.sbin/lpr/lpr/Makefile projects/building-blocks/usr.sbin/lpr/lprm/Makefile projects/building-blocks/usr.sbin/lpr/pac/Makefile projects/building-blocks/usr.sbin/mailstats/Makefile projects/building-blocks/usr.sbin/mailwrapper/Makefile projects/building-blocks/usr.sbin/makefs/Makefile projects/building-blocks/usr.sbin/makemap/Makefile projects/building-blocks/usr.sbin/mfiutil/Makefile projects/building-blocks/usr.sbin/mount_smbfs/Makefile projects/building-blocks/usr.sbin/mountd/Makefile projects/building-blocks/usr.sbin/moused/Makefile projects/building-blocks/usr.sbin/mptutil/Makefile projects/building-blocks/usr.sbin/mtree/Makefile projects/building-blocks/usr.sbin/nandtool/Makefile projects/building-blocks/usr.sbin/ndiscvt/Makefile projects/building-blocks/usr.sbin/ngctl/Makefile projects/building-blocks/usr.sbin/nghook/Makefile projects/building-blocks/usr.sbin/nmtree/Makefile projects/building-blocks/usr.sbin/nscd/Makefile projects/building-blocks/usr.sbin/ntp/Makefile.inc projects/building-blocks/usr.sbin/ntp/ntp-keygen/Makefile projects/building-blocks/usr.sbin/ntp/ntpd/Makefile projects/building-blocks/usr.sbin/ntp/ntpdate/Makefile projects/building-blocks/usr.sbin/ntp/ntpdc/Makefile projects/building-blocks/usr.sbin/ntp/ntpq/Makefile projects/building-blocks/usr.sbin/ntp/ntptime/Makefile projects/building-blocks/usr.sbin/ntp/sntp/Makefile projects/building-blocks/usr.sbin/pkg/Makefile projects/building-blocks/usr.sbin/pmccontrol/Makefile projects/building-blocks/usr.sbin/pmcstat/Makefile projects/building-blocks/usr.sbin/powerd/Makefile projects/building-blocks/usr.sbin/ppp/Makefile projects/building-blocks/usr.sbin/pppctl/Makefile projects/building-blocks/usr.sbin/praliases/Makefile projects/building-blocks/usr.sbin/praudit/Makefile projects/building-blocks/usr.sbin/pstat/Makefile projects/building-blocks/usr.sbin/pw/Makefile projects/building-blocks/usr.sbin/quotaon/Makefile projects/building-blocks/usr.sbin/rarpd/Makefile projects/building-blocks/usr.sbin/repquota/Makefile projects/building-blocks/usr.sbin/rpc.lockd/Makefile projects/building-blocks/usr.sbin/rpc.statd/Makefile projects/building-blocks/usr.sbin/rpc.yppasswdd/Makefile projects/building-blocks/usr.sbin/rpc.ypupdated/Makefile projects/building-blocks/usr.sbin/rpc.ypxfrd/Makefile projects/building-blocks/usr.sbin/rpcbind/Makefile projects/building-blocks/usr.sbin/rrenumd/Makefile projects/building-blocks/usr.sbin/rtadvd/Makefile projects/building-blocks/usr.sbin/rtsold/Makefile projects/building-blocks/usr.sbin/sendmail/Makefile projects/building-blocks/usr.sbin/services_mkdb/Makefile projects/building-blocks/usr.sbin/snapinfo/Makefile projects/building-blocks/usr.sbin/spray/Makefile projects/building-blocks/usr.sbin/syslogd/Makefile projects/building-blocks/usr.sbin/tcpdchk/Makefile projects/building-blocks/usr.sbin/tcpdmatch/Makefile projects/building-blocks/usr.sbin/tcpdump/tcpdump/Makefile projects/building-blocks/usr.sbin/timed/timed/Makefile projects/building-blocks/usr.sbin/traceroute/Makefile projects/building-blocks/usr.sbin/traceroute6/Makefile projects/building-blocks/usr.sbin/tzsetup/Makefile projects/building-blocks/usr.sbin/ugidfw/Makefile projects/building-blocks/usr.sbin/uhsoctl/Makefile projects/building-blocks/usr.sbin/unbound/anchor/Makefile projects/building-blocks/usr.sbin/unbound/checkconf/Makefile projects/building-blocks/usr.sbin/unbound/control/Makefile projects/building-blocks/usr.sbin/unbound/daemon/Makefile projects/building-blocks/usr.sbin/usbconfig/Makefile projects/building-blocks/usr.sbin/vipw/Makefile projects/building-blocks/usr.sbin/watch/Makefile projects/building-blocks/usr.sbin/watchdogd/Makefile projects/building-blocks/usr.sbin/wpa/Makefile.crypto projects/building-blocks/usr.sbin/wpa/hostapd/Makefile projects/building-blocks/usr.sbin/wpa/hostapd_cli/Makefile projects/building-blocks/usr.sbin/wpa/wpa_cli/Makefile projects/building-blocks/usr.sbin/wpa/wpa_passphrase/Makefile projects/building-blocks/usr.sbin/wpa/wpa_priv/Makefile projects/building-blocks/usr.sbin/wpa/wpa_supplicant/Makefile projects/building-blocks/usr.sbin/ypserv/Makefile Directory Properties: projects/building-blocks/ (props changed) projects/building-blocks/cddl/ (props changed) projects/building-blocks/cddl/contrib/opensolaris/ (props changed) projects/building-blocks/contrib/libucl/ (props changed) projects/building-blocks/contrib/mdocml/ (props changed) projects/building-blocks/gnu/lib/ (props changed) projects/building-blocks/gnu/usr.bin/binutils/ (props changed) projects/building-blocks/gnu/usr.bin/gdb/ (props changed) projects/building-blocks/lib/libc/ (props changed) projects/building-blocks/lib/libutil/ (props changed) projects/building-blocks/sbin/ (props changed) projects/building-blocks/sbin/ipfw/ (props changed) projects/building-blocks/share/ (props changed) projects/building-blocks/sys/ (props changed) projects/building-blocks/sys/boot/ (props changed) projects/building-blocks/sys/cddl/contrib/opensolaris/ (props changed) projects/building-blocks/sys/conf/ (props changed) projects/building-blocks/sys/contrib/ipfilter/ (props changed) projects/building-blocks/usr.bin/calendar/ (props changed) projects/building-blocks/usr.bin/mkimg/ (props changed) projects/building-blocks/usr.bin/procstat/ (props changed) projects/building-blocks/usr.sbin/bhyve/ (props changed) projects/building-blocks/usr.sbin/bhyvectl/ (props changed) projects/building-blocks/usr.sbin/bhyveload/ (props changed) projects/building-blocks/usr.sbin/jail/ (props changed) projects/building-blocks/usr.sbin/ndiscvt/ (props changed) projects/building-blocks/usr.sbin/rtadvd/ (props changed) projects/building-blocks/usr.sbin/rtsold/ (props changed) Modified: projects/building-blocks/MAINTAINERS ============================================================================== --- projects/building-blocks/MAINTAINERS Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/MAINTAINERS Sat Nov 29 05:28:40 2014 (r275233) @@ -48,7 +48,6 @@ cd(4) ken Pre-commit review requested. pass(4) ken Pre-commit review requested. ch(4) ken Pre-commit review requested. em(4) jfv Pre-commit review requested. -tdfx(4) cokane Just keep me informed of changes, try not to break it. sendmail gshapiro Pre-commit review requested. etc/mail gshapiro Pre-commit review requested. Keep in sync with -STABLE. @@ -118,7 +117,6 @@ lib/libc/stdtime edwin Heads-up apprec is maintained by a third party source. sbin/routed bms Pre-commit review; notify vendor at rhyolite.com isci(4) jimharris Pre-commit review requested. -3dfx cokane Pre-commit review preferred. cmx daniel@roe.ch Pre-commit review preferred. filemon obrien Pre-commit review preferred. sysdoc trhodes Pre-commit review preferred. Modified: projects/building-blocks/ObsoleteFiles.inc ============================================================================== --- projects/building-blocks/ObsoleteFiles.inc Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/ObsoleteFiles.inc Sat Nov 29 05:28:40 2014 (r275233) @@ -38,6 +38,12 @@ # xargs -n1 | sort | uniq -d; # done +# 20141126: convert sbin/mdconfig/tests to ATF format tests +OLD_FILES+=usr/tests/sbin/mdconfig/legacy_test +OLD_FILES+=usr/tests/sbin/mdconfig/mdconfig.test +OLD_FILES+=usr/tests/sbin/mdconfig/run.pl +# 20141126: remove xform_ipip decapsulation fallback +OLD_FILES+=usr/include/netipsec/ipip_var.h # 20141109: faith/faithd removal OLD_FILES+=etc/rc.d/faith OLD_FILES+=usr/share/man/man4/faith.4.gz @@ -134,10 +140,12 @@ OLD_FILES+=usr/include/readline/chardefs OLD_FILES+=usr/include/readline/history.h OLD_FILES+=usr/include/readline/keymaps.h OLD_FILES+=usr/include/readline/readline.h +OLD_FILES+=usr/include/readline/tilde.h OLD_FILES+=usr/include/readline/rlconf.h OLD_FILES+=usr/include/readline/rlstdc.h OLD_FILES+=usr/include/readline/rltypedefs.h OLD_FILES+=usr/include/readline/rltypedefs.h +OLD_DIRS+=usr/include/readline OLD_FILES+=usr/share/info/readline.info.gz OLD_FILES+=usr/share/man/man3/readline.3.gz # 20140625: csup removal Modified: projects/building-blocks/bin/csh/Makefile ============================================================================== --- projects/building-blocks/bin/csh/Makefile Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/bin/csh/Makefile Sat Nov 29 05:28:40 2014 (r275233) @@ -40,8 +40,7 @@ MLINKS= csh.1 tcsh.1 # utilities of the same name are handled with the associated manpage, # builtin.1 in share/man/man1/. -DPADD= ${LIBTERMCAPW} ${LIBCRYPT} -LDADD= -ltermcapw -lcrypt +LIBADD= termcapw crypt LINKS= ${BINDIR}/csh ${BINDIR}/tcsh Modified: projects/building-blocks/bin/df/Makefile ============================================================================== --- projects/building-blocks/bin/df/Makefile Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/bin/df/Makefile Sat Nov 29 05:28:40 2014 (r275233) @@ -9,7 +9,6 @@ SRCS= df.c vfslist.c CFLAGS+= -I${MOUNT} -DPADD= ${LIBUTIL} ${LIBXO} -LDADD= -lutil -lxo +LIBADD= xo util .include Modified: projects/building-blocks/bin/ed/Makefile ============================================================================== --- projects/building-blocks/bin/ed/Makefile Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/bin/ed/Makefile Sat Nov 29 05:28:40 2014 (r275233) @@ -9,8 +9,7 @@ MLINKS= ed.1 red.1 .if ${MK_OPENSSL} != "no" && ${MK_ED_CRYPTO} != "no" CFLAGS+=-DDES -DPADD= ${LIBCRYPTO} -LDADD= -lcrypto +LIBADD= crypto .endif .include Modified: projects/building-blocks/bin/ls/Makefile ============================================================================== --- projects/building-blocks/bin/ls/Makefile Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/bin/ls/Makefile Sat Nov 29 05:28:40 2014 (r275233) @@ -5,14 +5,12 @@ PROG= ls SRCS= cmp.c ls.c print.c util.c -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .if !defined(RELEASE_CRUNCH) && \ ${MK_LS_COLORS} != no CFLAGS+= -DCOLORLS -DPADD+= ${LIBTERMCAPW} -LDADD+= -ltermcapw +LIBADD+= termcapw .endif .include Modified: projects/building-blocks/bin/pkill/Makefile ============================================================================== --- projects/building-blocks/bin/pkill/Makefile Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/bin/pkill/Makefile Sat Nov 29 05:28:40 2014 (r275233) @@ -5,8 +5,7 @@ PROG= pkill -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm LINKS= ${BINDIR}/pkill ${BINDIR}/pgrep MLINKS= pkill.1 pgrep.1 Modified: projects/building-blocks/bin/ps/Makefile ============================================================================== --- projects/building-blocks/bin/ps/Makefile Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/bin/ps/Makefile Sat Nov 29 05:28:40 2014 (r275233) @@ -11,7 +11,6 @@ SRCS= fmt.c keyword.c nlist.c print.c ps # on large systems. # CFLAGS+=-DLAZY_PS -DPADD= ${LIBM} ${LIBKVM} ${LIBJAIL} -LDADD= -lm -lkvm -ljail +LIBADD= m kvm jail .include Modified: projects/building-blocks/bin/rmail/Makefile ============================================================================== --- projects/building-blocks/bin/rmail/Makefile Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/bin/rmail/Makefile Sat Nov 29 05:28:40 2014 (r275233) @@ -14,11 +14,7 @@ MAN= rmail.8 WARNS?= 2 CFLAGS+=-I${SENDMAIL_DIR}/include -I. -LIBSMDIR= ${.OBJDIR}/../../lib/libsm -LIBSM= ${LIBSMDIR}/libsm.a - -DPADD= ${LIBSM} -LDADD= ${LIBSM} +LIBADD= sm SRCS+= sm_os.h CLEANFILES+=sm_os.h Modified: projects/building-blocks/bin/sh/Makefile ============================================================================== --- projects/building-blocks/bin/sh/Makefile Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/bin/sh/Makefile Sat Nov 29 05:28:40 2014 (r275233) @@ -18,8 +18,7 @@ SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS} # utilities of the same name are handled with the associated manpage, # builtin.1 in share/man/man1/. -DPADD= ${LIBEDIT} ${LIBTERMCAPW} -LDADD= -ledit -ltermcapw +LIBADD= edit CFLAGS+=-DSHELL -I. -I${.CURDIR} # for debug: Modified: projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c ============================================================================== --- projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c Sat Nov 29 05:28:40 2014 (r275233) @@ -1211,13 +1211,13 @@ dt_module_update(dtrace_hdl_t *dtp, stru #if defined(__FreeBSD__) if (sh.sh_size == 0) continue; - if (is_elf_obj && (sh.sh_type == SHT_PROGBITS || - sh.sh_type == SHT_NOBITS)) { + if (sh.sh_type == SHT_PROGBITS || sh.sh_type == SHT_NOBITS) { alignmask = sh.sh_addralign - 1; mapbase += alignmask; mapbase &= ~alignmask; sh.sh_addr = mapbase; - dmp->dm_sec_offsets[elf_ndxscn(sp)] = sh.sh_addr; + if (is_elf_obj) + dmp->dm_sec_offsets[elf_ndxscn(sp)] = sh.sh_addr; mapbase += sh.sh_size; } #endif Modified: projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c ============================================================================== --- projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c Sat Nov 29 05:28:40 2014 (r275233) @@ -545,8 +545,9 @@ dt_probe_define(dt_provider_t *pvp, dt_p for (pip = prp->pr_inst; pip != NULL; pip = pip->pi_next) { if (strcmp(pip->pi_fname, fname) == 0 && - ((rname == NULL && pip->pi_rname[0] == '\0') || - (rname != NULL && strcmp(pip->pi_rname, rname)) == 0)) + ((rname == NULL && pip->pi_rname == NULL) || + (rname != NULL && pip->pi_rname != NULL && + strcmp(pip->pi_rname, rname) == 0))) break; } Copied: projects/building-blocks/contrib/libucl/COPYING (from r275232, head/contrib/libucl/COPYING) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/contrib/libucl/COPYING Sat Nov 29 05:28:40 2014 (r275233, copy of r275232, head/contrib/libucl/COPYING) @@ -0,0 +1,23 @@ +Copyright (c) 2013-2014, Vsevolod Stakhov +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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. Modified: projects/building-blocks/contrib/libucl/ChangeLog.md ============================================================================== --- projects/building-blocks/contrib/libucl/ChangeLog.md Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/contrib/libucl/ChangeLog.md Sat Nov 29 05:28:40 2014 (r275233) @@ -4,3 +4,19 @@ - Streamline emitter has been added, so it is now possible to output partial `ucl` objects - Emitter now is more flexible due to emitter_context structure + +### 0.5.1 +- Fixed number of bugs and memory leaks + +### 0.5.2 + +- Allow userdata objects to be emitted and destructed +- Use userdata objects to store lua function references + +### Libucl 0.6 + +- Reworked macro interface + +### Libucl 0.6.1 + +- Various utilities fixes Modified: projects/building-blocks/contrib/libucl/Makefile.am ============================================================================== --- projects/building-blocks/contrib/libucl/Makefile.am Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/contrib/libucl/Makefile.am Sat Nov 29 05:28:40 2014 (r275233) @@ -4,4 +4,8 @@ EXTRA_DIST = uthash README.md pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libucl.pc -SUBDIRS = src tests utils doc +if LUA_SUB + LUA_SUBDIR = lua +endif + +SUBDIRS = src tests utils doc $(LUA_SUBDIR) \ No newline at end of file Modified: projects/building-blocks/contrib/libucl/Makefile.w32 ============================================================================== --- projects/building-blocks/contrib/libucl/Makefile.w32 Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/contrib/libucl/Makefile.w32 Sat Nov 29 05:28:40 2014 (r275233) @@ -33,6 +33,7 @@ OBJECTS = $(OBJDIR)/ucl_hash.o \ $(OBJDIR)/ucl_util.o \ $(OBJDIR)/ucl_parser.o \ $(OBJDIR)/ucl_emitter.o \ + $(OBJDIR)/ucl_emitter_utils.o \ $(OBJDIR)/ucl_schema.o \ $(OBJDIR)/xxhash.o @@ -51,6 +52,8 @@ $(OBJDIR)/ucl_parser.o: $(SRCDIR)/ucl_pa $(CC) -o $(OBJDIR)/ucl_parser.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_parser.c $(OBJDIR)/ucl_emitter.o: $(SRCDIR)/ucl_emitter.c $(HDEPS) $(CC) -o $(OBJDIR)/ucl_emitter.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_emitter.c +$(OBJDIR)/ucl_emitter_utils.o: $(SRCDIR)/ucl_emitter_utils.c $(HDEPS) + $(CC) -o $(OBJDIR)/ucl_emitter_utils.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_emitter_utils.c $(OBJDIR)/ucl_hash.o: $(SRCDIR)/ucl_hash.c $(HDEPS) $(CC) -o $(OBJDIR)/ucl_hash.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_hash.c $(OBJDIR)/ucl_schema.o: $(SRCDIR)/ucl_schema.c $(HDEPS) @@ -61,7 +64,7 @@ $(OBJDIR)/xxhash.o: $(SRCDIR)/xxhash.c $ clean: $(RM) $(OBJDIR)/*.o $(OBJDIR)/$(SONAME) $(OBJDIR)/$(SONAME) $(OBJDIR)/chargen $(OBJDIR)/test_basic $(OBJDIR)/test_speed $(OBJDIR)/objdump $(OBJDIR)/test_generate $(RMDIR) $(OBJDIR) - + # Utils chargen: utils/chargen.c $(OBJDIR)/$(SONAME) @@ -75,7 +78,7 @@ test: $(OBJDIR) $(OBJDIR)/$(SONAME) $(OB run-test: test TEST_DIR=$(TESTDIR) $(TESTDIR)/run_tests.sh $(OBJDIR)/test_basic $(OBJDIR)/test_speed $(OBJDIR)/test_generate - + $(OBJDIR)/test_basic: $(TESTDIR)/test_basic.c $(OBJDIR)/$(SONAME) $(CC) -o $(OBJDIR)/test_basic $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) $(LDFLAGS) $(TESTDIR)/test_basic.c $(LD_UCL_FLAGS) $(OBJDIR)/test_speed: $(TESTDIR)/test_speed.c $(OBJDIR)/$(SONAME) Modified: projects/building-blocks/contrib/libucl/README.md ============================================================================== --- projects/building-blocks/contrib/libucl/README.md Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/contrib/libucl/README.md Sat Nov 29 05:28:40 2014 (r275233) @@ -223,15 +223,57 @@ UCL supports external macros both multil .... }; ``` -There are two internal macros provided by UCL: -* `include` - read a file `/path/to/file` or an url `http://example.com/file` and include it to the current place of -UCL configuration; -* `try\_include` - try to read a file or url and include it but do not create a fatal error if a file or url is not accessible; -* `includes` - read a file or an url like the previous macro, but fetch and check the signature file (which is obtained -by `.sig` suffix appending). - -Public keys which are used for the last command are specified by the concrete UCL user. +Moreover, each macro can accept an optional list of arguments in braces. These +arguments themselves are the UCL object that is parsed and passed to a macro as +options: + +```nginx +.macro(param=value) "something"; +.macro(param={key=value}) "something"; +.macro(.include "params.conf") "something"; +.macro(#this is multiline macro +param = [value1, value2]) "something"; +.macro(key="()") "something"; +``` + +UCL also provide a convenient `include` macro to load content from another files +to the current UCL object. This macro accepts either path to file: + +```nginx +.include "/full/path.conf" +.include "./relative/path.conf" +.include "${CURDIR}/path.conf" +``` + +or URL (if ucl is built with url support provided by either `libcurl` or `libfetch`): + + .include "http://example.com/file.conf" + +`.include` macro supports a set of options: + +* `try` (default: **false**) - if this option is `true` than UCL treats errors on loading of +this file as non-fatal. For example, such a file can be absent but it won't stop the parsing +of the top-level document. +* `sign` (default: **false**) - if this option is `true` UCL loads and checks the signature for +a file from path named `.sig`. Trusted public keys should be provided for UCL API after +parser is created but before any configurations are parsed. +* `glob` (default: **false**) - if this option is `true` UCL treats the filename as GLOB pattern and load +all files that matches the specified pattern (normally the format of patterns is defined in `glob` manual page +for your operating system). This option is meaningless for URL includes. +* `url` (default: **true**) - allow URL includes. +* `priority` (default: 0) - specify priority for the include (see below). + +Priorities are used by UCL parser to manage the policy of objects rewriting during including other files +as following: + +* If we have two objects with the same priority then we form an implicit array +* If a new object has bigger priority then we overwrite an old one +* If a new object has lower priority then we ignore it + +By default, the priority of top-level object is set to zero (lowest priority). Currently, +you can define up to 16 priorities (from 0 to 15). Includes with bigger priorities will +rewrite keys from the objects with lower priorities as specified by the policy. ### Variables support @@ -317,7 +359,7 @@ ucl: emitted compact json in 0.0991 seco ucl: emitted yaml in 0.1354 seconds ``` -You can do your own benchmarks by running `make test` in libucl top directory. +You can do your own benchmarks by running `make check` in libucl top directory. ## Conclusion Modified: projects/building-blocks/contrib/libucl/cmake/CMakeLists.txt ============================================================================== --- projects/building-blocks/contrib/libucl/cmake/CMakeLists.txt Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/contrib/libucl/cmake/CMakeLists.txt Sat Nov 29 05:28:40 2014 (r275233) @@ -1,8 +1,8 @@ PROJECT(libucl C) SET(LIBUCL_VERSION_MAJOR 0) -SET(LIBUCL_VERSION_MINOR 2) -SET(LIBUCL_VERSION_PATCH 9) +SET(LIBUCL_VERSION_MINOR 5) +SET(LIBUCL_VERSION_PATCH 0) SET(LIBUCL_VERSION "${LIBUCL_VERSION_MAJOR}.${LIBUCL_VERSION_MINOR}.${LIBUCL_VERSION_PATCH}") @@ -86,6 +86,8 @@ INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOU SET(UCLSRC ../src/ucl_util.c ../src/ucl_parser.c ../src/ucl_emitter.c + ../src/ucl_emitter_streamline.c + ../src/ucl_emitter_utils.c ../src/ucl_hash.c ../src/ucl_schema.c ../src/xxhash.c) @@ -98,6 +100,18 @@ ENDIF (BUILD_SHARED_LIBS) ADD_LIBRARY(ucl ${LIB_TYPE} ${UCLSRC}) SET_TARGET_PROPERTIES(ucl PROPERTIES VERSION ${LIBUCL_VERSION} SOVERSION ${LIBUCL_VERSION_MAJOR}) +IF(WITH_LUA) + SET(UCL_LUA_SRC ../lua/lua_ucl.c) + ADD_LIBRARY(lua-ucl ${LIB_TYPE} ${UCL_LUA_SRC}) + IF(ENABLE_LUAJIT MATCHES "ON") + TARGET_LINK_LIBRARIES(lua-ucl "${LUAJIT_LIBRARY}") + ELSE(ENABLE_LUAJIT MATCHES "ON") + TARGET_LINK_LIBRARIES(lua-ucl "${LUA_LIBRARY}") + ENDIF(ENABLE_LUAJIT MATCHES "ON") + TARGET_LINK_LIBRARIES(lua-ucl ucl) + SET_TARGET_PROPERTIES(lua-ucl PROPERTIES VERSION ${LIBUCL_VERSION} SOVERSION ${LIBUCL_VERSION_MAJOR}) +ENDIF(WITH_LUA) + IF(HAVE_FETCH_H) TARGET_LINK_LIBRARIES(ucl fetch) ELSE(HAVE_FETCH_H) Modified: projects/building-blocks/contrib/libucl/configure.ac ============================================================================== --- projects/building-blocks/contrib/libucl/configure.ac Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/contrib/libucl/configure.ac Sat Nov 29 05:28:40 2014 (r275233) @@ -1,12 +1,13 @@ m4_define([maj_ver], [0]) -m4_define([med_ver], [5]) -m4_define([min_ver], [0]) -m4_define([so_version], [2:0:0]) +m4_define([med_ver], [6]) +m4_define([min_ver], [1]) +m4_define([so_version], [3:0:1]) m4_define([ucl_version], [maj_ver.med_ver.min_ver]) AC_INIT([libucl],[ucl_version],[https://github.com/vstakhov/libucl],[libucl]) AC_CONFIG_SRCDIR([configure.ac]) -AM_INIT_AUTOMAKE([1.11 foreign silent-rules -Wall -Wportability no-dist-gzip dist-xz]) +AM_INIT_AUTOMAKE([1.11 foreign -Wall -Wportability no-dist-gzip dist-xz]) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) UCL_VERSION=ucl_version SO_VERSION=so_version @@ -57,6 +58,9 @@ AC_ARG_ENABLE([regex], AS_HELP_STRING([- AC_ARG_ENABLE([signatures], AS_HELP_STRING([--enable-signatures], [Enable signatures check (requires openssl) @<:@default=no@:>@]), [], [enable_signatures=no]) +AC_ARG_ENABLE([lua], AS_HELP_STRING([--enable-lua], + [Enable lua API build (requires lua libraries and headers) @<:@default=no@:>@]), [], + [enable_lua=no]) AC_ARG_ENABLE([utils], AS_HELP_STRING([--enable-utils], [Build and install utils @<:@default=no@:>@]), [case "${enableval}" in @@ -99,6 +103,21 @@ AS_IF([test "x$enable_regex" = "xyes"], ]) AC_SUBST(LIBREGEX_LIB) +AS_IF([test "x$enable_lua" = "xyes"], [ + AX_PROG_LUA([5.1], [], [ + AX_LUA_HEADERS([ + AX_LUA_LIBS([ + AC_DEFINE(HAVE_LUA, 1, [Define to 1 for lua support.]) + with_lua="yes" + ], [AC_MSG_ERROR([unable to find the lua libraries]) + ]) + ], [AC_MSG_ERROR([unable to find the lua header files]) + ]) + ], [AC_MSG_ERROR([unable to find the lua interpreter])]) +], [with_lua="no"]) + +AM_CONDITIONAL([LUA_SUB], [test "$with_lua" = "yes"]) + AS_IF([test "x$enable_urls" = "xyes"], [ AC_CHECK_HEADER([fetch.h], [ AC_DEFINE(HAVE_FETCH_H, 1, [Define to 1 if you have the header file.]) @@ -155,9 +174,11 @@ AC_LINK_IFELSE([ AC_CONFIG_FILES(Makefile \ src/Makefile \ + lua/Makefile tests/Makefile \ utils/Makefile \ doc/Makefile \ + lua/libucl.rockspec \ libucl.pc) AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h]) AC_OUTPUT Copied: projects/building-blocks/contrib/libucl/doc/lua_api.md (from r275232, head/contrib/libucl/doc/lua_api.md) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/contrib/libucl/doc/lua_api.md Sat Nov 29 05:28:40 2014 (r275233, copy of r275232, head/contrib/libucl/doc/lua_api.md) @@ -0,0 +1,194 @@ +## Module `ucl` + +This lua module allows to parse objects from strings and to store data into +ucl objects. It uses `libucl` C library to parse and manipulate with ucl objects. + +Example: + +~~~lua +local ucl = require("ucl") + +local parser = ucl.parser() +local res,err = parser:parse_string('{key=value}') + +if not res then + print('parser error: ' .. err) +else + local obj = parser:get_object() + local got = ucl.to_format(obj, 'json') +endif + +local table = { + str = 'value', + num = 100500, + null = ucl.null, + func = function () + return 'huh' + end + + +print(ucl.to_format(table, 'ucl')) +-- Output: +--[[ +num = 100500; +str = "value"; +null = null; +func = "huh"; +--]] +~~~ + +###Brief content: + +**Functions**: + +> [`ucl_object_push_lua(L, obj, allow_array)`](#function-ucl_object_push_lual-obj-allow_array) + +> [`ucl.to_format(var, format)`](#function-uclto_formatvar-format) + + + +**Methods**: + +> [`parser:parse_file(name)`](#method-parserparse_filename) + +> [`parser:parse_string(input)`](#method-parserparse_stringinput) + +> [`parser:get_object()`](#method-parserget_object) + + +## Functions + +The module `ucl` defines the following functions. + +### Function `ucl_object_push_lua(L, obj, allow_array)` + +This is a `C` function to push `UCL` object as lua variable. This function +converts `obj` to lua representation using the following conversions: + +- *scalar* values are directly presented by lua objects +- *userdata* values are converted to lua function objects using `LUA_REGISTRYINDEX`, +this can be used to pass functions from lua to c and vice-versa +- *arrays* are converted to lua tables with numeric indicies suitable for `ipairs` iterations +- *objects* are converted to lua tables with string indicies + +**Parameters:** + +- `L {lua_State}`: lua state pointer +- `obj {ucl_object_t}`: object to push +- `allow_array {bool}`: expand implicit arrays (should be true for all but partial arrays) + +**Returns:** + +- `{int}`: `1` if an object is pushed to lua + +Back to [module description](#module-ucl). + +### Function `ucl.to_format(var, format)` + +Converts lua variable `var` to the specified `format`. Formats supported are: + +- `json` - fine printed json +- `json-compact` - compacted json +- `config` - fine printed configuration +- `ucl` - same as `config` +- `yaml` - embedded yaml + +If `var` contains function, they are called during output formatting and if +they return string value, then this value is used for ouptut. + +**Parameters:** + +- `var {variant}`: any sort of lua variable (if userdata then metafield `__to_ucl` is searched for output) +- `format {string}`: any available format + +**Returns:** + +- `{string}`: string representation of `var` in the specific `format`. + +Example: + +~~~lua +local table = { + str = 'value', + num = 100500, + null = ucl.null, + func = function () + return 'huh' + end + + +print(ucl.to_format(table, 'ucl')) +-- Output: +--[[ +num = 100500; +str = "value"; +null = null; +func = "huh"; +--]] +~~~ + +Back to [module description](#module-ucl). + + +## Methods + +The module `ucl` defines the following methods. + +### Method `parser:parse_file(name)` + +Parse UCL object from file. + +**Parameters:** + +- `name {string}`: filename to parse + +**Returns:** + +- `{bool[, string]}`: if res is `true` then file has been parsed successfully, otherwise an error string is also returned + +Example: + +~~~lua +local parser = ucl.parser() +local res,err = parser:parse_file('/some/file.conf') + +if not res then + print('parser error: ' .. err) +else + -- Do something with object +end +~~~ + +Back to [module description](#module-ucl). + +### Method `parser:parse_string(input)` + +Parse UCL object from file. + +**Parameters:** + +- `input {string}`: string to parse + +**Returns:** + +- `{bool[, string]}`: if res is `true` then file has been parsed successfully, otherwise an error string is also returned + +Back to [module description](#module-ucl). + +### Method `parser:get_object()` + +Get top object from parser and export it to lua representation. + +**Parameters:** + + nothing + +**Returns:** + +- `{variant or nil}`: ucl object as lua native variable + +Back to [module description](#module-ucl). + + +Back to [top](#). + Copied: projects/building-blocks/contrib/libucl/include/lua_ucl.h (from r275232, head/contrib/libucl/include/lua_ucl.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/contrib/libucl/include/lua_ucl.h Sat Nov 29 05:28:40 2014 (r275233, copy of r275232, head/contrib/libucl/include/lua_ucl.h) @@ -0,0 +1,69 @@ +/* Copyright (c) 2014, Vsevolod Stakhov + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * 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 ''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 AUTHOR 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. + */ +#ifndef LUA_UCL_H_ +#define LUA_UCL_H_ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include +#include +#include "ucl.h" + +/** + * Closure structure for lua function storing inside UCL + */ +struct ucl_lua_funcdata { + lua_State *L; + int idx; + char *ret; +}; + +/** + * Initialize lua UCL API + */ +UCL_EXTERN int luaopen_ucl (lua_State *L); + +/** + * Import UCL object from lua state + * @param L lua state + * @param idx index of object at the lua stack to convert to UCL + * @return new UCL object or NULL, the caller should unref object after using + */ +UCL_EXTERN ucl_object_t* ucl_object_lua_import (lua_State *L, int idx); + +/** + * Push an object to lua + * @param L lua state + * @param obj object to push + * @param allow_array traverse over implicit arrays + */ +UCL_EXTERN int ucl_object_push_lua (lua_State *L, + const ucl_object_t *obj, bool allow_array); + +UCL_EXTERN struct ucl_lua_funcdata* ucl_object_toclosure ( + const ucl_object_t *obj); + +#endif /* LUA_UCL_H_ */ Modified: projects/building-blocks/contrib/libucl/include/ucl.h ============================================================================== --- projects/building-blocks/contrib/libucl/include/ucl.h Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/contrib/libucl/include/ucl.h Sat Nov 29 05:28:40 2014 (r275233) @@ -147,7 +147,8 @@ typedef enum ucl_emitter { typedef enum ucl_parser_flags { UCL_PARSER_KEY_LOWERCASE = 0x1, /**< Convert all keys to lower case */ UCL_PARSER_ZEROCOPY = 0x2, /**< Parse input in zero-copy mode if possible */ - UCL_PARSER_NO_TIME = 0x4 /**< Do not parse time and treat time values as strings */ + UCL_PARSER_NO_TIME = 0x4, /**< Do not parse time and treat time values as strings */ + UCL_PARSER_NO_IMPLICIT_ARRAYS = 0x8 /** Create explicit arrays instead of implicit ones */ } ucl_parser_flags_t; /** @@ -171,9 +172,12 @@ typedef enum ucl_string_flags { * Basic flags for an object */ typedef enum ucl_object_flags { - UCL_OBJECT_ALLOCATED_KEY = 1, /**< An object has key allocated internally */ - UCL_OBJECT_ALLOCATED_VALUE = 2, /**< An object has a string value allocated internally */ - UCL_OBJECT_NEED_KEY_ESCAPE = 4 /**< The key of an object need to be escaped on output */ + UCL_OBJECT_ALLOCATED_KEY = 0x1, /**< An object has key allocated internally */ + UCL_OBJECT_ALLOCATED_VALUE = 0x2, /**< An object has a string value allocated internally */ + UCL_OBJECT_NEED_KEY_ESCAPE = 0x4, /**< The key of an object need to be escaped on output */ + UCL_OBJECT_EPHEMERAL = 0x8, /**< Temporary object that does not need to be freed really */ + UCL_OBJECT_MULTILINE = 0x10, /**< String should be displayed as multiline string */ + UCL_OBJECT_MULTIVALUE = 0x20 /**< Object is a key with multiple values */ } ucl_object_flags_t; /** @@ -195,14 +199,21 @@ typedef struct ucl_object_s { const char *key; /**< Key of an object */ struct ucl_object_s *next; /**< Array handle */ struct ucl_object_s *prev; /**< Array handle */ - unsigned char* trash_stack[2]; /**< Pointer to allocated chunks */ - unsigned keylen; /**< Lenght of a key */ - unsigned len; /**< Size of an object */ - enum ucl_type type; /**< Real type */ - uint16_t ref; /**< Reference count */ + uint32_t keylen; /**< Lenght of a key */ + uint32_t len; /**< Size of an object */ + uint32_t ref; /**< Reference count */ uint16_t flags; /**< Object flags */ + uint16_t type; /**< Real type */ + unsigned char* trash_stack[2]; /**< Pointer to allocated chunks */ } ucl_object_t; +/** + * Destructor type for userdata objects + * @param ud user specified data pointer + */ +typedef void (*ucl_userdata_dtor)(void *ud); +typedef const char* (*ucl_userdata_emitter)(void *ud); + /** @} */ /** @@ -239,6 +250,31 @@ UCL_EXTERN ucl_object_t* ucl_object_new UCL_EXTERN ucl_object_t* ucl_object_typed_new (ucl_type_t type) UCL_WARN_UNUSED_RESULT; /** + * Create new object with type and priority specified + * @param type type of a new object + * @param priority priority of an object + * @return new object + */ +UCL_EXTERN ucl_object_t* ucl_object_new_full (ucl_type_t type, unsigned priority) + UCL_WARN_UNUSED_RESULT; + +/** + * Create new object with userdata dtor + * @param dtor destructor function + * @return new object + */ +UCL_EXTERN ucl_object_t* ucl_object_new_userdata (ucl_userdata_dtor dtor, + ucl_userdata_emitter emitter) UCL_WARN_UNUSED_RESULT; + +/** + * Perform deep copy of an object copying everything + * @param other object to copy + * @return new object with refcount equal to 1 + */ +UCL_EXTERN ucl_object_t * ucl_object_copy (const ucl_object_t *other) + UCL_WARN_UNUSED_RESULT; + +/** * Return the type of an object * @return the object type */ @@ -293,7 +329,7 @@ UCL_EXTERN ucl_object_t* ucl_object_from /** * Insert a object 'elt' to the hash 'top' and associate it with key 'key' - * @param top destination object (will be created automatically if top is NULL) + * @param top destination object (must be of type UCL_OBJECT) * @param elt element to insert (must NOT be NULL) * @param key key to associate with this object (either const or preallocated) * @param keylen length of the key (or 0 for NULL terminated keys) @@ -306,7 +342,7 @@ UCL_EXTERN bool ucl_object_insert_key (u /** * Replace a object 'elt' to the hash 'top' and associate it with key 'key', old object will be unrefed, * if no object has been found this function works like ucl_object_insert_key() - * @param top destination object (will be created automatically if top is NULL) + * @param top destination object (must be of type UCL_OBJECT) * @param elt element to insert (must NOT be NULL) * @param key key to associate with this object (either const or preallocated) * @param keylen length of the key (or 0 for NULL terminated keys) @@ -317,6 +353,15 @@ UCL_EXTERN bool ucl_object_replace_key ( const char *key, size_t keylen, bool copy_key); /** + * Merge the keys from one object to another object. Overwrite on conflict + * @param top destination object (must be of type UCL_OBJECT) + * @param elt element to insert (must be of type UCL_OBJECT) + * @param copy copy rather than reference the elements + * @return true if all keys have been merged + */ +UCL_EXTERN bool ucl_object_merge (ucl_object_t *top, ucl_object_t *elt, bool copy); + +/** * Delete a object associated with key 'key', old object will be unrefered, * @param top object * @param key key associated to the object to remove @@ -335,8 +380,9 @@ UCL_EXTERN bool ucl_object_delete_key (u /** - * Delete key from `top` object returning the object deleted. This object is not - * released + * Removes `key` from `top` object, returning the object that was removed. This + * object is not released, caller must unref the returned object when it is no + * longer needed. * @param top object * @param key key to remove * @param keylen length of the key (or 0 for NULL terminated keys) @@ -346,8 +392,9 @@ UCL_EXTERN ucl_object_t* ucl_object_pop_ size_t keylen) UCL_WARN_UNUSED_RESULT; /** - * Delete key from `top` object returning the object deleted. This object is not - * released + * Removes `key` from `top` object returning the object that was removed. This + * object is not released, caller must unref the returned object when it is no + * longer needed. * @param top object * @param key key to remove * @return removed object or NULL if object has not been found @@ -356,9 +403,9 @@ UCL_EXTERN ucl_object_t* ucl_object_pop_ UCL_WARN_UNUSED_RESULT; /** - * Insert a object 'elt' to the hash 'top' and associate it with key 'key', if the specified key exist, - * try to merge its content - * @param top destination object (will be created automatically if top is NULL) + * Insert a object 'elt' to the hash 'top' and associate it with key 'key', if + * the specified key exist, try to merge its content + * @param top destination object (must be of type UCL_OBJECT) * @param elt element to insert (must NOT be NULL) * @param key key to associate with this object (either const or preallocated) * @param keylen length of the key (or 0 for NULL terminated keys) @@ -369,8 +416,8 @@ UCL_EXTERN bool ucl_object_insert_key_me const char *key, size_t keylen, bool copy_key); /** - * Append an element to the front of array object - * @param top destination object (will be created automatically if top is NULL) + * Append an element to the end of array object + * @param top destination object (must NOT be NULL) * @param elt element to append (must NOT be NULL) * @return true if value has been inserted */ @@ -379,7 +426,7 @@ UCL_EXTERN bool ucl_array_append (ucl_ob /** * Append an element to the start of array object - * @param top destination object (will be created automatically if top is NULL) + * @param top destination object (must NOT be NULL) * @param elt element to append (must NOT be NULL) * @return true if value has been inserted */ @@ -387,8 +434,19 @@ UCL_EXTERN bool ucl_array_prepend (ucl_o ucl_object_t *elt); /** - * Removes an element `elt` from the array `top`. Caller must unref the returned object when it is not - * needed. + * Merge all elements of second array into the first array + * @param top destination array (must be of type UCL_ARRAY) + * @param elt array to copy elements from (must be of type UCL_ARRAY) + * @param copy copy elements instead of referencing them + * @return true if arrays were merged + */ +UCL_EXTERN bool ucl_array_merge (ucl_object_t *top, ucl_object_t *elt, + bool copy); + +/** + * Removes an element `elt` from the array `top`, returning the object that was + * removed. This object is not released, caller must unref the returned object + * when it is no longer needed. * @param top array ucl object * @param elt element to remove * @return removed element or NULL if `top` is NULL or not an array @@ -411,35 +469,50 @@ UCL_EXTERN const ucl_object_t* ucl_array UCL_EXTERN const ucl_object_t* ucl_array_tail (const ucl_object_t *top); /** - * Removes the last element from the array `top`. Caller must unref the returned object when it is not - * needed. + * Removes the last element from the array `top`, returning the object that was + * removed. This object is not released, caller must unref the returned object + * when it is no longer needed. * @param top array ucl object * @return removed element or NULL if `top` is NULL or not an array */ UCL_EXTERN ucl_object_t* ucl_array_pop_last (ucl_object_t *top); /** - * Return object identified by an index of the array `top` - * @param obj object to get a key from (must be of type UCL_ARRAY) - * @param index index to return + * Removes the first element from the array `top`, returning the object that was + * removed. This object is not released, caller must unref the returned object + * when it is no longer needed. + * @param top array ucl object + * @return removed element or NULL if `top` is NULL or not an array + */ +UCL_EXTERN ucl_object_t* ucl_array_pop_first (ucl_object_t *top); + +/** + * Return object identified by index of the array `top` + * @param top object to get a key from (must be of type UCL_ARRAY) + * @param index array index to return * @return object at the specified index or NULL if index is not found */ UCL_EXTERN const ucl_object_t* ucl_array_find_index (const ucl_object_t *top, unsigned int index); /** - * Removes the first element from the array `top`. Caller must unref the returned object when it is not - * needed. - * @param top array ucl object - * @return removed element or NULL if `top` is NULL or not an array + * Replace an element in an array with a different element, returning the object + * that was replaced. This object is not released, caller must unref the + * returned object when it is no longer needed. + * @param top destination object (must be of type UCL_ARRAY) + * @param elt element to append (must NOT be NULL) + * @param index array index in destination to overwrite with elt + * @return object that was replaced or NULL if index is not found */ -UCL_EXTERN ucl_object_t* ucl_array_pop_first (ucl_object_t *top); +ucl_object_t * +ucl_array_replace_index (ucl_object_t *top, ucl_object_t *elt, + unsigned int index); /** * Append a element to another element forming an implicit array * @param head head to append (may be NULL) * @param elt new element - * @return true if element has been inserted + * @return the new implicit array */ UCL_EXTERN ucl_object_t * ucl_elt_append (ucl_object_t *head, ucl_object_t *elt); @@ -533,7 +606,7 @@ UCL_EXTERN const char* ucl_object_tolstr * Return object identified by a key in the specified object * @param obj object to get a key from (must be of type UCL_OBJECT) * @param key key to search - * @return object matched the specified key or NULL if key is not found + * @return object matching the specified key or NULL if key was not found *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Sat Nov 29 07:41:03 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DFC0D6EB; Sat, 29 Nov 2014 07:41:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CC7BB640; Sat, 29 Nov 2014 07:41:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAT7f3ue027200; Sat, 29 Nov 2014 07:41:03 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAT7f3Me027198; Sat, 29 Nov 2014 07:41:03 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411290741.sAT7f3Me027198@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 29 Nov 2014 07:41:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275235 - in projects/building-blocks: etc/defaults tools/build/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Nov 2014 07:41:04 -0000 Author: ngie Date: Sat Nov 29 07:41:02 2014 New Revision: 275235 URL: https://svnweb.freebsd.org/changeset/base/275235 Log: Honor MK_BLUETOOTH when installing bluetooth.device.conf Modified: projects/building-blocks/etc/defaults/Makefile projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/etc/defaults/Makefile ============================================================================== --- projects/building-blocks/etc/defaults/Makefile Sat Nov 29 06:53:06 2014 (r275234) +++ projects/building-blocks/etc/defaults/Makefile Sat Nov 29 07:41:02 2014 (r275235) @@ -1,7 +1,13 @@ # $FreeBSD$ -FILES= bluetooth.device.conf devfs.rules periodic.conf rc.conf +.include + +FILES= devfs.rules periodic.conf rc.conf NO_OBJ= FILESDIR= /etc/defaults +.if ${MK_BLUETOOTH} != "no" +FILES+= bluetooth.device.conf +.endif + .include Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Sat Nov 29 06:53:06 2014 (r275234) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Sat Nov 29 07:41:02 2014 (r275235) @@ -182,6 +182,7 @@ OLD_DIRS+=usr/share/examples/bhyve OLD_FILES+=etc/bluetooth/hcsecd.conf OLD_FILES+=etc/bluetooth/hosts OLD_FILES+=etc/bluetooth/protocols +OLD_FILES+=etc/defaults/bluetooth.device.conf OLD_DIRS+=etc/bluetooth OLD_FILES+=usr/bin/bthost OLD_FILES+=usr/bin/btsockstat From owner-svn-src-projects@FreeBSD.ORG Sat Nov 29 09:09:55 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 377C9501; Sat, 29 Nov 2014 09:09:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 23FFED2A; Sat, 29 Nov 2014 09:09:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAT99t02068338; Sat, 29 Nov 2014 09:09:55 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAT99sVG068337; Sat, 29 Nov 2014 09:09:55 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411290909.sAT99sVG068337@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 29 Nov 2014 09:09:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275238 - projects/building-blocks/tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Nov 2014 09:09:55 -0000 Author: ngie Date: Sat Nov 29 09:09:54 2014 New Revision: 275238 URL: https://svnweb.freebsd.org/changeset/base/275238 Log: Skip usr/share/misc Modified: projects/building-blocks/tools/add-optional-obsolete-files-entries.sh Modified: projects/building-blocks/tools/add-optional-obsolete-files-entries.sh ============================================================================== --- projects/building-blocks/tools/add-optional-obsolete-files-entries.sh Sat Nov 29 08:59:26 2014 (r275237) +++ projects/building-blocks/tools/add-optional-obsolete-files-entries.sh Sat Nov 29 09:09:54 2014 (r275238) @@ -52,6 +52,6 @@ done sed -e 's,^,OLD_FILES+=,' \ -e '/lib\/.*\.so\.[0-9]\.*/s/OLD_FILES+=/OLD_LIBS+=/g'; find -d -s . -type d -mindepth 1 -and \! -empty | \ - egrep -v '^\./(boot|s*bin|lib|libexec|usr|usr/include|usr/lib(32|data|exec)?|usr/libdata/pkgconfig|usr/lib/private|usr/s*bin|usr/share|usr/share/(examples|man|nls)|usr/share/man/man[0-9])$' | \ + egrep -v '^\./(boot|s*bin|lib|libexec|usr|usr/include|usr/lib(32|data|exec)?|usr/libdata/pkgconfig|usr/lib/private|usr/s*bin|usr/share|usr/share/(examples|man|misc|nls)|usr/share/man/man[0-9])$' | \ sed -e 's,^,OLD_DIRS+=,' ) | sed -e 's,+=\./,+=,' From owner-svn-src-projects@FreeBSD.ORG Sat Nov 29 15:02:47 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 40BE43D3; Sat, 29 Nov 2014 15:02:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2DB91107; Sat, 29 Nov 2014 15:02:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sATF2lgE036075; Sat, 29 Nov 2014 15:02:47 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sATF2kRA036067; Sat, 29 Nov 2014 15:02:46 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411291502.sATF2kRA036067@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sat, 29 Nov 2014 15:02:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275243 - projects/routing/sys/net X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Nov 2014 15:02:47 -0000 Author: melifaro Date: Sat Nov 29 15:02:45 2014 New Revision: 275243 URL: https://svnweb.freebsd.org/changeset/base/275243 Log: * Make ifa_add_loopback_route() prepare gw before insertion. * Temporarily move ifa_switch_loopback_route() implementation to route.c Modified: projects/routing/sys/net/if.c projects/routing/sys/net/route.c projects/routing/sys/net/route.h Modified: projects/routing/sys/net/if.c ============================================================================== --- projects/routing/sys/net/if.c Sat Nov 29 14:30:39 2014 (r275242) +++ projects/routing/sys/net/if.c Sat Nov 29 15:02:45 2014 (r275243) @@ -1528,27 +1528,28 @@ ifa_free(struct ifaddr *ifa) int ifa_add_loopback_route(struct ifaddr *ifa, struct sockaddr *ia) { - int error = 0; - struct rtentry *rt = NULL; + int error; struct rt_addrinfo info; - static struct sockaddr_dl null_sdl = {sizeof(null_sdl), AF_LINK}; + struct sockaddr_dl null_sdl; + struct ifnet *ifp; + + ifp = ifa->ifa_ifp; bzero(&info, sizeof(info)); info.rti_ifp = V_loif; info.rti_flags = ifa->ifa_flags | RTF_HOST | RTF_STATIC; info.rti_info[RTAX_DST] = ia; info.rti_info[RTAX_GATEWAY] = (struct sockaddr *)&null_sdl; - error = rtrequest1_fib(RTM_ADD, &info, &rt, ifa->ifa_ifp->if_fib); - if (error == 0 && rt != NULL) { - RT_LOCK(rt); - ((struct sockaddr_dl *)rt->rt_gateway)->sdl_type = - ifa->ifa_ifp->if_type; - ((struct sockaddr_dl *)rt->rt_gateway)->sdl_index = - ifa->ifa_ifp->if_index; - RT_REMREF(rt); - RT_UNLOCK(rt); - } else if (error != 0) + bzero(&null_sdl, sizeof(null_sdl)); + null_sdl.sdl_len = sizeof(null_sdl); + null_sdl.sdl_family = AF_LINK; + null_sdl.sdl_type = ifp->if_type; + null_sdl.sdl_index = ifp->if_index; + + error = rtrequest1_fib(RTM_ADD, &info, NULL, ifp->if_fib); + + if (error != 0) log(LOG_DEBUG, "%s: insertion failed: %u\n", __func__, error); return (error); @@ -1581,20 +1582,8 @@ ifa_del_loopback_route(struct ifaddr *if int ifa_switch_loopback_route(struct ifaddr *ifa, struct sockaddr *sa, int fib) { - struct rtentry *rt; - - rt = rtalloc1_fib(sa, 0, 0, fib); - if (rt == NULL) { - log(LOG_DEBUG, "%s: fail", __func__); - return (EHOSTUNREACH); - } - ((struct sockaddr_dl *)rt->rt_gateway)->sdl_type = - ifa->ifa_ifp->if_type; - ((struct sockaddr_dl *)rt->rt_gateway)->sdl_index = - ifa->ifa_ifp->if_index; - RTFREE_LOCKED(rt); - return (0); + return (rt_switch_loopback_route(fib, sa, ifa->ifa_ifp)); } /* Modified: projects/routing/sys/net/route.c ============================================================================== --- projects/routing/sys/net/route.c Sat Nov 29 14:30:39 2014 (r275242) +++ projects/routing/sys/net/route.c Sat Nov 29 15:02:45 2014 (r275243) @@ -2027,6 +2027,52 @@ rtinit(struct ifaddr *ifa, int cmd, int } /* + * Switches 'real' interface index inside rt_gateway + * for address in @dst to interface @ifp. + * + * Returns 0 on success/ + */ +int +rt_switch_loopback_route(uint32_t fibnum, struct sockaddr *dst, + struct ifnet *ifp) +{ + struct rib_head *rh; + struct radix_node *rn; + struct rtentry *rt; + struct sockaddr_dl *sdl; + + KASSERT((fibnum < rt_numfibs), ("rtalloc1_fib: bad fibnum")); + rh = rt_tables_get_rnh(fibnum, dst->sa_family); + if (rh == NULL) + return (EHOSTUNREACH); + + RIB_CFG_WLOCK(rh); + rn = rh->rnh_matchaddr(dst, &rh->head); + if (rn == NULL && ((rn->rn_flags & RNF_ROOT) != 0)) { + RIB_CFG_WUNLOCK(rh); + return (EHOSTUNREACH); + } + rt = RNTORT(rn); + + /* Ensure we have found host route */ + if (rt_mask(rt) == NULL) { + sdl = (struct sockaddr_dl *)rt->rt_gateway; + RIB_WLOCK(rh); + sdl->sdl_type = ifp->if_type; + sdl->sdl_index = ifp->if_index; + RIB_WUNLOCK(rh); + } else + rt = NULL; + + RIB_CFG_WUNLOCK(rh); + + if (rt == NULL) + return (EHOSTUNREACH); + + return (0); +} + +/* * Announce interface address arrival/withdraw * Returns 0 on success. */ Modified: projects/routing/sys/net/route.h ============================================================================== --- projects/routing/sys/net/route.h Sat Nov 29 14:30:39 2014 (r275242) +++ projects/routing/sys/net/route.h Sat Nov 29 15:02:45 2014 (r275243) @@ -338,6 +338,7 @@ typedef int rt_walktree_f_t(struct rtent typedef void rt_setwarg_t(struct rib_head *, uint32_t, int, void *); void rt_foreach_fib(int af, rt_setwarg_t *, rt_walktree_f_t *, void *); void rt_flushifroutes(struct ifnet *ifp); +int rt_switch_loopback_route(uint32_t, struct sockaddr *, struct ifnet *); /* XXX MRT COMPAT VERSIONS THAT SET UNIVERSE to 0 */ /* Thes are used by old code not yet converted to use multiple FIBS */ From owner-svn-src-projects@FreeBSD.ORG Sat Nov 29 15:45:24 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 790A6BFE; Sat, 29 Nov 2014 15:45:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6227E6AE; Sat, 29 Nov 2014 15:45:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sATFjOKu057546; Sat, 29 Nov 2014 15:45:24 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sATFjKWl057525; Sat, 29 Nov 2014 15:45:20 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411291545.sATFjKWl057525@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Sat, 29 Nov 2014 15:45:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275251 - in projects/sendfile: . contrib/binutils/ld contrib/elftoolchain/addr2line contrib/elftoolchain/cxxfilt contrib/elftoolchain/elfcopy contrib/elftoolchain/libelftc contrib/elft... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Nov 2014 15:45:24 -0000 Author: glebius Date: Sat Nov 29 15:45:19 2014 New Revision: 275251 URL: https://svnweb.freebsd.org/changeset/base/275251 Log: Merge head r258543 through r275248. Added: projects/sendfile/contrib/elftoolchain/addr2line/ - copied from r275248, head/contrib/elftoolchain/addr2line/ projects/sendfile/contrib/elftoolchain/cxxfilt/ - copied from r275248, head/contrib/elftoolchain/cxxfilt/ projects/sendfile/contrib/elftoolchain/elfcopy/ - copied from r275248, head/contrib/elftoolchain/elfcopy/ projects/sendfile/contrib/elftoolchain/libelftc/ - copied from r275248, head/contrib/elftoolchain/libelftc/ projects/sendfile/contrib/elftoolchain/nm/ - copied from r275248, head/contrib/elftoolchain/nm/ projects/sendfile/contrib/elftoolchain/size/ - copied from r275248, head/contrib/elftoolchain/size/ projects/sendfile/contrib/elftoolchain/strings/ - copied from r275248, head/contrib/elftoolchain/strings/ projects/sendfile/contrib/libucl/COPYING - copied unchanged from r275248, head/contrib/libucl/COPYING projects/sendfile/contrib/libucl/doc/lua_api.md - copied unchanged from r275248, head/contrib/libucl/doc/lua_api.md projects/sendfile/contrib/libucl/include/lua_ucl.h - copied unchanged from r275248, head/contrib/libucl/include/lua_ucl.h projects/sendfile/contrib/libucl/lua/ - copied from r275248, head/contrib/libucl/lua/ projects/sendfile/contrib/libucl/m4/ - copied from r275248, head/contrib/libucl/m4/ projects/sendfile/contrib/libucl/tests/basic/12.in - copied unchanged from r275248, head/contrib/libucl/tests/basic/12.in projects/sendfile/contrib/libucl/tests/basic/12.res - copied unchanged from r275248, head/contrib/libucl/tests/basic/12.res projects/sendfile/contrib/libucl/tests/basic/13.in - copied unchanged from r275248, head/contrib/libucl/tests/basic/13.in projects/sendfile/contrib/libucl/tests/basic/13.res - copied unchanged from r275248, head/contrib/libucl/tests/basic/13.res projects/sendfile/contrib/libucl/tests/basic/comments.in - copied unchanged from r275248, head/contrib/libucl/tests/basic/comments.in projects/sendfile/contrib/libucl/tests/basic/comments.res - copied unchanged from r275248, head/contrib/libucl/tests/basic/comments.res projects/sendfile/contrib/libucl/tests/basic/include_dir/ - copied from r275248, head/contrib/libucl/tests/basic/include_dir/ projects/sendfile/sbin/mdconfig/tests/mdconfig_test.sh - copied unchanged from r275248, head/sbin/mdconfig/tests/mdconfig_test.sh projects/sendfile/usr.sbin/cron/Makefile.inc - copied unchanged from r275248, head/usr.sbin/cron/Makefile.inc projects/sendfile/usr.sbin/fifolog/Makefile.inc - copied unchanged from r275248, head/usr.sbin/fifolog/Makefile.inc Deleted: projects/sendfile/sbin/mdconfig/tests/legacy_test.sh projects/sendfile/sbin/mdconfig/tests/mdconfig.test projects/sendfile/sbin/mdconfig/tests/run.pl projects/sendfile/sys/netipsec/ipip_var.h Modified: projects/sendfile/ObsoleteFiles.inc projects/sendfile/contrib/binutils/ld/lexsup.c projects/sendfile/contrib/libucl/ChangeLog.md projects/sendfile/contrib/libucl/Makefile.am projects/sendfile/contrib/libucl/Makefile.w32 projects/sendfile/contrib/libucl/README.md projects/sendfile/contrib/libucl/cmake/CMakeLists.txt projects/sendfile/contrib/libucl/configure.ac projects/sendfile/contrib/libucl/include/ucl.h projects/sendfile/contrib/libucl/libucl.pc.in projects/sendfile/contrib/libucl/src/ucl_emitter.c projects/sendfile/contrib/libucl/src/ucl_emitter_streamline.c projects/sendfile/contrib/libucl/src/ucl_emitter_utils.c projects/sendfile/contrib/libucl/src/ucl_hash.c projects/sendfile/contrib/libucl/src/ucl_hash.h projects/sendfile/contrib/libucl/src/ucl_internal.h projects/sendfile/contrib/libucl/src/ucl_parser.c projects/sendfile/contrib/libucl/src/ucl_util.c projects/sendfile/contrib/libucl/tests/Makefile.am projects/sendfile/contrib/libucl/tests/basic/4.res projects/sendfile/contrib/libucl/tests/generate.res projects/sendfile/contrib/libucl/tests/test_basic.c projects/sendfile/contrib/libucl/tests/test_generate.c projects/sendfile/contrib/libucl/tests/test_schema.c projects/sendfile/contrib/libucl/utils/objdump.c projects/sendfile/gnu/usr.bin/binutils/Makefile projects/sendfile/lib/libc/net/base64.c projects/sendfile/lib/libucl/Makefile projects/sendfile/sbin/mdconfig/tests/Makefile projects/sendfile/share/man/man5/src.conf.5 projects/sendfile/share/misc/bsd-family-tree projects/sendfile/share/mk/src.libnames.mk projects/sendfile/sys/arm/arm/generic_timer.c projects/sendfile/sys/boot/i386/boot2/boot2.c projects/sendfile/sys/boot/pc98/boot2/boot2.c projects/sendfile/sys/compat/linux/linux_misc.c projects/sendfile/sys/compat/svr4/svr4_misc.c projects/sendfile/sys/conf/kern.mk projects/sendfile/sys/contrib/ipfilter/netinet/fil.c projects/sendfile/sys/contrib/ipfilter/netinet/ip_frag.c projects/sendfile/sys/dev/drm2/drm_drv.c projects/sendfile/sys/dev/e1000/if_igb.c projects/sendfile/sys/dev/hwpmc/hwpmc_mpc7xxx.c projects/sendfile/sys/dev/hwpmc/hwpmc_ppc970.c projects/sendfile/sys/dev/isp/isp.c projects/sendfile/sys/dev/isp/isp_freebsd.c projects/sendfile/sys/dev/isp/isp_freebsd.h projects/sendfile/sys/dev/isp/isp_library.c projects/sendfile/sys/dev/ixgbe/ixgbe.c projects/sendfile/sys/dev/usb/controller/ehci_pci.c projects/sendfile/sys/fs/procfs/procfs_status.c projects/sendfile/sys/kern/init_main.c projects/sendfile/sys/kern/kern_clock.c projects/sendfile/sys/kern/kern_exit.c projects/sendfile/sys/kern/kern_mutex.c projects/sendfile/sys/kern/kern_proc.c projects/sendfile/sys/kern/kern_racct.c projects/sendfile/sys/kern/kern_resource.c projects/sendfile/sys/kern/kern_sig.c projects/sendfile/sys/kern/kern_thread.c projects/sendfile/sys/kern/kern_time.c projects/sendfile/sys/kern/subr_bus.c projects/sendfile/sys/kern/subr_prof.c projects/sendfile/sys/kern/sys_generic.c projects/sendfile/sys/net/if_arcsubr.c projects/sendfile/sys/net/if_ethersubr.c projects/sendfile/sys/net/if_fddisubr.c projects/sendfile/sys/net/if_fwsubr.c projects/sendfile/sys/net/if_iso88025subr.c projects/sendfile/sys/netinet/if_ether.c projects/sendfile/sys/netinet/if_ether.h projects/sendfile/sys/netinet/toecore.c projects/sendfile/sys/netinet6/nd6.c projects/sendfile/sys/netinet6/nd6.h projects/sendfile/sys/netipsec/xform.h projects/sendfile/sys/netipsec/xform_ipip.c projects/sendfile/sys/ofed/drivers/infiniband/core/addr.c projects/sendfile/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/sendfile/sys/sys/bus.h projects/sendfile/sys/sys/pmc.h projects/sendfile/sys/sys/proc.h projects/sendfile/sys/sys/resourcevar.h projects/sendfile/tools/build/options/WITHOUT_CROSS_COMPILER projects/sendfile/tools/build/options/WITHOUT_INCLUDES projects/sendfile/tools/build/options/WITHOUT_RCS projects/sendfile/tools/build/options/WITH_FMAKE projects/sendfile/tools/tools/nanobsd/nanobsd.sh projects/sendfile/usr.bin/dc/stack.c projects/sendfile/usr.bin/vi/catalog/Makefile Directory Properties: projects/sendfile/ (props changed) projects/sendfile/contrib/binutils/ (props changed) projects/sendfile/contrib/libucl/ (props changed) projects/sendfile/gnu/usr.bin/binutils/ (props changed) projects/sendfile/lib/libc/ (props changed) projects/sendfile/sbin/ (props changed) projects/sendfile/share/ (props changed) projects/sendfile/sys/ (props changed) projects/sendfile/sys/boot/ (props changed) projects/sendfile/sys/conf/ (props changed) projects/sendfile/sys/contrib/ipfilter/ (props changed) Modified: projects/sendfile/ObsoleteFiles.inc ============================================================================== --- projects/sendfile/ObsoleteFiles.inc Sat Nov 29 15:43:32 2014 (r275250) +++ projects/sendfile/ObsoleteFiles.inc Sat Nov 29 15:45:19 2014 (r275251) @@ -38,6 +38,12 @@ # xargs -n1 | sort | uniq -d; # done +# 20141126: convert sbin/mdconfig/tests to ATF format tests +OLD_FILES+=usr/tests/sbin/mdconfig/legacy_test +OLD_FILES+=usr/tests/sbin/mdconfig/mdconfig.test +OLD_FILES+=usr/tests/sbin/mdconfig/run.pl +# 20141126: remove xform_ipip decapsulation fallback +OLD_FILES+=usr/include/netipsec/ipip_var.h # 20141109: faith/faithd removal OLD_FILES+=etc/rc.d/faith OLD_FILES+=usr/share/man/man4/faith.4.gz @@ -134,10 +140,12 @@ OLD_FILES+=usr/include/readline/chardefs OLD_FILES+=usr/include/readline/history.h OLD_FILES+=usr/include/readline/keymaps.h OLD_FILES+=usr/include/readline/readline.h +OLD_FILES+=usr/include/readline/tilde.h OLD_FILES+=usr/include/readline/rlconf.h OLD_FILES+=usr/include/readline/rlstdc.h OLD_FILES+=usr/include/readline/rltypedefs.h OLD_FILES+=usr/include/readline/rltypedefs.h +OLD_DIRS+=usr/include/readline OLD_FILES+=usr/share/info/readline.info.gz OLD_FILES+=usr/share/man/man3/readline.3.gz # 20140625: csup removal Modified: projects/sendfile/contrib/binutils/ld/lexsup.c ============================================================================== --- projects/sendfile/contrib/binutils/ld/lexsup.c Sat Nov 29 15:43:32 2014 (r275250) +++ projects/sendfile/contrib/binutils/ld/lexsup.c Sat Nov 29 15:45:19 2014 (r275251) @@ -84,6 +84,7 @@ enum option_values OPTION_NO_KEEP_MEMORY, OPTION_NO_WARN_MISMATCH, OPTION_NO_WARN_SEARCH_MISMATCH, + OPTION_NO_WARN_FATAL, OPTION_NOINHIBIT_EXEC, OPTION_NON_SHARED, OPTION_NO_WHOLE_ARCHIVE, @@ -375,6 +376,9 @@ static const struct ld_option ld_options { {"fatal-warnings", no_argument, NULL, OPTION_WARN_FATAL}, '\0', NULL, N_("Treat warnings as errors"), TWO_DASHES }, + { {"no-fatal-warnings", no_argument, NULL, OPTION_NO_WARN_FATAL}, + '\0', NULL, N_("Don't treat warnings as errors"), + TWO_DASHES }, { {"fini", required_argument, NULL, OPTION_FINI}, '\0', N_("SYMBOL"), N_("Call SYMBOL at unload-time"), ONE_DASH }, { {"force-exe-suffix", no_argument, NULL, OPTION_FORCE_EXE_SUFFIX}, @@ -568,6 +572,7 @@ parse_args (unsigned argc, char **argv) struct option *really_longopts; int last_optind; enum report_method how_to_report_unresolved_symbols = RM_GENERATE_ERROR; + int no_fatal_warnings = FALSE; shortopts = xmalloc (OPTION_COUNT * 3 + 2); longopts = xmalloc (sizeof (*longopts) * (OPTION_COUNT + 1)); @@ -1317,6 +1322,9 @@ parse_args (unsigned argc, char **argv) case OPTION_WARN_FATAL: config.fatal_warnings = TRUE; break; + case OPTION_NO_WARN_FATAL: + no_fatal_warnings = TRUE; + break; case OPTION_WARN_MULTIPLE_GP: config.warn_multiple_gp = TRUE; break; @@ -1438,6 +1446,8 @@ parse_args (unsigned argc, char **argv) break; } } + if (no_fatal_warnings) + config.fatal_warnings = FALSE; if (ingroup) lang_leave_group (); Copied: projects/sendfile/contrib/libucl/COPYING (from r275248, head/contrib/libucl/COPYING) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sendfile/contrib/libucl/COPYING Sat Nov 29 15:45:19 2014 (r275251, copy of r275248, head/contrib/libucl/COPYING) @@ -0,0 +1,23 @@ +Copyright (c) 2013-2014, Vsevolod Stakhov +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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. Modified: projects/sendfile/contrib/libucl/ChangeLog.md ============================================================================== --- projects/sendfile/contrib/libucl/ChangeLog.md Sat Nov 29 15:43:32 2014 (r275250) +++ projects/sendfile/contrib/libucl/ChangeLog.md Sat Nov 29 15:45:19 2014 (r275251) @@ -4,3 +4,19 @@ - Streamline emitter has been added, so it is now possible to output partial `ucl` objects - Emitter now is more flexible due to emitter_context structure + +### 0.5.1 +- Fixed number of bugs and memory leaks + +### 0.5.2 + +- Allow userdata objects to be emitted and destructed +- Use userdata objects to store lua function references + +### Libucl 0.6 + +- Reworked macro interface + +### Libucl 0.6.1 + +- Various utilities fixes Modified: projects/sendfile/contrib/libucl/Makefile.am ============================================================================== --- projects/sendfile/contrib/libucl/Makefile.am Sat Nov 29 15:43:32 2014 (r275250) +++ projects/sendfile/contrib/libucl/Makefile.am Sat Nov 29 15:45:19 2014 (r275251) @@ -4,4 +4,8 @@ EXTRA_DIST = uthash README.md pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libucl.pc -SUBDIRS = src tests utils doc +if LUA_SUB + LUA_SUBDIR = lua +endif + +SUBDIRS = src tests utils doc $(LUA_SUBDIR) \ No newline at end of file Modified: projects/sendfile/contrib/libucl/Makefile.w32 ============================================================================== --- projects/sendfile/contrib/libucl/Makefile.w32 Sat Nov 29 15:43:32 2014 (r275250) +++ projects/sendfile/contrib/libucl/Makefile.w32 Sat Nov 29 15:45:19 2014 (r275251) @@ -33,6 +33,7 @@ OBJECTS = $(OBJDIR)/ucl_hash.o \ $(OBJDIR)/ucl_util.o \ $(OBJDIR)/ucl_parser.o \ $(OBJDIR)/ucl_emitter.o \ + $(OBJDIR)/ucl_emitter_utils.o \ $(OBJDIR)/ucl_schema.o \ $(OBJDIR)/xxhash.o @@ -51,6 +52,8 @@ $(OBJDIR)/ucl_parser.o: $(SRCDIR)/ucl_pa $(CC) -o $(OBJDIR)/ucl_parser.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_parser.c $(OBJDIR)/ucl_emitter.o: $(SRCDIR)/ucl_emitter.c $(HDEPS) $(CC) -o $(OBJDIR)/ucl_emitter.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_emitter.c +$(OBJDIR)/ucl_emitter_utils.o: $(SRCDIR)/ucl_emitter_utils.c $(HDEPS) + $(CC) -o $(OBJDIR)/ucl_emitter_utils.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_emitter_utils.c $(OBJDIR)/ucl_hash.o: $(SRCDIR)/ucl_hash.c $(HDEPS) $(CC) -o $(OBJDIR)/ucl_hash.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_hash.c $(OBJDIR)/ucl_schema.o: $(SRCDIR)/ucl_schema.c $(HDEPS) @@ -61,7 +64,7 @@ $(OBJDIR)/xxhash.o: $(SRCDIR)/xxhash.c $ clean: $(RM) $(OBJDIR)/*.o $(OBJDIR)/$(SONAME) $(OBJDIR)/$(SONAME) $(OBJDIR)/chargen $(OBJDIR)/test_basic $(OBJDIR)/test_speed $(OBJDIR)/objdump $(OBJDIR)/test_generate $(RMDIR) $(OBJDIR) - + # Utils chargen: utils/chargen.c $(OBJDIR)/$(SONAME) @@ -75,7 +78,7 @@ test: $(OBJDIR) $(OBJDIR)/$(SONAME) $(OB run-test: test TEST_DIR=$(TESTDIR) $(TESTDIR)/run_tests.sh $(OBJDIR)/test_basic $(OBJDIR)/test_speed $(OBJDIR)/test_generate - + $(OBJDIR)/test_basic: $(TESTDIR)/test_basic.c $(OBJDIR)/$(SONAME) $(CC) -o $(OBJDIR)/test_basic $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) $(LDFLAGS) $(TESTDIR)/test_basic.c $(LD_UCL_FLAGS) $(OBJDIR)/test_speed: $(TESTDIR)/test_speed.c $(OBJDIR)/$(SONAME) Modified: projects/sendfile/contrib/libucl/README.md ============================================================================== --- projects/sendfile/contrib/libucl/README.md Sat Nov 29 15:43:32 2014 (r275250) +++ projects/sendfile/contrib/libucl/README.md Sat Nov 29 15:45:19 2014 (r275251) @@ -223,15 +223,57 @@ UCL supports external macros both multil .... }; ``` -There are two internal macros provided by UCL: -* `include` - read a file `/path/to/file` or an url `http://example.com/file` and include it to the current place of -UCL configuration; -* `try\_include` - try to read a file or url and include it but do not create a fatal error if a file or url is not accessible; -* `includes` - read a file or an url like the previous macro, but fetch and check the signature file (which is obtained -by `.sig` suffix appending). - -Public keys which are used for the last command are specified by the concrete UCL user. +Moreover, each macro can accept an optional list of arguments in braces. These +arguments themselves are the UCL object that is parsed and passed to a macro as +options: + +```nginx +.macro(param=value) "something"; +.macro(param={key=value}) "something"; +.macro(.include "params.conf") "something"; +.macro(#this is multiline macro +param = [value1, value2]) "something"; +.macro(key="()") "something"; +``` + +UCL also provide a convenient `include` macro to load content from another files +to the current UCL object. This macro accepts either path to file: + +```nginx +.include "/full/path.conf" +.include "./relative/path.conf" +.include "${CURDIR}/path.conf" +``` + +or URL (if ucl is built with url support provided by either `libcurl` or `libfetch`): + + .include "http://example.com/file.conf" + +`.include` macro supports a set of options: + +* `try` (default: **false**) - if this option is `true` than UCL treats errors on loading of +this file as non-fatal. For example, such a file can be absent but it won't stop the parsing +of the top-level document. +* `sign` (default: **false**) - if this option is `true` UCL loads and checks the signature for +a file from path named `.sig`. Trusted public keys should be provided for UCL API after +parser is created but before any configurations are parsed. +* `glob` (default: **false**) - if this option is `true` UCL treats the filename as GLOB pattern and load +all files that matches the specified pattern (normally the format of patterns is defined in `glob` manual page +for your operating system). This option is meaningless for URL includes. +* `url` (default: **true**) - allow URL includes. +* `priority` (default: 0) - specify priority for the include (see below). + +Priorities are used by UCL parser to manage the policy of objects rewriting during including other files +as following: + +* If we have two objects with the same priority then we form an implicit array +* If a new object has bigger priority then we overwrite an old one +* If a new object has lower priority then we ignore it + +By default, the priority of top-level object is set to zero (lowest priority). Currently, +you can define up to 16 priorities (from 0 to 15). Includes with bigger priorities will +rewrite keys from the objects with lower priorities as specified by the policy. ### Variables support @@ -317,7 +359,7 @@ ucl: emitted compact json in 0.0991 seco ucl: emitted yaml in 0.1354 seconds ``` -You can do your own benchmarks by running `make test` in libucl top directory. +You can do your own benchmarks by running `make check` in libucl top directory. ## Conclusion Modified: projects/sendfile/contrib/libucl/cmake/CMakeLists.txt ============================================================================== --- projects/sendfile/contrib/libucl/cmake/CMakeLists.txt Sat Nov 29 15:43:32 2014 (r275250) +++ projects/sendfile/contrib/libucl/cmake/CMakeLists.txt Sat Nov 29 15:45:19 2014 (r275251) @@ -1,8 +1,8 @@ PROJECT(libucl C) SET(LIBUCL_VERSION_MAJOR 0) -SET(LIBUCL_VERSION_MINOR 2) -SET(LIBUCL_VERSION_PATCH 9) +SET(LIBUCL_VERSION_MINOR 5) +SET(LIBUCL_VERSION_PATCH 0) SET(LIBUCL_VERSION "${LIBUCL_VERSION_MAJOR}.${LIBUCL_VERSION_MINOR}.${LIBUCL_VERSION_PATCH}") @@ -86,6 +86,8 @@ INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOU SET(UCLSRC ../src/ucl_util.c ../src/ucl_parser.c ../src/ucl_emitter.c + ../src/ucl_emitter_streamline.c + ../src/ucl_emitter_utils.c ../src/ucl_hash.c ../src/ucl_schema.c ../src/xxhash.c) @@ -98,6 +100,18 @@ ENDIF (BUILD_SHARED_LIBS) ADD_LIBRARY(ucl ${LIB_TYPE} ${UCLSRC}) SET_TARGET_PROPERTIES(ucl PROPERTIES VERSION ${LIBUCL_VERSION} SOVERSION ${LIBUCL_VERSION_MAJOR}) +IF(WITH_LUA) + SET(UCL_LUA_SRC ../lua/lua_ucl.c) + ADD_LIBRARY(lua-ucl ${LIB_TYPE} ${UCL_LUA_SRC}) + IF(ENABLE_LUAJIT MATCHES "ON") + TARGET_LINK_LIBRARIES(lua-ucl "${LUAJIT_LIBRARY}") + ELSE(ENABLE_LUAJIT MATCHES "ON") + TARGET_LINK_LIBRARIES(lua-ucl "${LUA_LIBRARY}") + ENDIF(ENABLE_LUAJIT MATCHES "ON") + TARGET_LINK_LIBRARIES(lua-ucl ucl) + SET_TARGET_PROPERTIES(lua-ucl PROPERTIES VERSION ${LIBUCL_VERSION} SOVERSION ${LIBUCL_VERSION_MAJOR}) +ENDIF(WITH_LUA) + IF(HAVE_FETCH_H) TARGET_LINK_LIBRARIES(ucl fetch) ELSE(HAVE_FETCH_H) Modified: projects/sendfile/contrib/libucl/configure.ac ============================================================================== --- projects/sendfile/contrib/libucl/configure.ac Sat Nov 29 15:43:32 2014 (r275250) +++ projects/sendfile/contrib/libucl/configure.ac Sat Nov 29 15:45:19 2014 (r275251) @@ -1,12 +1,13 @@ m4_define([maj_ver], [0]) -m4_define([med_ver], [5]) -m4_define([min_ver], [0]) -m4_define([so_version], [2:0:0]) +m4_define([med_ver], [6]) +m4_define([min_ver], [1]) +m4_define([so_version], [3:0:1]) m4_define([ucl_version], [maj_ver.med_ver.min_ver]) AC_INIT([libucl],[ucl_version],[https://github.com/vstakhov/libucl],[libucl]) AC_CONFIG_SRCDIR([configure.ac]) -AM_INIT_AUTOMAKE([1.11 foreign silent-rules -Wall -Wportability no-dist-gzip dist-xz]) +AM_INIT_AUTOMAKE([1.11 foreign -Wall -Wportability no-dist-gzip dist-xz]) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) UCL_VERSION=ucl_version SO_VERSION=so_version @@ -57,6 +58,9 @@ AC_ARG_ENABLE([regex], AS_HELP_STRING([- AC_ARG_ENABLE([signatures], AS_HELP_STRING([--enable-signatures], [Enable signatures check (requires openssl) @<:@default=no@:>@]), [], [enable_signatures=no]) +AC_ARG_ENABLE([lua], AS_HELP_STRING([--enable-lua], + [Enable lua API build (requires lua libraries and headers) @<:@default=no@:>@]), [], + [enable_lua=no]) AC_ARG_ENABLE([utils], AS_HELP_STRING([--enable-utils], [Build and install utils @<:@default=no@:>@]), [case "${enableval}" in @@ -99,6 +103,21 @@ AS_IF([test "x$enable_regex" = "xyes"], ]) AC_SUBST(LIBREGEX_LIB) +AS_IF([test "x$enable_lua" = "xyes"], [ + AX_PROG_LUA([5.1], [], [ + AX_LUA_HEADERS([ + AX_LUA_LIBS([ + AC_DEFINE(HAVE_LUA, 1, [Define to 1 for lua support.]) + with_lua="yes" + ], [AC_MSG_ERROR([unable to find the lua libraries]) + ]) + ], [AC_MSG_ERROR([unable to find the lua header files]) + ]) + ], [AC_MSG_ERROR([unable to find the lua interpreter])]) +], [with_lua="no"]) + +AM_CONDITIONAL([LUA_SUB], [test "$with_lua" = "yes"]) + AS_IF([test "x$enable_urls" = "xyes"], [ AC_CHECK_HEADER([fetch.h], [ AC_DEFINE(HAVE_FETCH_H, 1, [Define to 1 if you have the header file.]) @@ -155,9 +174,11 @@ AC_LINK_IFELSE([ AC_CONFIG_FILES(Makefile \ src/Makefile \ + lua/Makefile tests/Makefile \ utils/Makefile \ doc/Makefile \ + lua/libucl.rockspec \ libucl.pc) AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h]) AC_OUTPUT Copied: projects/sendfile/contrib/libucl/doc/lua_api.md (from r275248, head/contrib/libucl/doc/lua_api.md) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sendfile/contrib/libucl/doc/lua_api.md Sat Nov 29 15:45:19 2014 (r275251, copy of r275248, head/contrib/libucl/doc/lua_api.md) @@ -0,0 +1,194 @@ +## Module `ucl` + +This lua module allows to parse objects from strings and to store data into +ucl objects. It uses `libucl` C library to parse and manipulate with ucl objects. + +Example: + +~~~lua +local ucl = require("ucl") + +local parser = ucl.parser() +local res,err = parser:parse_string('{key=value}') + +if not res then + print('parser error: ' .. err) +else + local obj = parser:get_object() + local got = ucl.to_format(obj, 'json') +endif + +local table = { + str = 'value', + num = 100500, + null = ucl.null, + func = function () + return 'huh' + end + + +print(ucl.to_format(table, 'ucl')) +-- Output: +--[[ +num = 100500; +str = "value"; +null = null; +func = "huh"; +--]] +~~~ + +###Brief content: + +**Functions**: + +> [`ucl_object_push_lua(L, obj, allow_array)`](#function-ucl_object_push_lual-obj-allow_array) + +> [`ucl.to_format(var, format)`](#function-uclto_formatvar-format) + + + +**Methods**: + +> [`parser:parse_file(name)`](#method-parserparse_filename) + +> [`parser:parse_string(input)`](#method-parserparse_stringinput) + +> [`parser:get_object()`](#method-parserget_object) + + +## Functions + +The module `ucl` defines the following functions. + +### Function `ucl_object_push_lua(L, obj, allow_array)` + +This is a `C` function to push `UCL` object as lua variable. This function +converts `obj` to lua representation using the following conversions: + +- *scalar* values are directly presented by lua objects +- *userdata* values are converted to lua function objects using `LUA_REGISTRYINDEX`, +this can be used to pass functions from lua to c and vice-versa +- *arrays* are converted to lua tables with numeric indicies suitable for `ipairs` iterations +- *objects* are converted to lua tables with string indicies + +**Parameters:** + +- `L {lua_State}`: lua state pointer +- `obj {ucl_object_t}`: object to push +- `allow_array {bool}`: expand implicit arrays (should be true for all but partial arrays) + +**Returns:** + +- `{int}`: `1` if an object is pushed to lua + +Back to [module description](#module-ucl). + +### Function `ucl.to_format(var, format)` + +Converts lua variable `var` to the specified `format`. Formats supported are: + +- `json` - fine printed json +- `json-compact` - compacted json +- `config` - fine printed configuration +- `ucl` - same as `config` +- `yaml` - embedded yaml + +If `var` contains function, they are called during output formatting and if +they return string value, then this value is used for ouptut. + +**Parameters:** + +- `var {variant}`: any sort of lua variable (if userdata then metafield `__to_ucl` is searched for output) +- `format {string}`: any available format + +**Returns:** + +- `{string}`: string representation of `var` in the specific `format`. + +Example: + +~~~lua +local table = { + str = 'value', + num = 100500, + null = ucl.null, + func = function () + return 'huh' + end + + +print(ucl.to_format(table, 'ucl')) +-- Output: +--[[ +num = 100500; +str = "value"; +null = null; +func = "huh"; +--]] +~~~ + +Back to [module description](#module-ucl). + + +## Methods + +The module `ucl` defines the following methods. + +### Method `parser:parse_file(name)` + +Parse UCL object from file. + +**Parameters:** + +- `name {string}`: filename to parse + +**Returns:** + +- `{bool[, string]}`: if res is `true` then file has been parsed successfully, otherwise an error string is also returned + +Example: + +~~~lua +local parser = ucl.parser() +local res,err = parser:parse_file('/some/file.conf') + +if not res then + print('parser error: ' .. err) +else + -- Do something with object +end +~~~ + +Back to [module description](#module-ucl). + +### Method `parser:parse_string(input)` + +Parse UCL object from file. + +**Parameters:** + +- `input {string}`: string to parse + +**Returns:** + +- `{bool[, string]}`: if res is `true` then file has been parsed successfully, otherwise an error string is also returned + +Back to [module description](#module-ucl). + +### Method `parser:get_object()` + +Get top object from parser and export it to lua representation. + +**Parameters:** + + nothing + +**Returns:** + +- `{variant or nil}`: ucl object as lua native variable + +Back to [module description](#module-ucl). + + +Back to [top](#). + Copied: projects/sendfile/contrib/libucl/include/lua_ucl.h (from r275248, head/contrib/libucl/include/lua_ucl.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sendfile/contrib/libucl/include/lua_ucl.h Sat Nov 29 15:45:19 2014 (r275251, copy of r275248, head/contrib/libucl/include/lua_ucl.h) @@ -0,0 +1,69 @@ +/* Copyright (c) 2014, Vsevolod Stakhov + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * 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 ''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 AUTHOR 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. + */ +#ifndef LUA_UCL_H_ +#define LUA_UCL_H_ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include +#include +#include "ucl.h" + +/** + * Closure structure for lua function storing inside UCL + */ +struct ucl_lua_funcdata { + lua_State *L; + int idx; + char *ret; +}; + +/** + * Initialize lua UCL API + */ +UCL_EXTERN int luaopen_ucl (lua_State *L); + +/** + * Import UCL object from lua state + * @param L lua state + * @param idx index of object at the lua stack to convert to UCL + * @return new UCL object or NULL, the caller should unref object after using + */ +UCL_EXTERN ucl_object_t* ucl_object_lua_import (lua_State *L, int idx); + +/** + * Push an object to lua + * @param L lua state + * @param obj object to push + * @param allow_array traverse over implicit arrays + */ +UCL_EXTERN int ucl_object_push_lua (lua_State *L, + const ucl_object_t *obj, bool allow_array); + +UCL_EXTERN struct ucl_lua_funcdata* ucl_object_toclosure ( + const ucl_object_t *obj); + +#endif /* LUA_UCL_H_ */ Modified: projects/sendfile/contrib/libucl/include/ucl.h ============================================================================== --- projects/sendfile/contrib/libucl/include/ucl.h Sat Nov 29 15:43:32 2014 (r275250) +++ projects/sendfile/contrib/libucl/include/ucl.h Sat Nov 29 15:45:19 2014 (r275251) @@ -147,7 +147,8 @@ typedef enum ucl_emitter { typedef enum ucl_parser_flags { UCL_PARSER_KEY_LOWERCASE = 0x1, /**< Convert all keys to lower case */ UCL_PARSER_ZEROCOPY = 0x2, /**< Parse input in zero-copy mode if possible */ - UCL_PARSER_NO_TIME = 0x4 /**< Do not parse time and treat time values as strings */ + UCL_PARSER_NO_TIME = 0x4, /**< Do not parse time and treat time values as strings */ + UCL_PARSER_NO_IMPLICIT_ARRAYS = 0x8 /** Create explicit arrays instead of implicit ones */ } ucl_parser_flags_t; /** @@ -171,9 +172,12 @@ typedef enum ucl_string_flags { * Basic flags for an object */ typedef enum ucl_object_flags { - UCL_OBJECT_ALLOCATED_KEY = 1, /**< An object has key allocated internally */ - UCL_OBJECT_ALLOCATED_VALUE = 2, /**< An object has a string value allocated internally */ - UCL_OBJECT_NEED_KEY_ESCAPE = 4 /**< The key of an object need to be escaped on output */ + UCL_OBJECT_ALLOCATED_KEY = 0x1, /**< An object has key allocated internally */ + UCL_OBJECT_ALLOCATED_VALUE = 0x2, /**< An object has a string value allocated internally */ + UCL_OBJECT_NEED_KEY_ESCAPE = 0x4, /**< The key of an object need to be escaped on output */ + UCL_OBJECT_EPHEMERAL = 0x8, /**< Temporary object that does not need to be freed really */ + UCL_OBJECT_MULTILINE = 0x10, /**< String should be displayed as multiline string */ + UCL_OBJECT_MULTIVALUE = 0x20 /**< Object is a key with multiple values */ } ucl_object_flags_t; /** @@ -195,14 +199,21 @@ typedef struct ucl_object_s { const char *key; /**< Key of an object */ struct ucl_object_s *next; /**< Array handle */ struct ucl_object_s *prev; /**< Array handle */ - unsigned char* trash_stack[2]; /**< Pointer to allocated chunks */ - unsigned keylen; /**< Lenght of a key */ - unsigned len; /**< Size of an object */ - enum ucl_type type; /**< Real type */ - uint16_t ref; /**< Reference count */ + uint32_t keylen; /**< Lenght of a key */ + uint32_t len; /**< Size of an object */ + uint32_t ref; /**< Reference count */ uint16_t flags; /**< Object flags */ + uint16_t type; /**< Real type */ + unsigned char* trash_stack[2]; /**< Pointer to allocated chunks */ } ucl_object_t; +/** + * Destructor type for userdata objects + * @param ud user specified data pointer + */ +typedef void (*ucl_userdata_dtor)(void *ud); +typedef const char* (*ucl_userdata_emitter)(void *ud); + /** @} */ /** @@ -239,6 +250,31 @@ UCL_EXTERN ucl_object_t* ucl_object_new UCL_EXTERN ucl_object_t* ucl_object_typed_new (ucl_type_t type) UCL_WARN_UNUSED_RESULT; /** + * Create new object with type and priority specified + * @param type type of a new object + * @param priority priority of an object + * @return new object + */ +UCL_EXTERN ucl_object_t* ucl_object_new_full (ucl_type_t type, unsigned priority) + UCL_WARN_UNUSED_RESULT; + +/** + * Create new object with userdata dtor + * @param dtor destructor function + * @return new object + */ +UCL_EXTERN ucl_object_t* ucl_object_new_userdata (ucl_userdata_dtor dtor, + ucl_userdata_emitter emitter) UCL_WARN_UNUSED_RESULT; + +/** + * Perform deep copy of an object copying everything + * @param other object to copy + * @return new object with refcount equal to 1 + */ +UCL_EXTERN ucl_object_t * ucl_object_copy (const ucl_object_t *other) + UCL_WARN_UNUSED_RESULT; + +/** * Return the type of an object * @return the object type */ @@ -293,7 +329,7 @@ UCL_EXTERN ucl_object_t* ucl_object_from /** * Insert a object 'elt' to the hash 'top' and associate it with key 'key' - * @param top destination object (will be created automatically if top is NULL) + * @param top destination object (must be of type UCL_OBJECT) * @param elt element to insert (must NOT be NULL) * @param key key to associate with this object (either const or preallocated) * @param keylen length of the key (or 0 for NULL terminated keys) @@ -306,7 +342,7 @@ UCL_EXTERN bool ucl_object_insert_key (u /** * Replace a object 'elt' to the hash 'top' and associate it with key 'key', old object will be unrefed, * if no object has been found this function works like ucl_object_insert_key() - * @param top destination object (will be created automatically if top is NULL) + * @param top destination object (must be of type UCL_OBJECT) * @param elt element to insert (must NOT be NULL) * @param key key to associate with this object (either const or preallocated) * @param keylen length of the key (or 0 for NULL terminated keys) @@ -317,6 +353,15 @@ UCL_EXTERN bool ucl_object_replace_key ( const char *key, size_t keylen, bool copy_key); /** + * Merge the keys from one object to another object. Overwrite on conflict + * @param top destination object (must be of type UCL_OBJECT) + * @param elt element to insert (must be of type UCL_OBJECT) + * @param copy copy rather than reference the elements + * @return true if all keys have been merged + */ +UCL_EXTERN bool ucl_object_merge (ucl_object_t *top, ucl_object_t *elt, bool copy); + +/** * Delete a object associated with key 'key', old object will be unrefered, * @param top object * @param key key associated to the object to remove @@ -335,8 +380,9 @@ UCL_EXTERN bool ucl_object_delete_key (u /** - * Delete key from `top` object returning the object deleted. This object is not - * released + * Removes `key` from `top` object, returning the object that was removed. This + * object is not released, caller must unref the returned object when it is no + * longer needed. * @param top object * @param key key to remove * @param keylen length of the key (or 0 for NULL terminated keys) @@ -346,8 +392,9 @@ UCL_EXTERN ucl_object_t* ucl_object_pop_ size_t keylen) UCL_WARN_UNUSED_RESULT; /** - * Delete key from `top` object returning the object deleted. This object is not - * released + * Removes `key` from `top` object returning the object that was removed. This + * object is not released, caller must unref the returned object when it is no + * longer needed. * @param top object * @param key key to remove * @return removed object or NULL if object has not been found @@ -356,9 +403,9 @@ UCL_EXTERN ucl_object_t* ucl_object_pop_ UCL_WARN_UNUSED_RESULT; /** - * Insert a object 'elt' to the hash 'top' and associate it with key 'key', if the specified key exist, - * try to merge its content - * @param top destination object (will be created automatically if top is NULL) + * Insert a object 'elt' to the hash 'top' and associate it with key 'key', if + * the specified key exist, try to merge its content + * @param top destination object (must be of type UCL_OBJECT) * @param elt element to insert (must NOT be NULL) * @param key key to associate with this object (either const or preallocated) * @param keylen length of the key (or 0 for NULL terminated keys) @@ -369,8 +416,8 @@ UCL_EXTERN bool ucl_object_insert_key_me const char *key, size_t keylen, bool copy_key); /** - * Append an element to the front of array object - * @param top destination object (will be created automatically if top is NULL) + * Append an element to the end of array object + * @param top destination object (must NOT be NULL) * @param elt element to append (must NOT be NULL) * @return true if value has been inserted */ @@ -379,7 +426,7 @@ UCL_EXTERN bool ucl_array_append (ucl_ob /** * Append an element to the start of array object - * @param top destination object (will be created automatically if top is NULL) + * @param top destination object (must NOT be NULL) * @param elt element to append (must NOT be NULL) * @return true if value has been inserted */ @@ -387,8 +434,19 @@ UCL_EXTERN bool ucl_array_prepend (ucl_o ucl_object_t *elt); /** - * Removes an element `elt` from the array `top`. Caller must unref the returned object when it is not - * needed. + * Merge all elements of second array into the first array + * @param top destination array (must be of type UCL_ARRAY) + * @param elt array to copy elements from (must be of type UCL_ARRAY) + * @param copy copy elements instead of referencing them + * @return true if arrays were merged + */ +UCL_EXTERN bool ucl_array_merge (ucl_object_t *top, ucl_object_t *elt, + bool copy); + +/** + * Removes an element `elt` from the array `top`, returning the object that was + * removed. This object is not released, caller must unref the returned object + * when it is no longer needed. * @param top array ucl object * @param elt element to remove * @return removed element or NULL if `top` is NULL or not an array @@ -411,35 +469,50 @@ UCL_EXTERN const ucl_object_t* ucl_array UCL_EXTERN const ucl_object_t* ucl_array_tail (const ucl_object_t *top); /** - * Removes the last element from the array `top`. Caller must unref the returned object when it is not - * needed. + * Removes the last element from the array `top`, returning the object that was + * removed. This object is not released, caller must unref the returned object + * when it is no longer needed. * @param top array ucl object * @return removed element or NULL if `top` is NULL or not an array */ UCL_EXTERN ucl_object_t* ucl_array_pop_last (ucl_object_t *top); /** - * Return object identified by an index of the array `top` - * @param obj object to get a key from (must be of type UCL_ARRAY) - * @param index index to return + * Removes the first element from the array `top`, returning the object that was + * removed. This object is not released, caller must unref the returned object + * when it is no longer needed. + * @param top array ucl object + * @return removed element or NULL if `top` is NULL or not an array + */ +UCL_EXTERN ucl_object_t* ucl_array_pop_first (ucl_object_t *top); + +/** + * Return object identified by index of the array `top` + * @param top object to get a key from (must be of type UCL_ARRAY) + * @param index array index to return * @return object at the specified index or NULL if index is not found */ UCL_EXTERN const ucl_object_t* ucl_array_find_index (const ucl_object_t *top, unsigned int index); /** - * Removes the first element from the array `top`. Caller must unref the returned object when it is not - * needed. - * @param top array ucl object - * @return removed element or NULL if `top` is NULL or not an array + * Replace an element in an array with a different element, returning the object + * that was replaced. This object is not released, caller must unref the + * returned object when it is no longer needed. + * @param top destination object (must be of type UCL_ARRAY) + * @param elt element to append (must NOT be NULL) + * @param index array index in destination to overwrite with elt + * @return object that was replaced or NULL if index is not found */ -UCL_EXTERN ucl_object_t* ucl_array_pop_first (ucl_object_t *top); +ucl_object_t * +ucl_array_replace_index (ucl_object_t *top, ucl_object_t *elt, + unsigned int index); /** * Append a element to another element forming an implicit array * @param head head to append (may be NULL) * @param elt new element - * @return true if element has been inserted + * @return the new implicit array */ UCL_EXTERN ucl_object_t * ucl_elt_append (ucl_object_t *head, ucl_object_t *elt); @@ -533,7 +606,7 @@ UCL_EXTERN const char* ucl_object_tolstr * Return object identified by a key in the specified object * @param obj object to get a key from (must be of type UCL_OBJECT) * @param key key to search - * @return object matched the specified key or NULL if key is not found + * @return object matching the specified key or NULL if key was not found */ UCL_EXTERN const ucl_object_t* ucl_object_find_key (const ucl_object_t *obj, const char *key); @@ -543,7 +616,7 @@ UCL_EXTERN const ucl_object_t* ucl_objec * @param obj object to get a key from (must be of type UCL_OBJECT) * @param key key to search * @param klen length of a key - * @return object matched the specified key or NULL if key is not found + * @return object matching the specified key or NULL if key was not found */ UCL_EXTERN const ucl_object_t* ucl_object_find_keyl (const ucl_object_t *obj, const char *key, size_t klen); @@ -575,6 +648,7 @@ UCL_EXTERN const char* ucl_object_keyl ( /** * Increase reference count for an object * @param obj object to ref + * @return the referenced object */ UCL_EXTERN ucl_object_t* ucl_object_ref (const ucl_object_t *obj); @@ -612,6 +686,21 @@ UCL_EXTERN void ucl_object_array_sort (u int (*cmp)(const ucl_object_t *o1, const ucl_object_t *o2)); /** + * Get the priority for specific UCL object + * @param obj any ucl object + * @return priority of an object + */ +UCL_EXTERN unsigned int ucl_object_get_priority (const ucl_object_t *obj); + +/** + * Set explicit priority of an object. + * @param obj any ucl object + * @param priority new priroity value (only 4 least significant bits are considred) + */ +UCL_EXTERN void ucl_object_set_priority (ucl_object_t *obj, + unsigned int priority); + +/** * Opaque iterator object */ typedef void* ucl_object_iter_t; @@ -640,11 +729,14 @@ UCL_EXTERN const ucl_object_t* ucl_itera * Macro handler for a parser * @param data the content of macro * @param len the length of content + * @param arguments arguments object * @param ud opaque user data * @param err error pointer * @return true if macro has been parsed */ -typedef bool (*ucl_macro_handler) (const unsigned char *data, size_t len, void* ud); +typedef bool (*ucl_macro_handler) (const unsigned char *data, size_t len, + const ucl_object_t *arguments, + void* ud); /* Opaque parser */ struct ucl_parser; @@ -702,13 +794,24 @@ UCL_EXTERN void ucl_parser_set_variables * @param parser parser structure * @param data the pointer to the beginning of a chunk * @param len the length of a chunk - * @param err if *err is NULL it is set to parser error * @return true if chunk has been added and false in case of error */ UCL_EXTERN bool ucl_parser_add_chunk (struct ucl_parser *parser, const unsigned char *data, size_t len); /** + * Load new chunk to a parser with the specified priority + * @param parser parser structure + * @param data the pointer to the beginning of a chunk + * @param len the length of a chunk + * @param priority the desired priority of a chunk (only 4 least significant bits + * are considered for this parameter) + * @return true if chunk has been added and false in case of error + */ +UCL_EXTERN bool ucl_parser_add_chunk_priority (struct ucl_parser *parser, + const unsigned char *data, size_t len, unsigned priority); + +/** * Load ucl object from a string * @param parser parser structure * @param data the pointer to the string @@ -835,7 +938,7 @@ struct ucl_emitter_context { /** A set of output operations */ const struct ucl_emitter_operations *ops; /** Current amount of indent tabs */ - unsigned int ident; + unsigned int indent; /** Top level object */ const ucl_object_t *top; /** The rest of context */ Modified: projects/sendfile/contrib/libucl/libucl.pc.in ============================================================================== --- projects/sendfile/contrib/libucl/libucl.pc.in Sat Nov 29 15:43:32 2014 (r275250) +++ projects/sendfile/contrib/libucl/libucl.pc.in Sat Nov 29 15:45:19 2014 (r275251) @@ -7,5 +7,5 @@ Name: LibUCL Description: Universal configuration library Version: @UCL_VERSION@ Libs: -L${libdir} -lucl -Libs.private: @LIBS_EXTRA@ +Libs.private: @LIBS_EXTRA@ @LUA_LIB@ Cflags: -I${includedir}/ Modified: projects/sendfile/contrib/libucl/src/ucl_emitter.c ============================================================================== --- projects/sendfile/contrib/libucl/src/ucl_emitter.c Sat Nov 29 15:43:32 2014 (r275250) +++ projects/sendfile/contrib/libucl/src/ucl_emitter.c Sat Nov 29 15:45:19 2014 (r275251) @@ -130,6 +130,19 @@ ucl_emitter_print_key (bool print_key, s func->ucl_emitter_append_character (' ', 1, func->ud); } } *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Sat Nov 29 18:44:56 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6B2A0D43; Sat, 29 Nov 2014 18:44:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 542BC8C5; Sat, 29 Nov 2014 18:44:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sATIiuoO043901; Sat, 29 Nov 2014 18:44:56 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sATIirYR043882; Sat, 29 Nov 2014 18:44:53 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411291844.sATIirYR043882@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 29 Nov 2014 18:44:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275262 - in projects/clang350-import: contrib/binutils/ld contrib/libucl contrib/libucl/cmake contrib/libucl/doc contrib/libucl/include contrib/libucl/lua contrib/libucl/m4 contrib/lib... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Nov 2014 18:44:56 -0000 Author: dim Date: Sat Nov 29 18:44:52 2014 New Revision: 275262 URL: https://svnweb.freebsd.org/changeset/base/275262 Log: Merge ^/head r274961 through r275261. Added: projects/clang350-import/contrib/libucl/COPYING - copied unchanged from r275261, head/contrib/libucl/COPYING projects/clang350-import/contrib/libucl/doc/lua_api.md - copied unchanged from r275261, head/contrib/libucl/doc/lua_api.md projects/clang350-import/contrib/libucl/include/lua_ucl.h - copied unchanged from r275261, head/contrib/libucl/include/lua_ucl.h projects/clang350-import/contrib/libucl/lua/ - copied from r275261, head/contrib/libucl/lua/ projects/clang350-import/contrib/libucl/m4/ - copied from r275261, head/contrib/libucl/m4/ projects/clang350-import/contrib/libucl/tests/basic/12.in - copied unchanged from r275261, head/contrib/libucl/tests/basic/12.in projects/clang350-import/contrib/libucl/tests/basic/12.res - copied unchanged from r275261, head/contrib/libucl/tests/basic/12.res projects/clang350-import/contrib/libucl/tests/basic/13.in - copied unchanged from r275261, head/contrib/libucl/tests/basic/13.in projects/clang350-import/contrib/libucl/tests/basic/13.res - copied unchanged from r275261, head/contrib/libucl/tests/basic/13.res projects/clang350-import/contrib/libucl/tests/basic/comments.in - copied unchanged from r275261, head/contrib/libucl/tests/basic/comments.in projects/clang350-import/contrib/libucl/tests/basic/comments.res - copied unchanged from r275261, head/contrib/libucl/tests/basic/comments.res projects/clang350-import/contrib/libucl/tests/basic/include_dir/ - copied from r275261, head/contrib/libucl/tests/basic/include_dir/ projects/clang350-import/usr.sbin/cron/Makefile.inc - copied unchanged from r275261, head/usr.sbin/cron/Makefile.inc projects/clang350-import/usr.sbin/fifolog/Makefile.inc - copied unchanged from r275261, head/usr.sbin/fifolog/Makefile.inc Modified: projects/clang350-import/contrib/binutils/ld/lexsup.c projects/clang350-import/contrib/libucl/ChangeLog.md projects/clang350-import/contrib/libucl/Makefile.am projects/clang350-import/contrib/libucl/Makefile.w32 projects/clang350-import/contrib/libucl/README.md projects/clang350-import/contrib/libucl/cmake/CMakeLists.txt projects/clang350-import/contrib/libucl/configure.ac projects/clang350-import/contrib/libucl/include/ucl.h projects/clang350-import/contrib/libucl/libucl.pc.in projects/clang350-import/contrib/libucl/src/ucl_emitter.c projects/clang350-import/contrib/libucl/src/ucl_emitter_streamline.c projects/clang350-import/contrib/libucl/src/ucl_emitter_utils.c projects/clang350-import/contrib/libucl/src/ucl_hash.c projects/clang350-import/contrib/libucl/src/ucl_hash.h projects/clang350-import/contrib/libucl/src/ucl_internal.h projects/clang350-import/contrib/libucl/src/ucl_parser.c projects/clang350-import/contrib/libucl/src/ucl_util.c projects/clang350-import/contrib/libucl/tests/Makefile.am projects/clang350-import/contrib/libucl/tests/basic/4.res projects/clang350-import/contrib/libucl/tests/generate.res projects/clang350-import/contrib/libucl/tests/test_basic.c projects/clang350-import/contrib/libucl/tests/test_generate.c projects/clang350-import/contrib/libucl/tests/test_schema.c projects/clang350-import/contrib/libucl/utils/objdump.c projects/clang350-import/lib/libc/arm/string/ffs.S projects/clang350-import/lib/libc/arm/string/memcmp.S projects/clang350-import/lib/libc/arm/string/memcpy_arm.S projects/clang350-import/lib/libc/arm/string/memcpy_xscale.S projects/clang350-import/lib/libc/arm/string/memmove.S projects/clang350-import/lib/libc/arm/string/memset.S projects/clang350-import/lib/libc/arm/string/strlen.S projects/clang350-import/lib/libucl/Makefile projects/clang350-import/share/mk/src.libnames.mk projects/clang350-import/sys/boot/common/module.c projects/clang350-import/sys/boot/i386/boot2/boot2.c projects/clang350-import/sys/boot/pc98/boot2/boot2.c projects/clang350-import/sys/conf/kern.mk projects/clang350-import/sys/kern/kern_linker.c projects/clang350-import/sys/kern/sys_pipe.c projects/clang350-import/sys/net/if_arcsubr.c projects/clang350-import/sys/net/if_fddisubr.c projects/clang350-import/sys/net/if_fwsubr.c projects/clang350-import/sys/sys/linker.h projects/clang350-import/usr.bin/vi/catalog/Makefile Directory Properties: projects/clang350-import/ (props changed) projects/clang350-import/contrib/binutils/ (props changed) projects/clang350-import/contrib/libucl/ (props changed) projects/clang350-import/lib/libc/ (props changed) projects/clang350-import/share/ (props changed) projects/clang350-import/sys/ (props changed) projects/clang350-import/sys/boot/ (props changed) projects/clang350-import/sys/conf/ (props changed) Modified: projects/clang350-import/contrib/binutils/ld/lexsup.c ============================================================================== --- projects/clang350-import/contrib/binutils/ld/lexsup.c Sat Nov 29 17:29:30 2014 (r275261) +++ projects/clang350-import/contrib/binutils/ld/lexsup.c Sat Nov 29 18:44:52 2014 (r275262) @@ -84,6 +84,7 @@ enum option_values OPTION_NO_KEEP_MEMORY, OPTION_NO_WARN_MISMATCH, OPTION_NO_WARN_SEARCH_MISMATCH, + OPTION_NO_WARN_FATAL, OPTION_NOINHIBIT_EXEC, OPTION_NON_SHARED, OPTION_NO_WHOLE_ARCHIVE, @@ -375,6 +376,9 @@ static const struct ld_option ld_options { {"fatal-warnings", no_argument, NULL, OPTION_WARN_FATAL}, '\0', NULL, N_("Treat warnings as errors"), TWO_DASHES }, + { {"no-fatal-warnings", no_argument, NULL, OPTION_NO_WARN_FATAL}, + '\0', NULL, N_("Don't treat warnings as errors"), + TWO_DASHES }, { {"fini", required_argument, NULL, OPTION_FINI}, '\0', N_("SYMBOL"), N_("Call SYMBOL at unload-time"), ONE_DASH }, { {"force-exe-suffix", no_argument, NULL, OPTION_FORCE_EXE_SUFFIX}, @@ -568,6 +572,7 @@ parse_args (unsigned argc, char **argv) struct option *really_longopts; int last_optind; enum report_method how_to_report_unresolved_symbols = RM_GENERATE_ERROR; + int no_fatal_warnings = FALSE; shortopts = xmalloc (OPTION_COUNT * 3 + 2); longopts = xmalloc (sizeof (*longopts) * (OPTION_COUNT + 1)); @@ -1317,6 +1322,9 @@ parse_args (unsigned argc, char **argv) case OPTION_WARN_FATAL: config.fatal_warnings = TRUE; break; + case OPTION_NO_WARN_FATAL: + no_fatal_warnings = TRUE; + break; case OPTION_WARN_MULTIPLE_GP: config.warn_multiple_gp = TRUE; break; @@ -1438,6 +1446,8 @@ parse_args (unsigned argc, char **argv) break; } } + if (no_fatal_warnings) + config.fatal_warnings = FALSE; if (ingroup) lang_leave_group (); Copied: projects/clang350-import/contrib/libucl/COPYING (from r275261, head/contrib/libucl/COPYING) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/contrib/libucl/COPYING Sat Nov 29 18:44:52 2014 (r275262, copy of r275261, head/contrib/libucl/COPYING) @@ -0,0 +1,23 @@ +Copyright (c) 2013-2014, Vsevolod Stakhov +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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. Modified: projects/clang350-import/contrib/libucl/ChangeLog.md ============================================================================== --- projects/clang350-import/contrib/libucl/ChangeLog.md Sat Nov 29 17:29:30 2014 (r275261) +++ projects/clang350-import/contrib/libucl/ChangeLog.md Sat Nov 29 18:44:52 2014 (r275262) @@ -4,3 +4,19 @@ - Streamline emitter has been added, so it is now possible to output partial `ucl` objects - Emitter now is more flexible due to emitter_context structure + +### 0.5.1 +- Fixed number of bugs and memory leaks + +### 0.5.2 + +- Allow userdata objects to be emitted and destructed +- Use userdata objects to store lua function references + +### Libucl 0.6 + +- Reworked macro interface + +### Libucl 0.6.1 + +- Various utilities fixes Modified: projects/clang350-import/contrib/libucl/Makefile.am ============================================================================== --- projects/clang350-import/contrib/libucl/Makefile.am Sat Nov 29 17:29:30 2014 (r275261) +++ projects/clang350-import/contrib/libucl/Makefile.am Sat Nov 29 18:44:52 2014 (r275262) @@ -4,4 +4,8 @@ EXTRA_DIST = uthash README.md pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libucl.pc -SUBDIRS = src tests utils doc +if LUA_SUB + LUA_SUBDIR = lua +endif + +SUBDIRS = src tests utils doc $(LUA_SUBDIR) \ No newline at end of file Modified: projects/clang350-import/contrib/libucl/Makefile.w32 ============================================================================== --- projects/clang350-import/contrib/libucl/Makefile.w32 Sat Nov 29 17:29:30 2014 (r275261) +++ projects/clang350-import/contrib/libucl/Makefile.w32 Sat Nov 29 18:44:52 2014 (r275262) @@ -33,6 +33,7 @@ OBJECTS = $(OBJDIR)/ucl_hash.o \ $(OBJDIR)/ucl_util.o \ $(OBJDIR)/ucl_parser.o \ $(OBJDIR)/ucl_emitter.o \ + $(OBJDIR)/ucl_emitter_utils.o \ $(OBJDIR)/ucl_schema.o \ $(OBJDIR)/xxhash.o @@ -51,6 +52,8 @@ $(OBJDIR)/ucl_parser.o: $(SRCDIR)/ucl_pa $(CC) -o $(OBJDIR)/ucl_parser.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_parser.c $(OBJDIR)/ucl_emitter.o: $(SRCDIR)/ucl_emitter.c $(HDEPS) $(CC) -o $(OBJDIR)/ucl_emitter.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_emitter.c +$(OBJDIR)/ucl_emitter_utils.o: $(SRCDIR)/ucl_emitter_utils.c $(HDEPS) + $(CC) -o $(OBJDIR)/ucl_emitter_utils.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_emitter_utils.c $(OBJDIR)/ucl_hash.o: $(SRCDIR)/ucl_hash.c $(HDEPS) $(CC) -o $(OBJDIR)/ucl_hash.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_hash.c $(OBJDIR)/ucl_schema.o: $(SRCDIR)/ucl_schema.c $(HDEPS) @@ -61,7 +64,7 @@ $(OBJDIR)/xxhash.o: $(SRCDIR)/xxhash.c $ clean: $(RM) $(OBJDIR)/*.o $(OBJDIR)/$(SONAME) $(OBJDIR)/$(SONAME) $(OBJDIR)/chargen $(OBJDIR)/test_basic $(OBJDIR)/test_speed $(OBJDIR)/objdump $(OBJDIR)/test_generate $(RMDIR) $(OBJDIR) - + # Utils chargen: utils/chargen.c $(OBJDIR)/$(SONAME) @@ -75,7 +78,7 @@ test: $(OBJDIR) $(OBJDIR)/$(SONAME) $(OB run-test: test TEST_DIR=$(TESTDIR) $(TESTDIR)/run_tests.sh $(OBJDIR)/test_basic $(OBJDIR)/test_speed $(OBJDIR)/test_generate - + $(OBJDIR)/test_basic: $(TESTDIR)/test_basic.c $(OBJDIR)/$(SONAME) $(CC) -o $(OBJDIR)/test_basic $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) $(LDFLAGS) $(TESTDIR)/test_basic.c $(LD_UCL_FLAGS) $(OBJDIR)/test_speed: $(TESTDIR)/test_speed.c $(OBJDIR)/$(SONAME) Modified: projects/clang350-import/contrib/libucl/README.md ============================================================================== --- projects/clang350-import/contrib/libucl/README.md Sat Nov 29 17:29:30 2014 (r275261) +++ projects/clang350-import/contrib/libucl/README.md Sat Nov 29 18:44:52 2014 (r275262) @@ -223,15 +223,57 @@ UCL supports external macros both multil .... }; ``` -There are two internal macros provided by UCL: -* `include` - read a file `/path/to/file` or an url `http://example.com/file` and include it to the current place of -UCL configuration; -* `try\_include` - try to read a file or url and include it but do not create a fatal error if a file or url is not accessible; -* `includes` - read a file or an url like the previous macro, but fetch and check the signature file (which is obtained -by `.sig` suffix appending). - -Public keys which are used for the last command are specified by the concrete UCL user. +Moreover, each macro can accept an optional list of arguments in braces. These +arguments themselves are the UCL object that is parsed and passed to a macro as +options: + +```nginx +.macro(param=value) "something"; +.macro(param={key=value}) "something"; +.macro(.include "params.conf") "something"; +.macro(#this is multiline macro +param = [value1, value2]) "something"; +.macro(key="()") "something"; +``` + +UCL also provide a convenient `include` macro to load content from another files +to the current UCL object. This macro accepts either path to file: + +```nginx +.include "/full/path.conf" +.include "./relative/path.conf" +.include "${CURDIR}/path.conf" +``` + +or URL (if ucl is built with url support provided by either `libcurl` or `libfetch`): + + .include "http://example.com/file.conf" + +`.include` macro supports a set of options: + +* `try` (default: **false**) - if this option is `true` than UCL treats errors on loading of +this file as non-fatal. For example, such a file can be absent but it won't stop the parsing +of the top-level document. +* `sign` (default: **false**) - if this option is `true` UCL loads and checks the signature for +a file from path named `.sig`. Trusted public keys should be provided for UCL API after +parser is created but before any configurations are parsed. +* `glob` (default: **false**) - if this option is `true` UCL treats the filename as GLOB pattern and load +all files that matches the specified pattern (normally the format of patterns is defined in `glob` manual page +for your operating system). This option is meaningless for URL includes. +* `url` (default: **true**) - allow URL includes. +* `priority` (default: 0) - specify priority for the include (see below). + +Priorities are used by UCL parser to manage the policy of objects rewriting during including other files +as following: + +* If we have two objects with the same priority then we form an implicit array +* If a new object has bigger priority then we overwrite an old one +* If a new object has lower priority then we ignore it + +By default, the priority of top-level object is set to zero (lowest priority). Currently, +you can define up to 16 priorities (from 0 to 15). Includes with bigger priorities will +rewrite keys from the objects with lower priorities as specified by the policy. ### Variables support @@ -317,7 +359,7 @@ ucl: emitted compact json in 0.0991 seco ucl: emitted yaml in 0.1354 seconds ``` -You can do your own benchmarks by running `make test` in libucl top directory. +You can do your own benchmarks by running `make check` in libucl top directory. ## Conclusion Modified: projects/clang350-import/contrib/libucl/cmake/CMakeLists.txt ============================================================================== --- projects/clang350-import/contrib/libucl/cmake/CMakeLists.txt Sat Nov 29 17:29:30 2014 (r275261) +++ projects/clang350-import/contrib/libucl/cmake/CMakeLists.txt Sat Nov 29 18:44:52 2014 (r275262) @@ -1,8 +1,8 @@ PROJECT(libucl C) SET(LIBUCL_VERSION_MAJOR 0) -SET(LIBUCL_VERSION_MINOR 2) -SET(LIBUCL_VERSION_PATCH 9) +SET(LIBUCL_VERSION_MINOR 5) +SET(LIBUCL_VERSION_PATCH 0) SET(LIBUCL_VERSION "${LIBUCL_VERSION_MAJOR}.${LIBUCL_VERSION_MINOR}.${LIBUCL_VERSION_PATCH}") @@ -86,6 +86,8 @@ INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOU SET(UCLSRC ../src/ucl_util.c ../src/ucl_parser.c ../src/ucl_emitter.c + ../src/ucl_emitter_streamline.c + ../src/ucl_emitter_utils.c ../src/ucl_hash.c ../src/ucl_schema.c ../src/xxhash.c) @@ -98,6 +100,18 @@ ENDIF (BUILD_SHARED_LIBS) ADD_LIBRARY(ucl ${LIB_TYPE} ${UCLSRC}) SET_TARGET_PROPERTIES(ucl PROPERTIES VERSION ${LIBUCL_VERSION} SOVERSION ${LIBUCL_VERSION_MAJOR}) +IF(WITH_LUA) + SET(UCL_LUA_SRC ../lua/lua_ucl.c) + ADD_LIBRARY(lua-ucl ${LIB_TYPE} ${UCL_LUA_SRC}) + IF(ENABLE_LUAJIT MATCHES "ON") + TARGET_LINK_LIBRARIES(lua-ucl "${LUAJIT_LIBRARY}") + ELSE(ENABLE_LUAJIT MATCHES "ON") + TARGET_LINK_LIBRARIES(lua-ucl "${LUA_LIBRARY}") + ENDIF(ENABLE_LUAJIT MATCHES "ON") + TARGET_LINK_LIBRARIES(lua-ucl ucl) + SET_TARGET_PROPERTIES(lua-ucl PROPERTIES VERSION ${LIBUCL_VERSION} SOVERSION ${LIBUCL_VERSION_MAJOR}) +ENDIF(WITH_LUA) + IF(HAVE_FETCH_H) TARGET_LINK_LIBRARIES(ucl fetch) ELSE(HAVE_FETCH_H) Modified: projects/clang350-import/contrib/libucl/configure.ac ============================================================================== --- projects/clang350-import/contrib/libucl/configure.ac Sat Nov 29 17:29:30 2014 (r275261) +++ projects/clang350-import/contrib/libucl/configure.ac Sat Nov 29 18:44:52 2014 (r275262) @@ -1,12 +1,13 @@ m4_define([maj_ver], [0]) -m4_define([med_ver], [5]) -m4_define([min_ver], [0]) -m4_define([so_version], [2:0:0]) +m4_define([med_ver], [6]) +m4_define([min_ver], [1]) +m4_define([so_version], [3:0:1]) m4_define([ucl_version], [maj_ver.med_ver.min_ver]) AC_INIT([libucl],[ucl_version],[https://github.com/vstakhov/libucl],[libucl]) AC_CONFIG_SRCDIR([configure.ac]) -AM_INIT_AUTOMAKE([1.11 foreign silent-rules -Wall -Wportability no-dist-gzip dist-xz]) +AM_INIT_AUTOMAKE([1.11 foreign -Wall -Wportability no-dist-gzip dist-xz]) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) UCL_VERSION=ucl_version SO_VERSION=so_version @@ -57,6 +58,9 @@ AC_ARG_ENABLE([regex], AS_HELP_STRING([- AC_ARG_ENABLE([signatures], AS_HELP_STRING([--enable-signatures], [Enable signatures check (requires openssl) @<:@default=no@:>@]), [], [enable_signatures=no]) +AC_ARG_ENABLE([lua], AS_HELP_STRING([--enable-lua], + [Enable lua API build (requires lua libraries and headers) @<:@default=no@:>@]), [], + [enable_lua=no]) AC_ARG_ENABLE([utils], AS_HELP_STRING([--enable-utils], [Build and install utils @<:@default=no@:>@]), [case "${enableval}" in @@ -99,6 +103,21 @@ AS_IF([test "x$enable_regex" = "xyes"], ]) AC_SUBST(LIBREGEX_LIB) +AS_IF([test "x$enable_lua" = "xyes"], [ + AX_PROG_LUA([5.1], [], [ + AX_LUA_HEADERS([ + AX_LUA_LIBS([ + AC_DEFINE(HAVE_LUA, 1, [Define to 1 for lua support.]) + with_lua="yes" + ], [AC_MSG_ERROR([unable to find the lua libraries]) + ]) + ], [AC_MSG_ERROR([unable to find the lua header files]) + ]) + ], [AC_MSG_ERROR([unable to find the lua interpreter])]) +], [with_lua="no"]) + +AM_CONDITIONAL([LUA_SUB], [test "$with_lua" = "yes"]) + AS_IF([test "x$enable_urls" = "xyes"], [ AC_CHECK_HEADER([fetch.h], [ AC_DEFINE(HAVE_FETCH_H, 1, [Define to 1 if you have the header file.]) @@ -155,9 +174,11 @@ AC_LINK_IFELSE([ AC_CONFIG_FILES(Makefile \ src/Makefile \ + lua/Makefile tests/Makefile \ utils/Makefile \ doc/Makefile \ + lua/libucl.rockspec \ libucl.pc) AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h]) AC_OUTPUT Copied: projects/clang350-import/contrib/libucl/doc/lua_api.md (from r275261, head/contrib/libucl/doc/lua_api.md) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/contrib/libucl/doc/lua_api.md Sat Nov 29 18:44:52 2014 (r275262, copy of r275261, head/contrib/libucl/doc/lua_api.md) @@ -0,0 +1,194 @@ +## Module `ucl` + +This lua module allows to parse objects from strings and to store data into +ucl objects. It uses `libucl` C library to parse and manipulate with ucl objects. + +Example: + +~~~lua +local ucl = require("ucl") + +local parser = ucl.parser() +local res,err = parser:parse_string('{key=value}') + +if not res then + print('parser error: ' .. err) +else + local obj = parser:get_object() + local got = ucl.to_format(obj, 'json') +endif + +local table = { + str = 'value', + num = 100500, + null = ucl.null, + func = function () + return 'huh' + end + + +print(ucl.to_format(table, 'ucl')) +-- Output: +--[[ +num = 100500; +str = "value"; +null = null; +func = "huh"; +--]] +~~~ + +###Brief content: + +**Functions**: + +> [`ucl_object_push_lua(L, obj, allow_array)`](#function-ucl_object_push_lual-obj-allow_array) + +> [`ucl.to_format(var, format)`](#function-uclto_formatvar-format) + + + +**Methods**: + +> [`parser:parse_file(name)`](#method-parserparse_filename) + +> [`parser:parse_string(input)`](#method-parserparse_stringinput) + +> [`parser:get_object()`](#method-parserget_object) + + +## Functions + +The module `ucl` defines the following functions. + +### Function `ucl_object_push_lua(L, obj, allow_array)` + +This is a `C` function to push `UCL` object as lua variable. This function +converts `obj` to lua representation using the following conversions: + +- *scalar* values are directly presented by lua objects +- *userdata* values are converted to lua function objects using `LUA_REGISTRYINDEX`, +this can be used to pass functions from lua to c and vice-versa +- *arrays* are converted to lua tables with numeric indicies suitable for `ipairs` iterations +- *objects* are converted to lua tables with string indicies + +**Parameters:** + +- `L {lua_State}`: lua state pointer +- `obj {ucl_object_t}`: object to push +- `allow_array {bool}`: expand implicit arrays (should be true for all but partial arrays) + +**Returns:** + +- `{int}`: `1` if an object is pushed to lua + +Back to [module description](#module-ucl). + +### Function `ucl.to_format(var, format)` + +Converts lua variable `var` to the specified `format`. Formats supported are: + +- `json` - fine printed json +- `json-compact` - compacted json +- `config` - fine printed configuration +- `ucl` - same as `config` +- `yaml` - embedded yaml + +If `var` contains function, they are called during output formatting and if +they return string value, then this value is used for ouptut. + +**Parameters:** + +- `var {variant}`: any sort of lua variable (if userdata then metafield `__to_ucl` is searched for output) +- `format {string}`: any available format + +**Returns:** + +- `{string}`: string representation of `var` in the specific `format`. + +Example: + +~~~lua +local table = { + str = 'value', + num = 100500, + null = ucl.null, + func = function () + return 'huh' + end + + +print(ucl.to_format(table, 'ucl')) +-- Output: +--[[ +num = 100500; +str = "value"; +null = null; +func = "huh"; +--]] +~~~ + +Back to [module description](#module-ucl). + + +## Methods + +The module `ucl` defines the following methods. + +### Method `parser:parse_file(name)` + +Parse UCL object from file. + +**Parameters:** + +- `name {string}`: filename to parse + +**Returns:** + +- `{bool[, string]}`: if res is `true` then file has been parsed successfully, otherwise an error string is also returned + +Example: + +~~~lua +local parser = ucl.parser() +local res,err = parser:parse_file('/some/file.conf') + +if not res then + print('parser error: ' .. err) +else + -- Do something with object +end +~~~ + +Back to [module description](#module-ucl). + +### Method `parser:parse_string(input)` + +Parse UCL object from file. + +**Parameters:** + +- `input {string}`: string to parse + +**Returns:** + +- `{bool[, string]}`: if res is `true` then file has been parsed successfully, otherwise an error string is also returned + +Back to [module description](#module-ucl). + +### Method `parser:get_object()` + +Get top object from parser and export it to lua representation. + +**Parameters:** + + nothing + +**Returns:** + +- `{variant or nil}`: ucl object as lua native variable + +Back to [module description](#module-ucl). + + +Back to [top](#). + Copied: projects/clang350-import/contrib/libucl/include/lua_ucl.h (from r275261, head/contrib/libucl/include/lua_ucl.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/contrib/libucl/include/lua_ucl.h Sat Nov 29 18:44:52 2014 (r275262, copy of r275261, head/contrib/libucl/include/lua_ucl.h) @@ -0,0 +1,69 @@ +/* Copyright (c) 2014, Vsevolod Stakhov + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * 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 ''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 AUTHOR 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. + */ +#ifndef LUA_UCL_H_ +#define LUA_UCL_H_ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include +#include +#include "ucl.h" + +/** + * Closure structure for lua function storing inside UCL + */ +struct ucl_lua_funcdata { + lua_State *L; + int idx; + char *ret; +}; + +/** + * Initialize lua UCL API + */ +UCL_EXTERN int luaopen_ucl (lua_State *L); + +/** + * Import UCL object from lua state + * @param L lua state + * @param idx index of object at the lua stack to convert to UCL + * @return new UCL object or NULL, the caller should unref object after using + */ +UCL_EXTERN ucl_object_t* ucl_object_lua_import (lua_State *L, int idx); + +/** + * Push an object to lua + * @param L lua state + * @param obj object to push + * @param allow_array traverse over implicit arrays + */ +UCL_EXTERN int ucl_object_push_lua (lua_State *L, + const ucl_object_t *obj, bool allow_array); + +UCL_EXTERN struct ucl_lua_funcdata* ucl_object_toclosure ( + const ucl_object_t *obj); + +#endif /* LUA_UCL_H_ */ Modified: projects/clang350-import/contrib/libucl/include/ucl.h ============================================================================== --- projects/clang350-import/contrib/libucl/include/ucl.h Sat Nov 29 17:29:30 2014 (r275261) +++ projects/clang350-import/contrib/libucl/include/ucl.h Sat Nov 29 18:44:52 2014 (r275262) @@ -147,7 +147,8 @@ typedef enum ucl_emitter { typedef enum ucl_parser_flags { UCL_PARSER_KEY_LOWERCASE = 0x1, /**< Convert all keys to lower case */ UCL_PARSER_ZEROCOPY = 0x2, /**< Parse input in zero-copy mode if possible */ - UCL_PARSER_NO_TIME = 0x4 /**< Do not parse time and treat time values as strings */ + UCL_PARSER_NO_TIME = 0x4, /**< Do not parse time and treat time values as strings */ + UCL_PARSER_NO_IMPLICIT_ARRAYS = 0x8 /** Create explicit arrays instead of implicit ones */ } ucl_parser_flags_t; /** @@ -171,9 +172,12 @@ typedef enum ucl_string_flags { * Basic flags for an object */ typedef enum ucl_object_flags { - UCL_OBJECT_ALLOCATED_KEY = 1, /**< An object has key allocated internally */ - UCL_OBJECT_ALLOCATED_VALUE = 2, /**< An object has a string value allocated internally */ - UCL_OBJECT_NEED_KEY_ESCAPE = 4 /**< The key of an object need to be escaped on output */ + UCL_OBJECT_ALLOCATED_KEY = 0x1, /**< An object has key allocated internally */ + UCL_OBJECT_ALLOCATED_VALUE = 0x2, /**< An object has a string value allocated internally */ + UCL_OBJECT_NEED_KEY_ESCAPE = 0x4, /**< The key of an object need to be escaped on output */ + UCL_OBJECT_EPHEMERAL = 0x8, /**< Temporary object that does not need to be freed really */ + UCL_OBJECT_MULTILINE = 0x10, /**< String should be displayed as multiline string */ + UCL_OBJECT_MULTIVALUE = 0x20 /**< Object is a key with multiple values */ } ucl_object_flags_t; /** @@ -195,14 +199,21 @@ typedef struct ucl_object_s { const char *key; /**< Key of an object */ struct ucl_object_s *next; /**< Array handle */ struct ucl_object_s *prev; /**< Array handle */ - unsigned char* trash_stack[2]; /**< Pointer to allocated chunks */ - unsigned keylen; /**< Lenght of a key */ - unsigned len; /**< Size of an object */ - enum ucl_type type; /**< Real type */ - uint16_t ref; /**< Reference count */ + uint32_t keylen; /**< Lenght of a key */ + uint32_t len; /**< Size of an object */ + uint32_t ref; /**< Reference count */ uint16_t flags; /**< Object flags */ + uint16_t type; /**< Real type */ + unsigned char* trash_stack[2]; /**< Pointer to allocated chunks */ } ucl_object_t; +/** + * Destructor type for userdata objects + * @param ud user specified data pointer + */ +typedef void (*ucl_userdata_dtor)(void *ud); +typedef const char* (*ucl_userdata_emitter)(void *ud); + /** @} */ /** @@ -239,6 +250,31 @@ UCL_EXTERN ucl_object_t* ucl_object_new UCL_EXTERN ucl_object_t* ucl_object_typed_new (ucl_type_t type) UCL_WARN_UNUSED_RESULT; /** + * Create new object with type and priority specified + * @param type type of a new object + * @param priority priority of an object + * @return new object + */ +UCL_EXTERN ucl_object_t* ucl_object_new_full (ucl_type_t type, unsigned priority) + UCL_WARN_UNUSED_RESULT; + +/** + * Create new object with userdata dtor + * @param dtor destructor function + * @return new object + */ +UCL_EXTERN ucl_object_t* ucl_object_new_userdata (ucl_userdata_dtor dtor, + ucl_userdata_emitter emitter) UCL_WARN_UNUSED_RESULT; + +/** + * Perform deep copy of an object copying everything + * @param other object to copy + * @return new object with refcount equal to 1 + */ +UCL_EXTERN ucl_object_t * ucl_object_copy (const ucl_object_t *other) + UCL_WARN_UNUSED_RESULT; + +/** * Return the type of an object * @return the object type */ @@ -293,7 +329,7 @@ UCL_EXTERN ucl_object_t* ucl_object_from /** * Insert a object 'elt' to the hash 'top' and associate it with key 'key' - * @param top destination object (will be created automatically if top is NULL) + * @param top destination object (must be of type UCL_OBJECT) * @param elt element to insert (must NOT be NULL) * @param key key to associate with this object (either const or preallocated) * @param keylen length of the key (or 0 for NULL terminated keys) @@ -306,7 +342,7 @@ UCL_EXTERN bool ucl_object_insert_key (u /** * Replace a object 'elt' to the hash 'top' and associate it with key 'key', old object will be unrefed, * if no object has been found this function works like ucl_object_insert_key() - * @param top destination object (will be created automatically if top is NULL) + * @param top destination object (must be of type UCL_OBJECT) * @param elt element to insert (must NOT be NULL) * @param key key to associate with this object (either const or preallocated) * @param keylen length of the key (or 0 for NULL terminated keys) @@ -317,6 +353,15 @@ UCL_EXTERN bool ucl_object_replace_key ( const char *key, size_t keylen, bool copy_key); /** + * Merge the keys from one object to another object. Overwrite on conflict + * @param top destination object (must be of type UCL_OBJECT) + * @param elt element to insert (must be of type UCL_OBJECT) + * @param copy copy rather than reference the elements + * @return true if all keys have been merged + */ +UCL_EXTERN bool ucl_object_merge (ucl_object_t *top, ucl_object_t *elt, bool copy); + +/** * Delete a object associated with key 'key', old object will be unrefered, * @param top object * @param key key associated to the object to remove @@ -335,8 +380,9 @@ UCL_EXTERN bool ucl_object_delete_key (u /** - * Delete key from `top` object returning the object deleted. This object is not - * released + * Removes `key` from `top` object, returning the object that was removed. This + * object is not released, caller must unref the returned object when it is no + * longer needed. * @param top object * @param key key to remove * @param keylen length of the key (or 0 for NULL terminated keys) @@ -346,8 +392,9 @@ UCL_EXTERN ucl_object_t* ucl_object_pop_ size_t keylen) UCL_WARN_UNUSED_RESULT; /** - * Delete key from `top` object returning the object deleted. This object is not - * released + * Removes `key` from `top` object returning the object that was removed. This + * object is not released, caller must unref the returned object when it is no + * longer needed. * @param top object * @param key key to remove * @return removed object or NULL if object has not been found @@ -356,9 +403,9 @@ UCL_EXTERN ucl_object_t* ucl_object_pop_ UCL_WARN_UNUSED_RESULT; /** - * Insert a object 'elt' to the hash 'top' and associate it with key 'key', if the specified key exist, - * try to merge its content - * @param top destination object (will be created automatically if top is NULL) + * Insert a object 'elt' to the hash 'top' and associate it with key 'key', if + * the specified key exist, try to merge its content + * @param top destination object (must be of type UCL_OBJECT) * @param elt element to insert (must NOT be NULL) * @param key key to associate with this object (either const or preallocated) * @param keylen length of the key (or 0 for NULL terminated keys) @@ -369,8 +416,8 @@ UCL_EXTERN bool ucl_object_insert_key_me const char *key, size_t keylen, bool copy_key); /** - * Append an element to the front of array object - * @param top destination object (will be created automatically if top is NULL) + * Append an element to the end of array object + * @param top destination object (must NOT be NULL) * @param elt element to append (must NOT be NULL) * @return true if value has been inserted */ @@ -379,7 +426,7 @@ UCL_EXTERN bool ucl_array_append (ucl_ob /** * Append an element to the start of array object - * @param top destination object (will be created automatically if top is NULL) + * @param top destination object (must NOT be NULL) * @param elt element to append (must NOT be NULL) * @return true if value has been inserted */ @@ -387,8 +434,19 @@ UCL_EXTERN bool ucl_array_prepend (ucl_o ucl_object_t *elt); /** - * Removes an element `elt` from the array `top`. Caller must unref the returned object when it is not - * needed. + * Merge all elements of second array into the first array + * @param top destination array (must be of type UCL_ARRAY) + * @param elt array to copy elements from (must be of type UCL_ARRAY) + * @param copy copy elements instead of referencing them + * @return true if arrays were merged + */ +UCL_EXTERN bool ucl_array_merge (ucl_object_t *top, ucl_object_t *elt, + bool copy); + +/** + * Removes an element `elt` from the array `top`, returning the object that was + * removed. This object is not released, caller must unref the returned object + * when it is no longer needed. * @param top array ucl object * @param elt element to remove * @return removed element or NULL if `top` is NULL or not an array @@ -411,35 +469,50 @@ UCL_EXTERN const ucl_object_t* ucl_array UCL_EXTERN const ucl_object_t* ucl_array_tail (const ucl_object_t *top); /** - * Removes the last element from the array `top`. Caller must unref the returned object when it is not - * needed. + * Removes the last element from the array `top`, returning the object that was + * removed. This object is not released, caller must unref the returned object + * when it is no longer needed. * @param top array ucl object * @return removed element or NULL if `top` is NULL or not an array */ UCL_EXTERN ucl_object_t* ucl_array_pop_last (ucl_object_t *top); /** - * Return object identified by an index of the array `top` - * @param obj object to get a key from (must be of type UCL_ARRAY) - * @param index index to return + * Removes the first element from the array `top`, returning the object that was + * removed. This object is not released, caller must unref the returned object + * when it is no longer needed. + * @param top array ucl object + * @return removed element or NULL if `top` is NULL or not an array + */ +UCL_EXTERN ucl_object_t* ucl_array_pop_first (ucl_object_t *top); + +/** + * Return object identified by index of the array `top` + * @param top object to get a key from (must be of type UCL_ARRAY) + * @param index array index to return * @return object at the specified index or NULL if index is not found */ UCL_EXTERN const ucl_object_t* ucl_array_find_index (const ucl_object_t *top, unsigned int index); /** - * Removes the first element from the array `top`. Caller must unref the returned object when it is not - * needed. - * @param top array ucl object - * @return removed element or NULL if `top` is NULL or not an array + * Replace an element in an array with a different element, returning the object + * that was replaced. This object is not released, caller must unref the + * returned object when it is no longer needed. + * @param top destination object (must be of type UCL_ARRAY) + * @param elt element to append (must NOT be NULL) + * @param index array index in destination to overwrite with elt + * @return object that was replaced or NULL if index is not found */ -UCL_EXTERN ucl_object_t* ucl_array_pop_first (ucl_object_t *top); +ucl_object_t * +ucl_array_replace_index (ucl_object_t *top, ucl_object_t *elt, + unsigned int index); /** * Append a element to another element forming an implicit array * @param head head to append (may be NULL) * @param elt new element - * @return true if element has been inserted + * @return the new implicit array */ UCL_EXTERN ucl_object_t * ucl_elt_append (ucl_object_t *head, ucl_object_t *elt); @@ -533,7 +606,7 @@ UCL_EXTERN const char* ucl_object_tolstr * Return object identified by a key in the specified object * @param obj object to get a key from (must be of type UCL_OBJECT) * @param key key to search - * @return object matched the specified key or NULL if key is not found + * @return object matching the specified key or NULL if key was not found */ UCL_EXTERN const ucl_object_t* ucl_object_find_key (const ucl_object_t *obj, const char *key); @@ -543,7 +616,7 @@ UCL_EXTERN const ucl_object_t* ucl_objec * @param obj object to get a key from (must be of type UCL_OBJECT) * @param key key to search * @param klen length of a key - * @return object matched the specified key or NULL if key is not found + * @return object matching the specified key or NULL if key was not found */ UCL_EXTERN const ucl_object_t* ucl_object_find_keyl (const ucl_object_t *obj, const char *key, size_t klen); @@ -575,6 +648,7 @@ UCL_EXTERN const char* ucl_object_keyl ( /** * Increase reference count for an object * @param obj object to ref + * @return the referenced object */ UCL_EXTERN ucl_object_t* ucl_object_ref (const ucl_object_t *obj); @@ -612,6 +686,21 @@ UCL_EXTERN void ucl_object_array_sort (u int (*cmp)(const ucl_object_t *o1, const ucl_object_t *o2)); /** + * Get the priority for specific UCL object + * @param obj any ucl object + * @return priority of an object + */ +UCL_EXTERN unsigned int ucl_object_get_priority (const ucl_object_t *obj); + +/** + * Set explicit priority of an object. + * @param obj any ucl object + * @param priority new priroity value (only 4 least significant bits are considred) + */ +UCL_EXTERN void ucl_object_set_priority (ucl_object_t *obj, + unsigned int priority); + +/** * Opaque iterator object */ typedef void* ucl_object_iter_t; @@ -640,11 +729,14 @@ UCL_EXTERN const ucl_object_t* ucl_itera * Macro handler for a parser * @param data the content of macro * @param len the length of content + * @param arguments arguments object * @param ud opaque user data * @param err error pointer * @return true if macro has been parsed */ -typedef bool (*ucl_macro_handler) (const unsigned char *data, size_t len, void* ud); +typedef bool (*ucl_macro_handler) (const unsigned char *data, size_t len, + const ucl_object_t *arguments, + void* ud); /* Opaque parser */ struct ucl_parser; @@ -702,13 +794,24 @@ UCL_EXTERN void ucl_parser_set_variables * @param parser parser structure * @param data the pointer to the beginning of a chunk * @param len the length of a chunk - * @param err if *err is NULL it is set to parser error * @return true if chunk has been added and false in case of error */ UCL_EXTERN bool ucl_parser_add_chunk (struct ucl_parser *parser, const unsigned char *data, size_t len); /** + * Load new chunk to a parser with the specified priority + * @param parser parser structure + * @param data the pointer to the beginning of a chunk + * @param len the length of a chunk + * @param priority the desired priority of a chunk (only 4 least significant bits + * are considered for this parameter) + * @return true if chunk has been added and false in case of error + */ +UCL_EXTERN bool ucl_parser_add_chunk_priority (struct ucl_parser *parser, + const unsigned char *data, size_t len, unsigned priority); + +/** * Load ucl object from a string * @param parser parser structure * @param data the pointer to the string @@ -835,7 +938,7 @@ struct ucl_emitter_context { /** A set of output operations */ const struct ucl_emitter_operations *ops; /** Current amount of indent tabs */ - unsigned int ident; + unsigned int indent; /** Top level object */ const ucl_object_t *top; /** The rest of context */ Modified: projects/clang350-import/contrib/libucl/libucl.pc.in ============================================================================== --- projects/clang350-import/contrib/libucl/libucl.pc.in Sat Nov 29 17:29:30 2014 (r275261) +++ projects/clang350-import/contrib/libucl/libucl.pc.in Sat Nov 29 18:44:52 2014 (r275262) @@ -7,5 +7,5 @@ Name: LibUCL Description: Universal configuration library Version: @UCL_VERSION@ Libs: -L${libdir} -lucl -Libs.private: @LIBS_EXTRA@ +Libs.private: @LIBS_EXTRA@ @LUA_LIB@ Cflags: -I${includedir}/ Modified: projects/clang350-import/contrib/libucl/src/ucl_emitter.c ============================================================================== --- projects/clang350-import/contrib/libucl/src/ucl_emitter.c Sat Nov 29 17:29:30 2014 (r275261) +++ projects/clang350-import/contrib/libucl/src/ucl_emitter.c Sat Nov 29 18:44:52 2014 (r275262) @@ -130,6 +130,19 @@ ucl_emitter_print_key (bool print_key, s func->ucl_emitter_append_character (' ', 1, func->ud); } } + else if (ctx->id == UCL_EMIT_YAML) { + if (obj->keylen > 0 && (obj->flags & UCL_OBJECT_NEED_KEY_ESCAPE)) { + ucl_elt_string_write_json (obj->key, obj->keylen, ctx); + } + else if (obj->keylen > 0) { + func->ucl_emitter_append_len (obj->key, obj->keylen, func->ud); + } + else { + func->ucl_emitter_append_len ("null", 4, func->ud); + } + + func->ucl_emitter_append_len (": ", 2, func->ud); + } else { if (obj->keylen > 0) { ucl_elt_string_write_json (obj->key, obj->keylen, ctx); @@ -182,7 +195,7 @@ ucl_emitter_common_end_object (struct uc const struct ucl_emitter_functions *func = ctx->func; if (UCL_EMIT_IDENT_TOP_OBJ(ctx, obj)) { - ctx->ident --; + ctx->indent --; if (compact) { func->ucl_emitter_append_character ('}', 1, func->ud); } @@ -191,7 +204,7 @@ ucl_emitter_common_end_object (struct uc /* newline is already added for this format */ func->ucl_emitter_append_character ('\n', 1, func->ud); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Sat Nov 29 19:27:46 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 686C1305; Sat, 29 Nov 2014 19:27:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 498E6C03; Sat, 29 Nov 2014 19:27:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sATJRkPN062890; Sat, 29 Nov 2014 19:27:46 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sATJRiLq062881; Sat, 29 Nov 2014 19:27:44 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411291927.sATJRiLq062881@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sat, 29 Nov 2014 19:27:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275263 - in projects/routing/sys: net netinet netinet6 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Nov 2014 19:27:46 -0000 Author: melifaro Date: Sat Nov 29 19:27:43 2014 New Revision: 275263 URL: https://svnweb.freebsd.org/changeset/base/275263 Log: Provide rte_ methods to access rtentry for external consumers. Modified: projects/routing/sys/net/if.c projects/routing/sys/net/route.c projects/routing/sys/net/route.h projects/routing/sys/netinet/if_ether.c projects/routing/sys/netinet/in_rmx.c projects/routing/sys/netinet6/in6_ifattach.c projects/routing/sys/netinet6/in6_rmx.c Modified: projects/routing/sys/net/if.c ============================================================================== --- projects/routing/sys/net/if.c Sat Nov 29 18:44:52 2014 (r275262) +++ projects/routing/sys/net/if.c Sat Nov 29 19:27:43 2014 (r275263) @@ -76,7 +76,6 @@ #include #include #include -#include #include #if defined(INET) || defined(INET6) @@ -1893,8 +1892,6 @@ ifa_preferred(struct ifaddr *cur, struct ((*carp_master_p)(next) && !(*carp_master_p)(cur)))); } -#include - /* * Default action when installing a route with a Link Level gateway. * Lookup an appropriate real ifa to point to. @@ -1904,16 +1901,18 @@ static void link_rtrequest(int cmd, struct rtentry *rt, struct rt_addrinfo *info) { struct ifaddr *ifa, *oifa; - struct sockaddr *dst; + const struct sockaddr *dst; struct ifnet *ifp; - if (cmd != RTM_ADD || ((ifa = rt->rt_ifa) == 0) || - ((ifp = ifa->ifa_ifp) == 0) || ((dst = rt_key(rt)) == 0)) + ifp = rte_get_lifp(rt); + oifa = rte_get_ifa(rt); + dst = rte_get_dst(rt); + + if (cmd != RTM_ADD || oifa == NULL || ifp == NULL || dst == NULL) return; - ifa = ifaof_ifpforaddr(dst, ifp); + ifa = ifaof_ifpforaddr(__DECONST(struct sockaddr *, dst), ifp); if (ifa) { - oifa = rt->rt_ifa; - rt->rt_ifa = ifa; + rte_set_ifa(rt, ifa); ifa_free(oifa); if (ifa->ifa_rtrequest && ifa->ifa_rtrequest != link_rtrequest) ifa->ifa_rtrequest(cmd, rt, info); Modified: projects/routing/sys/net/route.c ============================================================================== --- projects/routing/sys/net/route.c Sat Nov 29 18:44:52 2014 (r275262) +++ projects/routing/sys/net/route.c Sat Nov 29 19:27:43 2014 (r275263) @@ -512,6 +512,94 @@ done: RT_UNLOCK(rt); } +/* + * Route entry get/set methods for external consumers. + */ + +const struct sockaddr * +rte_get_dst(struct rtentry *rte) +{ + + return ((const struct sockaddr *)rt_key(rte)); +} + +const struct sockaddr * +rte_get_mask(struct rtentry *rte) +{ + + return ((const struct sockaddr *)rt_mask(rte)); +} + +struct sockaddr * +rte_get_gw(struct rtentry *rte) +{ + + return ((struct sockaddr *)rte->rt_gateway); +} + +struct ifnet * +rte_get_lifp(struct rtentry *rte) +{ + + return (rte->rt_ifp); +} + +struct ifaddr * +rte_get_ifa(struct rtentry *rte) +{ + + return (rte->rt_ifa); +} + +void +rte_set_ifa(struct rtentry *rte, struct ifaddr *ifa) +{ + + rte->rt_ifa = ifa; +} + +unsigned int +rte_get_flags(struct rtentry *rte) +{ + + return ((unsigned int)rte->rt_flags); +} + +void +rte_set_flags(struct rtentry *rte, unsigned int rt_flags) +{ + + rte->rt_flags = rt_flags; +} + +unsigned long +rte_get_mtu(struct rtentry *rte) +{ + + return ((unsigned int)rte->rt_mtu); +} + +void +rte_set_mtu(struct rtentry *rte, unsigned long mtu) +{ + + rte->rt_mtu = (u_long)mtu; +} + +unsigned long +rte_get_weight(struct rtentry *rte) +{ + + return ((uint32_t)rte->rt_weight); +} + +void +rte_set_weight(struct rtentry *rte, unsigned long weight) +{ + + rte->rt_weight = weight; +} + /* * Force a routing table entry to the specified Modified: projects/routing/sys/net/route.h ============================================================================== --- projects/routing/sys/net/route.h Sat Nov 29 18:44:52 2014 (r275262) +++ projects/routing/sys/net/route.h Sat Nov 29 19:27:43 2014 (r275263) @@ -178,6 +178,19 @@ struct rtentry { (RTF_PROTO1 | RTF_PROTO2 | RTF_PROTO3 | RTF_BLACKHOLE | \ RTF_REJECT | RTF_STATIC | RTF_STICKY) +const struct sockaddr *rte_get_dst(struct rtentry *rte); +const struct sockaddr *rte_get_mask(struct rtentry *rte); +struct sockaddr *rte_get_gw(struct rtentry *rte); +struct ifnet *rte_get_lifp(struct rtentry *rte); +struct ifaddr *rte_get_ifa(struct rtentry *rte); +void rte_set_ifa(struct rtentry *rte, struct ifaddr *ifa); +unsigned int rte_get_flags(struct rtentry *rte); +void rte_set_flags(struct rtentry *rte, unsigned int rt_flags); +unsigned long rte_get_mtu(struct rtentry *rte); +void rte_set_mtu(struct rtentry *rte, unsigned long mtu); +unsigned long rte_get_weight(struct rtentry *rte); +void rte_set_weight(struct rtentry *rte, unsigned long weight);; + /* * Routing statistics. */ Modified: projects/routing/sys/netinet/if_ether.c ============================================================================== --- projects/routing/sys/netinet/if_ether.c Sat Nov 29 18:44:52 2014 (r275262) +++ projects/routing/sys/netinet/if_ether.c Sat Nov 29 19:27:43 2014 (r275263) @@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include @@ -471,7 +470,7 @@ arpresolve(struct ifnet *ifp, struct rte } IF_AFDATA_RUN_RUNLOCK(ifp); - is_gw = (rt0 != NULL && (rt0->rt_flags & RTF_GATEWAY)) ? 1 : 0; + is_gw = (rt0 != NULL) ? (rte_get_flags(rt0) & RTF_GATEWAY) : 0; return (arpresolve_slow(ifp, is_gw, m, dst, desten, lle)); } Modified: projects/routing/sys/netinet/in_rmx.c ============================================================================== --- projects/routing/sys/netinet/in_rmx.c Sat Nov 29 18:44:52 2014 (r275262) +++ projects/routing/sys/netinet/in_rmx.c Sat Nov 29 19:27:43 2014 (r275263) @@ -64,9 +64,18 @@ static struct radix_node * in_addroute(void *v_arg, void *n_arg, struct radix_head *head, struct radix_node *treenodes) { - struct rtentry *rt = (struct rtentry *)treenodes; - struct sockaddr_in *sin = (struct sockaddr_in *)rt_key(rt); + unsigned int mtu, rt_flags; + struct rtentry *rt; + const struct sockaddr_in *sin; + struct ifnet *ifp; + struct ifaddr *ifa; + rt = (struct rtentry *)treenodes; + sin = (const struct sockaddr_in *)rte_get_dst(rt); + rt_flags = rte_get_flags(rt); + ifp = rte_get_lifp(rt); + ifa = rte_get_ifa(rt); + /* * A little bit of help for both IP output and input: * For host routes, we make sure that RTF_BROADCAST @@ -82,28 +91,31 @@ in_addroute(void *v_arg, void *n_arg, st * it's easy to do and might be useful (but this is much more * dubious since it's so easy to inspect the address). */ - if (rt->rt_flags & RTF_HOST) { - if (in_broadcast(sin->sin_addr, rt->rt_ifp)) { - rt->rt_flags |= RTF_BROADCAST; - } else if (satosin(rt->rt_ifa->ifa_addr)->sin_addr.s_addr == + if (rt_flags & RTF_HOST) { + if (in_broadcast(sin->sin_addr, ifp)) { + rt_flags |= RTF_BROADCAST; + } else if (satosin(ifa->ifa_addr)->sin_addr.s_addr == sin->sin_addr.s_addr) { - rt->rt_flags |= RTF_LOCAL; + rt_flags |= RTF_LOCAL; } } if (IN_MULTICAST(ntohl(sin->sin_addr.s_addr))) - rt->rt_flags |= RTF_MULTICAST; + rt_flags |= RTF_MULTICAST; + + rte_set_flags(rt, rt_flags); - if (rt->rt_ifp != NULL) { + if (ifp != NULL) { /* * Check route MTU: * inherit interface MTU if not set or * check if MTU is too large. */ - if (rt->rt_mtu == 0) { - rt->rt_mtu = rt->rt_ifp->if_mtu; - } else if (rt->rt_mtu > rt->rt_ifp->if_mtu) - rt->rt_mtu = rt->rt_ifp->if_mtu; + mtu = rte_get_mtu(rt); + if (mtu == 0) { + rte_set_mtu(rt, ifp->if_mtu); + } else if (mtu > ifp->if_mtu) + rte_set_mtu(rt, ifp->if_mtu); } return (rn_addroute(v_arg, n_arg, head, treenodes)); Modified: projects/routing/sys/netinet6/in6_ifattach.c ============================================================================== --- projects/routing/sys/netinet6/in6_ifattach.c Sat Nov 29 18:44:52 2014 (r275262) +++ projects/routing/sys/netinet6/in6_ifattach.c Sat Nov 29 19:27:43 2014 (r275263) @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: projects/routing/sys/netinet6/in6_rmx.c ============================================================================== --- projects/routing/sys/netinet6/in6_rmx.c Sat Nov 29 18:44:52 2014 (r275262) +++ projects/routing/sys/netinet6/in6_rmx.c Sat Nov 29 19:27:43 2014 (r275263) @@ -106,12 +106,22 @@ static struct radix_node * in6_addroute(void *v_arg, void *n_arg, struct radix_head *head, struct radix_node *treenodes) { - struct rtentry *rt = (struct rtentry *)treenodes; - struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)rt_key(rt); + unsigned int mtu, rt_flags; + struct rtentry *rt; + const struct sockaddr_in6 *sin6; + struct ifnet *ifp; + struct ifaddr *ifa; + + rt = (struct rtentry *)treenodes; + sin6 = (const struct sockaddr_in6 *)rte_get_dst(rt); + rt_flags = rte_get_flags(rt); + ifp = rte_get_lifp(rt); + ifa = rte_get_ifa(rt); + struct radix_node *ret; if (IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr)) - rt->rt_flags |= RTF_MULTICAST; + rt_flags |= RTF_MULTICAST; /* * A little bit of help for both IPv6 output and input: @@ -127,30 +137,33 @@ in6_addroute(void *v_arg, void *n_arg, s * XXX * should elaborate the code. */ - if (rt->rt_flags & RTF_HOST) { - if (IN6_ARE_ADDR_EQUAL(&satosin6(rt->rt_ifa->ifa_addr) - ->sin6_addr, - &sin6->sin6_addr)) { - rt->rt_flags |= RTF_LOCAL; + if (rt_flags & RTF_HOST) { + if (IN6_ARE_ADDR_EQUAL(&satosin6(ifa->ifa_addr)->sin6_addr, + &sin6->sin6_addr)) { + rt_flags |= RTF_LOCAL; } } - if (rt->rt_ifp != NULL) { + rte_set_flags(rt, rt_flags); + + if (ifp != NULL) { /* * Check route MTU: * inherit interface MTU if not set or * check if MTU is too large. */ - if (rt->rt_mtu == 0) { - rt->rt_mtu = IN6_LINKMTU(rt->rt_ifp); - } else if (rt->rt_mtu > IN6_LINKMTU(rt->rt_ifp)) - rt->rt_mtu = IN6_LINKMTU(rt->rt_ifp); + mtu = rte_get_mtu(rt); + if (mtu == 0) { + rte_set_mtu(rt, IN6_LINKMTU(rt->rt_ifp)); + } else if (mtu > IN6_LINKMTU(rt->rt_ifp)) + rte_set_mtu(rt, IN6_LINKMTU(rt->rt_ifp)); } ret = rn_addroute(v_arg, n_arg, head, treenodes); if (ret == NULL) { struct rtentry *rt2; + struct sockaddr *gw; /* * We are trying to add a net route, but can't. * The following case should be allowed, so we'll make a @@ -166,10 +179,13 @@ in6_addroute(void *v_arg, void *n_arg, s rt2 = in6_rtalloc1((struct sockaddr *)sin6, 0, RTF_RNH_LOCKED, rt->rt_fibnum); if (rt2) { - if (((rt2->rt_flags & (RTF_HOST|RTF_GATEWAY)) == 0) - && rt2->rt_gateway - && rt2->rt_gateway->sa_family == AF_LINK - && rt2->rt_ifp == rt->rt_ifp) { + rt_flags = rte_get_flags(rt2); + ifp = rte_get_lifp(rt2); + gw = rte_get_gw(rt2); + if (((rt_flags & (RTF_HOST|RTF_GATEWAY)) == 0) + && gw != NULL + && gw->sa_family == AF_LINK + && ifp == rte_get_lifp(rt)) { ret = rt2->rt_nodes; } RTFREE_LOCKED(rt2); From owner-svn-src-projects@FreeBSD.ORG Sat Nov 29 20:18:09 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B3D60D65; Sat, 29 Nov 2014 20:18:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 86C9D73; Sat, 29 Nov 2014 20:18:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sATKI9I1086735; Sat, 29 Nov 2014 20:18:09 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sATKI9DC086734; Sat, 29 Nov 2014 20:18:09 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411292018.sATKI9DC086734@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 29 Nov 2014 20:18:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275265 - projects/clang350-import/contrib/llvm/lib/Target/ARM/AsmParser X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Nov 2014 20:18:09 -0000 Author: dim Date: Sat Nov 29 20:18:08 2014 New Revision: 275265 URL: https://svnweb.freebsd.org/changeset/base/275265 Log: Pull in r214802 from upstream llvm trunk (by Renato Golin): Allow CP10/CP11 operations on ARMv5/v6 Those registers are VFP/NEON and vector instructions should be used instead, but old cores rely on those co-processors to enable VFP unwinding. This change was prompted by the libc++abi's unwinding routine and is also present in many legacy low-level bare-metal code that we ought to compile/assemble. Fixing bug PR20025 and allowing PR20529 to proceed with a fix in libc++abi. This enables assembling certain ARM instructions used in libgcc. Modified: projects/clang350-import/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp Modified: projects/clang350-import/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp ============================================================================== --- projects/clang350-import/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp Sat Nov 29 19:31:23 2014 (r275264) +++ projects/clang350-import/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp Sat Nov 29 20:18:08 2014 (r275265) @@ -3118,9 +3118,10 @@ static int MatchCoprocessorOperandName(S return -1; switch (Name[1]) { default: return -1; - // p10 and p11 are invalid for coproc instructions (reserved for FP/NEON) - case '0': return CoprocOp == 'p'? -1: 10; - case '1': return CoprocOp == 'p'? -1: 11; + // CP10 and CP11 are VFP/NEON and so vector instructions should be used. + // However, old cores (v5/v6) did use them in that way. + case '0': return 10; + case '1': return 11; case '2': return 12; case '3': return 13; case '4': return 14; @@ -3177,6 +3178,9 @@ ARMAsmParser::parseCoprocNumOperand(Oper int Num = MatchCoprocessorOperandName(Tok.getString(), 'p'); if (Num == -1) return MatchOperand_NoMatch; + // ARMv7 and v8 don't allow cp10/cp11 due to VFP/NEON specific instructions + if ((hasV7Ops() || hasV8Ops()) && (Num == 10 || Num == 11)) + return MatchOperand_NoMatch; Parser.Lex(); // Eat identifier token. Operands.push_back(ARMOperand::CreateCoprocNum(Num, S)); From owner-svn-src-projects@FreeBSD.ORG Sat Nov 29 20:23:21 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E04D93B7; Sat, 29 Nov 2014 20:23:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CBECF13C; Sat, 29 Nov 2014 20:23:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sATKNKDM091416; Sat, 29 Nov 2014 20:23:20 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sATKNIc8091404; Sat, 29 Nov 2014 20:23:18 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411292023.sATKNIc8091404@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 29 Nov 2014 20:23:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275266 - projects/clang350-import/contrib/llvm/patches X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Nov 2014 20:23:21 -0000 Author: dim Date: Sat Nov 29 20:23:18 2014 New Revision: 275266 URL: https://svnweb.freebsd.org/changeset/base/275266 Log: Remove bogus revision numbers from diff header lines in the existing llvm/clang patches. Modified: projects/clang350-import/contrib/llvm/patches/patch-10-llvm-r221709-debug-oom.diff projects/clang350-import/contrib/llvm/patches/patch-11-llvm-r222562-loop-rotate.diff projects/clang350-import/contrib/llvm/patches/patch-12-add-llvm-gvn-option.diff projects/clang350-import/contrib/llvm/patches/patch-13-llvm-r218241-dwarf2-warning.diff projects/clang350-import/contrib/llvm/patches/patch-14-llvm-r215352-aarch64-dyn-loader.diff projects/clang350-import/contrib/llvm/patches/patch-15-llvm-r216571-dynamiclib-usability.diff projects/clang350-import/contrib/llvm/patches/patch-16-clang-r221900-freebsd-aarch64.diff projects/clang350-import/contrib/llvm/patches/patch-17-llvm-r222856-libapr-miscompile.diff Modified: projects/clang350-import/contrib/llvm/patches/patch-10-llvm-r221709-debug-oom.diff ============================================================================== --- projects/clang350-import/contrib/llvm/patches/patch-10-llvm-r221709-debug-oom.diff Sat Nov 29 20:18:08 2014 (r275265) +++ projects/clang350-import/contrib/llvm/patches/patch-10-llvm-r221709-debug-oom.diff Sat Nov 29 20:23:18 2014 (r275266) @@ -24,8 +24,8 @@ Introduced here: http://svnweb.freebsd.o Index: include/llvm/CodeGen/SelectionDAG.h =================================================================== ---- include/llvm/CodeGen/SelectionDAG.h (revision 10) -+++ include/llvm/CodeGen/SelectionDAG.h (revision 11) +--- include/llvm/CodeGen/SelectionDAG.h ++++ include/llvm/CodeGen/SelectionDAG.h @@ -126,6 +126,10 @@ class SDDbgInfo { DbgValMap[Node].push_back(V); } @@ -39,8 +39,8 @@ Index: include/llvm/CodeGen/SelectionDAG DbgValues.clear(); Index: lib/CodeGen/SelectionDAG/SelectionDAG.cpp =================================================================== ---- lib/CodeGen/SelectionDAG/SelectionDAG.cpp (revision 10) -+++ lib/CodeGen/SelectionDAG/SelectionDAG.cpp (revision 11) +--- lib/CodeGen/SelectionDAG/SelectionDAG.cpp ++++ lib/CodeGen/SelectionDAG/SelectionDAG.cpp @@ -686,6 +686,15 @@ void SelectionDAG::DeleteNodeNotInCSEMaps(SDNode * DeallocateNode(N); } Modified: projects/clang350-import/contrib/llvm/patches/patch-11-llvm-r222562-loop-rotate.diff ============================================================================== --- projects/clang350-import/contrib/llvm/patches/patch-11-llvm-r222562-loop-rotate.diff Sat Nov 29 20:18:08 2014 (r275265) +++ projects/clang350-import/contrib/llvm/patches/patch-11-llvm-r222562-loop-rotate.diff Sat Nov 29 20:23:18 2014 (r275266) @@ -8,8 +8,8 @@ Introduced here: http://svnweb.freebsd.o Index: lib/Transforms/IPO/PassManagerBuilder.cpp =================================================================== ---- lib/Transforms/IPO/PassManagerBuilder.cpp (revision 11) -+++ lib/Transforms/IPO/PassManagerBuilder.cpp (revision 12) +--- lib/Transforms/IPO/PassManagerBuilder.cpp ++++ lib/Transforms/IPO/PassManagerBuilder.cpp @@ -195,7 +195,8 @@ void PassManagerBuilder::populateModulePassManager MPM.add(createTailCallEliminationPass()); // Eliminate tail calls MPM.add(createCFGSimplificationPass()); // Merge & remove BBs Modified: projects/clang350-import/contrib/llvm/patches/patch-12-add-llvm-gvn-option.diff ============================================================================== --- projects/clang350-import/contrib/llvm/patches/patch-12-add-llvm-gvn-option.diff Sat Nov 29 20:18:08 2014 (r275265) +++ projects/clang350-import/contrib/llvm/patches/patch-12-add-llvm-gvn-option.diff Sat Nov 29 20:23:18 2014 (r275266) @@ -6,8 +6,8 @@ Introduced here: http://svnweb.freebsd.o Index: lib/Transforms/IPO/PassManagerBuilder.cpp =================================================================== ---- lib/Transforms/IPO/PassManagerBuilder.cpp (revision 12) -+++ lib/Transforms/IPO/PassManagerBuilder.cpp (revision 13) +--- lib/Transforms/IPO/PassManagerBuilder.cpp ++++ lib/Transforms/IPO/PassManagerBuilder.cpp @@ -57,6 +57,10 @@ static cl::opt RunLoadCombine("combine-loads cl::Hidden, cl::desc("Run the load combining pass")); Modified: projects/clang350-import/contrib/llvm/patches/patch-13-llvm-r218241-dwarf2-warning.diff ============================================================================== --- projects/clang350-import/contrib/llvm/patches/patch-13-llvm-r218241-dwarf2-warning.diff Sat Nov 29 20:18:08 2014 (r275265) +++ projects/clang350-import/contrib/llvm/patches/patch-13-llvm-r218241-dwarf2-warning.diff Sat Nov 29 20:23:18 2014 (r275266) @@ -15,8 +15,8 @@ Introduced here: http://svnweb.freebsd.o Index: lib/MC/MCDwarf.cpp =================================================================== ---- lib/MC/MCDwarf.cpp (revision 13) -+++ lib/MC/MCDwarf.cpp (revision 14) +--- lib/MC/MCDwarf.cpp ++++ lib/MC/MCDwarf.cpp @@ -519,7 +519,8 @@ static void EmitGenDwarfAbbrev(MCStreamer *MCOS) { MCOS->EmitULEB128IntValue(dwarf::DW_TAG_compile_unit); MCOS->EmitIntValue(dwarf::DW_CHILDREN_yes, 1); @@ -44,8 +44,8 @@ Index: lib/MC/MCDwarf.cpp MCOS->SwitchSection(context.getObjectFileInfo()->getDwarfInfoSection()); Index: lib/MC/MCParser/ELFAsmParser.cpp =================================================================== ---- lib/MC/MCParser/ELFAsmParser.cpp (revision 13) -+++ lib/MC/MCParser/ELFAsmParser.cpp (revision 14) +--- lib/MC/MCParser/ELFAsmParser.cpp ++++ lib/MC/MCParser/ELFAsmParser.cpp @@ -555,7 +555,7 @@ EndStmt: std::make_pair(ELFSection, std::make_pair(nullptr, nullptr))); if (InsertResult.second) { @@ -57,8 +57,8 @@ Index: lib/MC/MCParser/ELFAsmParser.cpp getStreamer().EmitLabel(SectionStartSymbol); Index: test/MC/ARM/dwarf-asm-multiple-sections-dwarf-2.s =================================================================== ---- test/MC/ARM/dwarf-asm-multiple-sections-dwarf-2.s (revision 0) -+++ test/MC/ARM/dwarf-asm-multiple-sections-dwarf-2.s (revision 14) +--- test/MC/ARM/dwarf-asm-multiple-sections-dwarf-2.s ++++ test/MC/ARM/dwarf-asm-multiple-sections-dwarf-2.s @@ -0,0 +1,66 @@ +// RUN: llvm-mc < %s -triple=armv7-linux-gnueabi -filetype=obj -o %t -g -fdebug-compilation-dir=/tmp -dwarf-version 2 2>&1 | FileCheck -check-prefix MESSAGES %s +// RUN: llvm-dwarfdump %t | FileCheck -check-prefix DWARF %s @@ -128,8 +128,8 @@ Index: test/MC/ARM/dwarf-asm-multiple-se +// RELOC-NEXT: 00000018 R_ARM_ABS32 foo Index: test/MC/ARM/dwarf-asm-multiple-sections.s =================================================================== ---- test/MC/ARM/dwarf-asm-multiple-sections.s (revision 13) -+++ test/MC/ARM/dwarf-asm-multiple-sections.s (revision 14) +--- test/MC/ARM/dwarf-asm-multiple-sections.s ++++ test/MC/ARM/dwarf-asm-multiple-sections.s @@ -1,7 +1,7 @@ // RUN: llvm-mc < %s -triple=armv7-linux-gnueabi -filetype=obj -o %t -g -fdebug-compilation-dir=/tmp // RUN: llvm-dwarfdump %t | FileCheck -check-prefix DWARF %s Modified: projects/clang350-import/contrib/llvm/patches/patch-14-llvm-r215352-aarch64-dyn-loader.diff ============================================================================== --- projects/clang350-import/contrib/llvm/patches/patch-14-llvm-r215352-aarch64-dyn-loader.diff Sat Nov 29 20:18:08 2014 (r275265) +++ projects/clang350-import/contrib/llvm/patches/patch-14-llvm-r215352-aarch64-dyn-loader.diff Sat Nov 29 20:23:18 2014 (r275266) @@ -17,8 +17,8 @@ Cannot display: file marked as a binary svn:mime-type = application/x-object Index: test/tools/llvm-readobj/Inputs/relocs.py =================================================================== ---- test/tools/llvm-readobj/Inputs/relocs.py (revision 14) -+++ test/tools/llvm-readobj/Inputs/relocs.py (revision 15) +--- test/tools/llvm-readobj/Inputs/relocs.py ++++ test/tools/llvm-readobj/Inputs/relocs.py @@ -617,6 +617,8 @@ class Relocs_Elf_AArch64(Enum): R_AARCH64_LDST32_ABS_LO12_NC = 0x11d R_AARCH64_LDST64_ABS_LO12_NC = 0x11e @@ -46,8 +46,8 @@ Index: test/tools/llvm-readobj/Inputs/re R_ARM_NONE = 0x00 Index: test/tools/llvm-readobj/reloc-types.test =================================================================== ---- test/tools/llvm-readobj/reloc-types.test (revision 14) -+++ test/tools/llvm-readobj/reloc-types.test (revision 15) +--- test/tools/llvm-readobj/reloc-types.test ++++ test/tools/llvm-readobj/reloc-types.test @@ -179,6 +179,8 @@ ELF-AARCH64: Type: R_AARCH64_LDST16_ABS_LO12_NC (2 ELF-AARCH64: Type: R_AARCH64_LDST32_ABS_LO12_NC (285) ELF-AARCH64: Type: R_AARCH64_LDST64_ABS_LO12_NC (286) @@ -75,8 +75,8 @@ Index: test/tools/llvm-readobj/reloc-typ ELF-ARM: Type: R_ARM_PC24 (1) Index: include/llvm/Support/ELF.h =================================================================== ---- include/llvm/Support/ELF.h (revision 14) -+++ include/llvm/Support/ELF.h (revision 15) +--- include/llvm/Support/ELF.h ++++ include/llvm/Support/ELF.h @@ -653,6 +653,9 @@ enum { R_AARCH64_LDST128_ABS_LO12_NC = 0x12b, @@ -108,8 +108,8 @@ Index: include/llvm/Support/ELF.h // ARM Specific e_flags Index: lib/Object/ELF.cpp =================================================================== ---- lib/Object/ELF.cpp (revision 14) -+++ lib/Object/ELF.cpp (revision 15) +--- lib/Object/ELF.cpp ++++ lib/Object/ELF.cpp @@ -223,6 +223,8 @@ StringRef getELFRelocationTypeName(uint32_t Machin LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_LDST32_ABS_LO12_NC); LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_LDST64_ABS_LO12_NC); Modified: projects/clang350-import/contrib/llvm/patches/patch-15-llvm-r216571-dynamiclib-usability.diff ============================================================================== --- projects/clang350-import/contrib/llvm/patches/patch-15-llvm-r216571-dynamiclib-usability.diff Sat Nov 29 20:18:08 2014 (r275265) +++ projects/clang350-import/contrib/llvm/patches/patch-15-llvm-r216571-dynamiclib-usability.diff Sat Nov 29 20:23:18 2014 (r275266) @@ -14,8 +14,8 @@ Introduced here: http://svnweb.freebsd.o Index: include/llvm/Support/DynamicLibrary.h =================================================================== ---- include/llvm/Support/DynamicLibrary.h (revision 15) -+++ include/llvm/Support/DynamicLibrary.h (revision 16) +--- include/llvm/Support/DynamicLibrary.h ++++ include/llvm/Support/DynamicLibrary.h @@ -43,10 +43,11 @@ namespace sys { // Opaque data used to interface with OS-specific dynamic library handling. void *Data; Modified: projects/clang350-import/contrib/llvm/patches/patch-16-clang-r221900-freebsd-aarch64.diff ============================================================================== --- projects/clang350-import/contrib/llvm/patches/patch-16-clang-r221900-freebsd-aarch64.diff Sat Nov 29 20:18:08 2014 (r275265) +++ projects/clang350-import/contrib/llvm/patches/patch-16-clang-r221900-freebsd-aarch64.diff Sat Nov 29 20:23:18 2014 (r275266) @@ -8,8 +8,8 @@ Introduced here: http://svnweb.freebsd.o Index: tools/clang/test/Driver/freebsd.c =================================================================== ---- tools/clang/test/Driver/freebsd.c (revision 16) -+++ tools/clang/test/Driver/freebsd.c (revision 17) +--- tools/clang/test/Driver/freebsd.c ++++ tools/clang/test/Driver/freebsd.c @@ -1,4 +1,12 @@ // RUN: %clang -no-canonical-prefixes \ +// RUN: -target aarch64-pc-freebsd11 %s \ @@ -25,8 +25,8 @@ Index: tools/clang/test/Driver/freebsd.c // RUN: | FileCheck --check-prefix=CHECK-PPC %s Index: tools/clang/test/Preprocessor/init.c =================================================================== ---- tools/clang/test/Preprocessor/init.c (revision 16) -+++ tools/clang/test/Preprocessor/init.c (revision 17) +--- tools/clang/test/Preprocessor/init.c ++++ tools/clang/test/Preprocessor/init.c @@ -802,6 +802,199 @@ // AARCH64-NETBSD:#define __WINT_TYPE__ int // AARCH64-NETBSD:#define __WINT_WIDTH__ 32 @@ -229,8 +229,8 @@ Index: tools/clang/test/Preprocessor/ini // Index: tools/clang/lib/Basic/Targets.cpp =================================================================== ---- tools/clang/lib/Basic/Targets.cpp (revision 16) -+++ tools/clang/lib/Basic/Targets.cpp (revision 17) +--- tools/clang/lib/Basic/Targets.cpp ++++ tools/clang/lib/Basic/Targets.cpp @@ -6036,6 +6036,8 @@ static TargetInfo *AllocateTarget(const llvm::Trip return new DarwinAArch64TargetInfo(Triple); Modified: projects/clang350-import/contrib/llvm/patches/patch-17-llvm-r222856-libapr-miscompile.diff ============================================================================== --- projects/clang350-import/contrib/llvm/patches/patch-17-llvm-r222856-libapr-miscompile.diff Sat Nov 29 20:18:08 2014 (r275265) +++ projects/clang350-import/contrib/llvm/patches/patch-17-llvm-r222856-libapr-miscompile.diff Sat Nov 29 20:23:18 2014 (r275266) @@ -13,8 +13,8 @@ Introduced here: http://svnweb.freebsd.o Index: lib/Transforms/InstCombine/InstCombineSelect.cpp =================================================================== ---- lib/Transforms/InstCombine/InstCombineSelect.cpp (revision 17) -+++ lib/Transforms/InstCombine/InstCombineSelect.cpp (revision 18) +--- lib/Transforms/InstCombine/InstCombineSelect.cpp ++++ lib/Transforms/InstCombine/InstCombineSelect.cpp @@ -387,15 +387,7 @@ static Value *SimplifyWithOpReplaced(Value *V, Val /// 1. The icmp predicate is inverted /// 2. The select operands are reversed @@ -60,8 +60,8 @@ Index: lib/Transforms/InstCombine/InstCo if (!OrOnFalseVal) Index: test/Transforms/InstCombine/select.ll =================================================================== ---- test/Transforms/InstCombine/select.ll (revision 17) -+++ test/Transforms/InstCombine/select.ll (revision 18) +--- test/Transforms/InstCombine/select.ll ++++ test/Transforms/InstCombine/select.ll @@ -996,111 +996,6 @@ define <2 x i32> @select_icmp_eq_and_1_0_or_vector ret <2 x i32> %select } From owner-svn-src-projects@FreeBSD.ORG Sat Nov 29 20:24:19 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E9D2B4A4; Sat, 29 Nov 2014 20:24:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CB5CC143; Sat, 29 Nov 2014 20:24:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sATKOISO091577; Sat, 29 Nov 2014 20:24:18 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sATKOIQZ091576; Sat, 29 Nov 2014 20:24:18 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411292024.sATKOIQZ091576@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 29 Nov 2014 20:24:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275267 - projects/clang350-import/contrib/llvm/patches X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Nov 2014 20:24:19 -0000 Author: dim Date: Sat Nov 29 20:24:18 2014 New Revision: 275267 URL: https://svnweb.freebsd.org/changeset/base/275267 Log: Add patch file for r275265. Added: projects/clang350-import/contrib/llvm/patches/patch-18-llvm-r214802-armv6-cp10-cp11.diff Added: projects/clang350-import/contrib/llvm/patches/patch-18-llvm-r214802-armv6-cp10-cp11.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/contrib/llvm/patches/patch-18-llvm-r214802-armv6-cp10-cp11.diff Sat Nov 29 20:24:18 2014 (r275267) @@ -0,0 +1,64 @@ +Pull in r214802 from upstream llvm trunk (by Renato Golin): + + Allow CP10/CP11 operations on ARMv5/v6 + + Those registers are VFP/NEON and vector instructions should be used instead, + but old cores rely on those co-processors to enable VFP unwinding. This change + was prompted by the libc++abi's unwinding routine and is also present in many + legacy low-level bare-metal code that we ought to compile/assemble. + + Fixing bug PR20025 and allowing PR20529 to proceed with a fix in libc++abi. + +Pull in r214872 from upstream llvm trunk (by Renato Golin): + + Add tests for cp10/cp11 on ARMv5/6 + + Tests for ARMv7/8 are already on diagnostics.s + +This enables assembling certain ARM instructions used in libgcc. + +Introduced here: http://svnweb.freebsd.org/changeset/base/275265 + +Index: lib/Target/ARM/AsmParser/ARMAsmParser.cpp +=================================================================== +--- lib/Target/ARM/AsmParser/ARMAsmParser.cpp ++++ lib/Target/ARM/AsmParser/ARMAsmParser.cpp +@@ -3118,9 +3118,10 @@ static int MatchCoprocessorOperandName(StringRef N + return -1; + switch (Name[1]) { + default: return -1; +- // p10 and p11 are invalid for coproc instructions (reserved for FP/NEON) +- case '0': return CoprocOp == 'p'? -1: 10; +- case '1': return CoprocOp == 'p'? -1: 11; ++ // CP10 and CP11 are VFP/NEON and so vector instructions should be used. ++ // However, old cores (v5/v6) did use them in that way. ++ case '0': return 10; ++ case '1': return 11; + case '2': return 12; + case '3': return 13; + case '4': return 14; +@@ -3177,6 +3178,9 @@ ARMAsmParser::parseCoprocNumOperand(OperandVector + int Num = MatchCoprocessorOperandName(Tok.getString(), 'p'); + if (Num == -1) + return MatchOperand_NoMatch; ++ // ARMv7 and v8 don't allow cp10/cp11 due to VFP/NEON specific instructions ++ if ((hasV7Ops() || hasV8Ops()) && (Num == 10 || Num == 11)) ++ return MatchOperand_NoMatch; + + Parser.Lex(); // Eat identifier token. + Operands.push_back(ARMOperand::CreateCoprocNum(Num, S)); +Index: test/MC/ARM/coproc-diag.s +=================================================================== +--- test/MC/ARM/coproc-diag.s ++++ test/MC/ARM/coproc-diag.s +@@ -0,0 +1,10 @@ ++# Special test to make sure we don't error on VFP co-proc access ++@ RUN: llvm-mc -triple=armv5 < %s | FileCheck %s ++@ RUN: llvm-mc -triple=armv6 < %s | FileCheck %s ++ ++ @ p10 and p11 are reserved for NEON, but accessible on v5/v6 ++ ldc p10, cr0, [r0], {0x20} ++ ldc2 p11, cr0, [r0], {0x21} ++ ldcl p11, cr0, [r0], {0x20} ++ ++@ CHECK-NOT: error: invalid operand for instruction From owner-svn-src-projects@FreeBSD.ORG Sat Nov 29 21:23:08 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7FB2213F; Sat, 29 Nov 2014 21:23:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6CB358CF; Sat, 29 Nov 2014 21:23:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sATLN8Wa020041; Sat, 29 Nov 2014 21:23:08 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sATLN8C2020040; Sat, 29 Nov 2014 21:23:08 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411292123.sATLN8C2020040@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 29 Nov 2014 21:23:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275269 - projects/clang350-import/sys/arm/arm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Nov 2014 21:23:08 -0000 Author: dim Date: Sat Nov 29 21:23:07 2014 New Revision: 275269 URL: https://svnweb.freebsd.org/changeset/base/275269 Log: Consistently use ARM UAL syntax in stdatomic.c, e.g. streqb and streqh become strbeq and strheq, respectively. Clang's integrated assembler intentionally does not support the old spellings. Modified: projects/clang350-import/sys/arm/arm/stdatomic.c Modified: projects/clang350-import/sys/arm/arm/stdatomic.c ============================================================================== --- projects/clang350-import/sys/arm/arm/stdatomic.c Sat Nov 29 20:54:33 2014 (r275268) +++ projects/clang350-import/sys/arm/arm/stdatomic.c Sat Nov 29 21:23:07 2014 (r275269) @@ -850,8 +850,8 @@ EMIT_FETCH_AND_OP_N(N, uintN_t, ldr, str EMIT_FETCH_AND_OP_N(N, uintN_t, ldr, str, fetch_and_sub, "sub") \ EMIT_FETCH_AND_OP_N(N, uintN_t, ldr, str, fetch_and_xor, "eor") -EMIT_ALL_OPS_N(1, uint8_t, "ldrb", "strb", "streqb") -EMIT_ALL_OPS_N(2, uint16_t, "ldrh", "strh", "streqh") +EMIT_ALL_OPS_N(1, uint8_t, "ldrb", "strb", "strbeq") +EMIT_ALL_OPS_N(2, uint16_t, "ldrh", "strh", "strheq") EMIT_ALL_OPS_N(4, uint32_t, "ldr", "str", "streq") #ifndef __clang__ From owner-svn-src-projects@FreeBSD.ORG Sat Nov 29 22:42:54 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5CDFBD52; Sat, 29 Nov 2014 22:42:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49BD3F3D; Sat, 29 Nov 2014 22:42:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sATMgscl057299; Sat, 29 Nov 2014 22:42:54 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sATMgs9p057298; Sat, 29 Nov 2014 22:42:54 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411292242.sATMgs9p057298@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 29 Nov 2014 22:42:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275272 - projects/building-blocks/etc/rc.d X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Nov 2014 22:42:54 -0000 Author: ngie Date: Sat Nov 29 22:42:53 2014 New Revision: 275272 URL: https://svnweb.freebsd.org/changeset/base/275272 Log: atm1 already sets "BEFORE: netif", so remove "REQUIRE: atm1" from netif to allow atm* to be decoupled from rc.d Modified: projects/building-blocks/etc/rc.d/netif Modified: projects/building-blocks/etc/rc.d/netif ============================================================================== --- projects/building-blocks/etc/rc.d/netif Sat Nov 29 22:31:19 2014 (r275271) +++ projects/building-blocks/etc/rc.d/netif Sat Nov 29 22:42:53 2014 (r275272) @@ -26,7 +26,7 @@ # # PROVIDE: netif -# REQUIRE: atm1 FILESYSTEMS serial sppp sysctl +# REQUIRE: FILESYSTEMS serial sppp sysctl # REQUIRE: ipfilter ipfs # KEYWORD: nojailvnet From owner-svn-src-projects@FreeBSD.ORG Sat Nov 29 23:49:01 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 671C97F0; Sat, 29 Nov 2014 23:49:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 53A156AF; Sat, 29 Nov 2014 23:49:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sATNn1up086119; Sat, 29 Nov 2014 23:49:01 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sATNn0gS086113; Sat, 29 Nov 2014 23:49:00 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411292349.sATNn0gS086113@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 29 Nov 2014 23:49:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275276 - projects/building-blocks/etc/rc.d X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Nov 2014 23:49:01 -0000 Author: ngie Date: Sat Nov 29 23:49:00 2014 New Revision: 275276 URL: https://svnweb.freebsd.org/changeset/base/275276 Log: Make local_unbound come before NETWORKING instead of having NETWORKING depend on local_unbound This should be reworked with a dummy DNS provider Modified: projects/building-blocks/etc/rc.d/NETWORKING projects/building-blocks/etc/rc.d/local_unbound Modified: projects/building-blocks/etc/rc.d/NETWORKING ============================================================================== --- projects/building-blocks/etc/rc.d/NETWORKING Sat Nov 29 23:10:19 2014 (r275275) +++ projects/building-blocks/etc/rc.d/NETWORKING Sat Nov 29 23:49:00 2014 (r275276) @@ -6,7 +6,7 @@ # PROVIDE: NETWORKING NETWORK # REQUIRE: netif netoptions routing ppp ipfw stf # REQUIRE: defaultroute routed mrouted route6d mroute6d resolv bridge -# REQUIRE: static_arp static_ndp local_unbound +# REQUIRE: static_arp static_ndp # This is a dummy dependency, for services which require networking # to be operational before starting. Modified: projects/building-blocks/etc/rc.d/local_unbound ============================================================================== --- projects/building-blocks/etc/rc.d/local_unbound Sat Nov 29 23:10:19 2014 (r275275) +++ projects/building-blocks/etc/rc.d/local_unbound Sat Nov 29 23:49:00 2014 (r275276) @@ -5,6 +5,7 @@ # PROVIDE: local_unbound # REQUIRE: FILESYSTEMS netif resolv +# BEFORE: NETWORKING # KEYWORD: shutdown . /etc/rc.subr From owner-svn-src-projects@FreeBSD.ORG Sat Nov 29 23:57:09 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B43D5A67; Sat, 29 Nov 2014 23:57:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A0EAC7D1; Sat, 29 Nov 2014 23:57:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sATNv9pi090817; Sat, 29 Nov 2014 23:57:09 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sATNv9I4090815; Sat, 29 Nov 2014 23:57:09 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411292357.sATNv9I4090815@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 29 Nov 2014 23:57:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275277 - projects/building-blocks/etc/rc.d X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Nov 2014 23:57:09 -0000 Author: ngie Date: Sat Nov 29 23:57:08 2014 New Revision: 275277 URL: https://svnweb.freebsd.org/changeset/base/275277 Log: Make gssd come before nfsd so gssd can be decoupled from etc/rc.d/Makefile Modified: projects/building-blocks/etc/rc.d/gssd projects/building-blocks/etc/rc.d/nfsd Modified: projects/building-blocks/etc/rc.d/gssd ============================================================================== --- projects/building-blocks/etc/rc.d/gssd Sat Nov 29 23:49:00 2014 (r275276) +++ projects/building-blocks/etc/rc.d/gssd Sat Nov 29 23:57:08 2014 (r275277) @@ -5,6 +5,7 @@ # PROVIDE: gssd # REQUIRE: root +# BEFORE: nfsd # KEYWORD: nojail shutdown . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/nfsd ============================================================================== --- projects/building-blocks/etc/rc.d/nfsd Sat Nov 29 23:49:00 2014 (r275276) +++ projects/building-blocks/etc/rc.d/nfsd Sat Nov 29 23:57:08 2014 (r275277) @@ -4,7 +4,7 @@ # # PROVIDE: nfsd -# REQUIRE: mountd hostname gssd nfsuserd +# REQUIRE: mountd hostname nfsuserd # KEYWORD: nojail shutdown . /etc/rc.subr From owner-svn-src-projects@FreeBSD.ORG Sat Nov 29 23:59:53 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 08149B64; Sat, 29 Nov 2014 23:59:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E90E47DD; Sat, 29 Nov 2014 23:59:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sATNxq11091167; Sat, 29 Nov 2014 23:59:52 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sATNxqbt091163; Sat, 29 Nov 2014 23:59:52 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411292359.sATNxqbt091163@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 29 Nov 2014 23:59:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275278 - projects/building-blocks/etc/rc.d X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Nov 2014 23:59:53 -0000 Author: ngie Date: Sat Nov 29 23:59:51 2014 New Revision: 275278 URL: https://svnweb.freebsd.org/changeset/base/275278 Log: Make ntpdate run before rpcbind to allow ntpdate to be decoupled from the build Modified: projects/building-blocks/etc/rc.d/ntpdate projects/building-blocks/etc/rc.d/rpcbind Modified: projects/building-blocks/etc/rc.d/ntpdate ============================================================================== --- projects/building-blocks/etc/rc.d/ntpdate Sat Nov 29 23:57:08 2014 (r275277) +++ projects/building-blocks/etc/rc.d/ntpdate Sat Nov 29 23:59:51 2014 (r275278) @@ -5,6 +5,7 @@ # PROVIDE: ntpdate # REQUIRE: NETWORKING syslogd +# BEFORE: rpcbind # KEYWORD: nojail . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/rpcbind ============================================================================== --- projects/building-blocks/etc/rc.d/rpcbind Sat Nov 29 23:57:08 2014 (r275277) +++ projects/building-blocks/etc/rc.d/rpcbind Sat Nov 29 23:59:51 2014 (r275278) @@ -4,7 +4,7 @@ # # PROVIDE: rpcbind -# REQUIRE: NETWORKING ntpdate syslogd +# REQUIRE: NETWORKING syslogd # KEYWORD: shutdown . /etc/rc.subr