From owner-svn-src-projects@FreeBSD.ORG Sun Dec 5 20:24:22 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A6C141065670; Sun, 5 Dec 2010 20:24:22 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9340B8FC08; Sun, 5 Dec 2010 20:24:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oB5KOMDt007060; Sun, 5 Dec 2010 20:24:22 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB5KOMUF007051; Sun, 5 Dec 2010 20:24:22 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201012052024.oB5KOMUF007051@svn.freebsd.org> From: Dimitry Andric Date: Sun, 5 Dec 2010 20:24:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216200 - in projects/binutils-2.17: contrib/binutils/bfd contrib/binutils/gas/config contrib/binutils/ld/emulparams gnu/usr.bin/binutils/libbfd sys/boot/ia64/efi sys/boot/ia64/ski sys/... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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, 05 Dec 2010 20:24:22 -0000 Author: dim Date: Sun Dec 5 20:24:22 2010 New Revision: 216200 URL: http://svn.freebsd.org/changeset/base/216200 Log: For ia64, add a proper 'elf64-ia64-freebsd' output format to BFD, so the ELF branding for FreeBSD is done in the same way as amd64, i386 and sparc. Something similar should probably also be done for arm, mips and powerpc. Modified: projects/binutils-2.17/contrib/binutils/bfd/elfxx-ia64.c projects/binutils-2.17/contrib/binutils/bfd/targets.c projects/binutils-2.17/contrib/binutils/gas/config/tc-ia64.c projects/binutils-2.17/contrib/binutils/ld/emulparams/elf64_ia64_fbsd.sh projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile.ia64 projects/binutils-2.17/sys/boot/ia64/efi/ldscript.ia64 projects/binutils-2.17/sys/boot/ia64/ski/ldscript.ia64 projects/binutils-2.17/sys/conf/ldscript.ia64 Modified: projects/binutils-2.17/contrib/binutils/bfd/elfxx-ia64.c ============================================================================== --- projects/binutils-2.17/contrib/binutils/bfd/elfxx-ia64.c Sun Dec 5 16:09:03 2010 (r216199) +++ projects/binutils-2.17/contrib/binutils/bfd/elfxx-ia64.c Sun Dec 5 20:24:22 2010 (r216200) @@ -5909,6 +5909,26 @@ elfNN_hpux_backend_symbol_processing (bf #include "elfNN-target.h" +/* FreeBSD support. */ + +#undef TARGET_LITTLE_SYM +#define TARGET_LITTLE_SYM bfd_elfNN_ia64_freebsd_vec +#undef TARGET_LITTLE_NAME +#define TARGET_LITTLE_NAME "elfNN-ia64-freebsd" +#undef TARGET_BIG_SYM +#undef TARGET_BIG_NAME + +#undef ELF_OSABI +#define ELF_OSABI ELFOSABI_FREEBSD + +#undef elf_backend_post_process_headers +#define elf_backend_post_process_headers _bfd_elf_set_osabi + +#undef elfNN_bed +#define elfNN_bed elfNN_ia64_fbsd_bed + +#include "elfNN-target.h" + /* HPUX-specific vectors. */ #undef TARGET_LITTLE_SYM Modified: projects/binutils-2.17/contrib/binutils/bfd/targets.c ============================================================================== --- projects/binutils-2.17/contrib/binutils/bfd/targets.c Sun Dec 5 16:09:03 2010 (r216199) +++ projects/binutils-2.17/contrib/binutils/bfd/targets.c Sun Dec 5 20:24:22 2010 (r216200) @@ -594,6 +594,7 @@ extern const bfd_target bfd_elf32_i860_l extern const bfd_target bfd_elf32_i860_vec; extern const bfd_target bfd_elf32_i960_vec; extern const bfd_target bfd_elf32_ia64_big_vec; +extern const bfd_target bfd_elf64_ia64_freebsd_vec; extern const bfd_target bfd_elf32_ia64_hpux_big_vec; extern const bfd_target bfd_elf32_ip2k_vec; extern const bfd_target bfd_elf32_iq2000_vec; Modified: projects/binutils-2.17/contrib/binutils/gas/config/tc-ia64.c ============================================================================== --- projects/binutils-2.17/contrib/binutils/gas/config/tc-ia64.c Sun Dec 5 16:09:03 2010 (r216199) +++ projects/binutils-2.17/contrib/binutils/gas/config/tc-ia64.c Sun Dec 5 20:24:22 2010 (r216200) @@ -7704,8 +7704,10 @@ ia64_target_format () else { if (md.flags & EF_IA_64_ABI64) -#ifdef TE_AIX50 +#if defined(TE_AIX50) return "elf64-ia64-aix-little"; +#elif defined(TE_FreeBSD) + return "elf64-ia64-freebsd"; #else return "elf64-ia64-little"; #endif Modified: projects/binutils-2.17/contrib/binutils/ld/emulparams/elf64_ia64_fbsd.sh ============================================================================== --- projects/binutils-2.17/contrib/binutils/ld/emulparams/elf64_ia64_fbsd.sh Sun Dec 5 16:09:03 2010 (r216199) +++ projects/binutils-2.17/contrib/binutils/ld/emulparams/elf64_ia64_fbsd.sh Sun Dec 5 20:24:22 2010 (r216200) @@ -4,3 +4,4 @@ unset DATA_ADDR unset SMALL_DATA_CTOR unset SMALL_DATA_DTOR . ${srcdir}/emulparams/elf_fbsd.sh +OUTPUT_FORMAT="elf64-ia64-freebsd" Modified: projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile.ia64 ============================================================================== --- projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile.ia64 Sun Dec 5 16:09:03 2010 (r216199) +++ projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile.ia64 Sun Dec 5 20:24:22 2010 (r216200) @@ -1,6 +1,6 @@ # $FreeBSD$ -DEFAULT_VECTOR= bfd_elf64_ia64_little_vec +DEFAULT_VECTOR= bfd_elf64_ia64_freebsd_vec SRCS+= cofflink.c \ cpu-ia64.c \ @@ -18,13 +18,14 @@ SRCS+= cofflink.c \ VECS+= ${DEFAULT_VECTOR} \ bfd_efi_app_ia64_vec \ + bfd_elf64_ia64_little_vec \ bfd_elf64_ia64_big_vec \ bfd_elf64_little_generic_vec bfd_elf64_big_generic_vec \ bfd_elf32_little_generic_vec bfd_elf32_big_generic_vec CLEANFILES+= elf64-ia64.c pepigen.c pex64igen.c -elf64-ia64.c: elf-fbsd-brand.c elfxx-ia64.c +elf64-ia64.c: elfxx-ia64.c sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET} pepigen.c: peXXigen.c Modified: projects/binutils-2.17/sys/boot/ia64/efi/ldscript.ia64 ============================================================================== --- projects/binutils-2.17/sys/boot/ia64/efi/ldscript.ia64 Sun Dec 5 16:09:03 2010 (r216199) +++ projects/binutils-2.17/sys/boot/ia64/efi/ldscript.ia64 Sun Dec 5 20:24:22 2010 (r216200) @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little") +OUTPUT_FORMAT("elf64-ia64-freebsd", "elf64-ia64-freebsd", "elf64-ia64-freebsd") OUTPUT_ARCH(ia64) ENTRY(_start_plabel) SECTIONS Modified: projects/binutils-2.17/sys/boot/ia64/ski/ldscript.ia64 ============================================================================== --- projects/binutils-2.17/sys/boot/ia64/ski/ldscript.ia64 Sun Dec 5 16:09:03 2010 (r216199) +++ projects/binutils-2.17/sys/boot/ia64/ski/ldscript.ia64 Sun Dec 5 20:24:22 2010 (r216200) @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little") +OUTPUT_FORMAT("elf64-ia64-freebsd", "elf64-ia64-freebsd", "elf64-ia64-freebsd") OUTPUT_ARCH(ia64) ENTRY(_start) SECTIONS Modified: projects/binutils-2.17/sys/conf/ldscript.ia64 ============================================================================== --- projects/binutils-2.17/sys/conf/ldscript.ia64 Sun Dec 5 16:09:03 2010 (r216199) +++ projects/binutils-2.17/sys/conf/ldscript.ia64 Sun Dec 5 20:24:22 2010 (r216200) @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little") +OUTPUT_FORMAT("elf64-ia64-freebsd", "elf64-ia64-freebsd", "elf64-ia64-freebsd") OUTPUT_ARCH(ia64) ENTRY(__start) SEARCH_DIR(/usr/lib); From owner-svn-src-projects@FreeBSD.ORG Sun Dec 5 20:47:38 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 19E51106566B; Sun, 5 Dec 2010 20:47:38 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0373B8FC19; Sun, 5 Dec 2010 20:47:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oB5KlcW1007960; Sun, 5 Dec 2010 20:47:38 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB5Klbg9007945; Sun, 5 Dec 2010 20:47:37 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201012052047.oB5Klbg9007945@svn.freebsd.org> From: Marcel Moolenaar Date: Sun, 5 Dec 2010 20:47:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216201 - in projects/altix/sys: . amd64/acpica amd64/amd64 amd64/ia32 amd64/include arm/arm arm/conf arm/include arm/xscale/ixp425 boot/arm/ixp425/boot2 boot/arm/uboot boot/common boot... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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, 05 Dec 2010 20:47:38 -0000 Author: marcel Date: Sun Dec 5 20:47:36 2010 New Revision: 216201 URL: http://svn.freebsd.org/changeset/base/216201 Log: svn+ssh://svn.freebsd.org/base/head@216199 Added: projects/altix/sys/arm/xscale/ixp425/avila_gpio.c - copied unchanged from r216199, head/sys/arm/xscale/ixp425/avila_gpio.c projects/altix/sys/arm/xscale/ixp425/cambria_gpio.c - copied unchanged from r216199, head/sys/arm/xscale/ixp425/cambria_gpio.c projects/altix/sys/cam/scsi/smp_all.c - copied unchanged from r216199, head/sys/cam/scsi/smp_all.c projects/altix/sys/cam/scsi/smp_all.h - copied unchanged from r216199, head/sys/cam/scsi/smp_all.h projects/altix/sys/contrib/octeon-sdk/cvmx-agl-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-agl-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-app-hotplug.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-app-hotplug.c projects/altix/sys/contrib/octeon-sdk/cvmx-app-hotplug.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-app-hotplug.h projects/altix/sys/contrib/octeon-sdk/cvmx-asx0-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-asx0-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-asxx-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-asxx-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-ciu-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-ciu-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-clock.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-clock.c projects/altix/sys/contrib/octeon-sdk/cvmx-clock.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-clock.h projects/altix/sys/contrib/octeon-sdk/cvmx-crypto.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-crypto.c projects/altix/sys/contrib/octeon-sdk/cvmx-crypto.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-crypto.h projects/altix/sys/contrib/octeon-sdk/cvmx-dbg-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-dbg-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-debug-handler.S - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-debug-handler.S projects/altix/sys/contrib/octeon-sdk/cvmx-debug-remote.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-debug-remote.c projects/altix/sys/contrib/octeon-sdk/cvmx-debug-uart.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-debug-uart.c projects/altix/sys/contrib/octeon-sdk/cvmx-debug.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-debug.c projects/altix/sys/contrib/octeon-sdk/cvmx-debug.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-debug.h projects/altix/sys/contrib/octeon-sdk/cvmx-dfa-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-dfa-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-dfm-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-dfm-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-dpi-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-dpi-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-error-custom.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-error-custom.c projects/altix/sys/contrib/octeon-sdk/cvmx-error-custom.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-error-custom.h projects/altix/sys/contrib/octeon-sdk/cvmx-error-init-cn30xx.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-error-init-cn30xx.c projects/altix/sys/contrib/octeon-sdk/cvmx-error-init-cn31xx.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-error-init-cn31xx.c projects/altix/sys/contrib/octeon-sdk/cvmx-error-init-cn38xx.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-error-init-cn38xx.c projects/altix/sys/contrib/octeon-sdk/cvmx-error-init-cn38xxp2.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-error-init-cn38xxp2.c projects/altix/sys/contrib/octeon-sdk/cvmx-error-init-cn50xx.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-error-init-cn50xx.c projects/altix/sys/contrib/octeon-sdk/cvmx-error-init-cn52xx.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-error-init-cn52xx.c projects/altix/sys/contrib/octeon-sdk/cvmx-error-init-cn52xxp1.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-error-init-cn52xxp1.c projects/altix/sys/contrib/octeon-sdk/cvmx-error-init-cn56xx.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-error-init-cn56xx.c projects/altix/sys/contrib/octeon-sdk/cvmx-error-init-cn56xxp1.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-error-init-cn56xxp1.c projects/altix/sys/contrib/octeon-sdk/cvmx-error-init-cn58xx.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-error-init-cn58xx.c projects/altix/sys/contrib/octeon-sdk/cvmx-error-init-cn58xxp1.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-error-init-cn58xxp1.c projects/altix/sys/contrib/octeon-sdk/cvmx-error-init-cn63xx.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-error-init-cn63xx.c projects/altix/sys/contrib/octeon-sdk/cvmx-error-init-cn63xxp1.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-error-init-cn63xxp1.c projects/altix/sys/contrib/octeon-sdk/cvmx-error.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-error.c projects/altix/sys/contrib/octeon-sdk/cvmx-error.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-error.h projects/altix/sys/contrib/octeon-sdk/cvmx-fpa-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-fpa-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-gmxx-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-gmxx-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-gpio-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-gpio-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-helper-jtag.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-helper-jtag.c projects/altix/sys/contrib/octeon-sdk/cvmx-helper-jtag.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-helper-jtag.h projects/altix/sys/contrib/octeon-sdk/cvmx-helper-srio.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-helper-srio.c projects/altix/sys/contrib/octeon-sdk/cvmx-helper-srio.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-helper-srio.h projects/altix/sys/contrib/octeon-sdk/cvmx-iob-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-iob-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-ipd-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-ipd-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-ixf18201.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-ixf18201.c projects/altix/sys/contrib/octeon-sdk/cvmx-ixf18201.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-ixf18201.h projects/altix/sys/contrib/octeon-sdk/cvmx-key-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-key-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-l2c-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-l2c-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-l2d-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-l2d-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-l2t-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-l2t-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-led-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-led-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-lmcx-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-lmcx-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-mio-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-mio-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-mixx-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-mixx-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-mpi-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-mpi-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-ndf-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-ndf-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-npei-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-npei-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-npi-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-npi-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-pci-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-pci-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-pcieepx-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-pcieepx-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-pciercx-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-pciercx-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-pcm-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-pcm-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-pcmx-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-pcmx-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-pcsx-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-pcsx-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-pcsxx-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-pcsxx-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-pemx-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-pemx-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-pescx-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-pescx-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-pexp-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-pexp-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-pip-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-pip-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-pko-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-pko-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-pow-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-pow-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-power-throttle.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-power-throttle.c projects/altix/sys/contrib/octeon-sdk/cvmx-power-throttle.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-power-throttle.h projects/altix/sys/contrib/octeon-sdk/cvmx-rad-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-rad-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-rnm-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-rnm-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-shmem.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-shmem.c projects/altix/sys/contrib/octeon-sdk/cvmx-shmem.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-shmem.h projects/altix/sys/contrib/octeon-sdk/cvmx-sim-magic.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-sim-magic.h projects/altix/sys/contrib/octeon-sdk/cvmx-sli-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-sli-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-smi-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-smi-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-smix-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-smix-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-spx0-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-spx0-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-spxx-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-spxx-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-srio.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-srio.c projects/altix/sys/contrib/octeon-sdk/cvmx-srio.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-srio.h projects/altix/sys/contrib/octeon-sdk/cvmx-sriomaintx-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-sriomaintx-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-sriox-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-sriox-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-srxx-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-srxx-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-stxx-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-stxx-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-tim-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-tim-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-tlb.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-tlb.c projects/altix/sys/contrib/octeon-sdk/cvmx-tlb.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-tlb.h projects/altix/sys/contrib/octeon-sdk/cvmx-tra-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-tra-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-uahcx-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-uahcx-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-uart.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-uart.c projects/altix/sys/contrib/octeon-sdk/cvmx-uctlx-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-uctlx-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-usbcx-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-usbcx-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-usbd.c - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-usbd.c projects/altix/sys/contrib/octeon-sdk/cvmx-usbd.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-usbd.h projects/altix/sys/contrib/octeon-sdk/cvmx-usbnx-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-usbnx-defs.h projects/altix/sys/contrib/octeon-sdk/cvmx-zip-defs.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-zip-defs.h projects/altix/sys/contrib/octeon-sdk/octeon-boot-info.h - copied unchanged from r216199, head/sys/contrib/octeon-sdk/octeon-boot-info.h projects/altix/sys/dev/agp/agp_apple.c - copied unchanged from r216199, head/sys/dev/agp/agp_apple.c projects/altix/sys/dev/ixgbe/ixgbe_mbx.c - copied unchanged from r216199, head/sys/dev/ixgbe/ixgbe_mbx.c projects/altix/sys/dev/ixgbe/ixgbe_mbx.h - copied unchanged from r216199, head/sys/dev/ixgbe/ixgbe_mbx.h projects/altix/sys/dev/ixgbe/ixgbe_vf.c - copied unchanged from r216199, head/sys/dev/ixgbe/ixgbe_vf.c projects/altix/sys/dev/ixgbe/ixgbe_vf.h - copied unchanged from r216199, head/sys/dev/ixgbe/ixgbe_vf.h projects/altix/sys/dev/ixgbe/ixv.c - copied unchanged from r216199, head/sys/dev/ixgbe/ixv.c projects/altix/sys/dev/ixgbe/ixv.h - copied unchanged from r216199, head/sys/dev/ixgbe/ixv.h projects/altix/sys/dev/usb/usb_pf.c - copied unchanged from r216199, head/sys/dev/usb/usb_pf.c projects/altix/sys/dev/usb/usb_pf.h - copied unchanged from r216199, head/sys/dev/usb/usb_pf.h projects/altix/sys/mips/atheros/std.ar71xx - copied unchanged from r216199, head/sys/mips/atheros/std.ar71xx projects/altix/sys/mips/cavium/octeon_nmi.S - copied unchanged from r216199, head/sys/mips/cavium/octeon_nmi.S projects/altix/sys/mips/cavium/octeon_wdog.c - copied unchanged from r216199, head/sys/mips/cavium/octeon_wdog.c projects/altix/sys/mips/conf/std.SWARM - copied unchanged from r216199, head/sys/mips/conf/std.SWARM projects/altix/sys/mips/mips/minidump_machdep.c - copied unchanged from r216199, head/sys/mips/mips/minidump_machdep.c projects/altix/sys/mips/sentry5/std.sentry5 - copied unchanged from r216199, head/sys/mips/sentry5/std.sentry5 projects/altix/sys/mips/sibyte/std.sibyte - copied unchanged from r216199, head/sys/mips/sibyte/std.sibyte projects/altix/sys/modules/cc/ - copied from r216199, head/sys/modules/cc/ projects/altix/sys/net/if_debug.c - copied unchanged from r216199, head/sys/net/if_debug.c projects/altix/sys/netinet/cc/ - copied from r216199, head/sys/netinet/cc/ projects/altix/sys/netinet/cc.h - copied unchanged from r216199, head/sys/netinet/cc.h projects/altix/sys/netinet/sctp_dtrace_declare.h - copied unchanged from r216199, head/sys/netinet/sctp_dtrace_declare.h projects/altix/sys/netinet/sctp_dtrace_define.h - copied unchanged from r216199, head/sys/netinet/sctp_dtrace_define.h projects/altix/sys/powerpc/aim/mmu_oea64.h - copied unchanged from r216199, head/sys/powerpc/aim/mmu_oea64.h projects/altix/sys/powerpc/aim/moea64_if.m - copied unchanged from r216199, head/sys/powerpc/aim/moea64_if.m projects/altix/sys/powerpc/aim/moea64_native.c - copied unchanged from r216199, head/sys/powerpc/aim/moea64_native.c projects/altix/sys/powerpc/ofw/ofw_machdep.c - copied unchanged from r216199, head/sys/powerpc/ofw/ofw_machdep.c projects/altix/sys/powerpc/powerpc/iommu_if.m - copied unchanged from r216199, head/sys/powerpc/powerpc/iommu_if.m projects/altix/sys/x86/acpica/OsdEnvironment.c - copied unchanged from r216199, head/sys/x86/acpica/OsdEnvironment.c projects/altix/sys/x86/acpica/acpi_apm.c - copied unchanged from r216199, head/sys/x86/acpica/acpi_apm.c projects/altix/sys/x86/acpica/madt.c - copied unchanged from r216199, head/sys/x86/acpica/madt.c projects/altix/sys/x86/include/ - copied from r216199, head/sys/x86/include/ projects/altix/sys/x86/x86/dump_machdep.c - copied unchanged from r216199, head/sys/x86/x86/dump_machdep.c projects/altix/sys/x86/x86/mptable.c - copied unchanged from r216199, head/sys/x86/x86/mptable.c projects/altix/sys/x86/x86/mptable_pci.c - copied unchanged from r216199, head/sys/x86/x86/mptable_pci.c projects/altix/sys/x86/x86/nexus.c - copied unchanged from r216199, head/sys/x86/x86/nexus.c Replaced: projects/altix/sys/contrib/octeon-sdk/cvmx-interrupt-handler.S - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-interrupt-handler.S projects/altix/sys/contrib/octeon-sdk/cvmx-log-arc.S - copied unchanged from r216199, head/sys/contrib/octeon-sdk/cvmx-log-arc.S Deleted: projects/altix/sys/amd64/acpica/OsdEnvironment.c projects/altix/sys/amd64/acpica/madt.c projects/altix/sys/amd64/amd64/dump_machdep.c projects/altix/sys/amd64/amd64/mptable.c projects/altix/sys/amd64/amd64/mptable_pci.c projects/altix/sys/amd64/amd64/nexus.c projects/altix/sys/amd64/include/apicreg.h projects/altix/sys/amd64/include/mca.h projects/altix/sys/amd64/include/mptable.h projects/altix/sys/amd64/include/mutex.h projects/altix/sys/arm/include/mutex.h projects/altix/sys/boot/pc98/libpc98/i386_module.c projects/altix/sys/contrib/octeon-sdk/README.txt projects/altix/sys/contrib/octeon-sdk/cvmx-asx.h projects/altix/sys/contrib/octeon-sdk/cvmx-ciu.h projects/altix/sys/contrib/octeon-sdk/cvmx-csr-addresses.h projects/altix/sys/contrib/octeon-sdk/cvmx-cvmmem.h projects/altix/sys/contrib/octeon-sdk/cvmx-interrupt-decodes.c projects/altix/sys/contrib/octeon-sdk/cvmx-interrupt-rsl.c projects/altix/sys/contrib/octeon-sdk/cvmx-iob.h projects/altix/sys/contrib/octeon-sdk/cvmx-lmc.h projects/altix/sys/contrib/octeon-sdk/cvmx-malloc/ projects/altix/sys/contrib/octeon-sdk/cvmx-mio.h projects/altix/sys/contrib/octeon-sdk/cvmx-resources.config projects/altix/sys/contrib/octeon-sdk/cvmx-shared-linux-n32.ld projects/altix/sys/contrib/octeon-sdk/cvmx-shared-linux-o32.ld projects/altix/sys/contrib/octeon-sdk/cvmx-shared-linux.ld projects/altix/sys/contrib/octeon-sdk/cvmx-twsi-raw.c projects/altix/sys/contrib/octeon-sdk/cvmx-twsi-raw.h projects/altix/sys/contrib/octeon-sdk/cvmx.mk projects/altix/sys/contrib/octeon-sdk/executive-config.h.template projects/altix/sys/i386/acpica/Makefile projects/altix/sys/i386/acpica/OsdEnvironment.c projects/altix/sys/i386/acpica/genwakecode.sh projects/altix/sys/i386/acpica/madt.c projects/altix/sys/i386/i386/dump_machdep.c projects/altix/sys/i386/i386/mptable.c projects/altix/sys/i386/i386/mptable_pci.c projects/altix/sys/i386/i386/nexus.c projects/altix/sys/i386/include/apicreg.h projects/altix/sys/i386/include/mca.h projects/altix/sys/i386/include/mptable.h projects/altix/sys/i386/include/mutex.h projects/altix/sys/ia64/include/mutex.h projects/altix/sys/mips/conf/SWARM_COMMON projects/altix/sys/mips/include/mutex.h projects/altix/sys/pc98/include/apicreg.h projects/altix/sys/pc98/include/mca.h projects/altix/sys/pc98/include/mptable.h projects/altix/sys/pc98/include/mutex.h projects/altix/sys/powerpc/aim/ofw_machdep.c projects/altix/sys/powerpc/include/mutex.h projects/altix/sys/sparc64/include/mutex.h projects/altix/sys/sun4v/include/mutex.h projects/altix/sys/ufs/ffs/README.snapshot Modified: projects/altix/sys/Makefile projects/altix/sys/amd64/acpica/acpi_machdep.c projects/altix/sys/amd64/acpica/acpi_switch.S projects/altix/sys/amd64/acpica/acpi_wakecode.S projects/altix/sys/amd64/acpica/acpi_wakeup.c projects/altix/sys/amd64/amd64/amd64_mem.c projects/altix/sys/amd64/amd64/apic_vector.S projects/altix/sys/amd64/amd64/cpu_switch.S projects/altix/sys/amd64/amd64/fpu.c projects/altix/sys/amd64/amd64/genassym.c projects/altix/sys/amd64/amd64/intr_machdep.c projects/altix/sys/amd64/amd64/machdep.c projects/altix/sys/amd64/amd64/minidump_machdep.c projects/altix/sys/amd64/amd64/mp_machdep.c projects/altix/sys/amd64/amd64/mp_watchdog.c projects/altix/sys/amd64/amd64/pmap.c projects/altix/sys/amd64/amd64/support.S projects/altix/sys/amd64/amd64/trap.c projects/altix/sys/amd64/amd64/tsc.c projects/altix/sys/amd64/ia32/ia32_reg.c projects/altix/sys/amd64/ia32/ia32_signal.c projects/altix/sys/amd64/include/_align.h projects/altix/sys/amd64/include/apm_bios.h projects/altix/sys/amd64/include/fpu.h projects/altix/sys/amd64/include/minidump.h projects/altix/sys/amd64/include/pmap.h projects/altix/sys/amd64/include/profile.h projects/altix/sys/amd64/include/specialreg.h projects/altix/sys/amd64/include/vmparam.h projects/altix/sys/arm/arm/elf_trampoline.c projects/altix/sys/arm/arm/machdep.c projects/altix/sys/arm/conf/AVILA projects/altix/sys/arm/conf/AVILA.hints projects/altix/sys/arm/conf/BWCT.hints projects/altix/sys/arm/conf/CAMBRIA projects/altix/sys/arm/conf/CAMBRIA.hints projects/altix/sys/arm/include/cpuconf.h projects/altix/sys/arm/xscale/ixp425/avila_led.c projects/altix/sys/arm/xscale/ixp425/files.avila projects/altix/sys/arm/xscale/ixp425/ixp425.c projects/altix/sys/arm/xscale/ixp425/ixp425_iic.c projects/altix/sys/arm/xscale/ixp425/ixp425_qmgr.c projects/altix/sys/arm/xscale/ixp425/ixp425reg.h projects/altix/sys/arm/xscale/ixp425/ixp425var.h projects/altix/sys/boot/arm/ixp425/boot2/ixp425_board.c projects/altix/sys/boot/arm/uboot/ldscript.arm projects/altix/sys/boot/common/load_elf.c projects/altix/sys/boot/common/loader.8 projects/altix/sys/boot/fdt/dts/mpc8555cds.dts projects/altix/sys/boot/forth/beastie.4th projects/altix/sys/boot/i386/boot2/boot1.S projects/altix/sys/boot/i386/libi386/biosacpi.c projects/altix/sys/boot/i386/libi386/i386_module.c projects/altix/sys/boot/i386/loader/help.i386 projects/altix/sys/boot/ofw/common/main.c projects/altix/sys/boot/ofw/libofw/ofw_copy.c projects/altix/sys/boot/ofw/libofw/ofw_memory.c projects/altix/sys/boot/ofw/libofw/ofw_net.c projects/altix/sys/boot/ofw/libofw/openfirm.c projects/altix/sys/boot/ofw/libofw/openfirm.h projects/altix/sys/boot/powerpc/ofw/start.c projects/altix/sys/boot/sparc64/loader/main.c projects/altix/sys/cam/ata/ata_xpt.c projects/altix/sys/cam/cam.c projects/altix/sys/cam/cam.h projects/altix/sys/cam/cam_ccb.h projects/altix/sys/cam/cam_periph.c projects/altix/sys/cam/cam_xpt.c projects/altix/sys/cam/cam_xpt_internal.h projects/altix/sys/cam/scsi/scsi_all.c projects/altix/sys/cam/scsi/scsi_all.h projects/altix/sys/cam/scsi/scsi_pass.c projects/altix/sys/cam/scsi/scsi_xpt.c projects/altix/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c projects/altix/sys/compat/freebsd32/freebsd32.h projects/altix/sys/compat/freebsd32/freebsd32_misc.c projects/altix/sys/compat/ia32/ia32_signal.h projects/altix/sys/compat/ia32/ia32_util.h projects/altix/sys/compat/linprocfs/linprocfs.c projects/altix/sys/compat/linsysfs/linsysfs.c projects/altix/sys/compat/linux/linux_emul.c projects/altix/sys/compat/linux/linux_emul.h projects/altix/sys/compat/linux/linux_futex.c projects/altix/sys/compat/linux/linux_futex.h projects/altix/sys/compat/linux/linux_misc.c projects/altix/sys/compat/ndis/kern_ndis.c projects/altix/sys/compat/ndis/kern_windrv.c projects/altix/sys/compat/ndis/ntoskrnl_var.h projects/altix/sys/compat/ndis/subr_ndis.c projects/altix/sys/compat/ndis/subr_ntoskrnl.c projects/altix/sys/compat/ndis/winx64_wrap.S projects/altix/sys/conf/Makefile.mips projects/altix/sys/conf/NOTES projects/altix/sys/conf/files projects/altix/sys/conf/files.amd64 projects/altix/sys/conf/files.i386 projects/altix/sys/conf/files.mips projects/altix/sys/conf/files.pc98 projects/altix/sys/conf/files.powerpc projects/altix/sys/conf/kern.post.mk projects/altix/sys/conf/kern.pre.mk projects/altix/sys/conf/kmod.mk projects/altix/sys/conf/ldscript.mips projects/altix/sys/conf/options projects/altix/sys/conf/options.amd64 projects/altix/sys/conf/options.powerpc projects/altix/sys/contrib/octeon-sdk/cvmip.h projects/altix/sys/contrib/octeon-sdk/cvmx-abi.h projects/altix/sys/contrib/octeon-sdk/cvmx-access-native.h projects/altix/sys/contrib/octeon-sdk/cvmx-access.h projects/altix/sys/contrib/octeon-sdk/cvmx-address.h projects/altix/sys/contrib/octeon-sdk/cvmx-app-init-linux.c projects/altix/sys/contrib/octeon-sdk/cvmx-app-init.c projects/altix/sys/contrib/octeon-sdk/cvmx-app-init.h projects/altix/sys/contrib/octeon-sdk/cvmx-asm.h projects/altix/sys/contrib/octeon-sdk/cvmx-atomic.h projects/altix/sys/contrib/octeon-sdk/cvmx-bootloader.h projects/altix/sys/contrib/octeon-sdk/cvmx-bootmem.c projects/altix/sys/contrib/octeon-sdk/cvmx-bootmem.h projects/altix/sys/contrib/octeon-sdk/cvmx-cmd-queue.c projects/altix/sys/contrib/octeon-sdk/cvmx-cmd-queue.h projects/altix/sys/contrib/octeon-sdk/cvmx-cn3010-evb-hs5.c projects/altix/sys/contrib/octeon-sdk/cvmx-cn3010-evb-hs5.h projects/altix/sys/contrib/octeon-sdk/cvmx-compactflash.c projects/altix/sys/contrib/octeon-sdk/cvmx-compactflash.h projects/altix/sys/contrib/octeon-sdk/cvmx-core.c projects/altix/sys/contrib/octeon-sdk/cvmx-core.h projects/altix/sys/contrib/octeon-sdk/cvmx-coremask.c projects/altix/sys/contrib/octeon-sdk/cvmx-coremask.h projects/altix/sys/contrib/octeon-sdk/cvmx-csr-db-support.c projects/altix/sys/contrib/octeon-sdk/cvmx-csr-db.c projects/altix/sys/contrib/octeon-sdk/cvmx-csr-db.h projects/altix/sys/contrib/octeon-sdk/cvmx-csr-enums.h projects/altix/sys/contrib/octeon-sdk/cvmx-csr-typedefs.h projects/altix/sys/contrib/octeon-sdk/cvmx-csr.h projects/altix/sys/contrib/octeon-sdk/cvmx-dfa.c projects/altix/sys/contrib/octeon-sdk/cvmx-dfa.h projects/altix/sys/contrib/octeon-sdk/cvmx-dma-engine.c projects/altix/sys/contrib/octeon-sdk/cvmx-dma-engine.h projects/altix/sys/contrib/octeon-sdk/cvmx-ebt3000.c projects/altix/sys/contrib/octeon-sdk/cvmx-ebt3000.h projects/altix/sys/contrib/octeon-sdk/cvmx-fau.h projects/altix/sys/contrib/octeon-sdk/cvmx-flash.c projects/altix/sys/contrib/octeon-sdk/cvmx-flash.h projects/altix/sys/contrib/octeon-sdk/cvmx-fpa.c projects/altix/sys/contrib/octeon-sdk/cvmx-fpa.h projects/altix/sys/contrib/octeon-sdk/cvmx-gmx.h projects/altix/sys/contrib/octeon-sdk/cvmx-gpio.h projects/altix/sys/contrib/octeon-sdk/cvmx-helper-board.c projects/altix/sys/contrib/octeon-sdk/cvmx-helper-board.h projects/altix/sys/contrib/octeon-sdk/cvmx-helper-check-defines.h projects/altix/sys/contrib/octeon-sdk/cvmx-helper-errata.c projects/altix/sys/contrib/octeon-sdk/cvmx-helper-errata.h projects/altix/sys/contrib/octeon-sdk/cvmx-helper-fpa.c projects/altix/sys/contrib/octeon-sdk/cvmx-helper-fpa.h projects/altix/sys/contrib/octeon-sdk/cvmx-helper-loop.c projects/altix/sys/contrib/octeon-sdk/cvmx-helper-loop.h projects/altix/sys/contrib/octeon-sdk/cvmx-helper-npi.c projects/altix/sys/contrib/octeon-sdk/cvmx-helper-npi.h projects/altix/sys/contrib/octeon-sdk/cvmx-helper-rgmii.c projects/altix/sys/contrib/octeon-sdk/cvmx-helper-rgmii.h projects/altix/sys/contrib/octeon-sdk/cvmx-helper-sgmii.c projects/altix/sys/contrib/octeon-sdk/cvmx-helper-sgmii.h projects/altix/sys/contrib/octeon-sdk/cvmx-helper-spi.c projects/altix/sys/contrib/octeon-sdk/cvmx-helper-spi.h projects/altix/sys/contrib/octeon-sdk/cvmx-helper-util.c projects/altix/sys/contrib/octeon-sdk/cvmx-helper-util.h projects/altix/sys/contrib/octeon-sdk/cvmx-helper-xaui.c projects/altix/sys/contrib/octeon-sdk/cvmx-helper-xaui.h projects/altix/sys/contrib/octeon-sdk/cvmx-helper.c projects/altix/sys/contrib/octeon-sdk/cvmx-helper.h projects/altix/sys/contrib/octeon-sdk/cvmx-higig.h projects/altix/sys/contrib/octeon-sdk/cvmx-interrupt.c projects/altix/sys/contrib/octeon-sdk/cvmx-interrupt.h projects/altix/sys/contrib/octeon-sdk/cvmx-ipd.h projects/altix/sys/contrib/octeon-sdk/cvmx-key.h projects/altix/sys/contrib/octeon-sdk/cvmx-l2c.c projects/altix/sys/contrib/octeon-sdk/cvmx-l2c.h projects/altix/sys/contrib/octeon-sdk/cvmx-llm.c projects/altix/sys/contrib/octeon-sdk/cvmx-llm.h projects/altix/sys/contrib/octeon-sdk/cvmx-log.c projects/altix/sys/contrib/octeon-sdk/cvmx-log.h projects/altix/sys/contrib/octeon-sdk/cvmx-malloc.h projects/altix/sys/contrib/octeon-sdk/cvmx-mdio.h projects/altix/sys/contrib/octeon-sdk/cvmx-mgmt-port.c projects/altix/sys/contrib/octeon-sdk/cvmx-mgmt-port.h projects/altix/sys/contrib/octeon-sdk/cvmx-nand.c projects/altix/sys/contrib/octeon-sdk/cvmx-nand.h projects/altix/sys/contrib/octeon-sdk/cvmx-npi.h projects/altix/sys/contrib/octeon-sdk/cvmx-packet.h projects/altix/sys/contrib/octeon-sdk/cvmx-pci.h projects/altix/sys/contrib/octeon-sdk/cvmx-pcie.c projects/altix/sys/contrib/octeon-sdk/cvmx-pcie.h projects/altix/sys/contrib/octeon-sdk/cvmx-pip.h projects/altix/sys/contrib/octeon-sdk/cvmx-pko.c projects/altix/sys/contrib/octeon-sdk/cvmx-pko.h projects/altix/sys/contrib/octeon-sdk/cvmx-platform.h projects/altix/sys/contrib/octeon-sdk/cvmx-pow.c projects/altix/sys/contrib/octeon-sdk/cvmx-pow.h projects/altix/sys/contrib/octeon-sdk/cvmx-raid.c projects/altix/sys/contrib/octeon-sdk/cvmx-raid.h projects/altix/sys/contrib/octeon-sdk/cvmx-rng.h projects/altix/sys/contrib/octeon-sdk/cvmx-rtc.h projects/altix/sys/contrib/octeon-sdk/cvmx-rwlock.h projects/altix/sys/contrib/octeon-sdk/cvmx-scratch.h projects/altix/sys/contrib/octeon-sdk/cvmx-spi.c projects/altix/sys/contrib/octeon-sdk/cvmx-spi.h projects/altix/sys/contrib/octeon-sdk/cvmx-spi4000.c projects/altix/sys/contrib/octeon-sdk/cvmx-spinlock.h projects/altix/sys/contrib/octeon-sdk/cvmx-swap.h projects/altix/sys/contrib/octeon-sdk/cvmx-sysinfo.c projects/altix/sys/contrib/octeon-sdk/cvmx-sysinfo.h projects/altix/sys/contrib/octeon-sdk/cvmx-thunder.c projects/altix/sys/contrib/octeon-sdk/cvmx-thunder.h projects/altix/sys/contrib/octeon-sdk/cvmx-tim.c projects/altix/sys/contrib/octeon-sdk/cvmx-tim.h projects/altix/sys/contrib/octeon-sdk/cvmx-tra.c projects/altix/sys/contrib/octeon-sdk/cvmx-tra.h projects/altix/sys/contrib/octeon-sdk/cvmx-twsi.c projects/altix/sys/contrib/octeon-sdk/cvmx-twsi.h projects/altix/sys/contrib/octeon-sdk/cvmx-uart.h projects/altix/sys/contrib/octeon-sdk/cvmx-usb.c projects/altix/sys/contrib/octeon-sdk/cvmx-usb.h projects/altix/sys/contrib/octeon-sdk/cvmx-utils.h projects/altix/sys/contrib/octeon-sdk/cvmx-version.h projects/altix/sys/contrib/octeon-sdk/cvmx-warn.c projects/altix/sys/contrib/octeon-sdk/cvmx-warn.h projects/altix/sys/contrib/octeon-sdk/cvmx-wqe.h projects/altix/sys/contrib/octeon-sdk/cvmx-zip.c projects/altix/sys/contrib/octeon-sdk/cvmx-zip.h projects/altix/sys/contrib/octeon-sdk/cvmx-zone.c projects/altix/sys/contrib/octeon-sdk/cvmx.h projects/altix/sys/contrib/octeon-sdk/octeon-feature.h projects/altix/sys/contrib/octeon-sdk/octeon-model.c projects/altix/sys/contrib/octeon-sdk/octeon-model.h projects/altix/sys/contrib/octeon-sdk/octeon-pci-console.c projects/altix/sys/contrib/octeon-sdk/octeon-pci-console.h projects/altix/sys/crypto/aesni/aesni_wrap.c projects/altix/sys/crypto/via/padlock.c projects/altix/sys/crypto/via/padlock_cipher.c projects/altix/sys/crypto/via/padlock_hash.c projects/altix/sys/dev/acpica/acpi.c projects/altix/sys/dev/acpica/acpi_cpu.c projects/altix/sys/dev/acpica/acpi_hpet.c projects/altix/sys/dev/acpica/acpi_pci_link.c projects/altix/sys/dev/acpica/acpivar.h projects/altix/sys/dev/agp/agp.c projects/altix/sys/dev/ahci/ahci.c projects/altix/sys/dev/alc/if_alc.c projects/altix/sys/dev/arcmsr/arcmsr.c projects/altix/sys/dev/arcmsr/arcmsr.h projects/altix/sys/dev/asr/asr.c projects/altix/sys/dev/ata/ata-all.c projects/altix/sys/dev/ata/ata-all.h projects/altix/sys/dev/ata/ata-disk.c projects/altix/sys/dev/ata/ata-dma.c projects/altix/sys/dev/ata/ata-lowlevel.c projects/altix/sys/dev/ata/ata-pci.h projects/altix/sys/dev/ata/ata-sata.c projects/altix/sys/dev/ata/chipsets/ata-ahci.c projects/altix/sys/dev/ata/chipsets/ata-cyrix.c projects/altix/sys/dev/ata/chipsets/ata-intel.c projects/altix/sys/dev/ata/chipsets/ata-marvell.c projects/altix/sys/dev/ata/chipsets/ata-national.c projects/altix/sys/dev/ata/chipsets/ata-promise.c projects/altix/sys/dev/ata/chipsets/ata-serverworks.c projects/altix/sys/dev/ata/chipsets/ata-siliconimage.c projects/altix/sys/dev/ata/chipsets/ata-via.c projects/altix/sys/dev/atkbdc/psm.c projects/altix/sys/dev/bce/if_bce.c projects/altix/sys/dev/bge/if_bge.c projects/altix/sys/dev/bge/if_bgereg.h projects/altix/sys/dev/bwi/if_bwi.c projects/altix/sys/dev/bwn/if_bwn.c projects/altix/sys/dev/cas/if_cas.c projects/altix/sys/dev/drm/drmP.h projects/altix/sys/dev/drm/drm_agpsupport.c projects/altix/sys/dev/drm/drm_drv.c projects/altix/sys/dev/drm/drm_memory.c projects/altix/sys/dev/drm/drm_sysctl.c projects/altix/sys/dev/drm/r300_reg.h projects/altix/sys/dev/drm/radeon_cs.c projects/altix/sys/dev/e1000/e1000_82571.c projects/altix/sys/dev/e1000/e1000_api.c projects/altix/sys/dev/e1000/e1000_hw.h projects/altix/sys/dev/e1000/if_em.c projects/altix/sys/dev/e1000/if_em.h projects/altix/sys/dev/e1000/if_igb.c projects/altix/sys/dev/e1000/if_igb.h projects/altix/sys/dev/e1000/if_lem.c projects/altix/sys/dev/e1000/if_lem.h projects/altix/sys/dev/firewire/00README projects/altix/sys/dev/fxp/if_fxp.c projects/altix/sys/dev/fxp/if_fxpreg.h projects/altix/sys/dev/fxp/if_fxpvar.h projects/altix/sys/dev/gem/if_gem.c projects/altix/sys/dev/gpio/gpiobus.c projects/altix/sys/dev/gpio/gpioc.c projects/altix/sys/dev/gpio/gpioled.c projects/altix/sys/dev/ichwd/ichwd.c projects/altix/sys/dev/iicbus/iiconf.c projects/altix/sys/dev/isp/isp_freebsd.c projects/altix/sys/dev/iwn/if_iwn.c projects/altix/sys/dev/iwn/if_iwnvar.h projects/altix/sys/dev/ixgbe/ixgbe.c projects/altix/sys/dev/ixgbe/ixgbe.h projects/altix/sys/dev/ixgbe/ixgbe_82598.c projects/altix/sys/dev/ixgbe/ixgbe_82599.c projects/altix/sys/dev/ixgbe/ixgbe_api.c projects/altix/sys/dev/ixgbe/ixgbe_api.h projects/altix/sys/dev/ixgbe/ixgbe_common.c projects/altix/sys/dev/ixgbe/ixgbe_common.h projects/altix/sys/dev/ixgbe/ixgbe_osdep.h projects/altix/sys/dev/ixgbe/ixgbe_phy.c projects/altix/sys/dev/ixgbe/ixgbe_phy.h projects/altix/sys/dev/ixgbe/ixgbe_type.h projects/altix/sys/dev/jme/if_jme.c projects/altix/sys/dev/jme/if_jmereg.h projects/altix/sys/dev/mii/atphy.c projects/altix/sys/dev/mii/bmtphy.c projects/altix/sys/dev/mii/brgphy.c projects/altix/sys/dev/mii/ciphy.c projects/altix/sys/dev/mii/e1000phy.c projects/altix/sys/dev/mii/gentbi.c projects/altix/sys/dev/mii/inphy.c projects/altix/sys/dev/mii/ip1000phy.c projects/altix/sys/dev/mii/jmphy.c projects/altix/sys/dev/mii/mii.c projects/altix/sys/dev/mii/mii.h projects/altix/sys/dev/mii/mii_physubr.c projects/altix/sys/dev/mii/miidevs projects/altix/sys/dev/mii/miivar.h projects/altix/sys/dev/mii/nsgphy.c projects/altix/sys/dev/mii/nsphyter.c projects/altix/sys/dev/mii/rgephy.c projects/altix/sys/dev/mii/smcphy.c projects/altix/sys/dev/mii/ukphy.c projects/altix/sys/dev/mii/ukphy_subr.c projects/altix/sys/dev/mii/xmphy.c projects/altix/sys/dev/mps/mps.c projects/altix/sys/dev/mps/mps_pci.c projects/altix/sys/dev/mps/mps_sas.c projects/altix/sys/dev/mps/mps_user.c projects/altix/sys/dev/mps/mpsvar.h projects/altix/sys/dev/mpt/mpt.h projects/altix/sys/dev/msk/if_msk.c projects/altix/sys/dev/mxge/if_mxge.c projects/altix/sys/dev/nfe/if_nfe.c projects/altix/sys/dev/nfe/if_nfereg.h projects/altix/sys/dev/nfe/if_nfevar.h projects/altix/sys/dev/ofw/ofw_fdt.c projects/altix/sys/dev/ofw/openfirm.c projects/altix/sys/dev/pccard/pccardvar.h projects/altix/sys/dev/pci/pci.c projects/altix/sys/dev/pci/pci_pci.c projects/altix/sys/dev/ral/rt2560.c projects/altix/sys/dev/ral/rt2661.c projects/altix/sys/dev/re/if_re.c projects/altix/sys/dev/siis/siis.c projects/altix/sys/dev/sk/if_sk.c projects/altix/sys/dev/sound/pcm/channel.c projects/altix/sys/dev/sound/sbus/cs4231.c projects/altix/sys/dev/stge/if_stge.c projects/altix/sys/dev/syscons/schistory.c projects/altix/sys/dev/syscons/scvidctl.c projects/altix/sys/dev/syscons/syscons.c projects/altix/sys/dev/tdfx/tdfx_pci.c projects/altix/sys/dev/uart/uart_subr.c projects/altix/sys/dev/usb/controller/ehci.c projects/altix/sys/dev/usb/controller/ehcireg.h projects/altix/sys/dev/usb/controller/usb_controller.c projects/altix/sys/dev/usb/input/uhid.c projects/altix/sys/dev/usb/net/if_axe.c projects/altix/sys/dev/usb/net/if_axereg.h projects/altix/sys/dev/usb/net/if_ruereg.h projects/altix/sys/dev/usb/net/uhso.c projects/altix/sys/dev/usb/quirk/usb_quirk.c projects/altix/sys/dev/usb/quirk/usb_quirk.h projects/altix/sys/dev/usb/serial/u3g.c projects/altix/sys/dev/usb/serial/uark.c projects/altix/sys/dev/usb/serial/ubsa.c projects/altix/sys/dev/usb/serial/ubser.c projects/altix/sys/dev/usb/serial/uchcom.c projects/altix/sys/dev/usb/serial/ucycom.c projects/altix/sys/dev/usb/serial/ufoma.c projects/altix/sys/dev/usb/serial/uftdi.c projects/altix/sys/dev/usb/serial/ugensa.c projects/altix/sys/dev/usb/serial/uipaq.c projects/altix/sys/dev/usb/serial/umct.c projects/altix/sys/dev/usb/serial/umodem.c projects/altix/sys/dev/usb/serial/umoscom.c projects/altix/sys/dev/usb/serial/uplcom.c projects/altix/sys/dev/usb/serial/usb_serial.c projects/altix/sys/dev/usb/serial/usb_serial.h projects/altix/sys/dev/usb/serial/uslcom.c projects/altix/sys/dev/usb/serial/uvisor.c projects/altix/sys/dev/usb/serial/uvscom.c projects/altix/sys/dev/usb/usb_bus.h projects/altix/sys/dev/usb/usb_device.c projects/altix/sys/dev/usb/usb_hub.c projects/altix/sys/dev/usb/usb_request.c projects/altix/sys/dev/usb/usb_request.h projects/altix/sys/dev/usb/usb_transfer.c projects/altix/sys/dev/usb/usbdevs projects/altix/sys/dev/usb/usbdi.h projects/altix/sys/dev/usb/wlan/if_rum.c projects/altix/sys/dev/usb/wlan/if_run.c projects/altix/sys/dev/usb/wlan/if_ural.c projects/altix/sys/dev/usb/wlan/if_zyd.c projects/altix/sys/dev/wb/if_wb.c projects/altix/sys/dev/wpi/if_wpi.c projects/altix/sys/dev/xen/blkback/blkback.c projects/altix/sys/dev/xl/if_xl.c projects/altix/sys/fs/cd9660/cd9660_node.c projects/altix/sys/fs/coda/coda_vnops.c projects/altix/sys/fs/ext2fs/ext2_inode.c projects/altix/sys/fs/hpfs/hpfs_vnops.c projects/altix/sys/fs/msdosfs/msdosfs_denode.c projects/altix/sys/fs/nfs/nfsclstate.h projects/altix/sys/fs/nfsclient/nfs_clnode.c projects/altix/sys/fs/nfsclient/nfs_clstate.c projects/altix/sys/fs/nfsclient/nfs_clvnops.c projects/altix/sys/fs/ntfs/ntfs_vnops.c projects/altix/sys/fs/nwfs/nwfs_vnops.c projects/altix/sys/fs/procfs/procfs_fpregs.c projects/altix/sys/fs/procfs/procfs_map.c projects/altix/sys/fs/procfs/procfs_regs.c projects/altix/sys/geom/eli/g_eli.c projects/altix/sys/geom/geom_event.c projects/altix/sys/geom/geom_kern.c projects/altix/sys/geom/label/g_label.c projects/altix/sys/geom/part/g_part.c projects/altix/sys/geom/part/g_part.h projects/altix/sys/geom/part/g_part_bsd.c projects/altix/sys/geom/part/g_part_gpt.c projects/altix/sys/geom/part/g_part_if.m projects/altix/sys/gnu/fs/reiserfs/reiserfs_inode.c projects/altix/sys/i386/acpica/acpi_machdep.c projects/altix/sys/i386/acpica/acpi_wakecode.S projects/altix/sys/i386/acpica/acpi_wakeup.c projects/altix/sys/i386/bios/apm.c projects/altix/sys/i386/i386/apic_vector.s projects/altix/sys/i386/i386/elan-mmcr.c projects/altix/sys/i386/i386/genassym.c projects/altix/sys/i386/i386/i686_mem.c projects/altix/sys/i386/i386/identcpu.c projects/altix/sys/i386/i386/initcpu.c projects/altix/sys/i386/i386/intr_machdep.c projects/altix/sys/i386/i386/longrun.c projects/altix/sys/i386/i386/machdep.c projects/altix/sys/i386/i386/mp_machdep.c projects/altix/sys/i386/i386/mp_watchdog.c projects/altix/sys/i386/i386/mpboot.s projects/altix/sys/i386/i386/perfmon.c projects/altix/sys/i386/i386/pmap.c projects/altix/sys/i386/i386/support.s projects/altix/sys/i386/i386/trap.c projects/altix/sys/i386/i386/tsc.c projects/altix/sys/i386/include/_align.h projects/altix/sys/i386/include/apm_bios.h projects/altix/sys/i386/include/npx.h projects/altix/sys/i386/include/pmap.h projects/altix/sys/i386/include/profile.h projects/altix/sys/i386/include/specialreg.h projects/altix/sys/i386/include/xen/hypercall.h projects/altix/sys/i386/isa/npx.c projects/altix/sys/i386/pci/pci_bus.c projects/altix/sys/i386/xen/clock.c projects/altix/sys/i386/xen/mp_machdep.c projects/altix/sys/i386/xen/mptable.c projects/altix/sys/i386/xen/pmap.c projects/altix/sys/i386/xen/xen_machdep.c projects/altix/sys/ia64/acpica/OsdEnvironment.c projects/altix/sys/ia64/ia64/db_machdep.c projects/altix/sys/ia64/ia64/genassym.c projects/altix/sys/ia64/ia64/machdep.c projects/altix/sys/ia64/include/pmap.h projects/altix/sys/kern/imgact_elf.c projects/altix/sys/kern/init_main.c projects/altix/sys/kern/kern_clock.c projects/altix/sys/kern/kern_clocksource.c projects/altix/sys/kern/kern_conf.c projects/altix/sys/kern/kern_cpuset.c projects/altix/sys/kern/kern_exit.c projects/altix/sys/kern/kern_module.c projects/altix/sys/kern/kern_mutex.c projects/altix/sys/kern/kern_physio.c projects/altix/sys/kern/kern_proc.c projects/altix/sys/kern/kern_rmlock.c projects/altix/sys/kern/kern_sysctl.c projects/altix/sys/kern/kern_tc.c projects/altix/sys/kern/kern_timeout.c projects/altix/sys/kern/kern_umtx.c projects/altix/sys/kern/link_elf.c projects/altix/sys/kern/link_elf_obj.c projects/altix/sys/kern/p1003_1b.c projects/altix/sys/kern/posix4_mib.c projects/altix/sys/kern/sched_ule.c projects/altix/sys/kern/subr_acl_nfs4.c projects/altix/sys/kern/subr_bus.c projects/altix/sys/kern/subr_clock.c projects/altix/sys/kern/subr_lock.c projects/altix/sys/kern/subr_taskqueue.c projects/altix/sys/kern/sys_process.c projects/altix/sys/kern/sysv_msg.c projects/altix/sys/kern/sysv_sem.c projects/altix/sys/kern/sysv_shm.c projects/altix/sys/kern/uipc_sem.c projects/altix/sys/kern/uipc_shm.c projects/altix/sys/kern/uipc_socket.c projects/altix/sys/kern/uipc_usrreq.c projects/altix/sys/kern/vfs_bio.c projects/altix/sys/kern/vfs_cache.c projects/altix/sys/kern/vfs_mount.c projects/altix/sys/kern/vfs_mountroot.c projects/altix/sys/kern/vfs_subr.c projects/altix/sys/libkern/gets.c projects/altix/sys/mips/adm5120/std.adm5120 projects/altix/sys/mips/alchemy/std.alchemy projects/altix/sys/mips/cavium/ciu.c projects/altix/sys/mips/cavium/files.octeon1 projects/altix/sys/mips/cavium/octe/ethernet-common.c projects/altix/sys/mips/cavium/octe/ethernet-common.h projects/altix/sys/mips/cavium/octe/ethernet-defines.h projects/altix/sys/mips/cavium/octe/ethernet-mdio.c projects/altix/sys/mips/cavium/octe/ethernet-mem.c projects/altix/sys/mips/cavium/octe/ethernet-rgmii.c projects/altix/sys/mips/cavium/octe/ethernet-rx.c projects/altix/sys/mips/cavium/octe/ethernet-sgmii.c projects/altix/sys/mips/cavium/octe/ethernet-tx.c projects/altix/sys/mips/cavium/octe/ethernet-tx.h projects/altix/sys/mips/cavium/octe/ethernet-xaui.c projects/altix/sys/mips/cavium/octe/ethernet.c projects/altix/sys/mips/cavium/octe/octe.c projects/altix/sys/mips/cavium/octe/wrapper-cvmx-includes.h projects/altix/sys/mips/cavium/octeon_ebt3000_cf.c projects/altix/sys/mips/cavium/octeon_machdep.c projects/altix/sys/mips/cavium/octopci.c projects/altix/sys/mips/cavium/std.octeon1 projects/altix/sys/mips/conf/ADM5120 projects/altix/sys/mips/conf/ALCHEMY projects/altix/sys/mips/conf/AR71XX projects/altix/sys/mips/conf/DEFAULTS projects/altix/sys/mips/conf/MALTA projects/altix/sys/mips/conf/MALTA64 projects/altix/sys/mips/conf/OCTEON1 projects/altix/sys/mips/conf/OCTEON1-32 projects/altix/sys/mips/conf/QEMU projects/altix/sys/mips/conf/SENTRY5 projects/altix/sys/mips/conf/SWARM projects/altix/sys/mips/conf/SWARM64 projects/altix/sys/mips/conf/SWARM64_SMP projects/altix/sys/mips/conf/SWARM_SMP projects/altix/sys/mips/conf/XLR projects/altix/sys/mips/conf/XLR64 projects/altix/sys/mips/conf/XLRN32 projects/altix/sys/mips/idt/std.idt projects/altix/sys/mips/include/cpuregs.h projects/altix/sys/mips/include/md_var.h projects/altix/sys/mips/include/param.h projects/altix/sys/mips/include/pmap.h projects/altix/sys/mips/include/vmparam.h projects/altix/sys/mips/mips/dump_machdep.c projects/altix/sys/mips/mips/gdb_machdep.c projects/altix/sys/mips/mips/machdep.c projects/altix/sys/mips/mips/pmap.c projects/altix/sys/mips/mips/vm_machdep.c projects/altix/sys/mips/rmi/dev/nlge/if_nlge.c projects/altix/sys/mips/rmi/dev/nlge/if_nlge.h projects/altix/sys/modules/Makefile projects/altix/sys/modules/acpi/Makefile projects/altix/sys/modules/acpi/acpi/Makefile projects/altix/sys/modules/agp/Makefile projects/altix/sys/modules/cam/Makefile projects/altix/sys/modules/ixgbe/Makefile projects/altix/sys/modules/usb/usb/Makefile projects/altix/sys/net/bpf.h projects/altix/sys/net/bpf_buffer.c projects/altix/sys/net/if.c projects/altix/sys/net/if_epair.c projects/altix/sys/net/if_llatbl.c projects/altix/sys/net/if_llatbl.h projects/altix/sys/net/if_media.h projects/altix/sys/net/if_vlan.c projects/altix/sys/net/vnet.h projects/altix/sys/net80211/ieee80211.c projects/altix/sys/net80211/ieee80211_node.c projects/altix/sys/net80211/ieee80211_ratectl.c projects/altix/sys/net80211/ieee80211_ratectl.h projects/altix/sys/net80211/ieee80211_ratectl_none.c projects/altix/sys/net80211/ieee80211_scan_sta.c projects/altix/sys/net80211/ieee80211_sta.c projects/altix/sys/net80211/ieee80211_var.h projects/altix/sys/netgraph/ng_eiface.c projects/altix/sys/netgraph/ng_eiface.h projects/altix/sys/netgraph/ng_pipe.c projects/altix/sys/netinet/if_ether.c projects/altix/sys/netinet/in.c projects/altix/sys/netinet/in_pcb.c projects/altix/sys/netinet/ip6.h projects/altix/sys/netinet/ip_carp.c projects/altix/sys/netinet/ip_fastfwd.c projects/altix/sys/netinet/ip_fw.h projects/altix/sys/netinet/ipfw/ip_fw2.c projects/altix/sys/netinet/ipfw/ip_fw_sockopt.c projects/altix/sys/netinet/libalias/alias.c projects/altix/sys/netinet/libalias/alias_sctp.c projects/altix/sys/netinet/libalias/alias_sctp.h projects/altix/sys/netinet/sctp.h projects/altix/sys/netinet/sctp_cc_functions.c projects/altix/sys/netinet/sctp_crc32.c projects/altix/sys/netinet/sctp_indata.c projects/altix/sys/netinet/sctp_input.c projects/altix/sys/netinet/sctp_os_bsd.h projects/altix/sys/netinet/sctp_output.c projects/altix/sys/netinet/sctp_pcb.c projects/altix/sys/netinet/sctp_structs.h projects/altix/sys/netinet/sctp_timer.c projects/altix/sys/netinet/sctp_timer.h projects/altix/sys/netinet/sctp_uio.h projects/altix/sys/netinet/sctp_usrreq.c projects/altix/sys/netinet/sctputil.c projects/altix/sys/netinet/sctputil.h projects/altix/sys/netinet/siftr.c projects/altix/sys/netinet/tcp.h projects/altix/sys/netinet/tcp_input.c projects/altix/sys/netinet/tcp_output.c projects/altix/sys/netinet/tcp_reass.c projects/altix/sys/netinet/tcp_sack.c projects/altix/sys/netinet/tcp_subr.c projects/altix/sys/netinet/tcp_timer.c projects/altix/sys/netinet/tcp_usrreq.c projects/altix/sys/netinet/tcp_var.h projects/altix/sys/netinet6/in6.c projects/altix/sys/netinet6/in6_cksum.c projects/altix/sys/netinet6/ip6_input.c projects/altix/sys/netinet6/ip6_output.c projects/altix/sys/netinet6/ip6_var.h projects/altix/sys/netinet6/nd6.c projects/altix/sys/netinet6/nd6_nbr.c projects/altix/sys/netipsec/ipsec.c projects/altix/sys/netipsec/ipsec_input.c projects/altix/sys/nfsclient/nfs_node.c projects/altix/sys/nfsclient/nfs_vfsops.c projects/altix/sys/nfsserver/nfs_serv.c projects/altix/sys/opencrypto/cryptosoft.c projects/altix/sys/pc98/include/_align.h projects/altix/sys/pc98/include/apm_bios.h projects/altix/sys/pc98/include/bus.h projects/altix/sys/pc98/pc98/busiosubr.c projects/altix/sys/pc98/pc98/machdep.c projects/altix/sys/pci/if_rlreg.h projects/altix/sys/powerpc/aim/clock.c projects/altix/sys/powerpc/aim/copyinout.c projects/altix/sys/powerpc/aim/machdep.c projects/altix/sys/powerpc/aim/mmu_oea.c projects/altix/sys/powerpc/aim/mmu_oea64.c projects/altix/sys/powerpc/aim/mp_cpudep.c projects/altix/sys/powerpc/aim/nexus.c projects/altix/sys/powerpc/aim/slb.c projects/altix/sys/powerpc/aim/swtch32.S projects/altix/sys/powerpc/aim/swtch64.S projects/altix/sys/powerpc/aim/trap.c projects/altix/sys/powerpc/aim/trap_subr32.S projects/altix/sys/powerpc/aim/trap_subr64.S projects/altix/sys/powerpc/aim/vm_machdep.c projects/altix/sys/powerpc/booke/clock.c projects/altix/sys/powerpc/booke/locore.S projects/altix/sys/powerpc/booke/machdep.c projects/altix/sys/powerpc/booke/pmap.c projects/altix/sys/powerpc/booke/trap_subr.S projects/altix/sys/powerpc/conf/GENERIC projects/altix/sys/powerpc/conf/GENERIC64 projects/altix/sys/powerpc/conf/NOTES projects/altix/sys/powerpc/include/bus_dma.h projects/altix/sys/powerpc/include/cpufunc.h projects/altix/sys/powerpc/include/endian.h projects/altix/sys/powerpc/include/pcb.h projects/altix/sys/powerpc/include/platform.h projects/altix/sys/powerpc/include/pmap.h projects/altix/sys/powerpc/include/pte.h projects/altix/sys/powerpc/include/slb.h projects/altix/sys/powerpc/include/spr.h projects/altix/sys/powerpc/include/sr.h projects/altix/sys/powerpc/include/tlb.h projects/altix/sys/powerpc/mambo/mambo_console.c projects/altix/sys/powerpc/powermac/ata_dbdma.c projects/altix/sys/powerpc/powermac/cpcht.c projects/altix/sys/powerpc/powermac/smu.c projects/altix/sys/powerpc/powerpc/busdma_machdep.c projects/altix/sys/powerpc/powerpc/cpu.c projects/altix/sys/powerpc/powerpc/exec_machdep.c projects/altix/sys/powerpc/powerpc/genassym.c projects/altix/sys/powerpc/powerpc/mp_machdep.c projects/altix/sys/powerpc/powerpc/platform.c projects/altix/sys/powerpc/powerpc/platform_if.m projects/altix/sys/security/mac_portacl/mac_portacl.c projects/altix/sys/sparc64/include/vmparam.h projects/altix/sys/sparc64/pci/psycho.c projects/altix/sys/sparc64/pci/schizo.c projects/altix/sys/sparc64/sparc64/machdep.c projects/altix/sys/sparc64/sparc64/pmap.c projects/altix/sys/sparc64/sparc64/tick.c projects/altix/sys/sun4v/include/pmap.h projects/altix/sys/sun4v/include/smp.h projects/altix/sys/sun4v/sun4v/machdep.c projects/altix/sys/sun4v/sun4v/mp_machdep.c projects/altix/sys/sys/bus.h projects/altix/sys/sys/cdefs.h projects/altix/sys/sys/elf_common.h projects/altix/sys/sys/interrupt.h projects/altix/sys/sys/kernel.h projects/altix/sys/sys/kerneldump.h projects/altix/sys/sys/libkern.h projects/altix/sys/sys/linker_set.h projects/altix/sys/sys/mutex.h projects/altix/sys/sys/param.h projects/altix/sys/sys/pcpu.h projects/altix/sys/sys/procfs.h projects/altix/sys/sys/ptrace.h projects/altix/sys/sys/queue.h projects/altix/sys/sys/signal.h projects/altix/sys/sys/smp.h projects/altix/sys/sys/socket.h projects/altix/sys/sys/socketvar.h projects/altix/sys/sys/sysctl.h projects/altix/sys/sys/taskqueue.h projects/altix/sys/sys/vnode.h projects/altix/sys/teken/sequences projects/altix/sys/teken/teken_subr.h projects/altix/sys/teken/teken_subr_compat.h projects/altix/sys/ufs/ffs/ffs_inode.c projects/altix/sys/ufs/ffs/ffs_softdep.c projects/altix/sys/ufs/ffs/ffs_vfsops.c projects/altix/sys/ufs/ffs/fs.h projects/altix/sys/ufs/ufs/ufs_dirhash.c projects/altix/sys/ufs/ufs/ufs_inode.c projects/altix/sys/ufs/ufs/ufs_vnops.c projects/altix/sys/vm/default_pager.c projects/altix/sys/vm/swap_pager.c projects/altix/sys/vm/uma_core.c projects/altix/sys/vm/vm.h projects/altix/sys/vm/vm_contig.c projects/altix/sys/vm/vm_fault.c projects/altix/sys/vm/vm_map.c projects/altix/sys/vm/vm_map.h projects/altix/sys/vm/vm_mmap.c projects/altix/sys/vm/vm_object.c projects/altix/sys/vm/vm_object.h projects/altix/sys/vm/vm_page.c projects/altix/sys/vm/vm_page.h projects/altix/sys/vm/vm_pageout.c projects/altix/sys/vm/vm_pageout.h projects/altix/sys/vm/vm_phys.c projects/altix/sys/vm/vm_reserv.c projects/altix/sys/x86/cpufreq/hwpstate.c projects/altix/sys/x86/x86/io_apic.c projects/altix/sys/x86/x86/local_apic.c projects/altix/sys/x86/x86/mca.c projects/altix/sys/x86/x86/msi.c Directory Properties: projects/altix/lib/libstand/ (props changed) projects/altix/sys/ (props changed) projects/altix/sys/amd64/include/xen/ (props changed) projects/altix/sys/cddl/contrib/opensolaris/ (props changed) projects/altix/sys/contrib/dev/acpica/ (props changed) projects/altix/sys/contrib/octeon-sdk/ (props changed) projects/altix/sys/contrib/x86emu/ (props changed) Modified: projects/altix/sys/Makefile ============================================================================== --- projects/altix/sys/Makefile Sun Dec 5 20:24:22 2010 (r216200) +++ projects/altix/sys/Makefile Sun Dec 5 20:47:36 2010 (r216201) @@ -14,7 +14,7 @@ CSCOPEDIRS= boot bsm cam cddl compat con netsmb nfs nfsclient nfsserver nlm opencrypto \ pci rpc security sys ufs vm xdr ${CSCOPE_ARCHDIR} .if defined(ALL_ARCH) -CSCOPE_ARCHDIR ?= amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v +CSCOPE_ARCHDIR ?= amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v x86 .else CSCOPE_ARCHDIR ?= ${MACHINE} .endif @@ -34,7 +34,7 @@ cscope.out: ${.CURDIR}/cscope.files ${.CURDIR}/cscope.files: .PHONY cd ${.CURDIR}; \ - find ${CSCOPEDIRS} -name "*.[chSs]" -a -type f > ${.TARGET} + find ${CSCOPEDIRS} -name "*.[chSsly]" -a -type f > ${.TARGET} cscope-clean: rm -f cscope.files cscope.out cscope.in.out cscope.po.out Modified: projects/altix/sys/amd64/acpica/acpi_machdep.c ============================================================================== --- projects/altix/sys/amd64/acpica/acpi_machdep.c Sun Dec 5 20:24:22 2010 (r216200) +++ projects/altix/sys/amd64/acpica/acpi_machdep.c Sun Dec 5 20:47:36 2010 (r216201) @@ -44,24 +44,6 @@ __FBSDID("$FreeBSD$"); #include -/* - * APM driver emulation - */ - -#include -#include -#include -#include -#include -#include - -#include - -#include -#include - -#include - SYSCTL_DECL(_debug_acpi); int acpi_resume_beep; @@ -73,445 +55,15 @@ int acpi_reset_video; TUNABLE_INT("hw.acpi.reset_video", &acpi_reset_video); static int intr_model = ACPI_INTR_PIC; -static int apm_active; -static struct clonedevs *apm_clones; - -MALLOC_DEFINE(M_APMDEV, "apmdev", "APM device emulation"); - -static d_open_t apmopen; -static d_close_t apmclose; -static d_write_t apmwrite; -static d_ioctl_t apmioctl; -static d_poll_t apmpoll; -static d_kqfilter_t apmkqfilter; -static void apmreadfiltdetach(struct knote *kn); -static int apmreadfilt(struct knote *kn, long hint); -static struct filterops apm_readfiltops = { - .f_isfd = 1, - .f_detach = apmreadfiltdetach, - .f_event = apmreadfilt, -}; - -static struct cdevsw apm_cdevsw = { - .d_version = D_VERSION, - .d_flags = D_TRACKCLOSE | D_NEEDMINOR, - .d_open = apmopen, - .d_close = apmclose, - .d_write = apmwrite, - .d_ioctl = apmioctl, - .d_poll = apmpoll, - .d_name = "apm", - .d_kqfilter = apmkqfilter -}; - -static int -acpi_capm_convert_battstate(struct acpi_battinfo *battp) -{ - int state; - - state = APM_UNKNOWN; - - if (battp->state & ACPI_BATT_STAT_DISCHARG) { - if (battp->cap >= 50) - state = 0; /* high */ - else - state = 1; /* low */ - } - if (battp->state & ACPI_BATT_STAT_CRITICAL) - state = 2; /* critical */ - if (battp->state & ACPI_BATT_STAT_CHARGING) - state = 3; /* charging */ - - /* If still unknown, determine it based on the battery capacity. */ - if (state == APM_UNKNOWN) { - if (battp->cap >= 50) - state = 0; /* high */ - else - state = 1; /* low */ - } - - return (state); -} - -static int -acpi_capm_convert_battflags(struct acpi_battinfo *battp) -{ - int flags; - - flags = 0; - - if (battp->cap >= 50) - flags |= APM_BATT_HIGH; - else { - if (battp->state & ACPI_BATT_STAT_CRITICAL) - flags |= APM_BATT_CRITICAL; - else - flags |= APM_BATT_LOW; - } - if (battp->state & ACPI_BATT_STAT_CHARGING) - flags |= APM_BATT_CHARGING; - if (battp->state == ACPI_BATT_STAT_NOT_PRESENT) - flags = APM_BATT_NOT_PRESENT; - - return (flags); -} - -static int -acpi_capm_get_info(apm_info_t aip) -{ - int acline; - struct acpi_battinfo batt; - - aip->ai_infoversion = 1; - aip->ai_major = 1; - aip->ai_minor = 2; - aip->ai_status = apm_active; - aip->ai_capabilities= 0xff00; /* unknown */ - - if (acpi_acad_get_acline(&acline)) - aip->ai_acline = APM_UNKNOWN; /* unknown */ - else - aip->ai_acline = acline; /* on/off */ - - if (acpi_battery_get_battinfo(NULL, &batt) != 0) { - aip->ai_batt_stat = APM_UNKNOWN; - aip->ai_batt_life = APM_UNKNOWN; - aip->ai_batt_time = -1; /* unknown */ - aip->ai_batteries = ~0U; /* unknown */ - } else { - aip->ai_batt_stat = acpi_capm_convert_battstate(&batt); - aip->ai_batt_life = batt.cap; - aip->ai_batt_time = (batt.min == -1) ? -1 : batt.min * 60; - aip->ai_batteries = acpi_battery_get_units(); - } - - return (0); -} - -static int -acpi_capm_get_pwstatus(apm_pwstatus_t app) -{ - device_t dev; - int acline, unit, error; - struct acpi_battinfo batt; - - if (app->ap_device != PMDV_ALLDEV && - (app->ap_device < PMDV_BATT0 || app->ap_device > PMDV_BATT_ALL)) - return (1); - - if (app->ap_device == PMDV_ALLDEV) - error = acpi_battery_get_battinfo(NULL, &batt); - else { - unit = app->ap_device - PMDV_BATT0; - dev = devclass_get_device(devclass_find("battery"), unit); - if (dev != NULL) - error = acpi_battery_get_battinfo(dev, &batt); - else - error = ENXIO; - } - if (error) - return (1); - - app->ap_batt_stat = acpi_capm_convert_battstate(&batt); - app->ap_batt_flag = acpi_capm_convert_battflags(&batt); - app->ap_batt_life = batt.cap; - app->ap_batt_time = (batt.min == -1) ? -1 : batt.min * 60; - - if (acpi_acad_get_acline(&acline)) - app->ap_acline = APM_UNKNOWN; - else - app->ap_acline = acline; /* on/off */ - - return (0); -} - -/* Create single-use devices for /dev/apm and /dev/apmctl. */ -static void -apm_clone(void *arg, struct ucred *cred, char *name, int namelen, - struct cdev **dev) -{ - int ctl_dev, unit; - - if (*dev != NULL) - return; - if (strcmp(name, "apmctl") == 0) - ctl_dev = TRUE; - else if (strcmp(name, "apm") == 0) - ctl_dev = FALSE; - else - return; - - /* Always create a new device and unit number. */ - unit = -1; - if (clone_create(&apm_clones, &apm_cdevsw, &unit, dev, 0)) { - if (ctl_dev) { - *dev = make_dev(&apm_cdevsw, unit, - UID_ROOT, GID_OPERATOR, 0660, "apmctl%d", unit); - } else { - *dev = make_dev(&apm_cdevsw, unit, - UID_ROOT, GID_OPERATOR, 0664, "apm%d", unit); - } - if (*dev != NULL) { - dev_ref(*dev); - (*dev)->si_flags |= SI_CHEAPCLONE; - } - } -} - -/* Create a struct for tracking per-device suspend notification. */ -static struct apm_clone_data * -apm_create_clone(struct cdev *dev, struct acpi_softc *acpi_sc) -{ - struct apm_clone_data *clone; - - clone = malloc(sizeof(*clone), M_APMDEV, M_WAITOK); - clone->cdev = dev; - clone->acpi_sc = acpi_sc; - clone->notify_status = APM_EV_NONE; - bzero(&clone->sel_read, sizeof(clone->sel_read)); - knlist_init_mtx(&clone->sel_read.si_note, &acpi_mutex); - - /* - * The acpi device is always managed by devd(8) and is considered - * writable (i.e., ack is required to allow suspend to proceed.) - */ - if (strcmp("acpi", devtoname(dev)) == 0) - clone->flags = ACPI_EVF_DEVD | ACPI_EVF_WRITE; - else - clone->flags = ACPI_EVF_NONE; - - ACPI_LOCK(acpi); - STAILQ_INSERT_TAIL(&acpi_sc->apm_cdevs, clone, entries); - ACPI_UNLOCK(acpi); - return (clone); -} - -static int -apmopen(struct cdev *dev, int flag, int fmt, struct thread *td) -{ - struct acpi_softc *acpi_sc; - struct apm_clone_data *clone; - - acpi_sc = devclass_get_softc(devclass_find("acpi"), 0); - clone = apm_create_clone(dev, acpi_sc); - dev->si_drv1 = clone; - - /* If the device is opened for write, record that. */ - if ((flag & FWRITE) != 0) - clone->flags |= ACPI_EVF_WRITE; - - return (0); -} - -static int -apmclose(struct cdev *dev, int flag, int fmt, struct thread *td) -{ - struct apm_clone_data *clone; - struct acpi_softc *acpi_sc; - - clone = dev->si_drv1; - acpi_sc = clone->acpi_sc; - - /* We are about to lose a reference so check if suspend should occur */ - if (acpi_sc->acpi_next_sstate != 0 && - clone->notify_status != APM_EV_ACKED) - acpi_AckSleepState(clone, 0); - - /* Remove this clone's data from the list and free it. */ - ACPI_LOCK(acpi); - STAILQ_REMOVE(&acpi_sc->apm_cdevs, clone, apm_clone_data, entries); - knlist_destroy(&clone->sel_read.si_note); - ACPI_UNLOCK(acpi); - free(clone, M_APMDEV); - destroy_dev_sched(dev); - return (0); -} - -static int -apmioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td) -{ - int error; - struct apm_clone_data *clone; - struct acpi_softc *acpi_sc; - struct apm_info info; - struct apm_event_info *ev_info; - apm_info_old_t aiop; - - error = 0; - clone = dev->si_drv1; - acpi_sc = clone->acpi_sc; - - switch (cmd) { - case APMIO_SUSPEND: - if ((flag & FWRITE) == 0) - return (EPERM); - if (acpi_sc->acpi_next_sstate == 0) { - if (acpi_sc->acpi_suspend_sx != ACPI_STATE_S5) { - error = acpi_ReqSleepState(acpi_sc, - acpi_sc->acpi_suspend_sx); - } else { - printf( - "power off via apm suspend not supported\n"); - error = ENXIO; - } - } else - error = acpi_AckSleepState(clone, 0); - break; - case APMIO_STANDBY: - if ((flag & FWRITE) == 0) - return (EPERM); - if (acpi_sc->acpi_next_sstate == 0) { - if (acpi_sc->acpi_standby_sx != ACPI_STATE_S5) { - error = acpi_ReqSleepState(acpi_sc, - acpi_sc->acpi_standby_sx); - } else { - printf( - "power off via apm standby not supported\n"); - error = ENXIO; - } - } else - error = acpi_AckSleepState(clone, 0); - break; - case APMIO_NEXTEVENT: - printf("apm nextevent start\n"); - ACPI_LOCK(acpi); - if (acpi_sc->acpi_next_sstate != 0 && clone->notify_status == - APM_EV_NONE) { - ev_info = (struct apm_event_info *)addr; - if (acpi_sc->acpi_next_sstate <= ACPI_STATE_S3) - ev_info->type = PMEV_STANDBYREQ; - else - ev_info->type = PMEV_SUSPENDREQ; - ev_info->index = 0; - clone->notify_status = APM_EV_NOTIFIED; - printf("apm event returning %d\n", ev_info->type); - } else - error = EAGAIN; - ACPI_UNLOCK(acpi); - break; - case APMIO_GETINFO_OLD: - if (acpi_capm_get_info(&info)) - error = ENXIO; - aiop = (apm_info_old_t)addr; - aiop->ai_major = info.ai_major; - aiop->ai_minor = info.ai_minor; - aiop->ai_acline = info.ai_acline; - aiop->ai_batt_stat = info.ai_batt_stat; - aiop->ai_batt_life = info.ai_batt_life; - aiop->ai_status = info.ai_status; - break; - case APMIO_GETINFO: - if (acpi_capm_get_info((apm_info_t)addr)) - error = ENXIO; - break; - case APMIO_GETPWSTATUS: - if (acpi_capm_get_pwstatus((apm_pwstatus_t)addr)) - error = ENXIO; - break; - case APMIO_ENABLE: - if ((flag & FWRITE) == 0) - return (EPERM); - apm_active = 1; - break; - case APMIO_DISABLE: - if ((flag & FWRITE) == 0) - return (EPERM); - apm_active = 0; - break; - case APMIO_HALTCPU: - break; - case APMIO_NOTHALTCPU: - break; - case APMIO_DISPLAY: - if ((flag & FWRITE) == 0) - return (EPERM); - break; - case APMIO_BIOS: - if ((flag & FWRITE) == 0) - return (EPERM); - bzero(addr, sizeof(struct apm_bios_arg)); - break; - default: - error = EINVAL; - break; - } - - return (error); -} - -static int -apmwrite(struct cdev *dev, struct uio *uio, int ioflag) -{ - return (uio->uio_resid); -} - -static int -apmpoll(struct cdev *dev, int events, struct thread *td) -{ - struct apm_clone_data *clone; - int revents; - - revents = 0; - ACPI_LOCK(acpi); - clone = dev->si_drv1; - if (clone->acpi_sc->acpi_next_sstate) - revents |= events & (POLLIN | POLLRDNORM); - else - selrecord(td, &clone->sel_read); - ACPI_UNLOCK(acpi); - return (revents); -} - -static int -apmkqfilter(struct cdev *dev, struct knote *kn) -{ - struct apm_clone_data *clone; - - ACPI_LOCK(acpi); - clone = dev->si_drv1; - kn->kn_hook = clone; - kn->kn_fop = &apm_readfiltops; - knlist_add(&clone->sel_read.si_note, kn, 0); - ACPI_UNLOCK(acpi); - return (0); -} - -static void -apmreadfiltdetach(struct knote *kn) -{ - struct apm_clone_data *clone; - - ACPI_LOCK(acpi); - clone = kn->kn_hook; - knlist_remove(&clone->sel_read.si_note, kn, 0); - ACPI_UNLOCK(acpi); -} - -static int -apmreadfilt(struct knote *kn, long hint) -{ - struct apm_clone_data *clone; - int sleeping; - - ACPI_LOCK(acpi); - clone = kn->kn_hook; - sleeping = clone->acpi_sc->acpi_next_sstate ? 1 : 0; - ACPI_UNLOCK(acpi); - return (sleeping); -} int acpi_machdep_init(device_t dev) { - struct acpi_softc *sc; + struct acpi_softc *sc; - sc = devclass_get_softc(devclass_find("acpi"), 0); + sc = device_get_softc(dev); - /* Create a clone for /dev/acpi also. */ - STAILQ_INIT(&sc->apm_cdevs); - sc->acpi_clone = apm_create_clone(sc->acpi_dev_t, sc); - clone_setup(&apm_clones); - EVENTHANDLER_REGISTER(dev_clone, apm_clone, 0, 1000); + acpi_apm_init(sc); if (intr_model != ACPI_INTR_PIC) acpi_SetIntrModel(intr_model); @@ -534,12 +86,14 @@ acpi_SetDefaultIntrModel(int model) int acpi_machdep_quirks(int *quirks) { + return (0); } void acpi_cpu_c1() { + __asm __volatile("sti; hlt"); } Modified: projects/altix/sys/amd64/acpica/acpi_switch.S ============================================================================== --- projects/altix/sys/amd64/acpica/acpi_switch.S Sun Dec 5 20:24:22 2010 (r216200) +++ projects/altix/sys/amd64/acpica/acpi_switch.S Sun Dec 5 20:47:36 2010 (r216201) @@ -76,12 +76,6 @@ ENTRY(acpi_restorecpu) movl WAKEUP_CTX(efer), %eax wrmsr - /* Restore PAT. */ - movl $MSR_PAT, %ecx - movl WAKEUP_CTX(pat), %eax - movl 4 + WAKEUP_CTX(pat), %edx - wrmsr - /* Restore fast syscall stuff. */ movl $MSR_STAR, %ecx movl WAKEUP_CTX(star), %eax Modified: projects/altix/sys/amd64/acpica/acpi_wakecode.S ============================================================================== --- projects/altix/sys/amd64/acpica/acpi_wakecode.S Sun Dec 5 20:24:22 2010 (r216200) +++ projects/altix/sys/amd64/acpica/acpi_wakecode.S Sun Dec 5 20:47:36 2010 (r216201) @@ -274,8 +274,6 @@ wakeup_gdt: ALIGN_DATA wakeup_efer: .quad 0 -wakeup_pat: - .quad 0 wakeup_star: .quad 0 wakeup_lstar: Modified: projects/altix/sys/amd64/acpica/acpi_wakeup.c ============================================================================== --- projects/altix/sys/amd64/acpica/acpi_wakeup.c Sun Dec 5 20:24:22 2010 (r216200) +++ projects/altix/sys/amd64/acpica/acpi_wakeup.c Sun Dec 5 20:47:36 2010 (r216201) @@ -41,13 +41,13 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include #include #include #include #ifdef SMP -#include +#include #include #include #endif @@ -278,6 +278,7 @@ acpi_sleep_machdep(struct acpi_softc *sc for (;;) ia32_pause(); } else { + pmap_init_pat(); PCPU_SET(switchtime, 0); PCPU_SET(switchticks, ticks); #ifdef SMP @@ -372,7 +373,6 @@ acpi_install_wakeup_handler(struct acpi_ WAKECODE_FIXUP(wakeup_ctx, vm_offset_t, WAKECODE_VADDR(sc) + wakeup_ctx); WAKECODE_FIXUP(wakeup_efer, uint64_t, rdmsr(MSR_EFER)); - WAKECODE_FIXUP(wakeup_pat, uint64_t, rdmsr(MSR_PAT)); WAKECODE_FIXUP(wakeup_star, uint64_t, rdmsr(MSR_STAR)); WAKECODE_FIXUP(wakeup_lstar, uint64_t, rdmsr(MSR_LSTAR)); WAKECODE_FIXUP(wakeup_cstar, uint64_t, rdmsr(MSR_CSTAR)); Modified: projects/altix/sys/amd64/amd64/amd64_mem.c ============================================================================== --- projects/altix/sys/amd64/amd64/amd64_mem.c Sun Dec 5 20:24:22 2010 (r216200) +++ projects/altix/sys/amd64/amd64/amd64_mem.c Sun Dec 5 20:47:36 2010 (r216201) @@ -35,6 +35,10 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include +#include + #include #include #include @@ -303,20 +307,21 @@ amd64_mrstoreone(void *arg) struct mem_range_desc *mrd; u_int64_t omsrv, msrv; int i, j, msr; - u_int cr4save; + u_long cr0, cr4; mrd = sc->mr_desc; /* Disable PGE. */ - cr4save = rcr4(); - if (cr4save & CR4_PGE) - load_cr4(cr4save & ~CR4_PGE); + cr4 = rcr4(); + load_cr4(cr4 & ~CR4_PGE); /* Disable caches (CD = 1, NW = 0). */ - load_cr0((rcr0() & ~CR0_NW) | CR0_CD); + cr0 = rcr0(); + load_cr0((cr0 & ~CR0_NW) | CR0_CD); /* Flushes caches and TLBs. */ wbinvd(); + invltlb(); /* Disable MTRRs (E = 0). */ wrmsr(MSR_MTRRdefType, rdmsr(MSR_MTRRdefType) & ~MTRR_DEF_ENABLE); @@ -384,17 +389,16 @@ amd64_mrstoreone(void *arg) wrmsr(msr + 1, msrv); } - /* Flush caches, TLBs. */ + /* Flush caches and TLBs. */ wbinvd(); + invltlb(); /* Enable MTRRs. */ wrmsr(MSR_MTRRdefType, rdmsr(MSR_MTRRdefType) | MTRR_DEF_ENABLE); - /* Enable caches (CD = 0, NW = 0). */ - load_cr0(rcr0() & ~(CR0_CD | CR0_NW)); - - /* Restore PGE. */ - load_cr4(cr4save); + /* Restore caches and PGE. */ + load_cr0(cr0); + load_cr4(cr4); } /* @@ -527,9 +531,9 @@ static int amd64_mrset(struct mem_range_softc *sc, struct mem_range_desc *mrd, int *arg) { struct mem_range_desc *targ; - int error = 0; + int error, i; - switch(*arg) { + switch (*arg) { case MEMRANGE_SET_UPDATE: /* * Make sure that what's being asked for is even @@ -568,6 +572,21 @@ amd64_mrset(struct mem_range_softc *sc, return (EOPNOTSUPP); } + /* + * Ensure that the direct map region does not contain any mappings + * that span MTRRs of different types. However, the fixed MTRRs can + * be ignored, because a large page mapping the first 1 MB of physical + * memory is a special case that the processor handles. The entire + * TLB will be invalidated by amd64_mrstore(), so pmap_demote_DMAP() + * needn't do it. + */ + i = (sc->mr_cap & MR686_FIXMTRR) ? MTRR_N64K + MTRR_N16K + MTRR_N4K : 0; + mrd = sc->mr_desc + i; + for (; i < sc->mr_ndesc; i++, mrd++) { + if ((mrd->mr_flags & (MDF_ACTIVE | MDF_BOGUS)) == MDF_ACTIVE) + pmap_demote_DMAP(mrd->mr_base, mrd->mr_len, FALSE); + } + /* Update the hardware. */ amd64_mrstore(sc); @@ -657,6 +676,21 @@ amd64_mrinit(struct mem_range_softc *sc) if (mrd->mr_flags & MDF_ACTIVE) mrd->mr_flags |= MDF_FIRMWARE; } + + /* + * Ensure that the direct map region does not contain any mappings + * that span MTRRs of different types. However, the fixed MTRRs can + * be ignored, because a large page mapping the first 1 MB of physical + * memory is a special case that the processor handles. Invalidate + * any old TLB entries that might hold inconsistent memory type + * information. + */ + i = (sc->mr_cap & MR686_FIXMTRR) ? MTRR_N64K + MTRR_N16K + MTRR_N4K : 0; + mrd = sc->mr_desc + i; + for (; i < sc->mr_ndesc; i++, mrd++) { + if ((mrd->mr_flags & (MDF_ACTIVE | MDF_BOGUS)) == MDF_ACTIVE) + pmap_demote_DMAP(mrd->mr_base, mrd->mr_len, TRUE); + } } /* Modified: projects/altix/sys/amd64/amd64/apic_vector.S ============================================================================== --- projects/altix/sys/amd64/amd64/apic_vector.S Sun Dec 5 20:24:22 2010 (r216200) +++ projects/altix/sys/amd64/amd64/apic_vector.S Sun Dec 5 20:47:36 2010 (r216201) @@ -39,7 +39,7 @@ #include "opt_smp.h" #include -#include +#include #include "assym.s" Modified: projects/altix/sys/amd64/amd64/cpu_switch.S ============================================================================== --- projects/altix/sys/amd64/amd64/cpu_switch.S Sun Dec 5 20:24:22 2010 (r216200) +++ projects/altix/sys/amd64/amd64/cpu_switch.S Sun Dec 5 20:47:36 2010 (r216201) @@ -276,7 +276,7 @@ load_dr: do_tss: movq %rdx,PCPU(TSSP) movq %rdx,%rcx movq PCPU(TSS),%rax - movw %rcx,2(%rax) + movw %cx,2(%rax) shrq $16,%rcx movb %cl,4(%rax) shrq $8,%rcx Modified: projects/altix/sys/amd64/amd64/fpu.c ============================================================================== --- projects/altix/sys/amd64/amd64/fpu.c Sun Dec 5 20:24:22 2010 (r216200) +++ projects/altix/sys/amd64/amd64/fpu.c Sun Dec 5 20:47:36 2010 (r216201) @@ -113,14 +113,14 @@ static struct savefpu fpu_initialstate; void fpuinit(void) { - register_t savecrit; + register_t saveintr; u_int mxcsr; u_short control; /* * It is too early for critical_enter() to work on AP. */ - savecrit = intr_disable(); + saveintr = intr_disable(); stop_emulating(); fninit(); control = __INITIAL_FPUCW__; @@ -137,7 +137,7 @@ fpuinit(void) bzero(fpu_initialstate.sv_xmm, sizeof(fpu_initialstate.sv_xmm)); } start_emulating(); - intr_restore(savecrit); + intr_restore(saveintr); } /* @@ -426,9 +426,7 @@ fpudna(void) fxrstor(&fpu_initialstate); if (pcb->pcb_initial_fpucw != __INITIAL_FPUCW__) fldcw(pcb->pcb_initial_fpucw); - pcb->pcb_flags |= PCB_FPUINITDONE; - if (PCB_USER_FPU(pcb)) - pcb->pcb_flags |= PCB_USERFPUINITDONE; + fpuuserinited(curthread); } else fxrstor(pcb->pcb_save); critical_exit(); @@ -448,60 +446,50 @@ fpudrop() } /* - * Get the state of the FPU without dropping ownership (if possible). - * It returns the FPU ownership status. + * Get the user state of the FPU into pcb->pcb_user_save without + * dropping ownership (if possible). It returns the FPU ownership + * status. */ int -fpugetuserregs(struct thread *td, struct savefpu *addr) +fpugetregs(struct thread *td) { struct pcb *pcb; pcb = td->td_pcb; if ((pcb->pcb_flags & PCB_USERFPUINITDONE) == 0) { - bcopy(&fpu_initialstate, addr, sizeof(fpu_initialstate)); - addr->sv_env.en_cw = pcb->pcb_initial_fpucw; - return (_MC_FPOWNED_NONE); + bcopy(&fpu_initialstate, &pcb->pcb_user_save, + sizeof(fpu_initialstate)); + pcb->pcb_user_save.sv_env.en_cw = pcb->pcb_initial_fpucw; + fpuuserinited(td); + return (_MC_FPOWNED_PCB); } critical_enter(); if (td == PCPU_GET(fpcurthread) && PCB_USER_FPU(pcb)) { - fxsave(addr); + fxsave(&pcb->pcb_user_save); critical_exit(); return (_MC_FPOWNED_FPU); } else { critical_exit(); - bcopy(&pcb->pcb_user_save, addr, sizeof(*addr)); return (_MC_FPOWNED_PCB); } } -int -fpugetregs(struct thread *td, struct savefpu *addr) +void +fpuuserinited(struct thread *td) { struct pcb *pcb; pcb = td->td_pcb; - if ((pcb->pcb_flags & PCB_FPUINITDONE) == 0) { - bcopy(&fpu_initialstate, addr, sizeof(fpu_initialstate)); - addr->sv_env.en_cw = pcb->pcb_initial_fpucw; - return (_MC_FPOWNED_NONE); - } - critical_enter(); - if (td == PCPU_GET(fpcurthread)) { - fxsave(addr); - critical_exit(); - return (_MC_FPOWNED_FPU); - } else { - critical_exit(); - bcopy(pcb->pcb_save, addr, sizeof(*addr)); - return (_MC_FPOWNED_PCB); - } + if (PCB_USER_FPU(pcb)) + pcb->pcb_flags |= PCB_FPUINITDONE; + pcb->pcb_flags |= PCB_USERFPUINITDONE; } /* * Set the state of the FPU. */ void -fpusetuserregs(struct thread *td, struct savefpu *addr) +fpusetregs(struct thread *td, struct savefpu *addr) { struct pcb *pcb; @@ -514,29 +502,8 @@ fpusetuserregs(struct thread *td, struct } else { critical_exit(); bcopy(addr, &td->td_pcb->pcb_user_save, sizeof(*addr)); - if (PCB_USER_FPU(pcb)) - pcb->pcb_flags |= PCB_FPUINITDONE; - pcb->pcb_flags |= PCB_USERFPUINITDONE; - } -} - -void -fpusetregs(struct thread *td, struct savefpu *addr) -{ - struct pcb *pcb; - - pcb = td->td_pcb; - critical_enter(); - if (td == PCPU_GET(fpcurthread)) { - fxrstor(addr); - critical_exit(); - } else { - critical_exit(); - bcopy(addr, td->td_pcb->pcb_save, sizeof(*addr)); + fpuuserinited(td); } - if (PCB_USER_FPU(pcb)) - pcb->pcb_flags |= PCB_USERFPUINITDONE; - pcb->pcb_flags |= PCB_FPUINITDONE; } /* @@ -567,7 +534,7 @@ fpu_clean_state(void) * the x87 stack, but we don't care since we're about to call * fxrstor() anyway. */ - __asm __volatile("ffree %%st(7); fld %0" : : "m" (dummy_variable)); + __asm __volatile("ffree %%st(7); flds %0" : : "m" (dummy_variable)); } /* Modified: projects/altix/sys/amd64/amd64/genassym.c ============================================================================== --- projects/altix/sys/amd64/amd64/genassym.c Sun Dec 5 20:24:22 2010 (r216200) +++ projects/altix/sys/amd64/amd64/genassym.c Sun Dec 5 20:47:36 2010 (r216201) @@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #include #include #include Modified: projects/altix/sys/amd64/amd64/intr_machdep.c ============================================================================== --- projects/altix/sys/amd64/amd64/intr_machdep.c Sun Dec 5 20:24:22 2010 (r216200) +++ projects/altix/sys/amd64/amd64/intr_machdep.c Sun Dec 5 20:47:36 2010 (r216201) @@ -458,7 +458,7 @@ intr_next_cpu(void) /* Leave all interrupts on the BSP during boot. */ if (!assign_cpu) - return (cpu_apic_ids[0]); + return (PCPU_GET(apic_id)); mtx_lock_spin(&icu_lock); apic_id = cpu_apic_ids[current_cpu]; Modified: projects/altix/sys/amd64/amd64/machdep.c ============================================================================== --- projects/altix/sys/amd64/amd64/machdep.c Sun Dec 5 20:24:22 2010 (r216200) +++ projects/altix/sys/amd64/amd64/machdep.c Sun Dec 5 20:47:36 2010 (r216201) @@ -112,7 +112,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #include #include #include @@ -1762,11 +1762,15 @@ void spinlock_enter(void) { struct thread *td; + register_t flags; td = curthread; - if (td->td_md.md_spinlock_count == 0) - td->td_md.md_saved_flags = intr_disable(); - td->td_md.md_spinlock_count++; + if (td->td_md.md_spinlock_count == 0) { + flags = intr_disable(); + td->td_md.md_spinlock_count = 1; + td->td_md.md_saved_flags = flags; + } else + td->td_md.md_spinlock_count++; critical_enter(); } @@ -1774,12 +1778,14 @@ void spinlock_exit(void) { struct thread *td; + register_t flags; td = curthread; critical_exit(); + flags = td->td_md.md_saved_flags; td->td_md.md_spinlock_count--; if (td->td_md.md_spinlock_count == 0) - intr_restore(td->td_md.md_saved_flags); + intr_restore(flags); } /* @@ -1969,6 +1975,9 @@ int fill_fpregs(struct thread *td, struct fpreg *fpregs) { + KASSERT(td == curthread || TD_IS_SUSPENDED(td), + ("not suspended thread %p", td)); + fpugetregs(td); fill_fpregs_xmm(&td->td_pcb->pcb_user_save, fpregs); return (0); } @@ -1979,6 +1988,7 @@ set_fpregs(struct thread *td, struct fpr { set_fpregs_xmm(fpregs, &td->td_pcb->pcb_user_save); + fpuuserinited(td); return (0); } @@ -2093,8 +2103,9 @@ static void get_fpcontext(struct thread *td, mcontext_t *mcp) { - mcp->mc_ownedfp = fpugetuserregs(td, - (struct savefpu *)&mcp->mc_fpstate); + mcp->mc_ownedfp = fpugetregs(td); + bcopy(&td->td_pcb->pcb_user_save, &mcp->mc_fpstate, + sizeof(mcp->mc_fpstate)); mcp->mc_fpformat = fpuformat(); } @@ -2114,7 +2125,7 @@ set_fpcontext(struct thread *td, const m mcp->mc_ownedfp == _MC_FPOWNED_PCB) { fpstate = (struct savefpu *)&mcp->mc_fpstate; fpstate->sv_env.en_mxcsr &= cpu_mxcsr_mask; - fpusetuserregs(td, fpstate); + fpusetregs(td, fpstate); } else return (EINVAL); return (0); Modified: projects/altix/sys/amd64/amd64/minidump_machdep.c ============================================================================== --- projects/altix/sys/amd64/amd64/minidump_machdep.c Sun Dec 5 20:24:22 2010 (r216200) +++ projects/altix/sys/amd64/amd64/minidump_machdep.c Sun Dec 5 20:47:36 2010 (r216201) @@ -167,63 +167,91 @@ blk_write(struct dumperinfo *di, char *p } /* A fake page table page, to avoid having to handle both 4K and 2M pages */ -static pt_entry_t fakept[NPTEPG]; +static pd_entry_t fakepd[NPDEPG]; void minidumpsys(struct dumperinfo *di) { uint64_t dumpsize; - uint32_t ptesize; + uint32_t pmapsize; vm_offset_t va; int error; uint64_t bits; uint64_t *pdp, *pd, *pt, pa; - int i, j, k, bit; + int i, j, k, n, bit; + int retry_count; struct minidumphdr mdhdr; + retry_count = 0; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Mon Dec 6 16:47:19 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D06471065694; Mon, 6 Dec 2010 16:47:19 +0000 (UTC) (envelope-from tijl@coosemans.org) Received: from mailrelay010.isp.belgacom.be (mailrelay010.isp.belgacom.be [195.238.6.177]) by mx1.freebsd.org (Postfix) with ESMTP id 348B18FC33; Mon, 6 Dec 2010 16:47:18 +0000 (UTC) X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AvsEAOOZ/Exbsc6j/2dsb2JhbACjOHK9ZIVJBIl9 Received: from 163.206-177-91.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([91.177.206.163]) by relay.skynet.be with ESMTP; 06 Dec 2010 17:18:17 +0100 Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1]) by kalimero.tijl.coosemans.org (8.14.4/8.14.4) with ESMTP id oB6GIFoZ004224; Mon, 6 Dec 2010 17:18:16 +0100 (CET) (envelope-from tijl@coosemans.org) From: Tijl Coosemans To: Dimitry Andric Date: Mon, 6 Dec 2010 17:18:06 +0100 User-Agent: KMail/1.13.5 (FreeBSD/8.2-PRERELEASE; KDE/4.5.2; i386; ; ) References: <201012052024.oB5KOMUF007051@svn.freebsd.org> In-Reply-To: <201012052024.oB5KOMUF007051@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart2421429.0QgHX6hdXy"; protocol="application/pgp-signature"; micalg=pgp-sha256 Content-Transfer-Encoding: 7bit Message-Id: <201012061718.13823.tijl@coosemans.org> Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r216200 - in projects/binutils-2.17: contrib/binutils/bfd contrib/binutils/gas/config contrib/binutils/ld/emulparams gnu/usr.bin/binutils/libbfd sys/boot/ia64/efi sys/boot/ia64/ski sys/... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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, 06 Dec 2010 16:47:20 -0000 --nextPart2421429.0QgHX6hdXy Content-Type: Text/Plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable On Sunday 05 December 2010 21:24:22 Dimitry Andric wrote: > Author: dim > Date: Sun Dec 5 20:24:22 2010 > New Revision: 216200 > URL: http://svn.freebsd.org/changeset/base/216200 >=20 > Log: > For ia64, add a proper 'elf64-ia64-freebsd' output format to BFD, so the > ELF branding for FreeBSD is done in the same way as amd64, i386 and > sparc. Something similar should probably also be done for arm, mips and > powerpc. >=20 > Modified: > projects/binutils-2.17/contrib/binutils/bfd/elfxx-ia64.c > projects/binutils-2.17/contrib/binutils/bfd/targets.c > projects/binutils-2.17/contrib/binutils/gas/config/tc-ia64.c > projects/binutils-2.17/contrib/binutils/ld/emulparams/elf64_ia64_fbsd.sh > projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile.ia64 > projects/binutils-2.17/sys/boot/ia64/efi/ldscript.ia64 > projects/binutils-2.17/sys/boot/ia64/ski/ldscript.ia64 > projects/binutils-2.17/sys/conf/ldscript.ia64 >=20 > Modified: projects/binutils-2.17/contrib/binutils/bfd/elfxx-ia64.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- projects/binutils-2.17/contrib/binutils/bfd/elfxx-ia64.c Sun Dec 5 1= 6:09:03 2010 (r216199) > +++ projects/binutils-2.17/contrib/binutils/bfd/elfxx-ia64.c Sun Dec 5 2= 0:24:22 2010 (r216200) > @@ -5909,6 +5909,26 @@ elfNN_hpux_backend_symbol_processing (bf > =20 > #include "elfNN-target.h" > =20 > +/* FreeBSD support. */ > + > +#undef TARGET_LITTLE_SYM > +#define TARGET_LITTLE_SYM bfd_elfNN_ia64_freebsd_vec > +#undef TARGET_LITTLE_NAME > +#define TARGET_LITTLE_NAME "elfNN-ia64-freebsd" > +#undef TARGET_BIG_SYM > +#undef TARGET_BIG_NAME > + > +#undef ELF_OSABI > +#define ELF_OSABI ELFOSABI_FREEBSD Does this change fix the problem described here? http://lists.freebsd.org/pipermail/freebsd-ia64/2010-November/002773.html About elf64-ia64-freebsd, I'm not sure it is needed. FreeBSD 4.0 and older used non-standard ELF branding and that format got the name elf32-i386-freebsd (and elf64-alpha-freebsd). Later versions of FreeBSD use the standard method, but keep calling it elf32-i386-freebsd. Rather than copying this practise to other architectures, maybe binutils should be fixed for i386. It isn't used on amd64 and sparc64 either as far as I can tell. --nextPart2421429.0QgHX6hdXy Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (FreeBSD) iF4EABEIAAYFAkz9DMUACgkQfoCS2CCgtisMdgD/Y64VpPSBkDqWLDAnHy8zvVLj O8MG6k7+tFp88h0w954A/0/hcYpEuQUiwpoZMgYz9qt0BkP4BXIppQucbncAwmoi =uXqi -----END PGP SIGNATURE----- --nextPart2421429.0QgHX6hdXy-- From owner-svn-src-projects@FreeBSD.ORG Mon Dec 6 18:39:52 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6A4F0106566B; Mon, 6 Dec 2010 18:39:52 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (cl-327.ede-01.nl.sixxs.net [IPv6:2001:7b8:2ff:146::2]) by mx1.freebsd.org (Postfix) with ESMTP id 134F08FC1A; Mon, 6 Dec 2010 18:39:52 +0000 (UTC) Received: from [IPv6:2001:7b8:3a7:0:d137:4f93:99d7:b831] (unknown [IPv6:2001:7b8:3a7:0:d137:4f93:99d7:b831]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 05E925C5A; Mon, 6 Dec 2010 19:39:51 +0100 (CET) Message-ID: <4CFD2E01.1000509@FreeBSD.org> Date: Mon, 06 Dec 2010 19:40:01 +0100 From: Dimitry Andric Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.2; en-US; rv:1.9.2.14pre) Gecko/20101201 Lanikai/3.1.8pre MIME-Version: 1.0 To: Tijl Coosemans References: <201012052024.oB5KOMUF007051@svn.freebsd.org> <201012061718.13823.tijl@coosemans.org> In-Reply-To: <201012061718.13823.tijl@coosemans.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r216200 - in projects/binutils-2.17: contrib/binutils/bfd contrib/binutils/gas/config contrib/binutils/ld/emulparams gnu/usr.bin/binutils/libbfd sys/boot/ia64/efi sys/boot/ia64/ski sys/... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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, 06 Dec 2010 18:39:52 -0000 On 2010-12-06 17:18, Tijl Coosemans wrote: > On Sunday 05 December 2010 21:24:22 Dimitry Andric wrote: ... >> For ia64, add a proper 'elf64-ia64-freebsd' output format to BFD, so the >> ELF branding for FreeBSD is done in the same way as amd64, i386 and >> sparc. Something similar should probably also be done for arm, mips and >> powerpc. ... > Does this change fix the problem described here? > http://lists.freebsd.org/pipermail/freebsd-ia64/2010-November/002773.html That problem is most likely due to using the binutils 2.20.1 port, which does not have support for a FreeBSD/ia64 target. I posted a similar patch for binutils 2.20 (without any base system modifications) here: http://lists.freebsd.org/pipermail/freebsd-current/2010-December/021649.html > About elf64-ia64-freebsd, I'm not sure it is needed. FreeBSD 4.0 and > older used non-standard ELF branding and that format got the name > elf32-i386-freebsd (and elf64-alpha-freebsd). Later versions of FreeBSD > use the standard method, but keep calling it elf32-i386-freebsd. The problem is that BFD needs to set the ELF_OSABI field in the ELF header to ELFOSABI_FREEBSD, at least for FreeBSD targets (whereas Linux does not care about the ELF_OSABI field at all, it seems). Because BFD sets the ELF_OSABI field to ELFOSABI_SYSV by default, this can only be done properly by selecting a specific BFD target ("elf64-ia64-freebsd") which is different from the default, usually "elf64-ia64-little". The same principle applies to other arches. In our base binutils, there is a hack in contrib/binutils/bfd/elf.c (function prep_headers(), line 4325) to set that field unconditionally, but obviously this is not in upstream binutils, as it would most likely be unacceptable for them. (Just maybe, if it was put between #ifdef __FreeBSD__ guards, but still unlikely. :) (Note that due to this elf.c hack, the messing with elf-fbsd-brand.c in gnu/usr.bin/binutils/libbfd/Makefile.{amd64,ia64} is actually completely unnecessary...) > Rather than copying this practise to other architectures, maybe > binutils should be fixed for i386. It isn't used on amd64 and sparc64 > either as far as I can tell. It is, in the binutils-2.17 branch, which has . :) The question is if we want to propagate our elf.c hack forever, in which case it would have to be added to the binutils port. The alternative, adding FreeBSD-specific targets, is more likely to be accepted by the binutils maintainers, which would be nice if we want to be able to build with "stock" binutils on FreeBSD. I am completely open for both approaches, really, and would like to see a bit of consensus. The "just hack elf.c" approach causes less churn in the tree, because it is small, and saves modifying a few places in the tree where target names are used, such as kernel link scripts. There is no way to specify a "non-FreeBSD" target, though. The "add FreeBSD targets" approach causes a bit of churn, but if we submit the required changes to binutils upstream, they are more likely to be accepted, as they are fairly minimal, and don't disturb support for other platforms. There will also be the possibility to produce non-FreeBSD-branded ELF files, although I am not sure if that is used very often. So, which colour? :) From owner-svn-src-projects@FreeBSD.ORG Mon Dec 6 19:19:51 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6F3D3106566C; Mon, 6 Dec 2010 19:19:51 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (cl-327.ede-01.nl.sixxs.net [IPv6:2001:7b8:2ff:146::2]) by mx1.freebsd.org (Postfix) with ESMTP id 2A52E8FC1D; Mon, 6 Dec 2010 19:19:51 +0000 (UTC) Received: from [IPv6:2001:7b8:3a7:0:d137:4f93:99d7:b831] (unknown [IPv6:2001:7b8:3a7:0:d137:4f93:99d7:b831]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 22E8F5C5A; Mon, 6 Dec 2010 20:19:50 +0100 (CET) Message-ID: <4CFD3760.8090606@FreeBSD.org> Date: Mon, 06 Dec 2010 20:20:00 +0100 From: Dimitry Andric Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.2; en-US; rv:1.9.2.14pre) Gecko/20101201 Lanikai/3.1.8pre MIME-Version: 1.0 To: Tijl Coosemans References: <201012052024.oB5KOMUF007051@svn.freebsd.org> <201012061718.13823.tijl@coosemans.org> <4CFD2E01.1000509@FreeBSD.org> In-Reply-To: <4CFD2E01.1000509@FreeBSD.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r216200 - in projects/binutils-2.17: contrib/binutils/bfd contrib/binutils/gas/config contrib/binutils/ld/emulparams gnu/usr.bin/binutils/libbfd sys/boot/ia64/efi sys/boot/ia64/ski sys/... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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, 06 Dec 2010 19:19:51 -0000 On 2010-12-06 19:40, Dimitry Andric wrote: > It is, in the binutils-2.17 branch, which has . :) Oops, that should have been "which has elf64-x86-64-freebsd and elf64-sparc-freebsd targets." From owner-svn-src-projects@FreeBSD.ORG Mon Dec 6 21:15:47 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 12EA1106566B; Mon, 6 Dec 2010 21:15:47 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DBED08FC13; Mon, 6 Dec 2010 21:15:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oB6LFk8B045098; Mon, 6 Dec 2010 21:15:46 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB6LFkjr045097; Mon, 6 Dec 2010 21:15:46 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <201012062115.oB6LFkjr045097@svn.freebsd.org> From: Sean Bruno Date: Mon, 6 Dec 2010 21:15:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216244 - projects/stable_7_xen X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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, 06 Dec 2010 21:15:47 -0000 Author: sbruno Date: Mon Dec 6 21:15:46 2010 New Revision: 216244 URL: http://svn.freebsd.org/changeset/base/216244 Log: stable branch for adding xen DomU support into FreeBSD 7 Obtained from: Yahoo! Inc. Added: - copied from r216243, stable/7/ Directory Properties: projects/stable_7_xen/ (props changed) From owner-svn-src-projects@FreeBSD.ORG Tue Dec 7 13:46:54 2010 Return-Path: Delivered-To: svn-src-projects@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 867501065693; Tue, 7 Dec 2010 13:46:54 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 362398FC18; Tue, 7 Dec 2010 13:46:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.3/8.14.1) with ESMTP id oB7DdaTn046545; Tue, 7 Dec 2010 06:39:36 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Tue, 07 Dec 2010 06:39:36 -0700 (MST) Message-Id: <20101207.063936.74702962.imp@bsdimp.com> To: dim@FreeBSD.org From: Warner Losh In-Reply-To: <4CFD2E01.1000509@FreeBSD.org> References: <201012052024.oB5KOMUF007051@svn.freebsd.org> <201012061718.13823.tijl@coosemans.org> <4CFD2E01.1000509@FreeBSD.org> X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: svn-src-projects@FreeBSD.org, tijl@coosemans.org, src-committers@FreeBSD.org Subject: Re: svn commit: r216200 - in projects/binutils-2.17: contrib/binutils/bfd contrib/binutils/gas/config contrib/binutils/ld/emulparams gnu/usr.bin/binutils/libbfd sys/boot/ia64/efi sys/boot/ia64/ski sys/... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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, 07 Dec 2010 13:46:54 -0000 From: Dimitry Andric Subject: Re: svn commit: r216200 - in projects/binutils-2.17: contrib/binutils/bfd contrib/binutils/gas/config contrib/binutils/ld/emulparams gnu/usr.bin/binutils/libbfd sys/boot/ia64/efi sys/boot/ia64/ski sys/... Date: Mon, 06 Dec 2010 19:40:01 +0100 > On 2010-12-06 17:18, Tijl Coosemans wrote: > > On Sunday 05 December 2010 21:24:22 Dimitry Andric wrote: > ... > >> For ia64, add a proper 'elf64-ia64-freebsd' output format to BFD, so the > >> ELF branding for FreeBSD is done in the same way as amd64, i386 and > >> sparc. Something similar should probably also be done for arm, mips and > >> powerpc. > ... > > Does this change fix the problem described here? > > http://lists.freebsd.org/pipermail/freebsd-ia64/2010-November/002773.html > > That problem is most likely due to using the binutils 2.20.1 port, which > does not have support for a FreeBSD/ia64 target. I posted a similar > patch for binutils 2.20 (without any base system modifications) here: > > http://lists.freebsd.org/pipermail/freebsd-current/2010-December/021649.html > > > > About elf64-ia64-freebsd, I'm not sure it is needed. FreeBSD 4.0 and > > older used non-standard ELF branding and that format got the name > > elf32-i386-freebsd (and elf64-alpha-freebsd). Later versions of FreeBSD > > use the standard method, but keep calling it elf32-i386-freebsd. > > The problem is that BFD needs to set the ELF_OSABI field in the ELF > header to ELFOSABI_FREEBSD, at least for FreeBSD targets (whereas Linux > does not care about the ELF_OSABI field at all, it seems). > > Because BFD sets the ELF_OSABI field to ELFOSABI_SYSV by default, this > can only be done properly by selecting a specific BFD target > ("elf64-ia64-freebsd") which is different from the default, usually > "elf64-ia64-little". The same principle applies to other arches. > > In our base binutils, there is a hack in contrib/binutils/bfd/elf.c > (function prep_headers(), line 4325) to set that field unconditionally, > but obviously this is not in upstream binutils, as it would most likely > be unacceptable for them. (Just maybe, if it was put between #ifdef > __FreeBSD__ guards, but still unlikely. :) > > (Note that due to this elf.c hack, the messing with elf-fbsd-brand.c in > gnu/usr.bin/binutils/libbfd/Makefile.{amd64,ia64} is actually completely > unnecessary...) > > > > Rather than copying this practise to other architectures, maybe > > binutils should be fixed for i386. It isn't used on amd64 and sparc64 > > either as far as I can tell. > > It is, in the binutils-2.17 branch, which has . :) The question is if > we want to propagate our elf.c hack forever, in which case it would > have to be added to the binutils port. > > The alternative, adding FreeBSD-specific targets, is more likely to be > accepted by the binutils maintainers, which would be nice if we want to > be able to build with "stock" binutils on FreeBSD. > > I am completely open for both approaches, really, and would like to see > a bit of consensus. > > The "just hack elf.c" approach causes less churn in the tree, because it > is small, and saves modifying a few places in the tree where target > names are used, such as kernel link scripts. There is no way to specify > a "non-FreeBSD" target, though. > > The "add FreeBSD targets" approach causes a bit of churn, but if we > submit the required changes to binutils upstream, they are more likely > to be accepted, as they are fairly minimal, and don't disturb support > for other platforms. There will also be the possibility to produce > non-FreeBSD-branded ELF files, although I am not sure if that is used > very often. I'd add the FreeBSD targets... We have a bunch of them already, and their lack is a problem relative to linux, which has linux specific targets for ages... Warner From owner-svn-src-projects@FreeBSD.ORG Tue Dec 7 14:18:37 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E0B481065672; Tue, 7 Dec 2010 14:18:37 +0000 (UTC) (envelope-from tijl@freebsd.org) Received: from mailrelay011.isp.belgacom.be (mailrelay011.isp.belgacom.be [195.238.6.178]) by mx1.freebsd.org (Postfix) with ESMTP id 286928FC0C; Tue, 7 Dec 2010 14:18:36 +0000 (UTC) X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AvsEADvI/UxbscFI/2dsb2JhbACjPXLAbYVJBA Received: from 72.193-177-91.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([91.177.193.72]) by relay.skynet.be with ESMTP; 07 Dec 2010 14:48:49 +0100 Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1]) by kalimero.tijl.coosemans.org (8.14.4/8.14.4) with ESMTP id oB7Dmn8a003321; Tue, 7 Dec 2010 14:48:49 +0100 (CET) (envelope-from tijl@freebsd.org) From: Tijl Coosemans To: Dimitry Andric Date: Tue, 7 Dec 2010 14:48:41 +0100 User-Agent: KMail/1.13.5 (FreeBSD/8.2-PRERELEASE; KDE/4.5.2; i386; ; ) References: <201012052024.oB5KOMUF007051@svn.freebsd.org> <201012061718.13823.tijl@coosemans.org> <4CFD2E01.1000509@FreeBSD.org> In-Reply-To: <4CFD2E01.1000509@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1405737.0elAEnjU74"; protocol="application/pgp-signature"; micalg=pgp-sha256 Content-Transfer-Encoding: 7bit Message-Id: <201012071448.47319.tijl@freebsd.org> Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r216200 - in projects/binutils-2.17: contrib/binutils/bfd contrib/binutils/gas/config contrib/binutils/ld/emulparams gnu/usr.bin/binutils/libbfd sys/boot/ia64/efi sys/boot/ia64/ski sys/... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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, 07 Dec 2010 14:18:38 -0000 --nextPart1405737.0elAEnjU74 Content-Type: Text/Plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable On Monday 06 December 2010 19:40:01 Dimitry Andric wrote: > On 2010-12-06 17:18, Tijl Coosemans wrote: >> On Sunday 05 December 2010 21:24:22 Dimitry Andric wrote: > ... >>> For ia64, add a proper 'elf64-ia64-freebsd' output format to BFD, so= the >>> ELF branding for FreeBSD is done in the same way as amd64, i386 and >>> sparc. Something similar should probably also be done for arm, mips= and >>> powerpc. > ... >> About elf64-ia64-freebsd, I'm not sure it is needed. FreeBSD 4.0 and >> older used non-standard ELF branding and that format got the name >> elf32-i386-freebsd (and elf64-alpha-freebsd). Later versions of FreeBSD >> use the standard method, but keep calling it elf32-i386-freebsd. >=20 > The problem is that BFD needs to set the ELF_OSABI field in the ELF > header to ELFOSABI_FREEBSD, at least for FreeBSD targets (whereas Linux > does not care about the ELF_OSABI field at all, it seems). >=20 > Because BFD sets the ELF_OSABI field to ELFOSABI_SYSV by default, this > can only be done properly by selecting a specific BFD target > ("elf64-ia64-freebsd") which is different from the default, usually > "elf64-ia64-little". The same principle applies to other arches. I see. I thought target specifics were set at compile time, but apparently BFD can target multiple formats at runtime. >> Rather than copying this practise to other architectures, maybe >> binutils should be fixed for i386. It isn't used on amd64 and sparc64 >> either as far as I can tell. >=20 > It is, in the binutils-2.17 branch, which has . :) The question is if > we want to propagate our elf.c hack forever, in which case it would > have to be added to the binutils port. >=20 > The alternative, adding FreeBSD-specific targets, is more likely to be > accepted by the binutils maintainers, which would be nice if we want to > be able to build with "stock" binutils on FreeBSD. >=20 > I am completely open for both approaches, really, and would like to see > a bit of consensus. >=20 > The "just hack elf.c" approach causes less churn in the tree, because it > is small, and saves modifying a few places in the tree where target > names are used, such as kernel link scripts. There is no way to specify > a "non-FreeBSD" target, though. >=20 > The "add FreeBSD targets" approach causes a bit of churn, but if we > submit the required changes to binutils upstream, they are more likely > to be accepted, as they are fairly minimal, and don't disturb support > for other platforms. There will also be the possibility to produce > non-FreeBSD-branded ELF files, although I am not sure if that is used > very often. >=20 > So, which colour? :) A third alternative :) Stop setting OSABI. Looking at the binutils 2.20.1 BFD source the only files in which OSABI is set to FreeBSD are: elf32-i386.c, elf64-alpha.c, elf64-sparc.c and elf64-x86-64.c. For those architectures FreeBSD is the only OS that sets OSABI. Since nobody cares about it maybe FreeBSD shouldn't either. The field is redundant anyway given the .note.ABI-tag section. I noticed the .note.ABI-tag section was missing from the ia64 startup code (src/lib/csu/ia64/crt1.S). Adding it should fix the branding problem reported on the mailing lists too and then there's no need for hacks or special *-freebsd ELF formats. --nextPart1405737.0elAEnjU74 Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (FreeBSD) iF4EABEIAAYFAkz+Oz8ACgkQfoCS2CCgtivrswD7BBND2H4gfh1r1LgvK7f+pkhU 0HZbdFXYRhrKjXhqUXAA/ihQXbhfcylL0dbf6VYFsLVfNtpdiFnuKkH9H9+aQJtU =/rFy -----END PGP SIGNATURE----- --nextPart1405737.0elAEnjU74-- From owner-svn-src-projects@FreeBSD.ORG Tue Dec 7 17:36:18 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EA17D106564A; Tue, 7 Dec 2010 17:36:18 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D4B858FC1A; Tue, 7 Dec 2010 17:36:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oB7HaItl075161; Tue, 7 Dec 2010 17:36:18 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB7HaIqh075142; Tue, 7 Dec 2010 17:36:18 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201012071736.oB7HaIqh075142@svn.freebsd.org> From: Attilio Rao Date: Tue, 7 Dec 2010 17:36:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216259 - in projects/sv: . bin/csh/USD.doc bin/sh contrib/bind9 contrib/bind9/bin/check contrib/bind9/bin/dig contrib/bind9/bin/named contrib/bind9/bin/named/include/named contrib/bind... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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, 07 Dec 2010 17:36:19 -0000 Author: attilio Date: Tue Dec 7 17:36:17 2010 New Revision: 216259 URL: http://svn.freebsd.org/changeset/base/216259 Log: MFC @ r216258 Added: projects/sv/share/doc/smm/07.lpr/ - copied from r216258, head/share/doc/smm/07.lpr/ projects/sv/sys/contrib/octeon-sdk/cvmx-agl-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-agl-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-app-hotplug.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-app-hotplug.c projects/sv/sys/contrib/octeon-sdk/cvmx-app-hotplug.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-app-hotplug.h projects/sv/sys/contrib/octeon-sdk/cvmx-asx0-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-asx0-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-asxx-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-asxx-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-ciu-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-ciu-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-clock.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-clock.c projects/sv/sys/contrib/octeon-sdk/cvmx-clock.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-clock.h projects/sv/sys/contrib/octeon-sdk/cvmx-crypto.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-crypto.c projects/sv/sys/contrib/octeon-sdk/cvmx-crypto.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-crypto.h projects/sv/sys/contrib/octeon-sdk/cvmx-dbg-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-dbg-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-debug-handler.S - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-debug-handler.S projects/sv/sys/contrib/octeon-sdk/cvmx-debug-remote.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-debug-remote.c projects/sv/sys/contrib/octeon-sdk/cvmx-debug-uart.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-debug-uart.c projects/sv/sys/contrib/octeon-sdk/cvmx-debug.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-debug.c projects/sv/sys/contrib/octeon-sdk/cvmx-debug.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-debug.h projects/sv/sys/contrib/octeon-sdk/cvmx-dfa-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-dfa-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-dfm-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-dfm-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-dpi-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-dpi-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-error-custom.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-error-custom.c projects/sv/sys/contrib/octeon-sdk/cvmx-error-custom.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-error-custom.h projects/sv/sys/contrib/octeon-sdk/cvmx-error-init-cn30xx.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-error-init-cn30xx.c projects/sv/sys/contrib/octeon-sdk/cvmx-error-init-cn31xx.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-error-init-cn31xx.c projects/sv/sys/contrib/octeon-sdk/cvmx-error-init-cn38xx.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-error-init-cn38xx.c projects/sv/sys/contrib/octeon-sdk/cvmx-error-init-cn38xxp2.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-error-init-cn38xxp2.c projects/sv/sys/contrib/octeon-sdk/cvmx-error-init-cn50xx.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-error-init-cn50xx.c projects/sv/sys/contrib/octeon-sdk/cvmx-error-init-cn52xx.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-error-init-cn52xx.c projects/sv/sys/contrib/octeon-sdk/cvmx-error-init-cn52xxp1.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-error-init-cn52xxp1.c projects/sv/sys/contrib/octeon-sdk/cvmx-error-init-cn56xx.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-error-init-cn56xx.c projects/sv/sys/contrib/octeon-sdk/cvmx-error-init-cn56xxp1.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-error-init-cn56xxp1.c projects/sv/sys/contrib/octeon-sdk/cvmx-error-init-cn58xx.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-error-init-cn58xx.c projects/sv/sys/contrib/octeon-sdk/cvmx-error-init-cn58xxp1.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-error-init-cn58xxp1.c projects/sv/sys/contrib/octeon-sdk/cvmx-error-init-cn63xx.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-error-init-cn63xx.c projects/sv/sys/contrib/octeon-sdk/cvmx-error-init-cn63xxp1.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-error-init-cn63xxp1.c projects/sv/sys/contrib/octeon-sdk/cvmx-error.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-error.c projects/sv/sys/contrib/octeon-sdk/cvmx-error.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-error.h projects/sv/sys/contrib/octeon-sdk/cvmx-fpa-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-fpa-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-gmxx-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-gmxx-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-gpio-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-gpio-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-helper-jtag.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-helper-jtag.c projects/sv/sys/contrib/octeon-sdk/cvmx-helper-jtag.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-helper-jtag.h projects/sv/sys/contrib/octeon-sdk/cvmx-helper-srio.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-helper-srio.c projects/sv/sys/contrib/octeon-sdk/cvmx-helper-srio.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-helper-srio.h projects/sv/sys/contrib/octeon-sdk/cvmx-iob-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-iob-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-ipd-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-ipd-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-ixf18201.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-ixf18201.c projects/sv/sys/contrib/octeon-sdk/cvmx-ixf18201.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-ixf18201.h projects/sv/sys/contrib/octeon-sdk/cvmx-key-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-key-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-l2c-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-l2c-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-l2d-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-l2d-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-l2t-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-l2t-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-led-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-led-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-lmcx-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-lmcx-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-mio-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-mio-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-mixx-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-mixx-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-mpi-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-mpi-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-ndf-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-ndf-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-npei-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-npei-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-npi-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-npi-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-pci-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-pci-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-pcieepx-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-pcieepx-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-pciercx-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-pciercx-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-pcm-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-pcm-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-pcmx-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-pcmx-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-pcsx-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-pcsx-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-pcsxx-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-pcsxx-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-pemx-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-pemx-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-pescx-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-pescx-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-pexp-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-pexp-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-pip-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-pip-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-pko-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-pko-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-pow-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-pow-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-power-throttle.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-power-throttle.c projects/sv/sys/contrib/octeon-sdk/cvmx-power-throttle.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-power-throttle.h projects/sv/sys/contrib/octeon-sdk/cvmx-rad-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-rad-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-rnm-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-rnm-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-shmem.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-shmem.c projects/sv/sys/contrib/octeon-sdk/cvmx-shmem.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-shmem.h projects/sv/sys/contrib/octeon-sdk/cvmx-sim-magic.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-sim-magic.h projects/sv/sys/contrib/octeon-sdk/cvmx-sli-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-sli-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-smi-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-smi-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-smix-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-smix-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-spx0-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-spx0-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-spxx-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-spxx-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-srio.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-srio.c projects/sv/sys/contrib/octeon-sdk/cvmx-srio.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-srio.h projects/sv/sys/contrib/octeon-sdk/cvmx-sriomaintx-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-sriomaintx-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-sriox-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-sriox-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-srxx-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-srxx-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-stxx-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-stxx-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-tim-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-tim-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-tlb.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-tlb.c projects/sv/sys/contrib/octeon-sdk/cvmx-tlb.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-tlb.h projects/sv/sys/contrib/octeon-sdk/cvmx-tra-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-tra-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-uahcx-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-uahcx-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-uart.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-uart.c projects/sv/sys/contrib/octeon-sdk/cvmx-uctlx-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-uctlx-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-usbcx-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-usbcx-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-usbd.c - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-usbd.c projects/sv/sys/contrib/octeon-sdk/cvmx-usbd.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-usbd.h projects/sv/sys/contrib/octeon-sdk/cvmx-usbnx-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-usbnx-defs.h projects/sv/sys/contrib/octeon-sdk/cvmx-zip-defs.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-zip-defs.h projects/sv/sys/contrib/octeon-sdk/octeon-boot-info.h - copied unchanged from r216258, head/sys/contrib/octeon-sdk/octeon-boot-info.h projects/sv/sys/modules/cc/ - copied from r216258, head/sys/modules/cc/ projects/sv/sys/x86/include/_align.h - copied unchanged from r216258, head/sys/x86/include/_align.h projects/sv/usr.sbin/usbdump/ - copied from r216258, head/usr.sbin/usbdump/ Replaced: projects/sv/sys/contrib/octeon-sdk/cvmx-interrupt-handler.S - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-interrupt-handler.S projects/sv/sys/contrib/octeon-sdk/cvmx-log-arc.S - copied unchanged from r216258, head/sys/contrib/octeon-sdk/cvmx-log-arc.S Deleted: projects/sv/bin/csh/USD.doc/ projects/sv/contrib/traceroute/Makefile.in projects/sv/contrib/traceroute/aclocal.m4 projects/sv/contrib/traceroute/acsite.m4 projects/sv/contrib/traceroute/config.guess projects/sv/contrib/traceroute/config.sub projects/sv/contrib/traceroute/configure projects/sv/contrib/traceroute/configure.in projects/sv/contrib/traceroute/findsaddr-generic.c projects/sv/contrib/traceroute/findsaddr-linux.c projects/sv/contrib/traceroute/findsaddr-mib.c projects/sv/contrib/traceroute/install-sh projects/sv/contrib/traceroute/lbl/gnuc.h projects/sv/contrib/traceroute/lbl/os-solaris2.h projects/sv/contrib/traceroute/lbl/os-sunos4.h projects/sv/contrib/traceroute/mkdep projects/sv/contrib/traceroute/strerror.c projects/sv/contrib/traceroute/usleep.c projects/sv/lib/libc/rpc/PSD.doc/ projects/sv/sbin/fsck_ffs/SMM.doc/ projects/sv/sys/contrib/octeon-sdk/README.txt projects/sv/sys/contrib/octeon-sdk/cvmx-asx.h projects/sv/sys/contrib/octeon-sdk/cvmx-ciu.h projects/sv/sys/contrib/octeon-sdk/cvmx-csr-addresses.h projects/sv/sys/contrib/octeon-sdk/cvmx-cvmmem.h projects/sv/sys/contrib/octeon-sdk/cvmx-interrupt-decodes.c projects/sv/sys/contrib/octeon-sdk/cvmx-interrupt-rsl.c projects/sv/sys/contrib/octeon-sdk/cvmx-iob.h projects/sv/sys/contrib/octeon-sdk/cvmx-lmc.h projects/sv/sys/contrib/octeon-sdk/cvmx-malloc/ projects/sv/sys/contrib/octeon-sdk/cvmx-mio.h projects/sv/sys/contrib/octeon-sdk/cvmx-resources.config projects/sv/sys/contrib/octeon-sdk/cvmx-shared-linux-n32.ld projects/sv/sys/contrib/octeon-sdk/cvmx-shared-linux-o32.ld projects/sv/sys/contrib/octeon-sdk/cvmx-shared-linux.ld projects/sv/sys/contrib/octeon-sdk/cvmx-twsi-raw.c projects/sv/sys/contrib/octeon-sdk/cvmx-twsi-raw.h projects/sv/sys/contrib/octeon-sdk/cvmx.mk projects/sv/sys/contrib/octeon-sdk/executive-config.h.template projects/sv/sys/ufs/ffs/README.snapshot projects/sv/usr.bin/bc/USD.doc/ projects/sv/usr.bin/dc/USD.doc/ projects/sv/usr.bin/gprof/PSD.doc/ projects/sv/usr.bin/mail/USD.doc/ projects/sv/usr.bin/make/PSD.doc/ projects/sv/usr.sbin/config/SMM.doc/ projects/sv/usr.sbin/kernbb/ projects/sv/usr.sbin/lpr/SMM.doc/ projects/sv/usr.sbin/timed/SMM.doc/ projects/sv/usr.sbin/usbdevs/ Modified: projects/sv/ObsoleteFiles.inc projects/sv/bin/sh/arith_lex.l projects/sv/bin/sh/cd.c projects/sv/bin/sh/eval.c projects/sv/bin/sh/expand.c projects/sv/bin/sh/histedit.c projects/sv/bin/sh/jobs.c projects/sv/bin/sh/main.c projects/sv/bin/sh/memalloc.c projects/sv/bin/sh/memalloc.h projects/sv/bin/sh/miscbltin.c projects/sv/bin/sh/mksyntax.c projects/sv/bin/sh/options.c projects/sv/bin/sh/output.c projects/sv/bin/sh/output.h projects/sv/bin/sh/parser.c projects/sv/bin/sh/sh.1 projects/sv/bin/sh/var.c projects/sv/contrib/bind9/CHANGES projects/sv/contrib/bind9/bin/check/check-tool.c projects/sv/contrib/bind9/bin/check/check-tool.h projects/sv/contrib/bind9/bin/check/named-checkconf.c projects/sv/contrib/bind9/bin/check/named-checkzone.c projects/sv/contrib/bind9/bin/dig/host.c projects/sv/contrib/bind9/bin/named/client.c projects/sv/contrib/bind9/bin/named/include/named/query.h projects/sv/contrib/bind9/bin/named/query.c projects/sv/contrib/bind9/bin/named/server.c projects/sv/contrib/bind9/lib/dns/api projects/sv/contrib/bind9/lib/dns/include/dns/view.h projects/sv/contrib/bind9/lib/dns/journal.c projects/sv/contrib/bind9/lib/dns/rbtdb.c projects/sv/contrib/bind9/lib/dns/validator.c projects/sv/contrib/bind9/lib/dns/view.c projects/sv/contrib/bind9/lib/isc/api projects/sv/contrib/bind9/lib/isc/print.c projects/sv/contrib/bind9/version projects/sv/contrib/binutils/bfd/elf-bfd.h projects/sv/contrib/binutils/bfd/elf.c projects/sv/contrib/binutils/binutils/readelf.c projects/sv/contrib/binutils/include/elf/common.h projects/sv/contrib/file/readelf.h projects/sv/contrib/gcc/cgraphunit.c projects/sv/contrib/gcc/config/elfos.h projects/sv/contrib/gcc/config/ia64/hpux.h projects/sv/contrib/gcc/config/ia64/ia64.c projects/sv/contrib/gcc/config/ia64/unwind-ia64.h projects/sv/contrib/gcc/output.h projects/sv/contrib/gcc/toplev.c projects/sv/contrib/gcc/varasm.c projects/sv/contrib/gdb/gdb/fbsd-proc.c projects/sv/contrib/traceroute/as.c projects/sv/contrib/traceroute/as.h projects/sv/contrib/traceroute/ifaddrlist.c projects/sv/contrib/traceroute/traceroute.c projects/sv/crypto/openssl/CHANGES projects/sv/crypto/openssl/Configure projects/sv/crypto/openssl/FAQ projects/sv/crypto/openssl/Makefile projects/sv/crypto/openssl/NEWS projects/sv/crypto/openssl/PROBLEMS projects/sv/crypto/openssl/README projects/sv/crypto/openssl/apps/apps.c projects/sv/crypto/openssl/apps/dh.c projects/sv/crypto/openssl/apps/dhparam.c projects/sv/crypto/openssl/apps/dsaparam.c projects/sv/crypto/openssl/apps/ec.c projects/sv/crypto/openssl/apps/ecparam.c projects/sv/crypto/openssl/apps/enc.c projects/sv/crypto/openssl/apps/gendh.c projects/sv/crypto/openssl/apps/gendsa.c projects/sv/crypto/openssl/apps/genrsa.c projects/sv/crypto/openssl/apps/pkcs7.c projects/sv/crypto/openssl/apps/rand.c projects/sv/crypto/openssl/apps/s_server.c projects/sv/crypto/openssl/apps/s_socket.c projects/sv/crypto/openssl/apps/speed.c projects/sv/crypto/openssl/apps/x509.c projects/sv/crypto/openssl/crypto/aes/aes_wrap.c projects/sv/crypto/openssl/crypto/aes/asm/aes-x86_64.pl projects/sv/crypto/openssl/crypto/asn1/a_int.c projects/sv/crypto/openssl/crypto/asn1/n_pkey.c projects/sv/crypto/openssl/crypto/asn1/t_crl.c projects/sv/crypto/openssl/crypto/asn1/tasn_dec.c projects/sv/crypto/openssl/crypto/asn1/x_x509.c projects/sv/crypto/openssl/crypto/bio/b_sock.c projects/sv/crypto/openssl/crypto/bio/bf_nbio.c projects/sv/crypto/openssl/crypto/bio/bio_lib.c projects/sv/crypto/openssl/crypto/bio/bss_acpt.c projects/sv/crypto/openssl/crypto/bio/bss_sock.c projects/sv/crypto/openssl/crypto/bn/bn_exp2.c projects/sv/crypto/openssl/crypto/bn/bn_mul.c projects/sv/crypto/openssl/crypto/cms/cms_asn1.c projects/sv/crypto/openssl/crypto/conf/conf_def.c projects/sv/crypto/openssl/crypto/des/rpc_des.h projects/sv/crypto/openssl/crypto/dsa/dsa_gen.c projects/sv/crypto/openssl/crypto/dsa/dsa_ossl.c projects/sv/crypto/openssl/crypto/ec/ec2_mult.c projects/sv/crypto/openssl/crypto/ec/ec_mult.c projects/sv/crypto/openssl/crypto/ecdh/ech_lib.c projects/sv/crypto/openssl/crypto/ecdsa/ecs_lib.c projects/sv/crypto/openssl/crypto/engine/eng_list.c projects/sv/crypto/openssl/crypto/err/err_prn.c projects/sv/crypto/openssl/crypto/evp/bio_b64.c projects/sv/crypto/openssl/crypto/evp/enc_min.c projects/sv/crypto/openssl/crypto/evp/encode.c projects/sv/crypto/openssl/crypto/evp/evp_pbe.c projects/sv/crypto/openssl/crypto/evp/p_sign.c projects/sv/crypto/openssl/crypto/evp/p_verify.c projects/sv/crypto/openssl/crypto/hmac/hmac.c projects/sv/crypto/openssl/crypto/jpake/jpake.c projects/sv/crypto/openssl/crypto/jpake/jpake.h projects/sv/crypto/openssl/crypto/jpake/jpake_err.c projects/sv/crypto/openssl/crypto/md32_common.h projects/sv/crypto/openssl/crypto/o_init.c projects/sv/crypto/openssl/crypto/ocsp/ocsp_ht.c projects/sv/crypto/openssl/crypto/ocsp/ocsp_prn.c projects/sv/crypto/openssl/crypto/opensslv.h projects/sv/crypto/openssl/crypto/pem/pem_lib.c projects/sv/crypto/openssl/crypto/pkcs12/p12_key.c projects/sv/crypto/openssl/crypto/pkcs12/p12_npas.c projects/sv/crypto/openssl/crypto/pkcs7/pk7_doit.c projects/sv/crypto/openssl/crypto/pkcs7/pk7_lib.c projects/sv/crypto/openssl/crypto/pkcs7/pk7_mime.c projects/sv/crypto/openssl/crypto/pqueue/pqueue.c projects/sv/crypto/openssl/crypto/rand/rand_nw.c projects/sv/crypto/openssl/crypto/rand/randfile.c projects/sv/crypto/openssl/crypto/rsa/rsa_eay.c projects/sv/crypto/openssl/crypto/stack/safestack.h projects/sv/crypto/openssl/crypto/x509/x509.h projects/sv/crypto/openssl/crypto/x509/x509_vfy.c projects/sv/crypto/openssl/crypto/x509/x_all.c projects/sv/crypto/openssl/crypto/x509v3/v3_ncons.c projects/sv/crypto/openssl/crypto/x509v3/v3_pci.c projects/sv/crypto/openssl/doc/apps/smime.pod projects/sv/crypto/openssl/doc/crypto/ASN1_OBJECT_new.pod projects/sv/crypto/openssl/doc/crypto/ASN1_STRING_length.pod projects/sv/crypto/openssl/doc/crypto/ASN1_STRING_new.pod projects/sv/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod projects/sv/crypto/openssl/doc/crypto/BIO_f_buffer.pod projects/sv/crypto/openssl/doc/crypto/BIO_should_retry.pod projects/sv/crypto/openssl/doc/crypto/CRYPTO_set_ex_data.pod projects/sv/crypto/openssl/doc/crypto/OBJ_nid2obj.pod projects/sv/crypto/openssl/doc/crypto/PKCS7_decrypt.pod projects/sv/crypto/openssl/doc/crypto/PKCS7_encrypt.pod projects/sv/crypto/openssl/doc/crypto/PKCS7_sign.pod projects/sv/crypto/openssl/doc/crypto/PKCS7_verify.pod projects/sv/crypto/openssl/doc/crypto/SMIME_read_PKCS7.pod projects/sv/crypto/openssl/doc/crypto/SMIME_write_PKCS7.pod projects/sv/crypto/openssl/doc/crypto/X509_NAME_ENTRY_get_object.pod projects/sv/crypto/openssl/doc/crypto/X509_NAME_add_entry_by_txt.pod projects/sv/crypto/openssl/doc/crypto/X509_NAME_get_index_by_NID.pod projects/sv/crypto/openssl/doc/crypto/X509_new.pod projects/sv/crypto/openssl/doc/crypto/bn_internal.pod projects/sv/crypto/openssl/doc/crypto/ui_compat.pod projects/sv/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod projects/sv/crypto/openssl/doc/ssl/SSL_library_init.pod projects/sv/crypto/openssl/e_os.h projects/sv/crypto/openssl/engines/e_chil.c projects/sv/crypto/openssl/engines/e_cswift.c projects/sv/crypto/openssl/engines/e_ubsec.c projects/sv/crypto/openssl/fips/mkfipsscr.pl projects/sv/crypto/openssl/openssl.spec projects/sv/crypto/openssl/ssl/d1_both.c projects/sv/crypto/openssl/ssl/d1_clnt.c projects/sv/crypto/openssl/ssl/d1_enc.c projects/sv/crypto/openssl/ssl/d1_lib.c projects/sv/crypto/openssl/ssl/d1_pkt.c projects/sv/crypto/openssl/ssl/dtls1.h projects/sv/crypto/openssl/ssl/s23_clnt.c projects/sv/crypto/openssl/ssl/s23_lib.c projects/sv/crypto/openssl/ssl/s2_srvr.c projects/sv/crypto/openssl/ssl/s3_both.c projects/sv/crypto/openssl/ssl/s3_clnt.c projects/sv/crypto/openssl/ssl/s3_enc.c projects/sv/crypto/openssl/ssl/s3_srvr.c projects/sv/crypto/openssl/ssl/ssl_algs.c projects/sv/crypto/openssl/ssl/ssl_asn1.c projects/sv/crypto/openssl/ssl/ssl_cert.c projects/sv/crypto/openssl/ssl/ssl_ciph.c projects/sv/crypto/openssl/ssl/ssl_lib.c projects/sv/crypto/openssl/ssl/ssltest.c projects/sv/crypto/openssl/ssl/t1_enc.c projects/sv/crypto/openssl/ssl/t1_lib.c projects/sv/crypto/openssl/test/cms-test.pl projects/sv/crypto/openssl/tools/c_rehash projects/sv/crypto/openssl/tools/c_rehash.in projects/sv/crypto/openssl/util/libeay.num projects/sv/crypto/openssl/util/mkdef.pl projects/sv/crypto/openssl/util/pl/VC-32.pl projects/sv/etc/defaults/rc.conf projects/sv/etc/rc.d/gptboot projects/sv/etc/rc.d/mountcritlocal projects/sv/games/bcd/bcd.6 projects/sv/games/caesar/caesar.6 projects/sv/games/caesar/rot13.sh projects/sv/games/factor/factor.6 projects/sv/games/morse/morse.6 projects/sv/games/number/number.6 projects/sv/games/pom/pom.6 projects/sv/games/random/random.6 projects/sv/gnu/usr.bin/cc/Makefile.fe projects/sv/gnu/usr.bin/gdb/libgdb/fbsd-threads.c projects/sv/lib/libarchive/archive_read_extract.c projects/sv/lib/libarchive/test/Makefile projects/sv/lib/libarchive/test/test_acl_freebsd.c projects/sv/lib/libc/stdio/getline.3 projects/sv/lib/libc/stdio/printf-pos.c projects/sv/lib/libcam/Makefile projects/sv/lib/libgeom/libgeom.3 projects/sv/lib/libpam/modules/pam_unix/pam_unix.c projects/sv/lib/msun/Makefile projects/sv/lib/msun/Symbol.map projects/sv/lib/msun/man/log.3 projects/sv/lib/msun/man/math.3 projects/sv/lib/msun/src/math.h projects/sv/lib/msun/src/math_private.h projects/sv/libexec/bootpd/rtmsg.c projects/sv/libexec/mknetid/parse_group.c projects/sv/sbin/bsdlabel/bsdlabel.c projects/sv/sbin/camcontrol/camcontrol.8 projects/sv/sbin/camcontrol/camcontrol.c projects/sv/sbin/ddb/ddb.c projects/sv/sbin/devd/devd.cc projects/sv/sbin/devd/token.l projects/sv/sbin/geom/class/eli/geli.8 projects/sv/sbin/geom/class/eli/geom_eli.c projects/sv/sbin/geom/class/part/geom_part.c projects/sv/sbin/geom/class/part/gpart.8 projects/sv/sbin/geom/class/virstor/geom_virstor.c projects/sv/sbin/growfs/debug.c projects/sv/sbin/gvinum/gvinum.c projects/sv/sbin/hastctl/Makefile projects/sv/sbin/hastd/Makefile projects/sv/sbin/ifconfig/ifconfig.c projects/sv/sbin/mknod/mknod.c projects/sv/sbin/mount/mount.8 projects/sv/sbin/routed/parms.c projects/sv/secure/lib/libcrypto/Makefile.inc projects/sv/secure/lib/libcrypto/man/ASN1_OBJECT_new.3 projects/sv/secure/lib/libcrypto/man/ASN1_STRING_length.3 projects/sv/secure/lib/libcrypto/man/ASN1_STRING_new.3 projects/sv/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3 projects/sv/secure/lib/libcrypto/man/ASN1_generate_nconf.3 projects/sv/secure/lib/libcrypto/man/BIO_ctrl.3 projects/sv/secure/lib/libcrypto/man/BIO_f_base64.3 projects/sv/secure/lib/libcrypto/man/BIO_f_buffer.3 projects/sv/secure/lib/libcrypto/man/BIO_f_cipher.3 projects/sv/secure/lib/libcrypto/man/BIO_f_md.3 projects/sv/secure/lib/libcrypto/man/BIO_f_null.3 projects/sv/secure/lib/libcrypto/man/BIO_f_ssl.3 projects/sv/secure/lib/libcrypto/man/BIO_find_type.3 projects/sv/secure/lib/libcrypto/man/BIO_new.3 projects/sv/secure/lib/libcrypto/man/BIO_push.3 projects/sv/secure/lib/libcrypto/man/BIO_read.3 projects/sv/secure/lib/libcrypto/man/BIO_s_accept.3 projects/sv/secure/lib/libcrypto/man/BIO_s_bio.3 projects/sv/secure/lib/libcrypto/man/BIO_s_connect.3 projects/sv/secure/lib/libcrypto/man/BIO_s_fd.3 projects/sv/secure/lib/libcrypto/man/BIO_s_file.3 projects/sv/secure/lib/libcrypto/man/BIO_s_mem.3 projects/sv/secure/lib/libcrypto/man/BIO_s_null.3 projects/sv/secure/lib/libcrypto/man/BIO_s_socket.3 projects/sv/secure/lib/libcrypto/man/BIO_set_callback.3 projects/sv/secure/lib/libcrypto/man/BIO_should_retry.3 projects/sv/secure/lib/libcrypto/man/BN_BLINDING_new.3 projects/sv/secure/lib/libcrypto/man/BN_CTX_new.3 projects/sv/secure/lib/libcrypto/man/BN_CTX_start.3 projects/sv/secure/lib/libcrypto/man/BN_add.3 projects/sv/secure/lib/libcrypto/man/BN_add_word.3 projects/sv/secure/lib/libcrypto/man/BN_bn2bin.3 projects/sv/secure/lib/libcrypto/man/BN_cmp.3 projects/sv/secure/lib/libcrypto/man/BN_copy.3 projects/sv/secure/lib/libcrypto/man/BN_generate_prime.3 projects/sv/secure/lib/libcrypto/man/BN_mod_inverse.3 projects/sv/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3 projects/sv/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3 projects/sv/secure/lib/libcrypto/man/BN_new.3 projects/sv/secure/lib/libcrypto/man/BN_num_bytes.3 projects/sv/secure/lib/libcrypto/man/BN_rand.3 projects/sv/secure/lib/libcrypto/man/BN_set_bit.3 projects/sv/secure/lib/libcrypto/man/BN_swap.3 projects/sv/secure/lib/libcrypto/man/BN_zero.3 projects/sv/secure/lib/libcrypto/man/CONF_modules_free.3 projects/sv/secure/lib/libcrypto/man/CONF_modules_load_file.3 projects/sv/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3 projects/sv/secure/lib/libcrypto/man/DH_generate_key.3 projects/sv/secure/lib/libcrypto/man/DH_generate_parameters.3 projects/sv/secure/lib/libcrypto/man/DH_get_ex_new_index.3 projects/sv/secure/lib/libcrypto/man/DH_new.3 projects/sv/secure/lib/libcrypto/man/DH_set_method.3 projects/sv/secure/lib/libcrypto/man/DH_size.3 projects/sv/secure/lib/libcrypto/man/DSA_SIG_new.3 projects/sv/secure/lib/libcrypto/man/DSA_do_sign.3 projects/sv/secure/lib/libcrypto/man/DSA_dup_DH.3 projects/sv/secure/lib/libcrypto/man/DSA_generate_key.3 projects/sv/secure/lib/libcrypto/man/DSA_generate_parameters.3 projects/sv/secure/lib/libcrypto/man/DSA_get_ex_new_index.3 projects/sv/secure/lib/libcrypto/man/DSA_new.3 projects/sv/secure/lib/libcrypto/man/DSA_set_method.3 projects/sv/secure/lib/libcrypto/man/DSA_sign.3 projects/sv/secure/lib/libcrypto/man/DSA_size.3 projects/sv/secure/lib/libcrypto/man/ERR_GET_LIB.3 projects/sv/secure/lib/libcrypto/man/ERR_clear_error.3 projects/sv/secure/lib/libcrypto/man/ERR_error_string.3 projects/sv/secure/lib/libcrypto/man/ERR_get_error.3 projects/sv/secure/lib/libcrypto/man/ERR_load_crypto_strings.3 projects/sv/secure/lib/libcrypto/man/ERR_load_strings.3 projects/sv/secure/lib/libcrypto/man/ERR_print_errors.3 projects/sv/secure/lib/libcrypto/man/ERR_put_error.3 projects/sv/secure/lib/libcrypto/man/ERR_remove_state.3 projects/sv/secure/lib/libcrypto/man/ERR_set_mark.3 projects/sv/secure/lib/libcrypto/man/EVP_BytesToKey.3 projects/sv/secure/lib/libcrypto/man/EVP_DigestInit.3 projects/sv/secure/lib/libcrypto/man/EVP_EncryptInit.3 projects/sv/secure/lib/libcrypto/man/EVP_OpenInit.3 projects/sv/secure/lib/libcrypto/man/EVP_PKEY_new.3 projects/sv/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 projects/sv/secure/lib/libcrypto/man/EVP_SealInit.3 projects/sv/secure/lib/libcrypto/man/EVP_SignInit.3 projects/sv/secure/lib/libcrypto/man/EVP_VerifyInit.3 projects/sv/secure/lib/libcrypto/man/OBJ_nid2obj.3 projects/sv/secure/lib/libcrypto/man/OPENSSL_Applink.3 projects/sv/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 projects/sv/secure/lib/libcrypto/man/OPENSSL_config.3 projects/sv/secure/lib/libcrypto/man/OPENSSL_ia32cap.3 projects/sv/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 projects/sv/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 projects/sv/secure/lib/libcrypto/man/PKCS12_create.3 projects/sv/secure/lib/libcrypto/man/PKCS12_parse.3 projects/sv/secure/lib/libcrypto/man/PKCS7_decrypt.3 projects/sv/secure/lib/libcrypto/man/PKCS7_encrypt.3 projects/sv/secure/lib/libcrypto/man/PKCS7_sign.3 projects/sv/secure/lib/libcrypto/man/PKCS7_verify.3 projects/sv/secure/lib/libcrypto/man/RAND_add.3 projects/sv/secure/lib/libcrypto/man/RAND_bytes.3 projects/sv/secure/lib/libcrypto/man/RAND_cleanup.3 projects/sv/secure/lib/libcrypto/man/RAND_egd.3 projects/sv/secure/lib/libcrypto/man/RAND_load_file.3 projects/sv/secure/lib/libcrypto/man/RAND_set_rand_method.3 projects/sv/secure/lib/libcrypto/man/RSA_blinding_on.3 projects/sv/secure/lib/libcrypto/man/RSA_check_key.3 projects/sv/secure/lib/libcrypto/man/RSA_generate_key.3 projects/sv/secure/lib/libcrypto/man/RSA_get_ex_new_index.3 projects/sv/secure/lib/libcrypto/man/RSA_new.3 projects/sv/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 projects/sv/secure/lib/libcrypto/man/RSA_print.3 projects/sv/secure/lib/libcrypto/man/RSA_private_encrypt.3 projects/sv/secure/lib/libcrypto/man/RSA_public_encrypt.3 projects/sv/secure/lib/libcrypto/man/RSA_set_method.3 projects/sv/secure/lib/libcrypto/man/RSA_sign.3 projects/sv/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 projects/sv/secure/lib/libcrypto/man/RSA_size.3 projects/sv/secure/lib/libcrypto/man/SMIME_read_PKCS7.3 projects/sv/secure/lib/libcrypto/man/SMIME_write_PKCS7.3 projects/sv/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 projects/sv/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 projects/sv/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 projects/sv/secure/lib/libcrypto/man/X509_NAME_print_ex.3 projects/sv/secure/lib/libcrypto/man/X509_new.3 projects/sv/secure/lib/libcrypto/man/bio.3 projects/sv/secure/lib/libcrypto/man/blowfish.3 projects/sv/secure/lib/libcrypto/man/bn.3 projects/sv/secure/lib/libcrypto/man/bn_internal.3 projects/sv/secure/lib/libcrypto/man/buffer.3 projects/sv/secure/lib/libcrypto/man/crypto.3 projects/sv/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3 projects/sv/secure/lib/libcrypto/man/d2i_DHparams.3 projects/sv/secure/lib/libcrypto/man/d2i_DSAPublicKey.3 projects/sv/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 projects/sv/secure/lib/libcrypto/man/d2i_RSAPublicKey.3 projects/sv/secure/lib/libcrypto/man/d2i_X509.3 projects/sv/secure/lib/libcrypto/man/d2i_X509_ALGOR.3 projects/sv/secure/lib/libcrypto/man/d2i_X509_CRL.3 projects/sv/secure/lib/libcrypto/man/d2i_X509_NAME.3 projects/sv/secure/lib/libcrypto/man/d2i_X509_REQ.3 projects/sv/secure/lib/libcrypto/man/d2i_X509_SIG.3 projects/sv/secure/lib/libcrypto/man/des.3 projects/sv/secure/lib/libcrypto/man/dh.3 projects/sv/secure/lib/libcrypto/man/dsa.3 projects/sv/secure/lib/libcrypto/man/ecdsa.3 projects/sv/secure/lib/libcrypto/man/engine.3 projects/sv/secure/lib/libcrypto/man/err.3 projects/sv/secure/lib/libcrypto/man/evp.3 projects/sv/secure/lib/libcrypto/man/hmac.3 projects/sv/secure/lib/libcrypto/man/lh_stats.3 projects/sv/secure/lib/libcrypto/man/lhash.3 projects/sv/secure/lib/libcrypto/man/md5.3 projects/sv/secure/lib/libcrypto/man/mdc2.3 projects/sv/secure/lib/libcrypto/man/pem.3 projects/sv/secure/lib/libcrypto/man/rand.3 projects/sv/secure/lib/libcrypto/man/rc4.3 projects/sv/secure/lib/libcrypto/man/ripemd.3 projects/sv/secure/lib/libcrypto/man/rsa.3 projects/sv/secure/lib/libcrypto/man/sha.3 projects/sv/secure/lib/libcrypto/man/threads.3 projects/sv/secure/lib/libcrypto/man/ui.3 projects/sv/secure/lib/libcrypto/man/ui_compat.3 projects/sv/secure/lib/libcrypto/man/x509.3 projects/sv/secure/lib/libssl/man/SSL_CIPHER_get_name.3 projects/sv/secure/lib/libssl/man/SSL_COMP_add_compression_method.3 projects/sv/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 projects/sv/secure/lib/libssl/man/SSL_CTX_add_session.3 projects/sv/secure/lib/libssl/man/SSL_CTX_ctrl.3 projects/sv/secure/lib/libssl/man/SSL_CTX_flush_sessions.3 projects/sv/secure/lib/libssl/man/SSL_CTX_free.3 projects/sv/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3 projects/sv/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3 projects/sv/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3 projects/sv/secure/lib/libssl/man/SSL_CTX_new.3 projects/sv/secure/lib/libssl/man/SSL_CTX_sess_number.3 projects/sv/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3 projects/sv/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3 projects/sv/secure/lib/libssl/man/SSL_CTX_sessions.3 projects/sv/secure/lib/libssl/man/SSL_CTX_set_cert_store.3 projects/sv/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3 projects/sv/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3 projects/sv/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3 projects/sv/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3 projects/sv/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3 projects/sv/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3 projects/sv/secure/lib/libssl/man/SSL_CTX_set_info_callback.3 projects/sv/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3 projects/sv/secure/lib/libssl/man/SSL_CTX_set_mode.3 projects/sv/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3 projects/sv/secure/lib/libssl/man/SSL_CTX_set_options.3 projects/sv/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3 projects/sv/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3 projects/sv/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3 projects/sv/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3 projects/sv/secure/lib/libssl/man/SSL_CTX_set_timeout.3 projects/sv/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3 projects/sv/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3 projects/sv/secure/lib/libssl/man/SSL_CTX_set_verify.3 projects/sv/secure/lib/libssl/man/SSL_CTX_use_certificate.3 projects/sv/secure/lib/libssl/man/SSL_SESSION_free.3 projects/sv/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3 projects/sv/secure/lib/libssl/man/SSL_SESSION_get_time.3 projects/sv/secure/lib/libssl/man/SSL_accept.3 projects/sv/secure/lib/libssl/man/SSL_alert_type_string.3 projects/sv/secure/lib/libssl/man/SSL_clear.3 projects/sv/secure/lib/libssl/man/SSL_connect.3 projects/sv/secure/lib/libssl/man/SSL_do_handshake.3 projects/sv/secure/lib/libssl/man/SSL_free.3 projects/sv/secure/lib/libssl/man/SSL_get_SSL_CTX.3 projects/sv/secure/lib/libssl/man/SSL_get_ciphers.3 projects/sv/secure/lib/libssl/man/SSL_get_client_CA_list.3 projects/sv/secure/lib/libssl/man/SSL_get_current_cipher.3 projects/sv/secure/lib/libssl/man/SSL_get_default_timeout.3 projects/sv/secure/lib/libssl/man/SSL_get_error.3 projects/sv/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 projects/sv/secure/lib/libssl/man/SSL_get_ex_new_index.3 projects/sv/secure/lib/libssl/man/SSL_get_fd.3 projects/sv/secure/lib/libssl/man/SSL_get_peer_cert_chain.3 projects/sv/secure/lib/libssl/man/SSL_get_peer_certificate.3 projects/sv/secure/lib/libssl/man/SSL_get_rbio.3 projects/sv/secure/lib/libssl/man/SSL_get_session.3 projects/sv/secure/lib/libssl/man/SSL_get_verify_result.3 projects/sv/secure/lib/libssl/man/SSL_get_version.3 projects/sv/secure/lib/libssl/man/SSL_library_init.3 projects/sv/secure/lib/libssl/man/SSL_load_client_CA_file.3 projects/sv/secure/lib/libssl/man/SSL_new.3 projects/sv/secure/lib/libssl/man/SSL_pending.3 projects/sv/secure/lib/libssl/man/SSL_read.3 projects/sv/secure/lib/libssl/man/SSL_rstate_string.3 projects/sv/secure/lib/libssl/man/SSL_session_reused.3 projects/sv/secure/lib/libssl/man/SSL_set_bio.3 projects/sv/secure/lib/libssl/man/SSL_set_connect_state.3 projects/sv/secure/lib/libssl/man/SSL_set_fd.3 projects/sv/secure/lib/libssl/man/SSL_set_session.3 projects/sv/secure/lib/libssl/man/SSL_set_shutdown.3 projects/sv/secure/lib/libssl/man/SSL_set_verify_result.3 projects/sv/secure/lib/libssl/man/SSL_shutdown.3 projects/sv/secure/lib/libssl/man/SSL_state_string.3 projects/sv/secure/lib/libssl/man/SSL_want.3 projects/sv/secure/lib/libssl/man/SSL_write.3 projects/sv/secure/lib/libssl/man/d2i_SSL_SESSION.3 projects/sv/secure/lib/libssl/man/ssl.3 projects/sv/secure/usr.bin/openssl/man/CA.pl.1 projects/sv/secure/usr.bin/openssl/man/asn1parse.1 projects/sv/secure/usr.bin/openssl/man/ca.1 projects/sv/secure/usr.bin/openssl/man/ciphers.1 projects/sv/secure/usr.bin/openssl/man/crl.1 projects/sv/secure/usr.bin/openssl/man/crl2pkcs7.1 projects/sv/secure/usr.bin/openssl/man/dgst.1 projects/sv/secure/usr.bin/openssl/man/dhparam.1 projects/sv/secure/usr.bin/openssl/man/dsa.1 projects/sv/secure/usr.bin/openssl/man/dsaparam.1 projects/sv/secure/usr.bin/openssl/man/ec.1 projects/sv/secure/usr.bin/openssl/man/ecparam.1 projects/sv/secure/usr.bin/openssl/man/enc.1 projects/sv/secure/usr.bin/openssl/man/errstr.1 projects/sv/secure/usr.bin/openssl/man/gendsa.1 projects/sv/secure/usr.bin/openssl/man/genrsa.1 projects/sv/secure/usr.bin/openssl/man/nseq.1 projects/sv/secure/usr.bin/openssl/man/ocsp.1 projects/sv/secure/usr.bin/openssl/man/openssl.1 projects/sv/secure/usr.bin/openssl/man/passwd.1 projects/sv/secure/usr.bin/openssl/man/pkcs12.1 projects/sv/secure/usr.bin/openssl/man/pkcs7.1 projects/sv/secure/usr.bin/openssl/man/pkcs8.1 projects/sv/secure/usr.bin/openssl/man/rand.1 projects/sv/secure/usr.bin/openssl/man/req.1 projects/sv/secure/usr.bin/openssl/man/rsa.1 projects/sv/secure/usr.bin/openssl/man/rsautl.1 projects/sv/secure/usr.bin/openssl/man/s_client.1 projects/sv/secure/usr.bin/openssl/man/s_server.1 projects/sv/secure/usr.bin/openssl/man/s_time.1 projects/sv/secure/usr.bin/openssl/man/sess_id.1 projects/sv/secure/usr.bin/openssl/man/smime.1 projects/sv/secure/usr.bin/openssl/man/speed.1 projects/sv/secure/usr.bin/openssl/man/spkac.1 projects/sv/secure/usr.bin/openssl/man/verify.1 projects/sv/secure/usr.bin/openssl/man/version.1 projects/sv/secure/usr.bin/openssl/man/x509.1 projects/sv/secure/usr.bin/openssl/man/x509v3_config.1 projects/sv/share/doc/psd/12.make/Makefile projects/sv/share/doc/psd/18.gprof/Makefile projects/sv/share/doc/psd/22.rpcgen/Makefile projects/sv/share/doc/psd/23.rpc/Makefile projects/sv/share/doc/psd/24.xdr/Makefile projects/sv/share/doc/psd/25.xdrrfc/Makefile projects/sv/share/doc/psd/26.rpcrfc/Makefile projects/sv/share/doc/psd/27.nfsrpc/Makefile projects/sv/share/doc/smm/02.config/Makefile projects/sv/share/doc/smm/03.fsck/Makefile projects/sv/share/doc/smm/11.timedop/Makefile projects/sv/share/doc/smm/12.timed/Makefile projects/sv/share/doc/usd/04.csh/Makefile projects/sv/share/doc/usd/05.dc/Makefile projects/sv/share/doc/usd/06.bc/Makefile projects/sv/share/doc/usd/07.mail/Makefile projects/sv/share/man/man3/fpgetround.3 projects/sv/share/man/man4/arcmsr.4 projects/sv/share/man/man4/ata.4 projects/sv/share/man/man4/bge.4 projects/sv/share/man/man4/et.4 projects/sv/share/man/man4/fxp.4 projects/sv/share/man/man4/msk.4 projects/sv/share/man/man4/nge.4 projects/sv/share/man/man4/re.4 projects/sv/share/man/man4/rum.4 projects/sv/share/man/man4/sk.4 projects/sv/share/man/man4/splash.4 projects/sv/share/man/man4/stge.4 projects/sv/share/man/man4/usb_quirk.4 projects/sv/share/man/man4/vge.4 projects/sv/share/man/man5/rc.conf.5 projects/sv/share/man/man9/Makefile projects/sv/share/man/man9/bus_space.9 projects/sv/share/man/man9/vrele.9 projects/sv/share/misc/bsd-family-tree projects/sv/share/syscons/fonts/INDEX.fonts projects/sv/share/syscons/fonts/Makefile projects/sv/sys/Makefile projects/sv/sys/amd64/acpica/acpi_switch.S projects/sv/sys/amd64/acpica/acpi_wakecode.S projects/sv/sys/amd64/acpica/acpi_wakeup.c projects/sv/sys/amd64/amd64/cpu_switch.S projects/sv/sys/amd64/amd64/exception.S projects/sv/sys/amd64/amd64/fpu.c projects/sv/sys/amd64/amd64/genassym.c projects/sv/sys/amd64/amd64/machdep.c projects/sv/sys/amd64/amd64/mp_machdep.c projects/sv/sys/amd64/amd64/pmap.c projects/sv/sys/amd64/amd64/support.S projects/sv/sys/amd64/amd64/tsc.c projects/sv/sys/amd64/amd64/vm_machdep.c projects/sv/sys/amd64/ia32/ia32_reg.c projects/sv/sys/amd64/ia32/ia32_signal.c projects/sv/sys/amd64/include/_align.h projects/sv/sys/amd64/include/fpu.h projects/sv/sys/amd64/include/pcb.h projects/sv/sys/amd64/include/pmap.h projects/sv/sys/amd64/include/specialreg.h projects/sv/sys/amd64/include/vmparam.h projects/sv/sys/amd64/linux32/linux32_sysvec.c projects/sv/sys/arm/at91/at91_pmc.c projects/sv/sys/boot/common/load_elf.c projects/sv/sys/boot/ofw/libofw/openfirm.c projects/sv/sys/cam/cam.c projects/sv/sys/cam/cam.h projects/sv/sys/cam/cam_ccb.h projects/sv/sys/cam/cam_periph.c projects/sv/sys/cam/cam_xpt.c projects/sv/sys/cam/cam_xpt_internal.h projects/sv/sys/cam/scsi/scsi_all.c projects/sv/sys/cam/scsi/scsi_all.h projects/sv/sys/cam/scsi/scsi_pass.c projects/sv/sys/cam/scsi/scsi_xpt.c projects/sv/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c projects/sv/sys/cddl/compat/opensolaris/sys/cyclic_impl.h projects/sv/sys/cddl/dev/cyclic/cyclic.c projects/sv/sys/cddl/dev/cyclic/i386/cyclic_machdep.c projects/sv/sys/cddl/dev/dtrace/amd64/dtrace_subr.c projects/sv/sys/cddl/dev/dtrace/i386/dtrace_subr.c projects/sv/sys/compat/freebsd32/freebsd32.h projects/sv/sys/compat/freebsd32/freebsd32_misc.c projects/sv/sys/compat/ia32/ia32_signal.h projects/sv/sys/compat/ia32/ia32_util.h projects/sv/sys/compat/linux/linux_emul.c projects/sv/sys/compat/linux/linux_emul.h projects/sv/sys/compat/linux/linux_futex.c projects/sv/sys/compat/linux/linux_misc.c projects/sv/sys/compat/ndis/kern_ndis.c projects/sv/sys/compat/ndis/kern_windrv.c projects/sv/sys/compat/ndis/ndis_var.h projects/sv/sys/compat/ndis/ntoskrnl_var.h projects/sv/sys/compat/ndis/subr_ndis.c projects/sv/sys/compat/ndis/subr_ntoskrnl.c projects/sv/sys/compat/ndis/winx64_wrap.S projects/sv/sys/conf/NOTES projects/sv/sys/conf/files projects/sv/sys/conf/files.powerpc projects/sv/sys/conf/kern.pre.mk projects/sv/sys/conf/options projects/sv/sys/contrib/octeon-sdk/cvmip.h projects/sv/sys/contrib/octeon-sdk/cvmx-abi.h projects/sv/sys/contrib/octeon-sdk/cvmx-access-native.h projects/sv/sys/contrib/octeon-sdk/cvmx-access.h projects/sv/sys/contrib/octeon-sdk/cvmx-address.h projects/sv/sys/contrib/octeon-sdk/cvmx-app-init-linux.c projects/sv/sys/contrib/octeon-sdk/cvmx-app-init.c projects/sv/sys/contrib/octeon-sdk/cvmx-app-init.h projects/sv/sys/contrib/octeon-sdk/cvmx-asm.h projects/sv/sys/contrib/octeon-sdk/cvmx-atomic.h projects/sv/sys/contrib/octeon-sdk/cvmx-bootloader.h projects/sv/sys/contrib/octeon-sdk/cvmx-bootmem.c projects/sv/sys/contrib/octeon-sdk/cvmx-bootmem.h projects/sv/sys/contrib/octeon-sdk/cvmx-cmd-queue.c projects/sv/sys/contrib/octeon-sdk/cvmx-cmd-queue.h projects/sv/sys/contrib/octeon-sdk/cvmx-cn3010-evb-hs5.c projects/sv/sys/contrib/octeon-sdk/cvmx-cn3010-evb-hs5.h projects/sv/sys/contrib/octeon-sdk/cvmx-compactflash.c projects/sv/sys/contrib/octeon-sdk/cvmx-compactflash.h projects/sv/sys/contrib/octeon-sdk/cvmx-core.c projects/sv/sys/contrib/octeon-sdk/cvmx-core.h projects/sv/sys/contrib/octeon-sdk/cvmx-coremask.c projects/sv/sys/contrib/octeon-sdk/cvmx-coremask.h projects/sv/sys/contrib/octeon-sdk/cvmx-csr-db-support.c projects/sv/sys/contrib/octeon-sdk/cvmx-csr-db.c projects/sv/sys/contrib/octeon-sdk/cvmx-csr-db.h projects/sv/sys/contrib/octeon-sdk/cvmx-csr-enums.h projects/sv/sys/contrib/octeon-sdk/cvmx-csr-typedefs.h projects/sv/sys/contrib/octeon-sdk/cvmx-csr.h projects/sv/sys/contrib/octeon-sdk/cvmx-dfa.c projects/sv/sys/contrib/octeon-sdk/cvmx-dfa.h projects/sv/sys/contrib/octeon-sdk/cvmx-dma-engine.c projects/sv/sys/contrib/octeon-sdk/cvmx-dma-engine.h projects/sv/sys/contrib/octeon-sdk/cvmx-ebt3000.c projects/sv/sys/contrib/octeon-sdk/cvmx-ebt3000.h projects/sv/sys/contrib/octeon-sdk/cvmx-fau.h projects/sv/sys/contrib/octeon-sdk/cvmx-flash.c projects/sv/sys/contrib/octeon-sdk/cvmx-flash.h projects/sv/sys/contrib/octeon-sdk/cvmx-fpa.c projects/sv/sys/contrib/octeon-sdk/cvmx-fpa.h projects/sv/sys/contrib/octeon-sdk/cvmx-gmx.h projects/sv/sys/contrib/octeon-sdk/cvmx-gpio.h projects/sv/sys/contrib/octeon-sdk/cvmx-helper-board.c projects/sv/sys/contrib/octeon-sdk/cvmx-helper-board.h projects/sv/sys/contrib/octeon-sdk/cvmx-helper-check-defines.h projects/sv/sys/contrib/octeon-sdk/cvmx-helper-errata.c projects/sv/sys/contrib/octeon-sdk/cvmx-helper-errata.h projects/sv/sys/contrib/octeon-sdk/cvmx-helper-fpa.c projects/sv/sys/contrib/octeon-sdk/cvmx-helper-fpa.h projects/sv/sys/contrib/octeon-sdk/cvmx-helper-loop.c projects/sv/sys/contrib/octeon-sdk/cvmx-helper-loop.h projects/sv/sys/contrib/octeon-sdk/cvmx-helper-npi.c projects/sv/sys/contrib/octeon-sdk/cvmx-helper-npi.h projects/sv/sys/contrib/octeon-sdk/cvmx-helper-rgmii.c projects/sv/sys/contrib/octeon-sdk/cvmx-helper-rgmii.h projects/sv/sys/contrib/octeon-sdk/cvmx-helper-sgmii.c projects/sv/sys/contrib/octeon-sdk/cvmx-helper-sgmii.h projects/sv/sys/contrib/octeon-sdk/cvmx-helper-spi.c projects/sv/sys/contrib/octeon-sdk/cvmx-helper-spi.h projects/sv/sys/contrib/octeon-sdk/cvmx-helper-util.c projects/sv/sys/contrib/octeon-sdk/cvmx-helper-util.h projects/sv/sys/contrib/octeon-sdk/cvmx-helper-xaui.c projects/sv/sys/contrib/octeon-sdk/cvmx-helper-xaui.h projects/sv/sys/contrib/octeon-sdk/cvmx-helper.c projects/sv/sys/contrib/octeon-sdk/cvmx-helper.h projects/sv/sys/contrib/octeon-sdk/cvmx-higig.h projects/sv/sys/contrib/octeon-sdk/cvmx-interrupt.c projects/sv/sys/contrib/octeon-sdk/cvmx-interrupt.h projects/sv/sys/contrib/octeon-sdk/cvmx-ipd.h projects/sv/sys/contrib/octeon-sdk/cvmx-key.h projects/sv/sys/contrib/octeon-sdk/cvmx-l2c.c projects/sv/sys/contrib/octeon-sdk/cvmx-l2c.h projects/sv/sys/contrib/octeon-sdk/cvmx-llm.c projects/sv/sys/contrib/octeon-sdk/cvmx-llm.h projects/sv/sys/contrib/octeon-sdk/cvmx-log.c projects/sv/sys/contrib/octeon-sdk/cvmx-log.h projects/sv/sys/contrib/octeon-sdk/cvmx-malloc.h projects/sv/sys/contrib/octeon-sdk/cvmx-mdio.h projects/sv/sys/contrib/octeon-sdk/cvmx-mgmt-port.c projects/sv/sys/contrib/octeon-sdk/cvmx-mgmt-port.h projects/sv/sys/contrib/octeon-sdk/cvmx-nand.c projects/sv/sys/contrib/octeon-sdk/cvmx-nand.h projects/sv/sys/contrib/octeon-sdk/cvmx-npi.h projects/sv/sys/contrib/octeon-sdk/cvmx-packet.h projects/sv/sys/contrib/octeon-sdk/cvmx-pci.h projects/sv/sys/contrib/octeon-sdk/cvmx-pcie.c projects/sv/sys/contrib/octeon-sdk/cvmx-pcie.h projects/sv/sys/contrib/octeon-sdk/cvmx-pip.h projects/sv/sys/contrib/octeon-sdk/cvmx-pko.c projects/sv/sys/contrib/octeon-sdk/cvmx-pko.h projects/sv/sys/contrib/octeon-sdk/cvmx-platform.h projects/sv/sys/contrib/octeon-sdk/cvmx-pow.c projects/sv/sys/contrib/octeon-sdk/cvmx-pow.h projects/sv/sys/contrib/octeon-sdk/cvmx-raid.c projects/sv/sys/contrib/octeon-sdk/cvmx-raid.h projects/sv/sys/contrib/octeon-sdk/cvmx-rng.h projects/sv/sys/contrib/octeon-sdk/cvmx-rtc.h projects/sv/sys/contrib/octeon-sdk/cvmx-rwlock.h projects/sv/sys/contrib/octeon-sdk/cvmx-scratch.h projects/sv/sys/contrib/octeon-sdk/cvmx-spi.c projects/sv/sys/contrib/octeon-sdk/cvmx-spi.h projects/sv/sys/contrib/octeon-sdk/cvmx-spi4000.c projects/sv/sys/contrib/octeon-sdk/cvmx-spinlock.h projects/sv/sys/contrib/octeon-sdk/cvmx-swap.h projects/sv/sys/contrib/octeon-sdk/cvmx-sysinfo.c projects/sv/sys/contrib/octeon-sdk/cvmx-sysinfo.h projects/sv/sys/contrib/octeon-sdk/cvmx-thunder.c projects/sv/sys/contrib/octeon-sdk/cvmx-thunder.h projects/sv/sys/contrib/octeon-sdk/cvmx-tim.c projects/sv/sys/contrib/octeon-sdk/cvmx-tim.h projects/sv/sys/contrib/octeon-sdk/cvmx-tra.c projects/sv/sys/contrib/octeon-sdk/cvmx-tra.h projects/sv/sys/contrib/octeon-sdk/cvmx-twsi.c projects/sv/sys/contrib/octeon-sdk/cvmx-twsi.h projects/sv/sys/contrib/octeon-sdk/cvmx-uart.h projects/sv/sys/contrib/octeon-sdk/cvmx-usb.c projects/sv/sys/contrib/octeon-sdk/cvmx-usb.h projects/sv/sys/contrib/octeon-sdk/cvmx-utils.h projects/sv/sys/contrib/octeon-sdk/cvmx-version.h projects/sv/sys/contrib/octeon-sdk/cvmx-warn.c projects/sv/sys/contrib/octeon-sdk/cvmx-warn.h projects/sv/sys/contrib/octeon-sdk/cvmx-wqe.h projects/sv/sys/contrib/octeon-sdk/cvmx-zip.c projects/sv/sys/contrib/octeon-sdk/cvmx-zip.h projects/sv/sys/contrib/octeon-sdk/cvmx-zone.c projects/sv/sys/contrib/octeon-sdk/cvmx.h projects/sv/sys/contrib/octeon-sdk/octeon-feature.h projects/sv/sys/contrib/octeon-sdk/octeon-model.c projects/sv/sys/contrib/octeon-sdk/octeon-model.h projects/sv/sys/contrib/octeon-sdk/octeon-pci-console.c projects/sv/sys/contrib/octeon-sdk/octeon-pci-console.h projects/sv/sys/crypto/aesni/aesni_wrap.c projects/sv/sys/crypto/via/padlock.c projects/sv/sys/crypto/via/padlock_cipher.c projects/sv/sys/crypto/via/padlock_hash.c projects/sv/sys/dev/aac/aac_cam.c projects/sv/sys/dev/ahci/ahci.c projects/sv/sys/dev/alc/if_alc.c projects/sv/sys/dev/asr/asr.c projects/sv/sys/dev/ata/ata-dma.c projects/sv/sys/dev/ata/chipsets/ata-ahci.c projects/sv/sys/dev/ata/chipsets/ata-cyrix.c projects/sv/sys/dev/ata/chipsets/ata-marvell.c projects/sv/sys/dev/ata/chipsets/ata-national.c projects/sv/sys/dev/ata/chipsets/ata-promise.c projects/sv/sys/dev/ata/chipsets/ata-serverworks.c projects/sv/sys/dev/ata/chipsets/ata-siliconimage.c projects/sv/sys/dev/bge/if_bge.c projects/sv/sys/dev/bwn/if_bwn.c projects/sv/sys/dev/cas/if_cas.c projects/sv/sys/dev/e1000/e1000_api.c projects/sv/sys/dev/e1000/e1000_hw.h projects/sv/sys/dev/e1000/if_em.c projects/sv/sys/dev/e1000/if_igb.c projects/sv/sys/dev/e1000/if_igb.h projects/sv/sys/dev/e1000/if_lem.c projects/sv/sys/dev/fxp/if_fxp.c projects/sv/sys/dev/fxp/if_fxpreg.h projects/sv/sys/dev/fxp/if_fxpvar.h projects/sv/sys/dev/gem/if_gem.c projects/sv/sys/dev/ichwd/ichwd.c projects/sv/sys/dev/isp/isp_freebsd.c projects/sv/sys/dev/iwn/if_iwn.c projects/sv/sys/dev/iwn/if_iwnvar.h projects/sv/sys/dev/ixgbe/ixgbe.c projects/sv/sys/dev/ixgbe/ixgbe.h projects/sv/sys/dev/ixgbe/ixgbe_82598.c projects/sv/sys/dev/ixgbe/ixgbe_82599.c projects/sv/sys/dev/ixgbe/ixgbe_api.c projects/sv/sys/dev/ixgbe/ixgbe_api.h projects/sv/sys/dev/ixgbe/ixgbe_common.c projects/sv/sys/dev/ixgbe/ixgbe_common.h projects/sv/sys/dev/ixgbe/ixgbe_osdep.h projects/sv/sys/dev/ixgbe/ixgbe_phy.c projects/sv/sys/dev/ixgbe/ixgbe_phy.h projects/sv/sys/dev/ixgbe/ixgbe_type.h projects/sv/sys/dev/jme/if_jme.c projects/sv/sys/dev/jme/if_jmereg.h projects/sv/sys/dev/mfi/mfi_cam.c projects/sv/sys/dev/mii/bmtphy.c projects/sv/sys/dev/mii/e1000phy.c projects/sv/sys/dev/mii/gentbi.c projects/sv/sys/dev/mii/inphy.c projects/sv/sys/dev/mii/ip1000phy.c projects/sv/sys/dev/mii/mii.c projects/sv/sys/dev/mii/miidevs projects/sv/sys/dev/mii/nsgphy.c projects/sv/sys/dev/mii/nsphyter.c projects/sv/sys/dev/mii/ukphy.c projects/sv/sys/dev/mps/mps.c projects/sv/sys/dev/mps/mps_pci.c projects/sv/sys/dev/mps/mps_sas.c projects/sv/sys/dev/mps/mps_user.c projects/sv/sys/dev/mps/mpsvar.h projects/sv/sys/dev/mxge/if_mxge.c projects/sv/sys/dev/pci/pci.c projects/sv/sys/dev/pci/pci_pci.c projects/sv/sys/dev/siba/siba_bwn.c projects/sv/sys/dev/sis/if_sisreg.h projects/sv/sys/dev/syscons/scvidctl.c projects/sv/sys/dev/syscons/syscons.c projects/sv/sys/dev/usb/controller/usb_controller.c projects/sv/sys/dev/usb/net/if_axe.c projects/sv/sys/dev/usb/net/if_axereg.h projects/sv/sys/dev/usb/serial/u3g.c projects/sv/sys/dev/usb/serial/uftdi.c projects/sv/sys/dev/usb/usb_bus.h projects/sv/sys/dev/usb/usb_device.c projects/sv/sys/dev/usb/usb_request.c projects/sv/sys/dev/usb/usb_transfer.c projects/sv/sys/dev/usb/usbdevs projects/sv/sys/dev/usb/wlan/if_rum.c projects/sv/sys/dev/wpi/if_wpi.c projects/sv/sys/dev/xen/blkfront/blkfront.c projects/sv/sys/fs/cd9660/cd9660_node.c projects/sv/sys/fs/coda/coda_vnops.c projects/sv/sys/fs/ext2fs/ext2_inode.c projects/sv/sys/fs/hpfs/hpfs_vnops.c projects/sv/sys/fs/msdosfs/msdosfs_denode.c projects/sv/sys/fs/nfsclient/nfs_clnode.c projects/sv/sys/fs/ntfs/ntfs_vnops.c projects/sv/sys/fs/procfs/procfs_fpregs.c projects/sv/sys/fs/procfs/procfs_map.c projects/sv/sys/fs/procfs/procfs_regs.c projects/sv/sys/geom/geom_event.c projects/sv/sys/geom/geom_kern.c projects/sv/sys/geom/label/g_label.c projects/sv/sys/geom/part/g_part_bsd.c projects/sv/sys/gnu/fs/reiserfs/reiserfs_inode.c projects/sv/sys/i386/i386/busdma_machdep.c projects/sv/sys/i386/i386/machdep.c projects/sv/sys/i386/i386/pmap.c projects/sv/sys/i386/i386/support.s projects/sv/sys/i386/i386/tsc.c projects/sv/sys/i386/include/_align.h projects/sv/sys/i386/include/npx.h projects/sv/sys/i386/include/pmap.h projects/sv/sys/i386/include/specialreg.h projects/sv/sys/i386/include/xen/hypercall.h projects/sv/sys/i386/isa/npx.c projects/sv/sys/i386/pci/pci_bus.c projects/sv/sys/i386/xen/clock.c projects/sv/sys/i386/xen/mp_machdep.c projects/sv/sys/i386/xen/pmap.c projects/sv/sys/i386/xen/xen_machdep.c projects/sv/sys/ia64/include/pmap.h projects/sv/sys/kern/imgact_elf.c projects/sv/sys/kern/kern_clock.c projects/sv/sys/kern/kern_clocksource.c projects/sv/sys/kern/kern_exit.c projects/sv/sys/kern/kern_fork.c projects/sv/sys/kern/kern_module.c projects/sv/sys/kern/kern_physio.c projects/sv/sys/kern/kern_sysctl.c projects/sv/sys/kern/kern_tc.c projects/sv/sys/kern/kern_umtx.c projects/sv/sys/kern/sched_4bsd.c projects/sv/sys/kern/subr_bus.c projects/sv/sys/kern/subr_pcpu.c projects/sv/sys/kern/subr_taskqueue.c projects/sv/sys/kern/sys_process.c projects/sv/sys/kern/sysv_msg.c projects/sv/sys/kern/sysv_shm.c projects/sv/sys/kern/uipc_sem.c projects/sv/sys/kern/uipc_shm.c projects/sv/sys/kern/uipc_usrreq.c projects/sv/sys/kern/vfs_mount.c projects/sv/sys/kern/vfs_subr.c projects/sv/sys/mips/cavium/ciu.c projects/sv/sys/mips/cavium/files.octeon1 projects/sv/sys/mips/cavium/octe/ethernet-common.c projects/sv/sys/mips/cavium/octe/ethernet-common.h projects/sv/sys/mips/cavium/octe/ethernet-defines.h projects/sv/sys/mips/cavium/octe/ethernet-mdio.c projects/sv/sys/mips/cavium/octe/ethernet-mem.c projects/sv/sys/mips/cavium/octe/ethernet-rgmii.c projects/sv/sys/mips/cavium/octe/ethernet-rx.c projects/sv/sys/mips/cavium/octe/ethernet-sgmii.c projects/sv/sys/mips/cavium/octe/ethernet-tx.c projects/sv/sys/mips/cavium/octe/ethernet-tx.h projects/sv/sys/mips/cavium/octe/ethernet-xaui.c projects/sv/sys/mips/cavium/octe/ethernet.c projects/sv/sys/mips/cavium/octe/octe.c projects/sv/sys/mips/cavium/octe/wrapper-cvmx-includes.h projects/sv/sys/mips/cavium/octeon_machdep.c projects/sv/sys/mips/include/md_var.h projects/sv/sys/mips/include/param.h projects/sv/sys/mips/include/vmparam.h projects/sv/sys/mips/mips/minidump_machdep.c projects/sv/sys/mips/mips/mp_machdep.c projects/sv/sys/mips/mips/pmap.c projects/sv/sys/mips/mips/tick.c projects/sv/sys/mips/rmi/dev/nlge/if_nlge.c projects/sv/sys/mips/rmi/dev/nlge/if_nlge.h projects/sv/sys/mips/rmi/tick.c projects/sv/sys/modules/Makefile projects/sv/sys/modules/cam/Makefile projects/sv/sys/modules/ixgbe/Makefile projects/sv/sys/modules/usb/usb/Makefile projects/sv/sys/net/bpf_buffer.c projects/sv/sys/net/flowtable.c projects/sv/sys/net/if.c projects/sv/sys/net/if_clone.c projects/sv/sys/net/if_epair.c projects/sv/sys/net/if_ethersubr.c projects/sv/sys/net/if_gif.c projects/sv/sys/net/if_llatbl.c projects/sv/sys/net/if_loop.c projects/sv/sys/net/if_vlan.c projects/sv/sys/net/route.c projects/sv/sys/net/vnet.c projects/sv/sys/net/vnet.h projects/sv/sys/net80211/ieee80211_scan_sta.c projects/sv/sys/netgraph/ng_base.c projects/sv/sys/netgraph/ng_eiface.c projects/sv/sys/netgraph/ng_eiface.h projects/sv/sys/netgraph/ng_iface.c projects/sv/sys/netgraph/ng_pipe.c projects/sv/sys/netinet/cc/cc_newreno.c projects/sv/sys/netinet/if_ether.c projects/sv/sys/netinet/igmp.c projects/sv/sys/netinet/in.c projects/sv/sys/netinet/in_pcb.c projects/sv/sys/netinet/in_rmx.c projects/sv/sys/netinet/ip6.h projects/sv/sys/netinet/ip_carp.c projects/sv/sys/netinet/ip_divert.c projects/sv/sys/netinet/ip_fastfwd.c projects/sv/sys/netinet/ip_icmp.c projects/sv/sys/netinet/ip_input.c projects/sv/sys/netinet/ip_ipsec.c projects/sv/sys/netinet/ip_mroute.c projects/sv/sys/netinet/ipfw/ip_fw2.c projects/sv/sys/netinet/ipfw/ip_fw_dynamic.c projects/sv/sys/netinet/ipfw/ip_fw_nat.c projects/sv/sys/netinet/ipfw/ip_fw_pfil.c projects/sv/sys/netinet/sctp_cc_functions.c projects/sv/sys/netinet/sctp_indata.c projects/sv/sys/netinet/sctp_input.c projects/sv/sys/netinet/sctp_pcb.c projects/sv/sys/netinet/sctp_structs.h projects/sv/sys/netinet/sctp_uio.h projects/sv/sys/netinet/siftr.c projects/sv/sys/netinet/tcp_hostcache.c projects/sv/sys/netinet/tcp_input.c projects/sv/sys/netinet/tcp_output.c projects/sv/sys/netinet/tcp_reass.c projects/sv/sys/netinet/tcp_subr.c projects/sv/sys/netinet/tcp_syncache.c projects/sv/sys/netinet/tcp_timer.c projects/sv/sys/netinet/tcp_timewait.c projects/sv/sys/netinet/udp_usrreq.c projects/sv/sys/netinet6/frag6.c projects/sv/sys/netinet6/icmp6.c projects/sv/sys/netinet6/in6.c projects/sv/sys/netinet6/in6_cksum.c projects/sv/sys/netinet6/in6_rmx.c projects/sv/sys/netinet6/in6_src.c projects/sv/sys/netinet6/ip6_input.c projects/sv/sys/netinet6/ip6_ipsec.c projects/sv/sys/netinet6/ip6_mroute.c projects/sv/sys/netinet6/ip6_output.c projects/sv/sys/netinet6/ip6_var.h projects/sv/sys/netinet6/mld6.c projects/sv/sys/netinet6/nd6.c projects/sv/sys/netinet6/nd6_nbr.c projects/sv/sys/netinet6/nd6_rtr.c projects/sv/sys/netinet6/scope6.c projects/sv/sys/netipsec/key.c projects/sv/sys/netipsec/keysock.c projects/sv/sys/netipsec/xform_esp.c projects/sv/sys/nfsclient/nfs_node.c projects/sv/sys/pc98/include/_align.h projects/sv/sys/pc98/pc98/machdep.c projects/sv/sys/powerpc/aim/clock.c projects/sv/sys/powerpc/aim/mmu_oea.c projects/sv/sys/powerpc/aim/mmu_oea64.c projects/sv/sys/powerpc/booke/clock.c projects/sv/sys/powerpc/include/bus_dma.h projects/sv/sys/powerpc/include/endian.h projects/sv/sys/powerpc/include/pmap.h projects/sv/sys/powerpc/include/pte.h projects/sv/sys/powerpc/powermac/ata_dbdma.c projects/sv/sys/powerpc/powerpc/busdma_machdep.c projects/sv/sys/sparc64/include/vmparam.h projects/sv/sys/sys/cdefs.h projects/sv/sys/sys/elf_common.h projects/sv/sys/sys/linker_set.h projects/sv/sys/sys/param.h projects/sv/sys/sys/pcpu.h projects/sv/sys/sys/procfs.h projects/sv/sys/sys/ptrace.h projects/sv/sys/sys/queue.h projects/sv/sys/sys/sysctl.h projects/sv/sys/sys/vnode.h projects/sv/sys/teken/teken_subr.h projects/sv/sys/ufs/ffs/ffs_softdep.c projects/sv/sys/ufs/ffs/ffs_vfsops.c projects/sv/sys/ufs/ufs/ufs_inode.c projects/sv/sys/vm/default_pager.c projects/sv/sys/vm/swap_pager.c projects/sv/sys/vm/vm.h projects/sv/sys/vm/vm_fault.c projects/sv/sys/vm/vm_map.c projects/sv/sys/vm/vm_map.h projects/sv/sys/vm/vm_mmap.c projects/sv/sys/vm/vm_object.c projects/sv/sys/vm/vm_object.h projects/sv/sys/vm/vm_page.c projects/sv/sys/vm/vm_page.h projects/sv/sys/x86/x86/local_apic.c projects/sv/tools/build/mk/OptionalObsoleteFiles.inc projects/sv/tools/regression/bin/sh/builtins/cd2.0 projects/sv/tools/regression/lib/msun/Makefile projects/sv/tools/regression/lib/msun/test-exponential.c projects/sv/tools/regression/lib/msun/test-fma.c projects/sv/tools/regression/lib/msun/test-fmaxmin.c projects/sv/tools/regression/lib/msun/test-invtrig.c projects/sv/tools/regression/lib/msun/test-lrint.c projects/sv/tools/regression/lib/msun/test-trig.c projects/sv/tools/regression/sockets/unix_gc/unix_gc.c projects/sv/tools/tools/nanobsd/nanobsd.sh projects/sv/tools/tools/sysbuild/sysbuild.sh projects/sv/usr.bin/ar/acplex.l projects/sv/usr.bin/ar/ar.1 projects/sv/usr.bin/ar/ar.c projects/sv/usr.bin/bc/scan.l projects/sv/usr.bin/calendar/Makefile projects/sv/usr.bin/colldef/Makefile projects/sv/usr.bin/find/function.c projects/sv/usr.bin/gcore/elfcore.c projects/sv/usr.bin/kdump/mksubr projects/sv/usr.bin/ldd/ldd.c projects/sv/usr.bin/locate/locate/locate.h projects/sv/usr.bin/man/man.sh projects/sv/usr.bin/netstat/inet.c projects/sv/usr.bin/netstat/inet6.c projects/sv/usr.bin/stat/Makefile projects/sv/usr.bin/stat/stat.1 projects/sv/usr.bin/stat/stat.c projects/sv/usr.bin/truss/syscalls.c projects/sv/usr.bin/vmstat/vmstat.c projects/sv/usr.bin/xargs/xargs.c projects/sv/usr.sbin/ac/ac.c projects/sv/usr.sbin/apmd/apmdlex.l projects/sv/usr.sbin/arp/arp.c projects/sv/usr.sbin/bluetooth/bthidd/lexer.l projects/sv/usr.sbin/bluetooth/hcsecd/lexer.l projects/sv/usr.sbin/boot0cfg/boot0cfg.c projects/sv/usr.sbin/config/lang.l projects/sv/usr.sbin/crashinfo/crashinfo.sh projects/sv/usr.sbin/fifolog/lib/fifolog_write.h projects/sv/usr.sbin/fifolog/lib/fifolog_write_poll.c projects/sv/usr.sbin/iostat/iostat.8 projects/sv/usr.sbin/kbdcontrol/lex.l projects/sv/usr.sbin/kbdmap/kbdmap.c projects/sv/usr.sbin/lpr/Makefile projects/sv/usr.sbin/mptutil/mpt_config.c projects/sv/usr.sbin/newsyslog/newsyslog.c projects/sv/usr.sbin/rarpd/rarpd.c projects/sv/usr.sbin/sysinstall/devices.c projects/sv/usr.sbin/sysinstall/dispatch.c projects/sv/usr.sbin/sysinstall/dist.c projects/sv/usr.sbin/sysinstall/install.c projects/sv/usr.sbin/sysinstall/menus.c projects/sv/usr.sbin/sysinstall/modules.c projects/sv/usr.sbin/traceroute/Makefile projects/sv/usr.sbin/traceroute6/Makefile projects/sv/usr.sbin/traceroute6/traceroute6.c Directory Properties: projects/sv/ (props changed) projects/sv/cddl/contrib/opensolaris/ (props changed) projects/sv/contrib/bind9/ (props changed) projects/sv/contrib/binutils/ (props changed) projects/sv/contrib/bzip2/ (props changed) projects/sv/contrib/ee/ (props changed) projects/sv/contrib/expat/ (props changed) projects/sv/contrib/file/ (props changed) projects/sv/contrib/gdb/ (props changed) projects/sv/contrib/gdtoa/ (props changed) projects/sv/contrib/gnu-sort/ (props changed) projects/sv/contrib/groff/ (props changed) projects/sv/contrib/less/ (props changed) projects/sv/contrib/libpcap/ (props changed) projects/sv/contrib/llvm/ (props changed) projects/sv/contrib/llvm/tools/clang/ (props changed) projects/sv/contrib/ncurses/ (props changed) projects/sv/contrib/netcat/ (props changed) projects/sv/contrib/ntp/ (props changed) projects/sv/contrib/one-true-awk/ (props changed) projects/sv/contrib/openbsm/ (props changed) projects/sv/contrib/openpam/ (props changed) projects/sv/contrib/pf/ (props changed) projects/sv/contrib/sendmail/ (props changed) projects/sv/contrib/tcpdump/ (props changed) projects/sv/contrib/tcsh/ (props changed) projects/sv/contrib/top/ (props changed) projects/sv/contrib/top/install-sh (props changed) projects/sv/contrib/tzcode/stdtime/ (props changed) projects/sv/contrib/tzcode/zic/ (props changed) projects/sv/contrib/tzdata/ (props changed) projects/sv/contrib/wpa/ (props changed) projects/sv/contrib/xz/ (props changed) projects/sv/crypto/openssh/ (props changed) projects/sv/crypto/openssl/ (props changed) projects/sv/lib/libc/ (props changed) projects/sv/lib/libc/stdtime/ (props changed) projects/sv/lib/libutil/ (props changed) projects/sv/lib/libz/ (props changed) projects/sv/sbin/ (props changed) projects/sv/sbin/ipfw/ (props changed) projects/sv/share/mk/bsd.arch.inc.mk (props changed) projects/sv/share/zoneinfo/ (props changed) projects/sv/sys/ (props changed) projects/sv/sys/amd64/include/xen/ (props changed) projects/sv/sys/cddl/contrib/opensolaris/ (props changed) projects/sv/sys/contrib/dev/acpica/ (props changed) projects/sv/sys/contrib/octeon-sdk/ (props changed) projects/sv/sys/contrib/pf/ (props changed) projects/sv/sys/contrib/x86emu/ (props changed) projects/sv/sys/dev/xen/xenpci/ (props changed) projects/sv/usr.bin/calendar/ (props changed) projects/sv/usr.bin/csup/ (props changed) projects/sv/usr.bin/procstat/ (props changed) projects/sv/usr.sbin/zic/ (props changed) Modified: projects/sv/ObsoleteFiles.inc ============================================================================== --- projects/sv/ObsoleteFiles.inc Tue Dec 7 16:48:01 2010 (r216258) +++ projects/sv/ObsoleteFiles.inc Tue Dec 7 17:36:17 2010 (r216259) @@ -13,16 +13,42 @@ # # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# Before you commit changes to this file please check if any entries in +# tools/build/mk/OptionalObsoleteFiles.inc can be removed. The following +# command tells which files are listed more than once regardless of some +# architecture specific conditionals, so you can not blindly trust the +# output: +# ( grep '+=' /usr/src/ObsoleteFiles.inc | sort -u ; \ +# grep '+=' /usr/src/tools/build/mk/OptionalObsoleteFiles.inc | sort -u) | \ +# sort | uniq -d +# +# To find regular duplicates not dependant on optional components, you can +# also use something that will not give you false positives, e.g.: +# for t in `make -V TARGETS universe`; do +# __MAKE_CONF=/dev/null make -f Makefile.inc1 TARGET=$t \ +# -V OLD_FILES -V OLD_LIBS -V OLD_DIRS check-old | \ +# xargs -n1 | sort | uniq -d; +# done +# +# For optional components, you can use the following to see if some entries +# in OptionalObsoleteFiles.inc have been obsoleted by ObsoleteFiles.inc +# for o in tools/build/options/WITH*; do +# __MAKE_CONF=/dev/null make -f Makefile.inc1 -D${o##*/} \ +# -V OLD_FILES -V OLD_LIBS -V OLD_DIRS check-old | \ +# xargs -n1 | sort | uniq -d; +# done +# 20101114: Remove long-obsolete MAKEDEV.8 +OLD_FILES+=usr/share/man/man8/MAKEDEV.8.gz # 20101112: vgonel(9) has gone to private API a while ago OLD_FILES+=usr/share/man/man9/vgonel.9.gz # 20101112: removed gasp.info OLD_FILES+=usr/share/info/gasp.info.gz -# 20101109: headers moved to machine/ to x86/ +# 20101109: headers moved from machine/ to x86/ .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" OLD_FILES+=usr/include/machine/mptable.h .endif -# 20101101: headers moved to machine/ to x86/ +# 20101101: headers moved from machine/ to x86/ .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" OLD_FILES+=usr/include/machine/apicreg.h OLD_FILES+=usr/include/machine/mca.h @@ -1149,12 +1175,6 @@ OLD_FILES+=usr/include/machine/i4b_rbch_ OLD_FILES+=usr/include/machine/i4b_tel_ioctl.h OLD_FILES+=usr/include/machine/i4b_trace.h .endif -# 20070704: I4B 'modules' temporary disconnected (removed 20080525) -.if ${TARGET_ARCH} == "i386" -OLD_FILES+=usr/share/man/man4/i4bing.4.gz -OLD_FILES+=usr/share/man/man4/i4bipr.4.gz -OLD_FILES+=usr/share/man/man4/i4bisppp.4.gz -.endif # 20070703: pf 4.1 import OLD_FILES+=usr/libexec/ftp-proxy # 20070701: KAME IPSec removal @@ -1333,12 +1353,8 @@ OLD_LIBS+=usr/lib/libusbhid.so.2 OLD_LIBS+=usr/lib/libvgl.so.4 OLD_LIBS+=usr/lib/libwrap.so.4 OLD_LIBS+=usr/lib/libypclnt.so.2 -OLD_LIBS+=usr/lib/snmp_atm.so.3 OLD_LIBS+=usr/lib/snmp_bridge.so.3 OLD_LIBS+=usr/lib/snmp_hostres.so.3 -OLD_LIBS+=usr/lib/snmp_mibII.so.3 -OLD_LIBS+=usr/lib/snmp_netgraph.so.3 -OLD_LIBS+=usr/lib/snmp_pf.so.3 .if ${TARGET_ARCH} == "amd64" OLD_LIBS+=usr/lib32/libatm.so.4 OLD_LIBS+=usr/lib32/libbegemot.so.2 @@ -1634,7 +1650,7 @@ OLD_DIRS+=usr/include/c++/3.4 OLD_FILES+=usr/sbin/zfs OLD_FILES+=usr/sbin/zpool # 20070423: rc.bluetooth (examples) removed -OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth +OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth # 20070421: worm.4 removed OLD_FILES+=usr/share/man/man4/worm.4.gz # 20070417: trunk(4) renamed to lagg(4) @@ -4542,7 +4558,6 @@ OLD_FILES+=usr/games/worm OLD_FILES+=usr/games/worms OLD_FILES+=usr/games/wump OLD_FILES+=sbin/mount_reiserfs -OLD_FILES+=usr/include/c++/3.4/ext/demangle.h OLD_FILES+=usr/include/cam/cam_extend.h OLD_FILES+=usr/include/dev/wi/wi_hostap.h OLD_FILES+=usr/include/disktab.h @@ -4805,7 +4820,6 @@ OLD_FILES+=usr/include/posix4/posix4.h OLD_FILES+=usr/include/posix4/sched.h OLD_FILES+=usr/include/posix4/semaphore.h OLD_DIRS+=usr/include/posix4 -OLD_FILES+=usr/include/rune.h OLD_FILES+=usr/include/security/_pam_compat.h OLD_FILES+=usr/include/security/_pam_macros.h OLD_FILES+=usr/include/security/_pam_types.h @@ -4951,37 +4965,14 @@ OLD_FILES+=usr/share/doc/ntp/release.htm OLD_FILES+=usr/share/doc/ntp/tickadj.htm OLD_FILES+=usr/share/doc/papers/nqnfs.ascii.gz OLD_FILES+=usr/share/doc/papers/px.ascii.gz -OLD_FILES+=usr/share/man/man3/mbrune.3.gz -OLD_FILES+=usr/share/man/man3/rune.3.gz -OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz -OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz -OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz -OLD_FILES+=usr/share/man/man3/gss_krb5_compat_des3_mic.3.gz -OLD_FILES+=usr/share/man/man3/exp10f.3.gz OLD_FILES+=usr/share/man/man3/exp10.3.gz -OLD_FILES+=usr/share/man/man3/mbrrune.3.gz -OLD_FILES+=usr/share/man/man3/mbmb.3.gz -OLD_FILES+=usr/share/man/man3/sputrune.3.gz -OLD_FILES+=usr/share/man/man3/sgetrune.3.gz -OLD_FILES+=usr/share/man/man3/setrunelocale.3.gz -OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz -OLD_FILES+=usr/share/man/man3/mbrune.3.gz -OLD_FILES+=usr/share/man/man3/rune.3.gz -OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz +OLD_FILES+=usr/share/man/man3/exp10f.3.gz OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz -OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz OLD_FILES+=usr/share/man/man3/gss_krb5_compat_des3_mic.3.gz -OLD_FILES+=usr/share/man/man3/exp10f.3.gz -OLD_FILES+=usr/share/man/man3/exp10.3.gz -OLD_FILES+=usr/share/man/man3/mbrrune.3.gz +OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz +OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz OLD_FILES+=usr/share/man/man3/mbmb.3.gz -OLD_FILES+=usr/share/man/man3/sputrune.3.gz -OLD_FILES+=usr/share/man/man3/sgetrune.3.gz OLD_FILES+=usr/share/man/man3/setrunelocale.3.gz -OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz -OLD_FILES+=usr/share/man/man3/fungetrune.3.gz -OLD_FILES+=usr/share/man/man3/fputrune.3.gz -OLD_FILES+=usr/share/man/man3/fgetrune.3.gz OLD_FILES+=usr/share/man/man5/usbd.conf.5.gz .if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64" OLD_FILES+=usr/share/man/man8/boot_i386.8.gz @@ -5079,11 +5070,7 @@ OLD_LIBS+=lib/libgpib.so.1 # 20060413: libpcap.so.4 moved to /lib/ OLD_LIBS+=usr/lib/libpcap.so.4 # 20060412: libpthread.so.2 moved to /lib/ -.if ${TARGET_ARCH} != "sparc64" OLD_LIBS+=usr/lib/libpthread.so.2 -.else -OLD_LIBS+=usr/lib/libthr.so.2 -.endif # 20060127: revert libdisk to static-only OLD_LIBS+=usr/lib/libdisk.so.3 # 20051027: libc_r discontinued (removed 20101113) @@ -5202,8 +5189,6 @@ OLD_LIBS+=usr/lib/snmp_atm.so.3 OLD_LIBS+=usr/lib/snmp_mibII.so.3 OLD_LIBS+=usr/lib/snmp_netgraph.so.3 OLD_LIBS+=usr/lib/snmp_pf.so.3 -# 20050603: network related ABI change on 64bit systems -OLD_LIBS+=usr/lib/libpcap.so.3 # 200505XX: ? OLD_LIBS+=usr/lib/snmp_atm.so.2 OLD_LIBS+=usr/lib/snmp_mibII.so.2 @@ -5224,10 +5209,6 @@ OLD_LIBS+=usr/lib/libpcap.so.2 OLD_LIBS+=usr/lib/libisc.so.1 # 200408XX OLD_LIBS+=usr/lib/snmp_netgraph.so.1 -.if ${TARGET_ARCH} != "sparc64" -# 20040130: libkse renamed to libpthread -OLD_LIBS+=usr/lib/libkse.so.1 -.endif # 200404XX OLD_LIBS+=usr/lib/libsnmp.so.1 OLD_LIBS+=usr/lib/snmp_mibII.so.1 Modified: projects/sv/bin/sh/arith_lex.l ============================================================================== --- projects/sv/bin/sh/arith_lex.l Tue Dec 7 16:48:01 2010 (r216258) +++ projects/sv/bin/sh/arith_lex.l Tue Dec 7 17:36:17 2010 (r216259) @@ -53,8 +53,17 @@ int yylex(void); #undef YY_INPUT #define YY_INPUT(buf,result,max) \ - result = (*buf = *arith_buf++) ? 1 : YY_NULL; + do { \ + result = strnlen(arith_buf, max); \ + if (result == 0) \ + result = YY_NULL; \ + else { \ + memcpy(buf, arith_buf, result); \ + arith_buf += result; \ + } \ + } while (0); #define YY_NO_UNPUT +#define YY_NO_INPUT %} %% Modified: projects/sv/bin/sh/cd.c ============================================================================== --- projects/sv/bin/sh/cd.c Tue Dec 7 16:48:01 2010 (r216258) +++ projects/sv/bin/sh/cd.c Tue Dec 7 17:36:17 2010 (r216259) @@ -192,8 +192,7 @@ cdlogical(char *dest) STPUTC('/', p); first = 0; component = q; - while (*q) - STPUTC(*q++, p); + STPUTS(q, p); if (equal(component, "..")) continue; STACKSTRNUL(p); @@ -219,10 +218,13 @@ cdphysical(char *dest) char *p; INTOFF; - if (chdir(dest) < 0 || (p = findcwd(NULL)) == NULL) { + if (chdir(dest) < 0) { INTON; return (-1); } + p = findcwd(NULL); + if (p == NULL) + out2fmt_flush("cd: warning: failed to get name of current directory\n"); updatepwd(p); INTON; return (0); @@ -270,10 +272,8 @@ findcwd(char *dir) scopy(dir, cdcomppath); STARTSTACKSTR(new); if (*dir != '/') { - p = curdir; - while (*p) - STPUTC(*p++, new); - if (p[-1] == '/') + STPUTS(curdir, new); + if (STTOPC(new) == '/') STUNPUTC(new); } while ((p = getcomponent()) != NULL) { @@ -281,8 +281,7 @@ findcwd(char *dir) while (new > stackblock() && (STUNPUTC(new), *new) != '/'); } else if (*p != '\0' && ! equal(p, ".")) { STPUTC('/', new); - while (*p) - STPUTC(*p++, new); + STPUTS(p, new); } } if (new == stackblock()) @@ -304,7 +303,7 @@ updatepwd(char *dir) if (prevdir) ckfree(prevdir); prevdir = curdir; - curdir = savestr(dir); + curdir = dir ? savestr(dir) : NULL; setvar("PWD", curdir, VEXPORT); setvar("OLDPWD", prevdir, VEXPORT); } Modified: projects/sv/bin/sh/eval.c ============================================================================== --- projects/sv/bin/sh/eval.c Tue Dec 7 16:48:01 2010 (r216258) +++ projects/sv/bin/sh/eval.c Tue Dec 7 17:36:17 2010 (r216259) @@ -135,8 +135,7 @@ evalcmd(int argc, char **argv) STARTSTACKSTR(concat); ap = argv + 2; for (;;) { - while (*p) - STPUTC(*p++, concat); + STPUTS(p, concat); if ((p = *ap++) == NULL) break; STPUTC(' ', concat); @@ -699,13 +698,13 @@ evalcommand(union node *cmd, int flags, for (sp = varlist.list ; sp ; sp = sp->next) { if (sep != 0) out2c(' '); - p = sp->text; - while (*p != '=' && *p != '\0') - out2c(*p++); - if (*p != '\0') { - out2c(*p++); + p = strchr(sp->text, '='); + if (p != NULL) { + p++; + outbin(sp->text, p - sp->text, out2); out2qstr(p); - } + } else + out2qstr(sp->text); sep = ' '; } for (sp = arglist.list ; sp ; sp = sp->next) { Modified: projects/sv/bin/sh/expand.c ============================================================================== --- projects/sv/bin/sh/expand.c Tue Dec 7 16:48:01 2010 (r216258) +++ projects/sv/bin/sh/expand.c Tue Dec 7 17:36:17 2010 (r216259) @@ -225,6 +225,7 @@ argstr(char *p, int flag) if (*p == '~' && (flag & (EXP_TILDE | EXP_VARTILDE))) p = exptilde(p, flag); for (;;) { + CHECKSTRSPACE(2, expdest); switch (c = *p++) { case '\0': case CTLENDVAR: @@ -235,16 +236,16 @@ argstr(char *p, int flag) if (p[0] == CTLVAR && p[2] == '@' && p[3] == '=') break; if ((flag & EXP_FULL) != 0) - STPUTC(c, expdest); + USTPUTC(c, expdest); break; case CTLQUOTEEND: lit_quoted = 0; break; case CTLESC: if (quotes) - STPUTC(c, expdest); + USTPUTC(c, expdest); c = *p++; - STPUTC(c, expdest); + USTPUTC(c, expdest); if (split_lit && !lit_quoted) recordregion(expdest - stackblock() - (quotes ? 2 : 1), @@ -267,7 +268,7 @@ argstr(char *p, int flag) * sort of a hack - expand tildes in variable * assignments (after the first '=' and after ':'s). */ - STPUTC(c, expdest); + USTPUTC(c, expdest); if (split_lit && !lit_quoted) recordregion(expdest - stackblock() - 1, expdest - stackblock(), 0); @@ -279,7 +280,7 @@ argstr(char *p, int flag) } break; default: - STPUTC(c, expdest); + USTPUTC(c, expdest); if (split_lit && !lit_quoted) recordregion(expdest - stackblock() - 1, expdest - stackblock(), 0); @@ -902,8 +903,7 @@ varvalue(char *name, int quoted, int sub STPUTC(*p++, expdest); \ } \ } else \ - while (*p) \ - STPUTC(*p++, expdest); \ + STPUTS(p, expdest); \ } while (0) @@ -1573,8 +1573,7 @@ cvtnum(int num, char *buf) if (neg) *--p = '-'; - while (*p) - STPUTC(*p++, buf); + STPUTS(p, buf); return buf; } @@ -1592,9 +1591,7 @@ wordexpcmd(int argc, char **argv) for (i = 1, len = 0; i < argc; i++) len += strlen(argv[i]); out1fmt("%08x", (int)len); - for (i = 1; i < argc; i++) { - out1str(argv[i]); - out1c('\0'); - } + for (i = 1; i < argc; i++) + outbin(argv[i], strlen(argv[i]) + 1, out1); return (0); } Modified: projects/sv/bin/sh/histedit.c ============================================================================== --- projects/sv/bin/sh/histedit.c Tue Dec 7 16:48:01 2010 (r216258) +++ projects/sv/bin/sh/histedit.c Tue Dec 7 17:36:17 2010 (r216259) @@ -411,8 +411,7 @@ fc_replace(const char *s, char *p, char STARTSTACKSTR(dest); while (*s) { if (*s == *p && strncmp(s, p, plen) == 0) { - while (*r) - STPUTC(*r++, dest); + STPUTS(r, dest); s += plen; *p = '\0'; /* so no more matches */ } else Modified: projects/sv/bin/sh/jobs.c ============================================================================== --- projects/sv/bin/sh/jobs.c Tue Dec 7 16:48:01 2010 (r216258) +++ projects/sv/bin/sh/jobs.c Tue Dec 7 17:36:17 2010 (r216259) @@ -100,7 +100,8 @@ static void setcurjob(struct job *); static void deljob(struct job *); static struct job *getcurjob(struct job *); #endif -static void showjob(struct job *, pid_t, int); +static void printjobcmd(struct job *); +static void showjob(struct job *, int); /* @@ -205,8 +206,7 @@ fgcmd(int argc __unused, char **argv) jp = getjob(argv[1]); if (jp->jobctl == 0) error("job not created under job control"); - out1str(jp->ps[0].cmd); - out1c('\n'); + printjobcmd(jp); flushout(&output); pgrp = jp->ps[0].pid; tcsetpgrp(ttyfd, pgrp); @@ -235,8 +235,7 @@ bgcmd(int argc, char **argv) jp->foreground = 0; fmtstr(s, 64, "[%td] ", jp - jobtab + 1); out1str(s); - out1str(jp->ps[0].cmd); - out1c('\n'); + printjobcmd(jp); } while (--argc > 1); return 0; } @@ -296,19 +295,33 @@ jobscmd(int argc, char *argv[]) showjobs(0, mode); else while ((id = *argv++) != NULL) - showjob(getjob(id), 0, mode); + showjob(getjob(id), mode); return (0); } static void -showjob(struct job *jp, pid_t pid, int mode) +printjobcmd(struct job *jp) +{ + struct procstat *ps; + int i; + + for (ps = jp->ps, i = jp->nprocs ; --i >= 0 ; ps++) { + out1str(ps->cmd); + if (i > 0) + out1str(" | "); + } + out1c('\n'); +} + +static void +showjob(struct job *jp, int mode) { char s[64]; + char statestr[64]; struct procstat *ps; struct job *j; int col, curr, i, jobno, prev, procno; - pid_t ppid; char c; procno = (mode == SHOWJOBS_PGIDS) ? 1 : jp->nprocs; @@ -321,16 +334,44 @@ showjob(struct job *jp, pid_t pid, int m prev = j - jobtab + 1; } #endif + ps = jp->ps + jp->nprocs - 1; + if (jp->state == 0) { + strcpy(statestr, "Running"); +#if JOBS + } else if (jp->state == JOBSTOPPED) { + while (!WIFSTOPPED(ps->status) && ps > jp->ps) + ps--; + if (WIFSTOPPED(ps->status)) + i = WSTOPSIG(ps->status); + else + i = -1; + if (i > 0 && i < sys_nsig && sys_siglist[i]) + strcpy(statestr, sys_siglist[i]); + else + strcpy(statestr, "Suspended"); +#endif + } else if (WIFEXITED(ps->status)) { + if (WEXITSTATUS(ps->status) == 0) + strcpy(statestr, "Done"); + else + fmtstr(statestr, 64, "Done(%d)", + WEXITSTATUS(ps->status)); + } else { + i = WTERMSIG(ps->status); + if (i > 0 && i < sys_nsig && sys_siglist[i]) + strcpy(statestr, sys_siglist[i]); + else + fmtstr(statestr, 64, "Signal %d", i); + if (WCOREDUMP(ps->status)) + strcat(statestr, " (core dumped)"); + } + for (ps = jp->ps ; ; ps++) { /* for each process */ if (mode == SHOWJOBS_PIDS || mode == SHOWJOBS_PGIDS) { - ppid = (mode == SHOWJOBS_PIDS) ? ps->pid : - getpgid(ps->pid); - out1fmt("%d\n", (int)ppid); + out1fmt("%d\n", (int)ps->pid); goto skip; } - if (mode != SHOWJOBS_VERBOSE && ps != jp->ps && pid == 0) - goto skip; - if (pid != 0 && pid != ps->pid) + if (mode != SHOWJOBS_VERBOSE && ps != jp->ps) goto skip; if (jobno == curr && ps == jp->ps) c = '+'; @@ -349,39 +390,19 @@ showjob(struct job *jp, pid_t pid, int m out1str(s); col += strlen(s); } - s[0] = '\0'; - if (ps != jp->ps) { - *s = '\0'; - } else if (ps->status == -1) { - strcpy(s, "Running"); - } else if (WIFEXITED(ps->status)) { - if (WEXITSTATUS(ps->status) == 0) - strcpy(s, "Done"); - else - fmtstr(s, 64, "Done (%d)", - WEXITSTATUS(ps->status)); - } else { -#if JOBS - if (WIFSTOPPED(ps->status)) - i = WSTOPSIG(ps->status); - else -#endif - i = WTERMSIG(ps->status); - if ((i & 0x7F) < sys_nsig && sys_siglist[i & 0x7F]) - scopy(sys_siglist[i & 0x7F], s); - else - fmtstr(s, 64, "Signal %d", i & 0x7F); - if (WCOREDUMP(ps->status)) - strcat(s, " (core dumped)"); + if (ps == jp->ps) { + out1str(statestr); + col += strlen(statestr); } - out1str(s); - col += strlen(s); do { out1c(' '); col++; } while (col < 30); - out1str(ps->cmd); - out1c('\n'); + if (mode == SHOWJOBS_VERBOSE) { + out1str(ps->cmd); + out1c('\n'); + } else + printjobcmd(jp); skip: if (--procno <= 0) break; } @@ -413,7 +434,7 @@ showjobs(int change, int mode) } if (change && ! jp->changed) continue; - showjob(jp, 0, mode); + showjob(jp, mode); jp->changed = 0; /* Hack: discard jobs for which $! has not been referenced * in interactive mode when they terminate. @@ -769,7 +790,7 @@ forkshell(struct job *jp, union node *n, TRACE(("forkshell(%%%td, %p, %d) called\n", jp - jobtab, (void *)n, mode)); INTOFF; - if (mode == FORK_BG) + if (mode == FORK_BG && (jp == NULL || jp->nprocs == 0)) checkzombies(); flushall(); pid = fork(); @@ -961,7 +982,7 @@ dowait(int block, struct job *job) int done; int stopped; int sig; - int i; + int coredump; in_dowait++; TRACE(("dowait(%d) called\n", block)); @@ -983,7 +1004,7 @@ dowait(int block, struct job *job) INTOFF; thisjob = NULL; for (jp = jobtab ; jp < jobtab + njobs ; jp++) { - if (jp->used) { + if (jp->used && jp->nprocs > 0) { done = 1; stopped = 1; for (sp = jp->ps ; sp < jp->ps + jp->nprocs ; sp++) { @@ -1020,36 +1041,29 @@ dowait(int block, struct job *job) } } INTON; - if (! rootshell || ! iflag || (job && thisjob == job)) { -#if JOBS - if (WIFSTOPPED(status)) - sig = WSTOPSIG(status); - else -#endif - { - if (WIFEXITED(status)) - sig = 0; + if (!thisjob || thisjob->state == 0) + ; + else if ((!rootshell || !iflag || thisjob == job) && + thisjob->foreground && thisjob->state != JOBSTOPPED) { + sig = 0; + coredump = 0; + for (sp = thisjob->ps; sp < thisjob->ps + thisjob->nprocs; sp++) + if (WIFSIGNALED(sp->status)) { + sig = WTERMSIG(sp->status); + coredump = WCOREDUMP(sp->status); + } + if (sig > 0 && sig != SIGINT && sig != SIGPIPE) { + if (sig < sys_nsig && sys_siglist[sig]) + out1str(sys_siglist[sig]); else - sig = WTERMSIG(status); - } - if (sig != 0 && sig != SIGINT && sig != SIGPIPE) { - if (!mflag || - (thisjob->foreground && !WIFSTOPPED(status))) { - i = WTERMSIG(status); - if ((i & 0x7F) < sys_nsig && sys_siglist[i & 0x7F]) - out1str(sys_siglist[i & 0x7F]); - else - out1fmt("Signal %d", i & 0x7F); - if (WCOREDUMP(status)) - out1str(" (core dumped)"); - out1c('\n'); - } else - showjob(thisjob, pid, SHOWJOBS_DEFAULT); + out1fmt("Signal %d", sig); + if (coredump) + out1str(" (core dumped)"); + out1c('\n'); } } else { TRACE(("Not printing status, rootshell=%d, job=%p\n", rootshell, job)); - if (thisjob) - thisjob->changed = 1; + thisjob->changed = 1; } return pid; } @@ -1300,13 +1314,46 @@ cmdputs(const char *s) if (--cmdnleft > 0) *q++ = '{'; subtype = *p++; + if ((subtype & VSTYPE) == VSLENGTH && --cmdnleft > 0) + *q++ = '#'; } else if (c == '=' && subtype != 0) { - *q++ = "}-+?="[(subtype & VSTYPE) - VSNORMAL]; + *q = "}-+?=##%%\0X"[(subtype & VSTYPE) - VSNORMAL]; + if (*q) + q++; + else + cmdnleft++; + if (((subtype & VSTYPE) == VSTRIMLEFTMAX || + (subtype & VSTYPE) == VSTRIMRIGHTMAX) && + --cmdnleft > 0) + *q = q[-1], q++; subtype = 0; } else if (c == CTLENDVAR) { *q++ = '}'; - } else if (c == CTLBACKQ || c == CTLBACKQ+CTLQUOTE) - cmdnleft++; /* ignore it */ + } else if (c == CTLBACKQ || c == CTLBACKQ+CTLQUOTE) { + cmdnleft -= 5; + if (cmdnleft > 0) { + *q++ = '$'; + *q++ = '('; + *q++ = '.'; + *q++ = '.'; + *q++ = '.'; + *q++ = ')'; + } + } else if (c == CTLARI) { + cmdnleft -= 2; + if (cmdnleft > 0) { + *q++ = '$'; + *q++ = '('; + *q++ = '('; + } + p++; + } else if (c == CTLENDARI) { + if (--cmdnleft > 0) { + *q++ = ')'; + *q++ = ')'; + } + } else if (c == CTLQUOTEMARK || c == CTLQUOTEEND) + cmdnleft++; /* ignore */ else *q++ = c; if (--cmdnleft <= 0) { Modified: projects/sv/bin/sh/main.c ============================================================================== --- projects/sv/bin/sh/main.c Tue Dec 7 16:48:01 2010 (r216258) +++ projects/sv/bin/sh/main.c Tue Dec 7 17:36:17 2010 (r216259) @@ -128,10 +128,8 @@ main(int argc, char *argv[]) exitshell(exitstatus); } reset(); - if (exception == EXINT) { - out2c('\n'); - flushout(&errout); - } + if (exception == EXINT) + out2fmt_flush("\n"); popstackmark(&smark); FORCEINTON; /* enable interrupts */ if (state == 1) Modified: projects/sv/bin/sh/memalloc.c ============================================================================== --- projects/sv/bin/sh/memalloc.c Tue Dec 7 16:48:01 2010 (r216258) +++ projects/sv/bin/sh/memalloc.c Tue Dec 7 17:36:17 2010 (r216259) @@ -340,3 +340,20 @@ ungrabstackstr(char *s, char *p) stacknxt = s; sstrnleft = stacknleft - (p - s); } + + +char * +stputbin(const char *data, int len, char *p) +{ + int i; + + for (i = 0; i < len; i++) + STPUTC(data[i], p); + return (p); +} + +char * +stputs(const char *data, char *p) +{ + return (stputbin(data, strlen(data), p)); +} Modified: projects/sv/bin/sh/memalloc.h ============================================================================== --- projects/sv/bin/sh/memalloc.h Tue Dec 7 16:48:01 2010 (r216258) +++ projects/sv/bin/sh/memalloc.h Tue Dec 7 17:36:17 2010 (r216259) @@ -61,6 +61,8 @@ void grabstackblock(int); char *growstackstr(void); char *makestrspace(void); void ungrabstackstr(char *, char *); +char *stputbin(const char *data, int len, char *p); +char *stputs(const char *data, char *p); @@ -82,3 +84,5 @@ void ungrabstackstr(char *, char *); #define STTOPC(p) p[-1] #define STADJUST(amount, p) (p += (amount), sstrnleft -= (amount)) #define grabstackstr(p) stalloc(stackblocksize() - sstrnleft) +#define STPUTBIN(s, len, p) p = stputbin((s), (len), p) +#define STPUTS(s, p) p = stputs((s), p) Modified: projects/sv/bin/sh/miscbltin.c ============================================================================== --- projects/sv/bin/sh/miscbltin.c Tue Dec 7 16:48:01 2010 (r216258) +++ projects/sv/bin/sh/miscbltin.c Tue Dec 7 17:36:17 2010 (r216259) @@ -172,11 +172,12 @@ readcmd(int argc __unused, char **argv _ } if (c == '\0') continue; + CHECKSTRSPACE(1, p); if (backslash) { backslash = 0; startword = 0; if (c != '\n') - STPUTC(c, p); + USTPUTC(c, p); continue; } if (!rflag && c == '\\') { @@ -194,14 +195,14 @@ readcmd(int argc __unused, char **argv _ if (is_ifs == 1) { /* Ignore leading IFS whitespace */ if (saveall) - STPUTC(c, p); + USTPUTC(c, p); continue; } if (is_ifs == 2 && startword == 1) { /* Only one non-whitespace IFS per word */ startword = 2; if (saveall) - STPUTC(c, p); + USTPUTC(c, p); continue; } } @@ -212,7 +213,7 @@ readcmd(int argc __unused, char **argv _ if (saveall) /* Not just a spare terminator */ saveall++; - STPUTC(c, p); + USTPUTC(c, p); continue; } @@ -222,7 +223,7 @@ readcmd(int argc __unused, char **argv _ if (ap[1] == NULL) { /* Last variable needs all IFS chars */ saveall++; - STPUTC(c, p); + USTPUTC(c, p); continue; } Modified: projects/sv/bin/sh/mksyntax.c ============================================================================== --- projects/sv/bin/sh/mksyntax.c Tue Dec 7 16:48:01 2010 (r216258) +++ projects/sv/bin/sh/mksyntax.c Tue Dec 7 17:36:17 2010 (r216259) @@ -342,9 +342,9 @@ print(const char *name) static const char *macro[] = { "#define is_digit(c)\t((is_type+SYNBASE)[(int)c] & ISDIGIT)", "#define is_eof(c)\t((c) == PEOF)", - "#define is_alpha(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && (is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER))", - "#define is_name(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && (is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER|ISUNDER))", - "#define is_in_name(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && (is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER|ISUNDER|ISDIGIT))", + "#define is_alpha(c)\t((is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER))", + "#define is_name(c)\t((is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER|ISUNDER))", + "#define is_in_name(c)\t((is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER|ISUNDER|ISDIGIT))", "#define is_special(c)\t((is_type+SYNBASE)[(int)c] & (ISSPECL|ISDIGIT))", NULL }; Modified: projects/sv/bin/sh/options.c ============================================================================== --- projects/sv/bin/sh/options.c Tue Dec 7 16:48:01 2010 (r216258) +++ projects/sv/bin/sh/options.c Tue Dec 7 17:36:17 2010 (r216259) @@ -261,13 +261,12 @@ minus_o(char *name, int val) optlist[i].val ? "on" : "off"); } else { /* Output suitable for re-input to shell. */ - for (i = 0; i < NOPTS; i++) { - if (i % 6 == 0) - out1str(i == 0 ? "set" : "\nset"); - out1fmt(" %co %s", optlist[i].val ? '-' : '+', - optlist[i].name); - } - out1c('\n'); + for (i = 0; i < NOPTS; i++) + out1fmt("%s %co %s%s", + i % 6 == 0 ? "set" : "", + optlist[i].val ? '-' : '+', + optlist[i].name, + i % 6 == 5 || i == NOPTS - 1 ? "\n" : ""); } } else { for (i = 0; i < NOPTS; i++) Modified: projects/sv/bin/sh/output.c ============================================================================== --- projects/sv/bin/sh/output.c Tue Dec 7 16:48:01 2010 (r216258) +++ projects/sv/bin/sh/output.c Tue Dec 7 17:36:17 2010 (r216259) @@ -96,6 +96,12 @@ RESET { void +outcslow(int c, struct output *file) +{ + outc(c, file); +} + +void out1str(const char *p) { outstr(p, out1); @@ -149,19 +155,19 @@ outqstr(const char *p, struct output *fi case '\'': /* Can't quote single quotes inside single quotes. */ if (inquotes) - outc('\'', file); + outcslow('\'', file); inquotes = 0; outstr("\\'", file); break; default: if (!inquotes) - outc('\'', file); + outcslow('\'', file); inquotes = 1; outc(ch, file); } } if (inquotes) - outc('\'', file); + outcslow('\'', file); } void Modified: projects/sv/bin/sh/output.h ============================================================================== --- projects/sv/bin/sh/output.h Tue Dec 7 16:48:01 2010 (r216258) +++ projects/sv/bin/sh/output.h Tue Dec 7 17:36:17 2010 (r216259) @@ -54,6 +54,7 @@ extern struct output *out1; /* &memout i extern struct output *out2; /* &memout if backquote with 2>&1, otherwise &errout */ +void outcslow(int, struct output *); void out1str(const char *); void out1qstr(const char *); void out2str(const char *); @@ -74,7 +75,7 @@ int xwrite(int, const char *, int); #define outc(c, file) (--(file)->nleft < 0? (emptyoutbuf(file), *(file)->nextc++ = (c)) : (*(file)->nextc++ = (c))) #define out1c(c) outc(c, out1); -#define out2c(c) outc(c, out2); +#define out2c(c) outcslow(c, out2); #define OUTPUT_INCL #endif Modified: projects/sv/bin/sh/parser.c ============================================================================== --- projects/sv/bin/sh/parser.c Tue Dec 7 16:48:01 2010 (r216258) +++ projects/sv/bin/sh/parser.c Tue Dec 7 17:36:17 2010 (r216259) @@ -1017,6 +1017,7 @@ parsebackq(char *out, struct nodelist ** setprompt(2); needprompt = 0; } + CHECKSTRSPACE(2, oout); switch (c = pgetc()) { case '`': goto done; @@ -1031,14 +1032,14 @@ parsebackq(char *out, struct nodelist ** /* * If eating a newline, avoid putting * the newline into the new character - * stream (via the STPUTC after the + * stream (via the USTPUTC after the * switch). */ continue; } if (c != '\\' && c != '`' && c != '$' && (!dblquote || c != '"')) - STPUTC('\\', oout); + USTPUTC('\\', oout); break; case '\n': @@ -1054,10 +1055,10 @@ parsebackq(char *out, struct nodelist ** default: break; } - STPUTC(c, oout); + USTPUTC(c, oout); } done: - STPUTC('\0', oout); + USTPUTC('\0', oout); olen = oout - stackblock(); INTOFF; ostr = ckmalloc(olen); @@ -1444,7 +1445,6 @@ parsesub: { char *p; static const char types[] = "}-+?="; int bracketed_name = 0; /* used to handle ${[0-9]*} variables */ - int i; int linno; int length; @@ -1498,8 +1498,7 @@ parsesub: { linno -= funclinno - 1; snprintf(buf, sizeof(buf), "%d", linno); STADJUST(-6, out); - for (i = 0; buf[i] != '\0'; i++) - STPUTC(buf[i], out); + STPUTS(buf, out); flags |= VSLINENO; } } else if (is_digit(c)) { Modified: projects/sv/bin/sh/sh.1 ============================================================================== --- projects/sv/bin/sh/sh.1 Tue Dec 7 16:48:01 2010 (r216258) +++ projects/sv/bin/sh/sh.1 Tue Dec 7 17:36:17 2010 (r216259) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd November 19, 2010 +.Dd December 3, 2010 .Dt SH 1 .Os .Sh NAME @@ -1593,12 +1593,7 @@ To include a .Ql - , make it the first or last character listed. .Ss Built-in Commands -This section lists the commands which -are built-in because they need to perform some operation -that cannot be performed by a separate process. -In addition to -these, built-in versions of essential utilities -are provided for efficiency. +This section lists the built-in commands. .Bl -tag -width indent .It Ic \&: A null command that returns a 0 (true) exit value. @@ -1649,15 +1644,19 @@ subsection. Continue the specified jobs (or the current job if no jobs are given) in the background. +.It Ic bind Oo Fl aeklrsv Oc Oo Ar key Oo Ar command Oc Oc +List or alter key bindings for the line editor. +This command is documented in +.Xr editrc 5 . +.It Ic break Op Ar num +See the +.Sx Flow-Control Constructs +subsection. .It Ic builtin Ar cmd Op Ar arg ... Execute the specified built-in command, .Ar cmd . This is useful when the user wishes to override a shell function with the same name as a built-in command. -.It Ic bind Oo Fl aeklrsv Oc Oo Ar key Oo Ar command Oc Oc -List or alter key bindings for the line editor. -This command is documented in -.Xr editrc 5 . .It Ic cd Oo Fl L | P Oc Op Ar directory Switch to the specified .Ar directory , @@ -1712,7 +1711,8 @@ A synonym for the .Ic cd built-in command. .It Ic command Oo Fl p Oc Op Ar utility Op Ar argument ... -.It Ic command Oo Fl v | V Oc Op Ar utility +.It Ic command Oo Fl p Oc Fl v Ar utility +.It Ic command Oo Fl p Oc Fl V Ar utility The first form of invocation executes the specified *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Tue Dec 7 19:40:44 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 23016106566C; Tue, 7 Dec 2010 19:40:44 +0000 (UTC) (envelope-from tijl@freebsd.org) Received: from mailrelay009.isp.belgacom.be (mailrelay009.isp.belgacom.be [195.238.6.176]) by mx1.freebsd.org (Postfix) with ESMTP id 5064C8FC1F; Tue, 7 Dec 2010 19:40:42 +0000 (UTC) X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AvsEAPca/kxbscFI/2dsb2JhbACjRHLCDoVJBA Received: from 72.193-177-91.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([91.177.193.72]) by relay.skynet.be with ESMTP; 07 Dec 2010 20:40:41 +0100 Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1]) by kalimero.tijl.coosemans.org (8.14.4/8.14.4) with ESMTP id oB7JeeiZ005257; Tue, 7 Dec 2010 20:40:40 +0100 (CET) (envelope-from tijl@freebsd.org) From: Tijl Coosemans To: Dimitry Andric Date: Tue, 7 Dec 2010 20:40:20 +0100 User-Agent: KMail/1.13.5 (FreeBSD/8.2-PRERELEASE; KDE/4.5.2; i386; ; ) References: <201012052024.oB5KOMUF007051@svn.freebsd.org> <4CFD2E01.1000509@FreeBSD.org> <201012071448.47319.tijl@freebsd.org> In-Reply-To: <201012071448.47319.tijl@freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1608532.rUQiOJzNNZ"; protocol="application/pgp-signature"; micalg=pgp-sha256 Content-Transfer-Encoding: 7bit Message-Id: <201012072040.38364.tijl@freebsd.org> Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org, Anton Shterenlikht Subject: Re: svn commit: r216200 - in projects/binutils-2.17: contrib/binutils/bfd contrib/binutils/gas/config contrib/binutils/ld/emulparams gnu/usr.bin/binutils/libbfd sys/boot/ia64/efi sys/boot/ia64/ski sys/... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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, 07 Dec 2010 19:40:44 -0000 --nextPart1608532.rUQiOJzNNZ Content-Type: multipart/mixed; boundary="Boundary-01=_l2o/MsFYTpj6+af" Content-Transfer-Encoding: 7bit --Boundary-01=_l2o/MsFYTpj6+af Content-Type: Text/Plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Tuesday 07 December 2010 14:48:41 Tijl Coosemans wrote: > On Monday 06 December 2010 19:40:01 Dimitry Andric wrote: >> On 2010-12-06 17:18, Tijl Coosemans wrote: >>> On Sunday 05 December 2010 21:24:22 Dimitry Andric wrote: >> ... >>>> For ia64, add a proper 'elf64-ia64-freebsd' output format to BFD, s= o the >>>> ELF branding for FreeBSD is done in the same way as amd64, i386 and >>>> sparc. Something similar should probably also be done for arm, mip= s and >>>> powerpc. >> ... >>> Rather than copying this practise to other architectures, maybe >>> binutils should be fixed for i386. It isn't used on amd64 and sparc64 >>> either as far as I can tell. >>=20 >> It is, in the binutils-2.17 branch, which has . :) The question is if >> we want to propagate our elf.c hack forever, in which case it would >> have to be added to the binutils port. >>=20 >> The alternative, adding FreeBSD-specific targets, is more likely to be >> accepted by the binutils maintainers, which would be nice if we want to >> be able to build with "stock" binutils on FreeBSD. >>=20 >> I am completely open for both approaches, really, and would like to see >> a bit of consensus. >>=20 >> The "just hack elf.c" approach causes less churn in the tree, because it >> is small, and saves modifying a few places in the tree where target >> names are used, such as kernel link scripts. There is no way to specify >> a "non-FreeBSD" target, though. >>=20 >> The "add FreeBSD targets" approach causes a bit of churn, but if we >> submit the required changes to binutils upstream, they are more likely >> to be accepted, as they are fairly minimal, and don't disturb support >> for other platforms. There will also be the possibility to produce >> non-FreeBSD-branded ELF files, although I am not sure if that is used >> very often. >>=20 >> So, which colour? :) >=20 > A third alternative :) Stop setting OSABI. >=20 > Looking at the binutils 2.20.1 BFD source the only files in which OSABI > is set to FreeBSD are: elf32-i386.c, elf64-alpha.c, elf64-sparc.c and > elf64-x86-64.c. For those architectures FreeBSD is the only OS that sets > OSABI. Since nobody cares about it maybe FreeBSD shouldn't either. The > field is redundant anyway given the .note.ABI-tag section. >=20 > I noticed the .note.ABI-tag section was missing from the ia64 startup > code (src/lib/csu/ia64/crt1.S). Adding it should fix the branding > problem reported on the mailing lists too and then there's no need for > hacks or special *-freebsd ELF formats. I worked out a small patch to fix branding on ia64. Please give it a try. The patch links crtbrand.c in crti.o. On other architectures crtbrand.c is included from crt1.c, but that's not a C source code file on ia64. It is linked in crti rather than all the crt1 variants because the original commit log for crtbrand.c mentions that was the intention. --Boundary-01=_l2o/MsFYTpj6+af Content-Type: text/x-patch; charset="us-ascii"; name="ia64.abitag.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="ia64.abitag.diff" diff --git a/lib/csu/ia64/Makefile b/lib/csu/ia64/Makefile index 781c458..12bfb09 100644 =2D-- a/lib/csu/ia64/Makefile +++ b/lib/csu/ia64/Makefile @@ -5,8 +5,6 @@ SRCS=3D crt1.S crti.S crtn.S OBJS=3D ${SRCS:N*.h:R:S/$/.o/g} OBJS+=3D Scrt1.o gcrt1.o =2DCFLAGS+=3D -I${.CURDIR}/../common \ =2D -I${.CURDIR}/../../libc/include =20 all: ${OBJS} =20 @@ -18,6 +16,9 @@ gcrt1.o: crt1.S Scrt1.o: crt1.S ${CC} ${CFLAGS} -fPIC -DPIC -c -o Scrt1.o ${.ALLSRC} =20 +crti.o: crtbrand.c + ${CC} ${CFLAGS} -o crti.o -nostdlib -Wl,-r ${.ALLSRC} + realinstall: ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${OBJS} ${DESTDIR}${LIBDIR} --Boundary-01=_l2o/MsFYTpj6+af-- --nextPart1608532.rUQiOJzNNZ Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (FreeBSD) iF4EABEIAAYFAkz+jbYACgkQfoCS2CCgtiu2JwD/SCyvLbKYBTObWTtXmGMoLJlG pidm4uKd914qa/d9ei4A/02Z8PxQUowqqgdm/3oNzjoit+e13wsDVZHDI1C9qFAS =Cqxz -----END PGP SIGNATURE----- --nextPart1608532.rUQiOJzNNZ-- From owner-svn-src-projects@FreeBSD.ORG Tue Dec 7 21:39:37 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1BD0D106564A; Tue, 7 Dec 2010 21:39:37 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0989D8FC0C; Tue, 7 Dec 2010 21:39:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oB7Ldb2S080770; Tue, 7 Dec 2010 21:39:37 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB7Lda9C080766; Tue, 7 Dec 2010 21:39:36 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <201012072139.oB7Lda9C080766@svn.freebsd.org> From: Sean Bruno Date: Tue, 7 Dec 2010 21:39:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216270 - in projects/stable_7_xen: . contrib/bsnmp/snmpd contrib/wpa_supplicant gnu/usr.bin/groff/tmac share/misc sys/amd64/amd64 sys/dev/fxp sys/i386/i386 tools/tools/nanobsd usr.sbin... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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, 07 Dec 2010 21:39:37 -0000 Author: sbruno Date: Tue Dec 7 21:39:36 2010 New Revision: 216270 URL: http://svn.freebsd.org/changeset/base/216270 Log: Update to stable Modified: projects/stable_7_xen/sys/amd64/amd64/tsc.c projects/stable_7_xen/sys/dev/fxp/if_fxp.c projects/stable_7_xen/sys/i386/i386/tsc.c Directory Properties: projects/stable_7_xen/ (props changed) projects/stable_7_xen/COPYRIGHT (props changed) projects/stable_7_xen/Makefile (props changed) projects/stable_7_xen/Makefile.inc1 (props changed) projects/stable_7_xen/ObsoleteFiles.inc (props changed) projects/stable_7_xen/UPDATING (props changed) projects/stable_7_xen/bin/ (props changed) projects/stable_7_xen/bin/chflags/ (props changed) projects/stable_7_xen/bin/chio/ (props changed) projects/stable_7_xen/bin/cp/ (props changed) projects/stable_7_xen/bin/csh/ (props changed) projects/stable_7_xen/bin/dd/ (props changed) projects/stable_7_xen/bin/df/ (props changed) projects/stable_7_xen/bin/echo/ (props changed) projects/stable_7_xen/bin/expr/ (props changed) projects/stable_7_xen/bin/kill/ (props changed) projects/stable_7_xen/bin/ln/ (props changed) projects/stable_7_xen/bin/ls/ (props changed) projects/stable_7_xen/bin/pax/ (props changed) projects/stable_7_xen/bin/ps/ (props changed) projects/stable_7_xen/bin/rm/ (props changed) projects/stable_7_xen/bin/sh/ (props changed) projects/stable_7_xen/bin/test/ (props changed) projects/stable_7_xen/cddl/contrib/opensolaris/ (props changed) projects/stable_7_xen/cddl/lib/libzpool/ (props changed) projects/stable_7_xen/contrib/bind9/ (props changed) projects/stable_7_xen/contrib/binutils/ (props changed) projects/stable_7_xen/contrib/bsnmp/ (props changed) projects/stable_7_xen/contrib/bsnmp/snmpd/bsnmpd.1 (props changed) projects/stable_7_xen/contrib/cpio/ (props changed) projects/stable_7_xen/contrib/csup/ (props changed) projects/stable_7_xen/contrib/expat/ (props changed) projects/stable_7_xen/contrib/gcc/ (props changed) projects/stable_7_xen/contrib/gdb/ (props changed) projects/stable_7_xen/contrib/gdtoa/ (props changed) projects/stable_7_xen/contrib/groff/ (props changed) projects/stable_7_xen/contrib/ipfilter/ (props changed) projects/stable_7_xen/contrib/less/ (props changed) projects/stable_7_xen/contrib/libpcap/ (props changed) projects/stable_7_xen/contrib/ncurses/ (props changed) projects/stable_7_xen/contrib/netcat/ (props changed) projects/stable_7_xen/contrib/ntp/ (props changed) projects/stable_7_xen/contrib/nvi/ (props changed) projects/stable_7_xen/contrib/pf/ (props changed) projects/stable_7_xen/contrib/sendmail/ (props changed) projects/stable_7_xen/contrib/smbfs/ (props changed) projects/stable_7_xen/contrib/tcp_wrappers/ (props changed) projects/stable_7_xen/contrib/tcsh/ (props changed) projects/stable_7_xen/contrib/telnet/ (props changed) projects/stable_7_xen/contrib/top/ (props changed) projects/stable_7_xen/contrib/traceroute/ (props changed) projects/stable_7_xen/contrib/wpa_supplicant/ (props changed) projects/stable_7_xen/contrib/wpa_supplicant/wpa_supplicant.conf (props changed) projects/stable_7_xen/crypto/openssh/ (props changed) projects/stable_7_xen/crypto/openssl/ (props changed) projects/stable_7_xen/etc/ (props changed) projects/stable_7_xen/games/factor/ (props changed) projects/stable_7_xen/games/fortune/ (props changed) projects/stable_7_xen/games/grdc/ (props changed) projects/stable_7_xen/gnu/ (props changed) projects/stable_7_xen/gnu/lib/libstdc++/ (props changed) projects/stable_7_xen/gnu/usr.bin/ (props changed) projects/stable_7_xen/gnu/usr.bin/cc/ (props changed) projects/stable_7_xen/gnu/usr.bin/cpio/ (props changed) projects/stable_7_xen/gnu/usr.bin/cvs/ (props changed) projects/stable_7_xen/gnu/usr.bin/gdb/ (props changed) projects/stable_7_xen/gnu/usr.bin/gdb/kgdb/ (props changed) projects/stable_7_xen/gnu/usr.bin/grep/ (props changed) projects/stable_7_xen/gnu/usr.bin/groff/ (props changed) projects/stable_7_xen/gnu/usr.bin/groff/tmac/mdoc.local (props changed) projects/stable_7_xen/gnu/usr.bin/man/ (props changed) projects/stable_7_xen/gnu/usr.bin/sort/ (props changed) projects/stable_7_xen/include/ (props changed) projects/stable_7_xen/kerberos5/ (props changed) projects/stable_7_xen/lib/ (props changed) projects/stable_7_xen/lib/bind/ (props changed) projects/stable_7_xen/lib/csu/ (props changed) projects/stable_7_xen/lib/libarchive/ (props changed) projects/stable_7_xen/lib/libbluetooth/ (props changed) projects/stable_7_xen/lib/libc/ (props changed) projects/stable_7_xen/lib/libc/stdtime/ (props changed) projects/stable_7_xen/lib/libc_r/ (props changed) projects/stable_7_xen/lib/libcam/ (props changed) projects/stable_7_xen/lib/libdisk/ (props changed) projects/stable_7_xen/lib/libdwarf/ (props changed) projects/stable_7_xen/lib/libelf/ (props changed) projects/stable_7_xen/lib/libexpat/ (props changed) projects/stable_7_xen/lib/libfetch/ (props changed) projects/stable_7_xen/lib/libftpio/ (props changed) projects/stable_7_xen/lib/libgeom/ (props changed) projects/stable_7_xen/lib/libgssapi/ (props changed) projects/stable_7_xen/lib/libkse/ (props changed) projects/stable_7_xen/lib/libkvm/ (props changed) projects/stable_7_xen/lib/libmagic/ (props changed) projects/stable_7_xen/lib/libmemstat/ (props changed) projects/stable_7_xen/lib/libpmc/ (props changed) projects/stable_7_xen/lib/libradius/ (props changed) projects/stable_7_xen/lib/libsm/ (props changed) projects/stable_7_xen/lib/libstand/ (props changed) projects/stable_7_xen/lib/libthr/ (props changed) projects/stable_7_xen/lib/libthread_db/ (props changed) projects/stable_7_xen/lib/libufs/ (props changed) projects/stable_7_xen/lib/libutil/ (props changed) projects/stable_7_xen/lib/msun/ (props changed) projects/stable_7_xen/libexec/ (props changed) projects/stable_7_xen/libexec/ftpd/ (props changed) projects/stable_7_xen/libexec/rpc.rquotad/ (props changed) projects/stable_7_xen/libexec/rpc.rstatd/ (props changed) projects/stable_7_xen/libexec/rtld-elf/ (props changed) projects/stable_7_xen/libexec/tftpd/ (props changed) projects/stable_7_xen/release/ (props changed) projects/stable_7_xen/release/doc/ (props changed) projects/stable_7_xen/release/doc/en_US.ISO8859-1/hardware/ (props changed) projects/stable_7_xen/release/picobsd/tinyware/login/ (props changed) projects/stable_7_xen/rescue/ (props changed) projects/stable_7_xen/sbin/ (props changed) projects/stable_7_xen/sbin/atacontrol/ (props changed) projects/stable_7_xen/sbin/bsdlabel/ (props changed) projects/stable_7_xen/sbin/clri/ (props changed) projects/stable_7_xen/sbin/ddb/ (props changed) projects/stable_7_xen/sbin/devd/ (props changed) projects/stable_7_xen/sbin/devfs/ (props changed) projects/stable_7_xen/sbin/dhclient/ (props changed) projects/stable_7_xen/sbin/dumpfs/ (props changed) projects/stable_7_xen/sbin/fdisk/ (props changed) projects/stable_7_xen/sbin/fdisk_pc98/ (props changed) projects/stable_7_xen/sbin/fsck/ (props changed) projects/stable_7_xen/sbin/fsck_ffs/ (props changed) projects/stable_7_xen/sbin/fsck_msdosfs/ (props changed) projects/stable_7_xen/sbin/geom/ (props changed) projects/stable_7_xen/sbin/geom/class/label/ (props changed) projects/stable_7_xen/sbin/geom/class/part/ (props changed) projects/stable_7_xen/sbin/geom/class/stripe/ (props changed) projects/stable_7_xen/sbin/geom/misc/ (props changed) projects/stable_7_xen/sbin/growfs/ (props changed) projects/stable_7_xen/sbin/ifconfig/ (props changed) projects/stable_7_xen/sbin/init/ (props changed) projects/stable_7_xen/sbin/ipf/ (props changed) projects/stable_7_xen/sbin/ipfw/ (props changed) projects/stable_7_xen/sbin/md5/ (props changed) projects/stable_7_xen/sbin/mdconfig/ (props changed) projects/stable_7_xen/sbin/mksnap_ffs/ (props changed) projects/stable_7_xen/sbin/mount/ (props changed) projects/stable_7_xen/sbin/mount_msdosfs/ (props changed) projects/stable_7_xen/sbin/natd/ (props changed) projects/stable_7_xen/sbin/newfs/ (props changed) projects/stable_7_xen/sbin/newfs_msdos/ (props changed) projects/stable_7_xen/sbin/ping6/ (props changed) projects/stable_7_xen/sbin/reboot/ (props changed) projects/stable_7_xen/sbin/restore/ (props changed) projects/stable_7_xen/sbin/route/ (props changed) projects/stable_7_xen/sbin/savecore/ (props changed) projects/stable_7_xen/sbin/sconfig/ (props changed) projects/stable_7_xen/sbin/shutdown/ (props changed) projects/stable_7_xen/sbin/sysctl/ (props changed) projects/stable_7_xen/sbin/tunefs/ (props changed) projects/stable_7_xen/secure/lib/libcrypto/ (props changed) projects/stable_7_xen/secure/lib/libssh/ (props changed) projects/stable_7_xen/secure/lib/libssl/ (props changed) projects/stable_7_xen/secure/libexec/sftp-server/ (props changed) projects/stable_7_xen/secure/usr.bin/bdes/ (props changed) projects/stable_7_xen/secure/usr.bin/openssl/ (props changed) projects/stable_7_xen/secure/usr.bin/ssh/ (props changed) projects/stable_7_xen/secure/usr.sbin/sshd/ (props changed) projects/stable_7_xen/share/ (props changed) projects/stable_7_xen/share/colldef/ (props changed) projects/stable_7_xen/share/dict/ (props changed) projects/stable_7_xen/share/doc/bind9/ (props changed) projects/stable_7_xen/share/doc/papers/jail/ (props changed) projects/stable_7_xen/share/doc/smm/01.setup/ (props changed) projects/stable_7_xen/share/examples/ (props changed) projects/stable_7_xen/share/man/ (props changed) projects/stable_7_xen/share/man/man1/ (props changed) projects/stable_7_xen/share/man/man3/ (props changed) projects/stable_7_xen/share/man/man4/ (props changed) projects/stable_7_xen/share/man/man5/ (props changed) projects/stable_7_xen/share/man/man7/ (props changed) projects/stable_7_xen/share/man/man8/ (props changed) projects/stable_7_xen/share/man/man9/ (props changed) projects/stable_7_xen/share/misc/ (props changed) projects/stable_7_xen/share/misc/iso639 (props changed) projects/stable_7_xen/share/misc/pci_vendors (props changed) projects/stable_7_xen/share/mk/ (props changed) projects/stable_7_xen/share/mklocale/ (props changed) projects/stable_7_xen/share/monetdef/ (props changed) projects/stable_7_xen/share/msgdef/ (props changed) projects/stable_7_xen/share/numericdef/ (props changed) projects/stable_7_xen/share/sendmail/ (props changed) projects/stable_7_xen/share/syscons/ (props changed) projects/stable_7_xen/share/syscons/keymaps/ (props changed) projects/stable_7_xen/share/termcap/ (props changed) projects/stable_7_xen/share/timedef/ (props changed) projects/stable_7_xen/share/zoneinfo/ (props changed) projects/stable_7_xen/sys/ (props changed) projects/stable_7_xen/sys/cddl/contrib/opensolaris/ (props changed) projects/stable_7_xen/sys/contrib/dev/acpica/ (props changed) projects/stable_7_xen/sys/contrib/pf/ (props changed) projects/stable_7_xen/tools/ (props changed) projects/stable_7_xen/tools/build/ (props changed) projects/stable_7_xen/tools/build/options/ (props changed) projects/stable_7_xen/tools/debugscripts/ (props changed) projects/stable_7_xen/tools/regression/atm/ (props changed) projects/stable_7_xen/tools/regression/bin/ (props changed) projects/stable_7_xen/tools/regression/bin/sh/ (props changed) projects/stable_7_xen/tools/regression/file/ (props changed) projects/stable_7_xen/tools/regression/file/flock/ (props changed) projects/stable_7_xen/tools/regression/lib/libc/ (props changed) projects/stable_7_xen/tools/regression/usr.bin/ (props changed) projects/stable_7_xen/tools/regression/usr.bin/jot/ (props changed) projects/stable_7_xen/tools/regression/usr.bin/tr/ (props changed) projects/stable_7_xen/tools/sched/ (props changed) projects/stable_7_xen/tools/test/ (props changed) projects/stable_7_xen/tools/tools/ (props changed) projects/stable_7_xen/tools/tools/aac/ (props changed) projects/stable_7_xen/tools/tools/crypto/ (props changed) projects/stable_7_xen/tools/tools/editing/ (props changed) projects/stable_7_xen/tools/tools/nanobsd/ (props changed) projects/stable_7_xen/tools/tools/nanobsd/FlashDevice.sub (props changed) projects/stable_7_xen/tools/tools/nanobsd/nanobsd.sh (props changed) projects/stable_7_xen/tools/tools/netrate/ (props changed) projects/stable_7_xen/tools/tools/umastat/ (props changed) projects/stable_7_xen/tools/tools/usb/ (props changed) projects/stable_7_xen/usr.bin/ (props changed) projects/stable_7_xen/usr.bin/basename/ (props changed) projects/stable_7_xen/usr.bin/bluetooth/rfcomm_sppd/ (props changed) projects/stable_7_xen/usr.bin/calendar/ (props changed) projects/stable_7_xen/usr.bin/catman/ (props changed) projects/stable_7_xen/usr.bin/cksum/ (props changed) projects/stable_7_xen/usr.bin/comm/ (props changed) projects/stable_7_xen/usr.bin/cpuset/ (props changed) projects/stable_7_xen/usr.bin/csup/ (props changed) projects/stable_7_xen/usr.bin/dirname/ (props changed) projects/stable_7_xen/usr.bin/du/ (props changed) projects/stable_7_xen/usr.bin/fetch/ (props changed) projects/stable_7_xen/usr.bin/file/ (props changed) projects/stable_7_xen/usr.bin/find/ (props changed) projects/stable_7_xen/usr.bin/finger/ (props changed) projects/stable_7_xen/usr.bin/fold/ (props changed) projects/stable_7_xen/usr.bin/fstat/ (props changed) projects/stable_7_xen/usr.bin/gcore/ (props changed) projects/stable_7_xen/usr.bin/gprof/ (props changed) projects/stable_7_xen/usr.bin/gzip/ (props changed) projects/stable_7_xen/usr.bin/hexdump/ (props changed) projects/stable_7_xen/usr.bin/id/ (props changed) projects/stable_7_xen/usr.bin/indent/ (props changed) projects/stable_7_xen/usr.bin/ipcrm/ (props changed) projects/stable_7_xen/usr.bin/ipcs/ (props changed) projects/stable_7_xen/usr.bin/jot/ (props changed) projects/stable_7_xen/usr.bin/kdump/ (props changed) projects/stable_7_xen/usr.bin/ktrace/ (props changed) projects/stable_7_xen/usr.bin/ldd/ (props changed) projects/stable_7_xen/usr.bin/less/ (props changed) projects/stable_7_xen/usr.bin/locate/ (props changed) projects/stable_7_xen/usr.bin/lockf/ (props changed) projects/stable_7_xen/usr.bin/logger/ (props changed) projects/stable_7_xen/usr.bin/make/ (props changed) projects/stable_7_xen/usr.bin/ncal/ (props changed) projects/stable_7_xen/usr.bin/netstat/ (props changed) projects/stable_7_xen/usr.bin/newgrp/ (props changed) projects/stable_7_xen/usr.bin/nsupdate/ (props changed) projects/stable_7_xen/usr.bin/pkill/ (props changed) projects/stable_7_xen/usr.bin/procstat/ (props changed) projects/stable_7_xen/usr.bin/quota/ (props changed) projects/stable_7_xen/usr.bin/rpcgen/ (props changed) projects/stable_7_xen/usr.bin/ruptime/ (props changed) projects/stable_7_xen/usr.bin/script/ (props changed) projects/stable_7_xen/usr.bin/sed/ (props changed) projects/stable_7_xen/usr.bin/shar/ (props changed) projects/stable_7_xen/usr.bin/sockstat/ (props changed) projects/stable_7_xen/usr.bin/stat/ (props changed) projects/stable_7_xen/usr.bin/su/ (props changed) projects/stable_7_xen/usr.bin/systat/ (props changed) projects/stable_7_xen/usr.bin/tail/ (props changed) projects/stable_7_xen/usr.bin/tar/ (props changed) projects/stable_7_xen/usr.bin/tftp/ (props changed) projects/stable_7_xen/usr.bin/tip/ (props changed) projects/stable_7_xen/usr.bin/top/ (props changed) projects/stable_7_xen/usr.bin/truncate/ (props changed) projects/stable_7_xen/usr.bin/truss/ (props changed) projects/stable_7_xen/usr.bin/uname/ (props changed) projects/stable_7_xen/usr.bin/unifdef/ (props changed) projects/stable_7_xen/usr.bin/units/ (props changed) projects/stable_7_xen/usr.bin/uudecode/ (props changed) projects/stable_7_xen/usr.bin/vmstat/ (props changed) projects/stable_7_xen/usr.bin/w/ (props changed) projects/stable_7_xen/usr.bin/wc/ (props changed) projects/stable_7_xen/usr.bin/whereis/ (props changed) projects/stable_7_xen/usr.bin/whois/ (props changed) projects/stable_7_xen/usr.bin/window/ (props changed) projects/stable_7_xen/usr.bin/xargs/ (props changed) projects/stable_7_xen/usr.bin/ypcat/ (props changed) projects/stable_7_xen/usr.bin/ypmatch/ (props changed) projects/stable_7_xen/usr.bin/ypwhich/ (props changed) projects/stable_7_xen/usr.sbin/ (props changed) projects/stable_7_xen/usr.sbin/Makefile (props changed) projects/stable_7_xen/usr.sbin/acpi/ (props changed) projects/stable_7_xen/usr.sbin/adduser/ (props changed) projects/stable_7_xen/usr.sbin/arp/ (props changed) projects/stable_7_xen/usr.sbin/bluetooth/ (props changed) projects/stable_7_xen/usr.sbin/bluetooth/btpand/ (props changed) projects/stable_7_xen/usr.sbin/bluetooth/hcsecd/ (props changed) projects/stable_7_xen/usr.sbin/bluetooth/hcseriald/ (props changed) projects/stable_7_xen/usr.sbin/bluetooth/rfcomm_pppd/ (props changed) projects/stable_7_xen/usr.sbin/bluetooth/sdpd/ (props changed) projects/stable_7_xen/usr.sbin/boot0cfg/ (props changed) projects/stable_7_xen/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c (props changed) projects/stable_7_xen/usr.sbin/bsnmpd/modules/snmp_pf/ (props changed) projects/stable_7_xen/usr.sbin/burncd/ (props changed) projects/stable_7_xen/usr.sbin/cdcontrol/ (props changed) projects/stable_7_xen/usr.sbin/chown/ (props changed) projects/stable_7_xen/usr.sbin/chroot/ (props changed) projects/stable_7_xen/usr.sbin/config/ (props changed) projects/stable_7_xen/usr.sbin/config/SMM.doc/ (props changed) projects/stable_7_xen/usr.sbin/cpucontrol/ (props changed) projects/stable_7_xen/usr.sbin/crashinfo/ (props changed) projects/stable_7_xen/usr.sbin/cron/ (props changed) projects/stable_7_xen/usr.sbin/cron/cron/ (props changed) projects/stable_7_xen/usr.sbin/crunch/ (props changed) projects/stable_7_xen/usr.sbin/cxgbtool/ (props changed) projects/stable_7_xen/usr.sbin/eeprom/ (props changed) projects/stable_7_xen/usr.sbin/extattr/ (props changed) projects/stable_7_xen/usr.sbin/faithd/ (props changed) projects/stable_7_xen/usr.sbin/fdcontrol/ (props changed) projects/stable_7_xen/usr.sbin/fdformat/ (props changed) projects/stable_7_xen/usr.sbin/fdread/ (props changed) projects/stable_7_xen/usr.sbin/fdwrite/ (props changed) projects/stable_7_xen/usr.sbin/fifolog/ (props changed) projects/stable_7_xen/usr.sbin/freebsd-update/ (props changed) projects/stable_7_xen/usr.sbin/fwcontrol/ (props changed) projects/stable_7_xen/usr.sbin/gstat/ (props changed) projects/stable_7_xen/usr.sbin/iostat/ (props changed) projects/stable_7_xen/usr.sbin/jail/ (props changed) projects/stable_7_xen/usr.sbin/jexec/ (props changed) projects/stable_7_xen/usr.sbin/jls/ (props changed) projects/stable_7_xen/usr.sbin/lpr/ (props changed) projects/stable_7_xen/usr.sbin/mailwrapper/ (props changed) projects/stable_7_xen/usr.sbin/makefs/ (props changed) projects/stable_7_xen/usr.sbin/makefs/ffs/ffs_bswap.c (props changed) projects/stable_7_xen/usr.sbin/makefs/ffs/ffs_subr.c (props changed) projects/stable_7_xen/usr.sbin/makefs/ffs/ufs_bswap.h (props changed) projects/stable_7_xen/usr.sbin/makefs/getid.c (props changed) projects/stable_7_xen/usr.sbin/mergemaster/ (props changed) projects/stable_7_xen/usr.sbin/mfiutil/ (props changed) projects/stable_7_xen/usr.sbin/mountd/ (props changed) projects/stable_7_xen/usr.sbin/mptutil/ (props changed) projects/stable_7_xen/usr.sbin/mtree/ (props changed) projects/stable_7_xen/usr.sbin/ndiscvt/ (props changed) projects/stable_7_xen/usr.sbin/ndp/ (props changed) projects/stable_7_xen/usr.sbin/newsyslog/ (props changed) projects/stable_7_xen/usr.sbin/nscd/ (props changed) projects/stable_7_xen/usr.sbin/ntp/ (props changed) projects/stable_7_xen/usr.sbin/pciconf/ (props changed) projects/stable_7_xen/usr.sbin/pkg_install/ (props changed) projects/stable_7_xen/usr.sbin/pmccontrol/ (props changed) projects/stable_7_xen/usr.sbin/pmcstat/ (props changed) projects/stable_7_xen/usr.sbin/portsnap/ (props changed) projects/stable_7_xen/usr.sbin/powerd/ (props changed) projects/stable_7_xen/usr.sbin/ppp/ (props changed) projects/stable_7_xen/usr.sbin/pstat/ (props changed) projects/stable_7_xen/usr.sbin/pw/ (props changed) projects/stable_7_xen/usr.sbin/pwd_mkdb/ (props changed) projects/stable_7_xen/usr.sbin/rpc.lockd/ (props changed) projects/stable_7_xen/usr.sbin/rpc.statd/ (props changed) projects/stable_7_xen/usr.sbin/rpc.yppasswdd/ (props changed) projects/stable_7_xen/usr.sbin/rtadvd/ (props changed) projects/stable_7_xen/usr.sbin/rtsold/ (props changed) projects/stable_7_xen/usr.sbin/sade/ (props changed) projects/stable_7_xen/usr.sbin/service/ (props changed) projects/stable_7_xen/usr.sbin/setfib/ (props changed) projects/stable_7_xen/usr.sbin/sysinstall/ (props changed) projects/stable_7_xen/usr.sbin/syslogd/ (props changed) projects/stable_7_xen/usr.sbin/traceroute/ (props changed) projects/stable_7_xen/usr.sbin/traceroute6/ (props changed) projects/stable_7_xen/usr.sbin/tzsetup/ (props changed) projects/stable_7_xen/usr.sbin/ugidfw/ (props changed) projects/stable_7_xen/usr.sbin/wpa/wpa_supplicant/ (props changed) projects/stable_7_xen/usr.sbin/ypserv/ (props changed) projects/stable_7_xen/usr.sbin/zic/ (props changed) Modified: projects/stable_7_xen/sys/amd64/amd64/tsc.c ============================================================================== --- projects/stable_7_xen/sys/amd64/amd64/tsc.c Tue Dec 7 20:46:11 2010 (r216269) +++ projects/stable_7_xen/sys/amd64/amd64/tsc.c Tue Dec 7 21:39:36 2010 (r216270) @@ -151,6 +151,9 @@ tsc_levels_changed(void *arg, int unit) int count, error; uint64_t max_freq; + if (tsc_is_invariant) + return; + /* Only use values from the first CPU, assuming all are equal. */ if (unit != 0) return; Modified: projects/stable_7_xen/sys/dev/fxp/if_fxp.c ============================================================================== --- projects/stable_7_xen/sys/dev/fxp/if_fxp.c Tue Dec 7 20:46:11 2010 (r216269) +++ projects/stable_7_xen/sys/dev/fxp/if_fxp.c Tue Dec 7 21:39:36 2010 (r216270) @@ -527,10 +527,12 @@ fxp_attach(device_t dev) } /* Receiver lock-up workaround detection. */ - fxp_read_eeprom(sc, &data, 3, 1); - if ((data & 0x03) != 0x03) { - sc->flags |= FXP_FLAG_RXBUG; - device_printf(dev, "Enabling Rx lock-up workaround\n"); + if (sc->revision < FXP_REV_82558_A4) { + fxp_read_eeprom(sc, &data, 3, 1); + if ((data & 0x03) != 0x03) { + sc->flags |= FXP_FLAG_RXBUG; + device_printf(dev, "Enabling Rx lock-up workaround\n"); + } } /* Modified: projects/stable_7_xen/sys/i386/i386/tsc.c ============================================================================== --- projects/stable_7_xen/sys/i386/i386/tsc.c Tue Dec 7 20:46:11 2010 (r216269) +++ projects/stable_7_xen/sys/i386/i386/tsc.c Tue Dec 7 21:39:36 2010 (r216270) @@ -170,6 +170,9 @@ tsc_levels_changed(void *arg, int unit) int count, error; uint64_t max_freq; + if (tsc_is_invariant) + return; + /* Only use values from the first CPU, assuming all are equal. */ if (unit != 0) return; From owner-svn-src-projects@FreeBSD.ORG Tue Dec 7 22:16:37 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B54641065695; Tue, 7 Dec 2010 22:16:37 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A25028FC19; Tue, 7 Dec 2010 22:16:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oB7MGbWf081690; Tue, 7 Dec 2010 22:16:37 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB7MGbwQ081683; Tue, 7 Dec 2010 22:16:37 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <201012072216.oB7MGbwQ081683@svn.freebsd.org> From: Sean Bruno Date: Tue, 7 Dec 2010 22:16:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216273 - in projects/stable_7_xen/sys: amd64/conf amd64/include amd64/include/xen conf dev/xen dev/xen/balloon dev/xen/blkback dev/xen/blkfront dev/xen/console dev/xen/control dev/xen/... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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, 07 Dec 2010 22:16:37 -0000 Author: sbruno Date: Tue Dec 7 22:16:37 2010 New Revision: 216273 URL: http://svn.freebsd.org/changeset/base/216273 Log: Merge in Xen DomU to a stable_7 branch. Note this is AMD64 only and HVM only Added: projects/stable_7_xen/sys/amd64/conf/XENHVM projects/stable_7_xen/sys/amd64/include/xen/ projects/stable_7_xen/sys/amd64/include/xen/hypercall.h projects/stable_7_xen/sys/amd64/include/xen/synch_bitops.h projects/stable_7_xen/sys/amd64/include/xen/xen-os.h projects/stable_7_xen/sys/amd64/include/xen/xenfunc.h projects/stable_7_xen/sys/amd64/include/xen/xenpmap.h projects/stable_7_xen/sys/amd64/include/xen/xenvar.h projects/stable_7_xen/sys/dev/xen/ projects/stable_7_xen/sys/dev/xen/balloon/ projects/stable_7_xen/sys/dev/xen/balloon/balloon.c projects/stable_7_xen/sys/dev/xen/blkback/ projects/stable_7_xen/sys/dev/xen/blkback/blkback.c projects/stable_7_xen/sys/dev/xen/blkfront/ projects/stable_7_xen/sys/dev/xen/blkfront/blkfront.c projects/stable_7_xen/sys/dev/xen/blkfront/block.h projects/stable_7_xen/sys/dev/xen/console/ projects/stable_7_xen/sys/dev/xen/console/console.c projects/stable_7_xen/sys/dev/xen/console/xencons_ring.c projects/stable_7_xen/sys/dev/xen/console/xencons_ring.h projects/stable_7_xen/sys/dev/xen/control/ projects/stable_7_xen/sys/dev/xen/control/control.c projects/stable_7_xen/sys/dev/xen/evtchn/ projects/stable_7_xen/sys/dev/xen/evtchn/evtchn_dev.c projects/stable_7_xen/sys/dev/xen/netback/ projects/stable_7_xen/sys/dev/xen/netback/netback.c projects/stable_7_xen/sys/dev/xen/netfront/ projects/stable_7_xen/sys/dev/xen/netfront/mbufq.h projects/stable_7_xen/sys/dev/xen/netfront/netfront.c projects/stable_7_xen/sys/dev/xen/pcifront/ projects/stable_7_xen/sys/dev/xen/pcifront/pcifront.c projects/stable_7_xen/sys/dev/xen/xenpci/ projects/stable_7_xen/sys/dev/xen/xenpci/evtchn.c projects/stable_7_xen/sys/dev/xen/xenpci/machine_reboot.c projects/stable_7_xen/sys/dev/xen/xenpci/xenpci.c projects/stable_7_xen/sys/dev/xen/xenpci/xenpcivar.h projects/stable_7_xen/sys/xen/ projects/stable_7_xen/sys/xen/blkif.h projects/stable_7_xen/sys/xen/evtchn/ projects/stable_7_xen/sys/xen/evtchn.h projects/stable_7_xen/sys/xen/evtchn/evtchn.c projects/stable_7_xen/sys/xen/evtchn/evtchn_dev.c projects/stable_7_xen/sys/xen/features.c projects/stable_7_xen/sys/xen/features.h projects/stable_7_xen/sys/xen/gnttab.c projects/stable_7_xen/sys/xen/gnttab.h projects/stable_7_xen/sys/xen/hypervisor.h projects/stable_7_xen/sys/xen/interface/ projects/stable_7_xen/sys/xen/interface/COPYING projects/stable_7_xen/sys/xen/interface/acm.h projects/stable_7_xen/sys/xen/interface/acm_ops.h projects/stable_7_xen/sys/xen/interface/arch-ia64.h projects/stable_7_xen/sys/xen/interface/arch-powerpc.h projects/stable_7_xen/sys/xen/interface/arch-x86/ projects/stable_7_xen/sys/xen/interface/arch-x86/cpuid.h projects/stable_7_xen/sys/xen/interface/arch-x86/hvm/ projects/stable_7_xen/sys/xen/interface/arch-x86/hvm/save.h projects/stable_7_xen/sys/xen/interface/arch-x86/xen-mca.h projects/stable_7_xen/sys/xen/interface/arch-x86/xen-x86_32.h projects/stable_7_xen/sys/xen/interface/arch-x86/xen-x86_64.h projects/stable_7_xen/sys/xen/interface/arch-x86/xen.h projects/stable_7_xen/sys/xen/interface/arch-x86_32.h projects/stable_7_xen/sys/xen/interface/arch-x86_64.h projects/stable_7_xen/sys/xen/interface/callback.h projects/stable_7_xen/sys/xen/interface/dom0_ops.h projects/stable_7_xen/sys/xen/interface/domctl.h projects/stable_7_xen/sys/xen/interface/elfnote.h projects/stable_7_xen/sys/xen/interface/elfstructs.h projects/stable_7_xen/sys/xen/interface/event_channel.h projects/stable_7_xen/sys/xen/interface/features.h projects/stable_7_xen/sys/xen/interface/foreign/ projects/stable_7_xen/sys/xen/interface/foreign/Makefile projects/stable_7_xen/sys/xen/interface/foreign/mkchecker.py projects/stable_7_xen/sys/xen/interface/foreign/mkheader.py projects/stable_7_xen/sys/xen/interface/foreign/reference.size projects/stable_7_xen/sys/xen/interface/foreign/structs.py projects/stable_7_xen/sys/xen/interface/grant_table.h projects/stable_7_xen/sys/xen/interface/hvm/ projects/stable_7_xen/sys/xen/interface/hvm/e820.h projects/stable_7_xen/sys/xen/interface/hvm/hvm_info_table.h projects/stable_7_xen/sys/xen/interface/hvm/hvm_op.h projects/stable_7_xen/sys/xen/interface/hvm/ioreq.h projects/stable_7_xen/sys/xen/interface/hvm/params.h projects/stable_7_xen/sys/xen/interface/hvm/save.h projects/stable_7_xen/sys/xen/interface/hvm/vmx_assist.h projects/stable_7_xen/sys/xen/interface/io/ projects/stable_7_xen/sys/xen/interface/io/blkif.h projects/stable_7_xen/sys/xen/interface/io/console.h projects/stable_7_xen/sys/xen/interface/io/fbif.h projects/stable_7_xen/sys/xen/interface/io/kbdif.h projects/stable_7_xen/sys/xen/interface/io/netif.h projects/stable_7_xen/sys/xen/interface/io/pciif.h projects/stable_7_xen/sys/xen/interface/io/protocols.h projects/stable_7_xen/sys/xen/interface/io/ring.h projects/stable_7_xen/sys/xen/interface/io/tpmif.h projects/stable_7_xen/sys/xen/interface/io/xenbus.h projects/stable_7_xen/sys/xen/interface/io/xs_wire.h projects/stable_7_xen/sys/xen/interface/kexec.h projects/stable_7_xen/sys/xen/interface/libelf.h projects/stable_7_xen/sys/xen/interface/memory.h projects/stable_7_xen/sys/xen/interface/nmi.h projects/stable_7_xen/sys/xen/interface/physdev.h projects/stable_7_xen/sys/xen/interface/platform.h projects/stable_7_xen/sys/xen/interface/sched.h projects/stable_7_xen/sys/xen/interface/sysctl.h projects/stable_7_xen/sys/xen/interface/trace.h projects/stable_7_xen/sys/xen/interface/vcpu.h projects/stable_7_xen/sys/xen/interface/version.h projects/stable_7_xen/sys/xen/interface/xen-compat.h projects/stable_7_xen/sys/xen/interface/xen.h projects/stable_7_xen/sys/xen/interface/xencomm.h projects/stable_7_xen/sys/xen/interface/xenoprof.h projects/stable_7_xen/sys/xen/xen_intr.h projects/stable_7_xen/sys/xen/xenbus/ projects/stable_7_xen/sys/xen/xenbus/xenbus.c projects/stable_7_xen/sys/xen/xenbus/xenbus_if.m projects/stable_7_xen/sys/xen/xenbus/xenbusb.c projects/stable_7_xen/sys/xen/xenbus/xenbusb.h projects/stable_7_xen/sys/xen/xenbus/xenbusb_back.c projects/stable_7_xen/sys/xen/xenbus/xenbusb_front.c projects/stable_7_xen/sys/xen/xenbus/xenbusb_if.m projects/stable_7_xen/sys/xen/xenbus/xenbusvar.h projects/stable_7_xen/sys/xen/xenstore/ projects/stable_7_xen/sys/xen/xenstore/xenstore.c projects/stable_7_xen/sys/xen/xenstore/xenstore_dev.c projects/stable_7_xen/sys/xen/xenstore/xenstore_internal.h projects/stable_7_xen/sys/xen/xenstore/xenstorevar.h Modified: projects/stable_7_xen/sys/amd64/include/pcpu.h projects/stable_7_xen/sys/conf/files projects/stable_7_xen/sys/conf/options.amd64 projects/stable_7_xen/sys/kern/subr_autoconf.c projects/stable_7_xen/sys/sys/bio.h Added: projects/stable_7_xen/sys/amd64/conf/XENHVM ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stable_7_xen/sys/amd64/conf/XENHVM Tue Dec 7 22:16:37 2010 (r216273) @@ -0,0 +1,159 @@ +# +# XENHVM -- Xen HVM kernel configuration file for FreeBSD/amd64 +# +# For more information on this file, please read the config(5) manual page, +# and/or the handbook section on Kernel Configuration Files: +# +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# +# The handbook is also available locally in /usr/share/doc/handbook +# if you've installed the doc distribution, otherwise always see the +# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# latest information. +# +# An exhaustive list of options and more detailed explanations of the +# device lines is also present in the ../../conf/NOTES and NOTES files. +# If you are in doubt as to the purpose or necessity of a line, check first +# in NOTES. +# +# $FreeBSD: stable/8/sys/amd64/conf/XENHVM 206336 2010-04-07 02:24:41Z nwhitehorn $ + +cpu HAMMER +ident XENHVM + +# To statically compile in device wiring instead of /boot/device.hints +#hints "GENERIC.hints" # Default places to look for devices. + +# Use the following to compile in values accessible to the kernel +# through getenv() (or kenv(1) in userland). The format of the file +# is 'variable=value', see kenv(1) +# +# env "GENERIC.env" + +makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols +makeoptions MODULES_OVERRIDE="" + +options SCHED_ULE # ULE scheduler +options PREEMPTION # Enable kernel thread preemption +options INET # InterNETworking +options INET6 # IPv6 communications protocols +options SCTP # Stream Control Transmission Protocol +options FFS # Berkeley Fast Filesystem +options SOFTUPDATES # Enable FFS soft updates support +options UFS_ACL # Support for access control lists +options UFS_DIRHASH # Improve performance on big directories +options UFS_GJOURNAL # Enable gjournal-based UFS journaling +options MD_ROOT # MD is a potential root device +options NFSCLIENT # Network Filesystem Client +options NFSSERVER # Network Filesystem Server +options NFSLOCKD # Network Lock Manager +options NFS_ROOT # NFS usable as /, requires NFSCLIENT +options MSDOSFS # MSDOS Filesystem +options CD9660 # ISO 9660 Filesystem +options PROCFS # Process filesystem (requires PSEUDOFS) +options PSEUDOFS # Pseudo-filesystem framework +options GEOM_PART_GPT # GUID Partition Tables. +options GEOM_LABEL # Provides labelization +options COMPAT_43TTY # BSD 4.3 TTY compat (sgtty) +options COMPAT_FREEBSD4 # Compatible with FreeBSD4 +options COMPAT_FREEBSD5 # Compatible with FreeBSD5 +options COMPAT_FREEBSD6 # Compatible with FreeBSD6 +options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI +options KTRACE # ktrace(1) support +options STACK # stack(9) support +options SYSVSHM # SYSV-style shared memory +options SYSVMSG # SYSV-style message queues +options SYSVSEM # SYSV-style semaphores +options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions +options KBD_INSTALL_CDEV # install a CDEV entry in /dev +options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) +options AUDIT # Security event auditing +#options KDTRACE_FRAME # Ensure frames are compiled in +#options KDTRACE_HOOKS # Kernel DTrace hooks +options NO_ADAPTIVE_MUTEXES +options NO_ADAPTIVE_RWLOCKS + +# Debugging for use in -current +options KDB # Enable kernel debugger support. +options DDB # Support DDB. +options GDB # Support remote GDB. +options INVARIANTS # Enable calls of extra sanity checking +options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +options WITNESS # Enable checks to detect deadlocks and cycles +options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed + +# Make an SMP-capable kernel by default +options SMP # Symmetric MultiProcessor Kernel + +# CPU frequency control +device cpufreq + +# Bus support. +device acpi +device pci + +# Floppy drives +device fdc + +# Xen HVM support +options XENHVM +device xenpci + +# ATA and ATAPI devices +device ata +device atadisk # ATA disk drives +device ataraid # ATA RAID drives +device atapicd # ATAPI CDROM drives +device atapifd # ATAPI floppy drives +device atapist # ATAPI tape drives +options ATA_STATIC_ID # Static device numbering + +# SCSI peripherals +device scbus # SCSI bus (required for SCSI) +device ch # SCSI media changers +device da # Direct Access (disks) +device sa # Sequential Access (tape etc) +device cd # CD +device pass # Passthrough device (direct SCSI access) +device ses # SCSI Environmental Services (and SAF-TE) + + +# atkbdc0 controls both the keyboard and the PS/2 mouse +device atkbdc # AT keyboard controller +device atkbd # AT keyboard +device psm # PS/2 mouse + +device kbdmux # keyboard multiplexer + +device vga # VGA video card driver + +device splash # Splash screen and screen saver support + +# syscons is the default console driver, resembling an SCO console +device sc + +device agp # support several AGP chipsets + +# Serial (COM) ports +device uart # Generic UART driver + +# PCI Ethernet NICs that use the common MII bus controller code. +# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! +device miibus # MII bus support +device re # RealTek 8139C+/8169/8169S/8110S + +# Pseudo devices. +device loop # Network loopback +device random # Entropy device +device ether # Ethernet support +device tun # Packet tunnel. +device pty # BSD-style compatibility pseudo ttys +device md # Memory "disks" +device gif # IPv6 and IPv4 tunneling +device faith # IPv6-to-IPv4 relaying (translation) +device firmware # firmware assist module + +# The `bpf' device enables the Berkeley Packet Filter. +# Be aware of the administrative consequences of enabling this! +# Note that 'bpf' is required for DHCP. +device bpf # Berkeley packet filter Modified: projects/stable_7_xen/sys/amd64/include/pcpu.h ============================================================================== --- projects/stable_7_xen/sys/amd64/include/pcpu.h Tue Dec 7 22:12:02 2010 (r216272) +++ projects/stable_7_xen/sys/amd64/include/pcpu.h Tue Dec 7 22:16:37 2010 (r216273) @@ -33,6 +33,24 @@ #error "sys/cdefs.h is a prerequisite for this file" #endif +#if defined(XEN) || defined(XENHVM) +#ifndef NR_VIRQS +#define NR_VIRQS 24 +#endif +#ifndef NR_IPIS +#define NR_IPIS 2 +#endif +#endif + +#ifdef XENHVM +#define PCPU_XEN_FIELDS \ + ; \ + unsigned int pc_last_processed_l1i; \ + unsigned int pc_last_processed_l2i +#else +#define PCPU_XEN_FIELDS +#endif + /* * The SMP parts are setup in pmap.c and locore.s for the BSP, and * mp_machdep.c sets up the data for the AP's to "see" when they awake. @@ -49,7 +67,8 @@ u_int pc_apic_id; \ u_int pc_acpi_id; /* ACPI CPU id */ \ struct user_segment_descriptor *pc_gs32p; \ - u_int pc_cmci_mask /* MCx banks for CMCI */ + u_int pc_cmci_mask; /* MCx banks for CMCI */ \ + PCPU_XEN_FIELDS #ifdef _KERNEL Added: projects/stable_7_xen/sys/amd64/include/xen/hypercall.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stable_7_xen/sys/amd64/include/xen/hypercall.h Tue Dec 7 22:16:37 2010 (r216273) @@ -0,0 +1,415 @@ +/****************************************************************************** + * hypercall.h + * + * Linux-specific hypervisor handling. + * + * Copyright (c) 2002-2004, K A Fraser + * + * 64-bit updates: + * Benjamin Liu + * Jun Nakajima + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation; or, when distributed + * separately from the Linux kernel or incorporated into other + * software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#ifndef __MACHINE_XEN_HYPERCALL_H__ +#define __MACHINE_XEN_HYPERCALL_H__ + +#include + +#ifndef __XEN_HYPERVISOR_H__ +# error "please don't include this file directly" +#endif + +#define __STR(x) #x +#define STR(x) __STR(x) +#define ENOXENSYS 38 +#define CONFIG_XEN_COMPAT 0x030002 +#define __must_check + +#ifdef XEN +#define HYPERCALL_STR(name) \ + "call hypercall_page + ("STR(__HYPERVISOR_##name)" * 32)" +#else +#define HYPERCALL_STR(name) \ + "mov $("STR(__HYPERVISOR_##name)" * 32),%%eax; "\ + "add hypercall_stubs(%%rip),%%rax; " \ + "call *%%rax" +#endif + +#define _hypercall0(type, name) \ +({ \ + type __res; \ + __asm__ volatile ( \ + HYPERCALL_STR(name) \ + : "=a" (__res) \ + : \ + : "memory" ); \ + __res; \ +}) + +#define _hypercall1(type, name, a1) \ +({ \ + type __res; \ + long __ign1; \ + __asm__ volatile ( \ + HYPERCALL_STR(name) \ + : "=a" (__res), "=D" (__ign1) \ + : "1" ((long)(a1)) \ + : "memory" ); \ + __res; \ +}) + +#define _hypercall2(type, name, a1, a2) \ +({ \ + type __res; \ + long __ign1, __ign2; \ + __asm__ volatile ( \ + HYPERCALL_STR(name) \ + : "=a" (__res), "=D" (__ign1), "=S" (__ign2) \ + : "1" ((long)(a1)), "2" ((long)(a2)) \ + : "memory" ); \ + __res; \ +}) + +#define _hypercall3(type, name, a1, a2, a3) \ +({ \ + type __res; \ + long __ign1, __ign2, __ign3; \ + __asm__ volatile ( \ + HYPERCALL_STR(name) \ + : "=a" (__res), "=D" (__ign1), "=S" (__ign2), \ + "=d" (__ign3) \ + : "1" ((long)(a1)), "2" ((long)(a2)), \ + "3" ((long)(a3)) \ + : "memory" ); \ + __res; \ +}) + +#define _hypercall4(type, name, a1, a2, a3, a4) \ +({ \ + type __res; \ + long __ign1, __ign2, __ign3; \ + register long __arg4 __asm__("r10") = (long)(a4); \ + __asm__ volatile ( \ + HYPERCALL_STR(name) \ + : "=a" (__res), "=D" (__ign1), "=S" (__ign2), \ + "=d" (__ign3), "+r" (__arg4) \ + : "1" ((long)(a1)), "2" ((long)(a2)), \ + "3" ((long)(a3)) \ + : "memory" ); \ + __res; \ +}) + +#define _hypercall5(type, name, a1, a2, a3, a4, a5) \ +({ \ + type __res; \ + long __ign1, __ign2, __ign3; \ + register long __arg4 __asm__("r10") = (long)(a4); \ + register long __arg5 __asm__("r8") = (long)(a5); \ + __asm__ volatile ( \ + HYPERCALL_STR(name) \ + : "=a" (__res), "=D" (__ign1), "=S" (__ign2), \ + "=d" (__ign3), "+r" (__arg4), "+r" (__arg5) \ + : "1" ((long)(a1)), "2" ((long)(a2)), \ + "3" ((long)(a3)) \ + : "memory" ); \ + __res; \ +}) + +static inline int __must_check +HYPERVISOR_set_trap_table( + const trap_info_t *table) +{ + return _hypercall1(int, set_trap_table, table); +} + +static inline int __must_check +HYPERVISOR_mmu_update( + mmu_update_t *req, unsigned int count, unsigned int *success_count, + domid_t domid) +{ + return _hypercall4(int, mmu_update, req, count, success_count, domid); +} + +static inline int __must_check +HYPERVISOR_mmuext_op( + struct mmuext_op *op, unsigned int count, unsigned int *success_count, + domid_t domid) +{ + return _hypercall4(int, mmuext_op, op, count, success_count, domid); +} + +static inline int __must_check +HYPERVISOR_set_gdt( + unsigned long *frame_list, unsigned int entries) +{ + return _hypercall2(int, set_gdt, frame_list, entries); +} + +static inline int __must_check +HYPERVISOR_stack_switch( + unsigned long ss, unsigned long esp) +{ + return _hypercall2(int, stack_switch, ss, esp); +} + +static inline int __must_check +HYPERVISOR_set_callbacks( + unsigned long event_address, unsigned long failsafe_address, + unsigned long syscall_address) +{ + return _hypercall3(int, set_callbacks, + event_address, failsafe_address, syscall_address); +} + +static inline int +HYPERVISOR_fpu_taskswitch( + int set) +{ + return _hypercall1(int, fpu_taskswitch, set); +} + +static inline int __must_check +HYPERVISOR_sched_op_compat( + int cmd, unsigned long arg) +{ + return _hypercall2(int, sched_op_compat, cmd, arg); +} + +static inline int __must_check +HYPERVISOR_sched_op( + int cmd, void *arg) +{ + return _hypercall2(int, sched_op, cmd, arg); +} + +static inline long __must_check +HYPERVISOR_set_timer_op( + uint64_t timeout) +{ + return _hypercall1(long, set_timer_op, timeout); +} + +static inline int __must_check +HYPERVISOR_platform_op( + struct xen_platform_op *platform_op) +{ + platform_op->interface_version = XENPF_INTERFACE_VERSION; + return _hypercall1(int, platform_op, platform_op); +} + +static inline int __must_check +HYPERVISOR_set_debugreg( + unsigned int reg, unsigned long value) +{ + return _hypercall2(int, set_debugreg, reg, value); +} + +static inline unsigned long __must_check +HYPERVISOR_get_debugreg( + unsigned int reg) +{ + return _hypercall1(unsigned long, get_debugreg, reg); +} + +static inline int __must_check +HYPERVISOR_update_descriptor( + unsigned long ma, unsigned long word) +{ + return _hypercall2(int, update_descriptor, ma, word); +} + +static inline int __must_check +HYPERVISOR_memory_op( + unsigned int cmd, void *arg) +{ + return _hypercall2(int, memory_op, cmd, arg); +} + +static inline int __must_check +HYPERVISOR_multicall( + multicall_entry_t *call_list, unsigned int nr_calls) +{ + return _hypercall2(int, multicall, call_list, nr_calls); +} + +static inline int __must_check +HYPERVISOR_update_va_mapping( + unsigned long va, uint64_t new_val, unsigned long flags) +{ + return _hypercall3(int, update_va_mapping, va, new_val, flags); +} + +static inline int __must_check +HYPERVISOR_event_channel_op( + int cmd, void *arg) +{ + int rc = _hypercall2(int, event_channel_op, cmd, arg); + +#if CONFIG_XEN_COMPAT <= 0x030002 + if (unlikely(rc == -ENOXENSYS)) { + struct evtchn_op op; + op.cmd = cmd; + memcpy(&op.u, arg, sizeof(op.u)); + rc = _hypercall1(int, event_channel_op_compat, &op); + memcpy(arg, &op.u, sizeof(op.u)); + } +#endif + + return rc; +} + +static inline int __must_check +HYPERVISOR_xen_version( + int cmd, void *arg) +{ + return _hypercall2(int, xen_version, cmd, arg); +} + +static inline int __must_check +HYPERVISOR_console_io( + int cmd, unsigned int count, char *str) +{ + return _hypercall3(int, console_io, cmd, count, str); +} + +static inline int __must_check +HYPERVISOR_physdev_op( + int cmd, void *arg) +{ + int rc = _hypercall2(int, physdev_op, cmd, arg); + +#if CONFIG_XEN_COMPAT <= 0x030002 + if (unlikely(rc == -ENOXENSYS)) { + struct physdev_op op; + op.cmd = cmd; + memcpy(&op.u, arg, sizeof(op.u)); + rc = _hypercall1(int, physdev_op_compat, &op); + memcpy(arg, &op.u, sizeof(op.u)); + } +#endif + + return rc; +} + +static inline int __must_check +HYPERVISOR_grant_table_op( + unsigned int cmd, void *uop, unsigned int count) +{ + return _hypercall3(int, grant_table_op, cmd, uop, count); +} + +static inline int __must_check +HYPERVISOR_update_va_mapping_otherdomain( + unsigned long va, uint64_t new_val, unsigned long flags, domid_t domid) +{ + return _hypercall4(int, update_va_mapping_otherdomain, va, + new_val, flags, domid); +} + +static inline int __must_check +HYPERVISOR_vm_assist( + unsigned int cmd, unsigned int type) +{ + return _hypercall2(int, vm_assist, cmd, type); +} + +static inline int __must_check +HYPERVISOR_vcpu_op( + int cmd, unsigned int vcpuid, void *extra_args) +{ + return _hypercall3(int, vcpu_op, cmd, vcpuid, extra_args); +} + +static inline int __must_check +HYPERVISOR_set_segment_base( + int reg, unsigned long value) +{ + return _hypercall2(int, set_segment_base, reg, value); +} + +static inline int __must_check +HYPERVISOR_suspend( + unsigned long srec) +{ + struct sched_shutdown sched_shutdown = { + .reason = SHUTDOWN_suspend + }; + + int rc = _hypercall3(int, sched_op, SCHEDOP_shutdown, + &sched_shutdown, srec); + +#if CONFIG_XEN_COMPAT <= 0x030002 + if (rc == -ENOXENSYS) + rc = _hypercall3(int, sched_op_compat, SCHEDOP_shutdown, + SHUTDOWN_suspend, srec); +#endif + + return rc; +} + +#if CONFIG_XEN_COMPAT <= 0x030002 +static inline int +HYPERVISOR_nmi_op( + unsigned long op, void *arg) +{ + return _hypercall2(int, nmi_op, op, arg); +} +#endif + +#ifndef CONFIG_XEN +static inline unsigned long __must_check +HYPERVISOR_hvm_op( + int op, void *arg) +{ + return _hypercall2(unsigned long, hvm_op, op, arg); +} +#endif + +static inline int __must_check +HYPERVISOR_callback_op( + int cmd, const void *arg) +{ + return _hypercall2(int, callback_op, cmd, arg); +} + +static inline int __must_check +HYPERVISOR_xenoprof_op( + int op, void *arg) +{ + return _hypercall2(int, xenoprof_op, op, arg); +} + +static inline int __must_check +HYPERVISOR_kexec_op( + unsigned long op, void *args) +{ + return _hypercall2(int, kexec_op, op, args); +} + +#undef __must_check + +#endif /* __MACHINE_XEN_HYPERCALL_H__ */ Added: projects/stable_7_xen/sys/amd64/include/xen/synch_bitops.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stable_7_xen/sys/amd64/include/xen/synch_bitops.h Tue Dec 7 22:16:37 2010 (r216273) @@ -0,0 +1,129 @@ +#ifndef __XEN_SYNCH_BITOPS_H__ +#define __XEN_SYNCH_BITOPS_H__ + +/* + * Copyright 1992, Linus Torvalds. + * Heavily modified to provide guaranteed strong synchronisation + * when communicating with Xen or other guest OSes running on other CPUs. + */ + + +#define ADDR (*(volatile long *) addr) + +static __inline__ void synch_set_bit(int nr, volatile void * addr) +{ + __asm__ __volatile__ ( + "lock btsl %1,%0" + : "=m" (ADDR) : "Ir" (nr) : "memory" ); +} + +static __inline__ void synch_clear_bit(int nr, volatile void * addr) +{ + __asm__ __volatile__ ( + "lock btrl %1,%0" + : "=m" (ADDR) : "Ir" (nr) : "memory" ); +} + +static __inline__ void synch_change_bit(int nr, volatile void * addr) +{ + __asm__ __volatile__ ( + "lock btcl %1,%0" + : "=m" (ADDR) : "Ir" (nr) : "memory" ); +} + +static __inline__ int synch_test_and_set_bit(int nr, volatile void * addr) +{ + int oldbit; + __asm__ __volatile__ ( + "lock btsl %2,%1\n\tsbbl %0,%0" + : "=r" (oldbit), "=m" (ADDR) : "Ir" (nr) : "memory"); + return oldbit; +} + +static __inline__ int synch_test_and_clear_bit(int nr, volatile void * addr) +{ + int oldbit; + __asm__ __volatile__ ( + "lock btrl %2,%1\n\tsbbl %0,%0" + : "=r" (oldbit), "=m" (ADDR) : "Ir" (nr) : "memory"); + return oldbit; +} + +static __inline__ int synch_test_and_change_bit(int nr, volatile void * addr) +{ + int oldbit; + + __asm__ __volatile__ ( + "lock btcl %2,%1\n\tsbbl %0,%0" + : "=r" (oldbit), "=m" (ADDR) : "Ir" (nr) : "memory"); + return oldbit; +} + +struct __synch_xchg_dummy { unsigned long a[100]; }; +#define __synch_xg(x) ((volatile struct __synch_xchg_dummy *)(x)) + +#define synch_cmpxchg(ptr, old, new) \ +((__typeof__(*(ptr)))__synch_cmpxchg((ptr),\ + (unsigned long)(old), \ + (unsigned long)(new), \ + sizeof(*(ptr)))) + +static inline unsigned long __synch_cmpxchg(volatile void *ptr, + unsigned long old, + unsigned long new, int size) +{ + unsigned long prev; + switch (size) { + case 1: + __asm__ __volatile__("lock; cmpxchgb %b1,%2" + : "=a"(prev) + : "q"(new), "m"(*__synch_xg(ptr)), + "0"(old) + : "memory"); + return prev; + case 2: + __asm__ __volatile__("lock; cmpxchgw %w1,%2" + : "=a"(prev) + : "q"(new), "m"(*__synch_xg(ptr)), + "0"(old) + : "memory"); + return prev; + case 4: + __asm__ __volatile__("lock; cmpxchgl %k1,%2" + : "=a"(prev) + : "q"(new), "m"(*__synch_xg(ptr)), + "0"(old) + : "memory"); + return prev; + case 8: + __asm__ __volatile__("lock; cmpxchgq %1,%2" + : "=a"(prev) + : "q"(new), "m"(*__synch_xg(ptr)), + "0"(old) + : "memory"); + return prev; + } + return old; +} + +static __inline__ int synch_const_test_bit(int nr, const volatile void * addr) +{ + return ((1UL << (nr & 31)) & + (((const volatile unsigned int *) addr)[nr >> 5])) != 0; +} + +static __inline__ int synch_var_test_bit(int nr, volatile void * addr) +{ + int oldbit; + __asm__ __volatile__ ( + "btl %2,%1\n\tsbbl %0,%0" + : "=r" (oldbit) : "m" (ADDR), "Ir" (nr) ); + return oldbit; +} + +#define synch_test_bit(nr,addr) \ +(__builtin_constant_p(nr) ? \ + synch_const_test_bit((nr),(addr)) : \ + synch_var_test_bit((nr),(addr))) + +#endif /* __XEN_SYNCH_BITOPS_H__ */ Added: projects/stable_7_xen/sys/amd64/include/xen/xen-os.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stable_7_xen/sys/amd64/include/xen/xen-os.h Tue Dec 7 22:16:37 2010 (r216273) @@ -0,0 +1,296 @@ +/****************************************************************************** + * os.h + * + * random collection of macros and definition + */ + +#ifndef _XEN_OS_H_ +#define _XEN_OS_H_ + +#ifdef PAE +#define CONFIG_X86_PAE +#endif + +#if !defined(__XEN_INTERFACE_VERSION__) +/* + * Can update to a more recent version when we implement + * the hypercall page + */ +#define __XEN_INTERFACE_VERSION__ 0x00030204 +#endif + +#include + +/* Force a proper event-channel callback from Xen. */ +void force_evtchn_callback(void); + +extern int gdtset; + +extern shared_info_t *HYPERVISOR_shared_info; + +/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */ +static inline void rep_nop(void) +{ + __asm__ __volatile__ ( "rep;nop" : : : "memory" ); +} +#define cpu_relax() rep_nop() + +/* crude memory allocator for memory allocation early in + * boot + */ +void *bootmem_alloc(unsigned int size); +void bootmem_free(void *ptr, unsigned int size); + + +/* Everything below this point is not included by assembler (.S) files. */ +#ifndef __ASSEMBLY__ + +void printk(const char *fmt, ...); + +/* some function prototypes */ +void trap_init(void); + +#define likely(x) __builtin_expect((x),1) +#define unlikely(x) __builtin_expect((x),0) + +#ifndef XENHVM + +/* + * STI/CLI equivalents. These basically set and clear the virtual + * event_enable flag in teh shared_info structure. Note that when + * the enable bit is set, there may be pending events to be handled. + * We may therefore call into do_hypervisor_callback() directly. + */ + +#define __cli() \ +do { \ + vcpu_info_t *_vcpu; \ + _vcpu = &HYPERVISOR_shared_info->vcpu_info[PCPU_GET(cpuid)]; \ + _vcpu->evtchn_upcall_mask = 1; \ + barrier(); \ +} while (0) + +#define __sti() \ +do { \ + vcpu_info_t *_vcpu; \ + barrier(); \ + _vcpu = &HYPERVISOR_shared_info->vcpu_info[PCPU_GET(cpuid)]; \ + _vcpu->evtchn_upcall_mask = 0; \ + barrier(); /* unmask then check (avoid races) */ \ + if ( unlikely(_vcpu->evtchn_upcall_pending) ) \ + force_evtchn_callback(); \ +} while (0) + +#define __restore_flags(x) \ +do { \ + vcpu_info_t *_vcpu; \ + barrier(); \ + _vcpu = &HYPERVISOR_shared_info->vcpu_info[PCPU_GET(cpuid)]; \ + if ((_vcpu->evtchn_upcall_mask = (x)) == 0) { \ + barrier(); /* unmask then check (avoid races) */ \ + if ( unlikely(_vcpu->evtchn_upcall_pending) ) \ + force_evtchn_callback(); \ + } \ +} while (0) + +/* + * Add critical_{enter, exit}? + * + */ +#define __save_and_cli(x) \ +do { \ + vcpu_info_t *_vcpu; \ + _vcpu = &HYPERVISOR_shared_info->vcpu_info[PCPU_GET(cpuid)]; \ + (x) = _vcpu->evtchn_upcall_mask; \ + _vcpu->evtchn_upcall_mask = 1; \ + barrier(); \ +} while (0) + + +#define cli() __cli() +#define sti() __sti() +#define save_flags(x) __save_flags(x) +#define restore_flags(x) __restore_flags(x) +#define save_and_cli(x) __save_and_cli(x) + +#define local_irq_save(x) __save_and_cli(x) +#define local_irq_restore(x) __restore_flags(x) +#define local_irq_disable() __cli() +#define local_irq_enable() __sti() + +#define mtx_lock_irqsave(lock, x) {local_irq_save((x)); mtx_lock_spin((lock));} +#define mtx_unlock_irqrestore(lock, x) {mtx_unlock_spin((lock)); local_irq_restore((x)); } +#define spin_lock_irqsave mtx_lock_irqsave +#define spin_unlock_irqrestore mtx_unlock_irqrestore + +#else +#endif + +#ifndef mb +#define mb() __asm__ __volatile__("mfence":::"memory") +#endif +#ifndef rmb +#define rmb() __asm__ __volatile__("lfence":::"memory"); +#endif +#ifndef wmb +#define wmb() barrier() +#endif +#ifdef SMP +#define smp_mb() mb() +#define smp_rmb() rmb() +#define smp_wmb() wmb() +#define smp_read_barrier_depends() read_barrier_depends() +#define set_mb(var, value) do { xchg(&var, value); } while (0) +#else +#define smp_mb() barrier() +#define smp_rmb() barrier() +#define smp_wmb() barrier() +#define smp_read_barrier_depends() do { } while(0) +#define set_mb(var, value) do { var = value; barrier(); } while (0) +#endif + + +/* This is a barrier for the compiler only, NOT the processor! */ +#define barrier() __asm__ __volatile__("": : :"memory") + +#define LOCK_PREFIX "" +#define LOCK "" +#define ADDR (*(volatile long *) addr) +/* + * Make sure gcc doesn't try to be clever and move things around + * on us. We need to use _exactly_ the address the user gave us, + * not some alias that contains the same information. + */ +typedef struct { volatile int counter; } atomic_t; + + + +#define xen_xchg(ptr,v) \ + ((__typeof__(*(ptr)))__xchg((unsigned long)(v),(ptr),sizeof(*(ptr)))) +struct __xchg_dummy { unsigned long a[100]; }; +#define __xg(x) ((volatile struct __xchg_dummy *)(x)) +static __inline unsigned long __xchg(unsigned long x, volatile void * ptr, + int size) +{ + switch (size) { + case 1: + __asm__ __volatile__("xchgb %b0,%1" + :"=q" (x) + :"m" (*__xg(ptr)), "0" (x) + :"memory"); + break; + case 2: + __asm__ __volatile__("xchgw %w0,%1" + :"=r" (x) + :"m" (*__xg(ptr)), "0" (x) + :"memory"); + break; + case 4: + __asm__ __volatile__("xchgl %0,%1" + :"=r" (x) + :"m" (*__xg(ptr)), "0" (x) + :"memory"); + break; + } + return x; +} + +/** + * test_and_clear_bit - Clear a bit and return its old value + * @nr: Bit to set + * @addr: Address to count from + * + * This operation is atomic and cannot be reordered. + * It also implies a memory barrier. + */ +static __inline int test_and_clear_bit(int nr, volatile void * addr) +{ + int oldbit; + + __asm__ __volatile__( LOCK_PREFIX + "btrl %2,%1\n\tsbbl %0,%0" + :"=r" (oldbit),"=m" (ADDR) + :"Ir" (nr) : "memory"); + return oldbit; +} + +static __inline int constant_test_bit(int nr, const volatile void * addr) +{ + return ((1UL << (nr & 31)) & (((const volatile unsigned int *) addr)[nr >> 5])) != 0; +} + +static __inline int variable_test_bit(int nr, volatile void * addr) +{ + int oldbit; + + __asm__ __volatile__( + "btl %2,%1\n\tsbbl %0,%0" + :"=r" (oldbit) + :"m" (ADDR),"Ir" (nr)); + return oldbit; +} + +#define test_bit(nr,addr) \ +(__builtin_constant_p(nr) ? \ + constant_test_bit((nr),(addr)) : \ + variable_test_bit((nr),(addr))) + + +/** + * set_bit - Atomically set a bit in memory + * @nr: the bit to set + * @addr: the address to start counting from + * + * This function is atomic and may not be reordered. See __set_bit() + * if you do not require the atomic guarantees. + * Note that @nr may be almost arbitrarily large; this function is not + * restricted to acting on a single-word quantity. + */ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Tue Dec 7 23:14:00 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ED977106564A; Tue, 7 Dec 2010 23:14:00 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DE0E28FC21; Tue, 7 Dec 2010 23:14:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oB7NE0rP083092; Tue, 7 Dec 2010 23:14:00 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB7NE0hL083090; Tue, 7 Dec 2010 23:14:00 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201012072314.oB7NE0hL083090@svn.freebsd.org> From: Nathan Whitehorn Date: Tue, 7 Dec 2010 23:14:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216278 - projects/binutils-2.17/contrib/binutils/bfd X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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, 07 Dec 2010 23:14:01 -0000 Author: nwhitehorn Date: Tue Dec 7 23:14:00 2010 New Revision: 216278 URL: http://svn.freebsd.org/changeset/base/216278 Log: Fix another .got references-in-linkonce-sections issue with C++. There are remaining issues here, and a more general solution is probably called for. Submitted by: Jakob van Santen Modified: projects/binutils-2.17/contrib/binutils/bfd/elf64-ppc.c Modified: projects/binutils-2.17/contrib/binutils/bfd/elf64-ppc.c ============================================================================== --- projects/binutils-2.17/contrib/binutils/bfd/elf64-ppc.c Tue Dec 7 22:43:29 2010 (r216277) +++ projects/binutils-2.17/contrib/binutils/bfd/elf64-ppc.c Tue Dec 7 23:14:00 2010 (r216278) @@ -9753,6 +9753,9 @@ ppc64_elf_action_discarded (asection *se if (strcmp (".got", sec->name) == 0) return 0; + if (strcmp (".got1", sec->name) == 0) + return 0; + return _bfd_elf_default_action_discarded (sec); } From owner-svn-src-projects@FreeBSD.ORG Tue Dec 7 23:44:07 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 60B79106566C; Tue, 7 Dec 2010 23:44:07 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 511D88FC18; Tue, 7 Dec 2010 23:44:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oB7Ni7to083792; Tue, 7 Dec 2010 23:44:07 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB7Ni7Ik083790; Tue, 7 Dec 2010 23:44:07 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201012072344.oB7Ni7Ik083790@svn.freebsd.org> From: Nathan Whitehorn Date: Tue, 7 Dec 2010 23:44:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216281 - projects/binutils-2.17/contrib/binutils/bfd X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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, 07 Dec 2010 23:44:07 -0000 Author: nwhitehorn Date: Tue Dec 7 23:44:07 2010 New Revision: 216281 URL: http://svn.freebsd.org/changeset/base/216281 Log: Try a more generic version of the last two fixes. Assuming this is correct, it should also be MI. The problem here arises when ld ends up linking a link-once section with relocations against sections that point back to it that are as yet unresolved. Instead of piecemeal finding sections we think are potentially subject to this issue, just defer processing for sections that have yet to be relocated instead of immediately bailing. Modified: projects/binutils-2.17/contrib/binutils/bfd/elf64-ppc.c Modified: projects/binutils-2.17/contrib/binutils/bfd/elf64-ppc.c ============================================================================== --- projects/binutils-2.17/contrib/binutils/bfd/elf64-ppc.c Tue Dec 7 23:33:20 2010 (r216280) +++ projects/binutils-2.17/contrib/binutils/bfd/elf64-ppc.c Tue Dec 7 23:44:07 2010 (r216281) @@ -9750,10 +9750,7 @@ ppc64_elf_action_discarded (asection *se if (strcmp (".toc1", sec->name) == 0) return 0; - if (strcmp (".got", sec->name) == 0) - return 0; - - if (strcmp (".got1", sec->name) == 0) + if (sec->flags & SEC_RELOC) return 0; return _bfd_elf_default_action_discarded (sec); From owner-svn-src-projects@FreeBSD.ORG Wed Dec 8 11:47:37 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 477D01065673; Wed, 8 Dec 2010 11:47:37 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (cl-327.ede-01.nl.sixxs.net [IPv6:2001:7b8:2ff:146::2]) by mx1.freebsd.org (Postfix) with ESMTP id 046108FC0C; Wed, 8 Dec 2010 11:47:37 +0000 (UTC) Received: from [IPv6:2001:7b8:3a7:0:8c19:df59:8444:adac] (unknown [IPv6:2001:7b8:3a7:0:8c19:df59:8444:adac]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id E55A55C5A; Wed, 8 Dec 2010 12:47:35 +0100 (CET) Message-ID: <4CFF7056.3040808@FreeBSD.org> Date: Wed, 08 Dec 2010 12:47:34 +0100 From: Dimitry Andric Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.2; en-US; rv:1.9.2.14pre) Gecko/20101201 Lanikai/3.1.8pre MIME-Version: 1.0 To: Tijl Coosemans References: <201012052024.oB5KOMUF007051@svn.freebsd.org> <201012061718.13823.tijl@coosemans.org> <4CFD2E01.1000509@FreeBSD.org> <201012071448.47319.tijl@freebsd.org> In-Reply-To: <201012071448.47319.tijl@freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r216200 - in projects/binutils-2.17: contrib/binutils/bfd contrib/binutils/gas/config contrib/binutils/ld/emulparams gnu/usr.bin/binutils/libbfd sys/boot/ia64/efi sys/boot/ia64/ski sys/... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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, 08 Dec 2010 11:47:37 -0000 On 2010-12-07 14:48, Tijl Coosemans wrote: > A third alternative :) Stop setting OSABI. Yes, that looks like a good alternative. It appears the kernel does not care too much about the OSABI field; if I hand-hack a static executable to reset the OSABI field to zero (aka 'SYSV'), it runs fine. It is sufficient that there is a .note.ABI-tag section in the file. > Looking at the binutils 2.20.1 BFD source the only files in which OSABI > is set to FreeBSD are: elf32-i386.c, elf64-alpha.c, elf64-sparc.c and > elf64-x86-64.c. For those architectures FreeBSD is the only OS that sets > OSABI. Since nobody cares about it maybe FreeBSD shouldn't either. The > field is redundant anyway given the .note.ABI-tag section. Indeed. There are some other OSes that seem to care about the field, but I don't see any real problem with just getting rid of it entirely. > I noticed the .note.ABI-tag section was missing from the ia64 startup > code (src/lib/csu/ia64/crt1.S). Adding it should fix the branding > problem reported on the mailing lists too and then there's no need for > hacks or special *-freebsd ELF formats. I verified this patch works on a ia64 box, it even looks nicer in file(1) output: test-before: ELF 64-bit LSB executable, IA-64, version 1 (FreeBSD), dynamically linked (uses shared libs), not stripped test-after: ELF 64-bit LSB executable, IA-64, version 1 (FreeBSD), dynamically linked (uses shared libs), for FreeBSD 9.0 (900026), not stripped So as far as I'm concerned, you can just commit it. As an aside, I saw that lib/csu/ia64/crti.S and crtn.S miss .ident statements, and as a whole lib/csu seems a bit inconsistent with those. Some files use __FBSID(), others plain .ident statements, and yet others simply use .ascii, and put the ID's in the .rodata segment... I'll have a look at cleaning that up, I think. :) From owner-svn-src-projects@FreeBSD.ORG Wed Dec 8 17:25:13 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8FDA6106573C for ; Wed, 8 Dec 2010 17:25:13 +0000 (UTC) (envelope-from giffunip@tutopia.com) Received: from nm18.bullet.mail.sp2.yahoo.com (nm18.bullet.mail.sp2.yahoo.com [98.139.91.88]) by mx1.freebsd.org (Postfix) with SMTP id 643EF8FC16 for ; Wed, 8 Dec 2010 17:25:08 +0000 (UTC) Received: from [98.139.91.66] by nm18.bullet.mail.sp2.yahoo.com with NNFMP; 08 Dec 2010 17:12:38 -0000 Received: from [98.139.91.15] by tm6.bullet.mail.sp2.yahoo.com with NNFMP; 08 Dec 2010 17:12:38 -0000 Received: from [127.0.0.1] by omp1015.mail.sp2.yahoo.com with NNFMP; 08 Dec 2010 17:12:38 -0000 X-Yahoo-Newman-Property: ymail-3 X-Yahoo-Newman-Id: 779007.69257.bm@omp1015.mail.sp2.yahoo.com Received: (qmail 61358 invoked by uid 60001); 8 Dec 2010 17:12:38 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s1024; t=1291828358; bh=6TsoanEaA8KUxX5LJhnLd7KRjJifCigxLX1/1CXeD3w=; h=Message-ID:X-YMail-OSG:Received:X-RocketYMMF:X-Mailer:Date:From:Subject:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding; b=Z8OTaUE68EfWA5w9WSkReBgY5kAx/qYr7kL4nXFyjrreZwk7QMinpAPeksahFHFf/Jkc4iaKQJBUHvzeMfxWvzA+wcsbJVITMc2sVKZq06taKJNMHUSUd+ya5aTTry4PsI/4XKcN79Vt1d6i5lHN7JbufH0S65o/pwRVmmfBVFk= Message-ID: <176575.61331.qm@web113501.mail.gq1.yahoo.com> X-YMail-OSG: L0oOcOsVM1m_4QOijb1koFBiH885PFAT.KkPX1miMslxcuh KcH7uwqUNiVWpDattQhiGUpAC4S6jOFyQP9TtGlUQzyON6JGWvL5ZNrjXv6W SKoi3DQQh6spdPYs2Ug_10Mg6DUI0oafbaWMK8Db_pwY5M1S6Jt_AxiHiAhs f23Y8Y8FT8Pc7KqrZ6vRQR7NBFKI8gdsJqLKtbgkkCFH23K7gM4Wwbxtbxaa LHQsZRD6TEyJRWpth4CdalgcJKTrwpij2m_mtr0sUXotIRiaL7ipkF7j9L_V 0uDtQEk9mKY_gndoEORJqMRXXw60i2UcaEuAAflCRtJ.VJElYpAQkfF2t6L_ Raf8GqWUsGdEe5mUWArYXw15aX6ceDsjqP8pTqNqGWw-- Received: from [190.157.140.248] by web113501.mail.gq1.yahoo.com via HTTP; Wed, 08 Dec 2010 09:12:37 PST X-RocketYMMF: giffunip X-Mailer: YahooMailRC/553 YahooMailWebService/0.8.107.285259 Date: Wed, 8 Dec 2010 09:12:37 -0800 (PST) From: "Pedro F. Giffuni" To: svn-src-projects@freebsd.org, src-committers@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: Tijl Coosemans , Dimitry Andric Subject: Re: svn commit: r216200 - in projects/binutils-2.17: contrib/binutils/bfd contrib/binutils/gas/config contrib/binutils/ld/emulparams gnu/usr.bin/binutils/libbfd sys/boot/ia64/efi sys/boot/ia64/ski sys/... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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, 08 Dec 2010 17:25:13 -0000 Hello;=0A=0AI don't think it's a good idea to stop using the ELF_OSABI fiel= d.=0AFor one thing, we've been using it since 1999 and we are registered=0A= along with most commercial UNIX vendors:=0A=0Ahttp://www.sco.com/developers= /gabi/latest/ch4.eheader.html#elfid=0A=0AELF notes are only used by GNU guy= s (therefore binutils) and we=0Aonly support it since 2009 (mainly to stop = using brandelf for the=0Alinuxulator). We aren't registered on the site tha= t seems to document=0Athem.=0A=0APedro.=0A=0A=0A From owner-svn-src-projects@FreeBSD.ORG Wed Dec 8 22:42:07 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E84D8106564A; Wed, 8 Dec 2010 22:42:07 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (cl-327.ede-01.nl.sixxs.net [IPv6:2001:7b8:2ff:146::2]) by mx1.freebsd.org (Postfix) with ESMTP id 3E97C8FC0C; Wed, 8 Dec 2010 22:42:07 +0000 (UTC) Received: from [IPv6:2001:7b8:3a7:0:4163:4ba4:d7c2:917d] (unknown [IPv6:2001:7b8:3a7:0:4163:4ba4:d7c2:917d]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 2E78F5C5A; Wed, 8 Dec 2010 23:42:06 +0100 (CET) Message-ID: <4D0009BF.6060000@FreeBSD.org> Date: Wed, 08 Dec 2010 23:42:07 +0100 From: Dimitry Andric Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.2; en-US; rv:1.9.2.14pre) Gecko/20101207 Lanikai/3.1.8pre MIME-Version: 1.0 To: Tijl Coosemans References: <201012052024.oB5KOMUF007051@svn.freebsd.org> <201012061718.13823.tijl@coosemans.org> <4CFD2E01.1000509@FreeBSD.org> <201012071448.47319.tijl@freebsd.org> <4CFF7056.3040808@FreeBSD.org> In-Reply-To: <4CFF7056.3040808@FreeBSD.org> Content-Type: multipart/mixed; boundary="------------000105070106050105010000" Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org Subject: Let lib/csu use __FBSDID consistently [was: Re: svn commit: r216200 - in projects/binutils-2.17: ...] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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, 08 Dec 2010 22:42:08 -0000 This is a multi-part message in MIME format. --------------000105070106050105010000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 2010-12-08 12:47, Dimitry Andric wrote: ... > As an aside, I saw that lib/csu/ia64/crti.S and crtn.S miss .ident > statements, and as a whole lib/csu seems a bit inconsistent with those. > Some files use __FBSID(), others plain .ident statements, and yet others > simply use .ascii, and put the ID's in the .rodata segment... I'll have > a look at cleaning that up, I think. :) Okay, here's a diff that lets lib/csu consistently use __FBSDID(). This survives a make universe. If there are no objections, I would like to commit it. --------------000105070106050105010000 Content-Type: text/plain; name="csu-ident-1.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="csu-ident-1.diff" Index: lib/csu/amd64/crt1.c =================================================================== --- lib/csu/amd64/crt1.c (revision 216309) +++ lib/csu/amd64/crt1.c (working copy) @@ -24,6 +24,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: head/lib/csu/amd64/crt1.c 204756 2010-03-05 13:28:05Z uqs $"); + #ifndef lint #ifndef __GNUC__ #error "GCC is needed to compile this file" @@ -92,5 +95,3 @@ __asm__("eprol:"); _init(); exit( main(argc, argv, env) ); } - -__asm__(".ident\t\"$FreeBSD: head/lib/csu/amd64/crt1.c 204756 2010-03-05 13:28:05Z uqs $\""); Index: lib/csu/amd64/crti.S =================================================================== --- lib/csu/amd64/crti.S (revision 216309) +++ lib/csu/amd64/crti.S (working copy) @@ -23,6 +23,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: head/lib/csu/amd64/crti.S 127252 2004-03-21 01:39:01Z peter $"); + .section .init,"ax",@progbits .align 4 .globl _init @@ -36,6 +39,3 @@ _init: .type _fini,@function _fini: subq $8,%rsp - - .section .rodata -.ascii "$FreeBSD: head/lib/csu/amd64/crti.S 127252 2004-03-21 01:39:01Z peter $\0" Index: lib/csu/amd64/crtn.S =================================================================== --- lib/csu/amd64/crtn.S (revision 216309) +++ lib/csu/amd64/crtn.S (working copy) @@ -23,6 +23,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: head/lib/csu/amd64/crtn.S 127252 2004-03-21 01:39:01Z peter $"); + .section .init,"ax",@progbits addq $8,%rsp ret @@ -30,6 +33,3 @@ .section .fini,"ax",@progbits addq $8,%rsp ret - - .section .rodata -.ascii "$FreeBSD: head/lib/csu/amd64/crtn.S 127252 2004-03-21 01:39:01Z peter $\0" Index: lib/csu/arm/crt1.c =================================================================== --- lib/csu/arm/crt1.c (revision 216309) +++ lib/csu/arm/crt1.c (working copy) @@ -39,6 +39,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: head/lib/csu/arm/crt1.c 204756 2010-03-05 13:28:05Z uqs $"); + #ifndef lint #ifndef __GNUC__ #error "GCC is needed to compile this file" @@ -49,7 +52,6 @@ #include "libc_private.h" #include "crtbrand.c" -#include struct Struct_Obj_Entry; struct ps_strings; @@ -136,5 +138,3 @@ __asm__(".text"); __asm__("eprol:"); __asm__(".previous"); #endif - -__asm__(".ident\t\"$FreeBSD: head/lib/csu/arm/crt1.c 204756 2010-03-05 13:28:05Z uqs $\""); Index: lib/csu/arm/crtn.S =================================================================== --- lib/csu/arm/crtn.S (revision 216309) +++ lib/csu/arm/crtn.S (working copy) @@ -1,5 +1,6 @@ #include __FBSDID("$FreeBSD: head/lib/csu/arm/crtn.S 135679 2004-09-23 23:00:51Z cognet $"); + .section .init,"ax",%progbits ldmea fp, {fp, sp, pc} mov pc, lr Index: lib/csu/i386-elf/crt1_c.c =================================================================== --- lib/csu/i386-elf/crt1_c.c (revision 216309) +++ lib/csu/i386-elf/crt1_c.c (working copy) @@ -26,6 +26,9 @@ * $FreeBSD: head/lib/csu/i386-elf/crt1_c.c 200038 2009-12-02 16:34:20Z kib $ */ +#include +__FBSDID("$FreeBSD: head/lib/csu/i386-elf/crt1_c.c 200038 2009-12-02 16:34:20Z kib $"); + #ifndef lint #ifndef __GNUC__ #error "GCC is needed to compile this file" Index: lib/csu/i386-elf/crt1_s.S =================================================================== --- lib/csu/i386-elf/crt1_s.S (revision 216309) +++ lib/csu/i386-elf/crt1_s.S (working copy) @@ -25,6 +25,8 @@ * $FreeBSD: head/lib/csu/i386-elf/crt1_s.S 209295 2010-06-18 11:10:39Z kib $ */ +#include +__FBSDID("$FreeBSD: head/lib/csu/i386-elf/crt1_s.S 209295 2010-06-18 11:10:39Z kib $"); .text .align 4 @@ -47,5 +49,3 @@ _start: int3 .cfi_endproc .size _start, . - _start - - .ident "$FreeBSD: head/lib/csu/i386-elf/crt1_s.S 209295 2010-06-18 11:10:39Z kib $" Index: lib/csu/i386-elf/crti.S =================================================================== --- lib/csu/i386-elf/crti.S (revision 216309) +++ lib/csu/i386-elf/crti.S (working copy) @@ -23,6 +23,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: head/lib/csu/i386-elf/crti.S 146369 2005-05-19 07:31:06Z dfr $"); + .section .init,"ax",@progbits .align 4 .globl _init @@ -36,6 +39,3 @@ _init: .type _fini,@function _fini: sub $12,%esp /* re-align stack pointer */ - - .section .rodata -.ascii "$FreeBSD: head/lib/csu/i386-elf/crti.S 146369 2005-05-19 07:31:06Z dfr $\0" Index: lib/csu/i386-elf/crtn.S =================================================================== --- lib/csu/i386-elf/crtn.S (revision 216309) +++ lib/csu/i386-elf/crtn.S (working copy) @@ -23,6 +23,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: head/lib/csu/i386-elf/crtn.S 146369 2005-05-19 07:31:06Z dfr $"); + .section .init,"ax",@progbits add $12,%esp ret @@ -30,6 +33,3 @@ .section .fini,"ax",@progbits add $12,%esp ret - - .section .rodata -.ascii "$FreeBSD: head/lib/csu/i386-elf/crtn.S 146369 2005-05-19 07:31:06Z dfr $\0" Index: lib/csu/ia64/crt1.S =================================================================== --- lib/csu/ia64/crt1.S (revision 216309) +++ lib/csu/ia64/crt1.S (working copy) @@ -24,7 +24,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - .ident "$FreeBSD: head/lib/csu/ia64/crt1.S 133989 2004-08-18 23:06:47Z marcel $" +#include +__FBSDID("$FreeBSD: head/lib/csu/ia64/crt1.S 133989 2004-08-18 23:06:47Z marcel $"); .text Index: lib/csu/ia64/crti.S =================================================================== --- lib/csu/ia64/crti.S (revision 216309) +++ lib/csu/ia64/crti.S (working copy) @@ -26,6 +26,9 @@ * $FreeBSD: head/lib/csu/ia64/crti.S 85952 2001-11-03 06:31:27Z peter $ */ +#include +__FBSDID("$FreeBSD: head/lib/csu/ia64/crti.S 85952 2001-11-03 06:31:27Z peter $"); + /* * This file (and its companion crtn.S) form the terminators of the * .init and .fini sections. Index: lib/csu/ia64/crtn.S =================================================================== --- lib/csu/ia64/crtn.S (revision 216309) +++ lib/csu/ia64/crtn.S (working copy) @@ -26,6 +26,9 @@ * $FreeBSD: head/lib/csu/ia64/crtn.S 213906 2010-10-15 21:40:20Z dim $ */ +#include +__FBSDID("$FreeBSD: head/lib/csu/ia64/crtn.S 213906 2010-10-15 21:40:20Z dim $"); + .file "crtn.S" .section .init,"ax",@progbits Index: lib/csu/powerpc/crt1.c =================================================================== --- lib/csu/powerpc/crt1.c (revision 216309) +++ lib/csu/powerpc/crt1.c (working copy) @@ -39,6 +39,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: head/lib/csu/powerpc/crt1.c 204756 2010-03-05 13:28:05Z uqs $"); + #ifndef lint #ifndef __GNUC__ #error "GCC is needed to compile this file" @@ -120,5 +123,3 @@ __asm__(".text"); __asm__("eprol:"); __asm__(".previous"); #endif - -__asm__(".ident\t\"$FreeBSD: head/lib/csu/powerpc/crt1.c 204756 2010-03-05 13:28:05Z uqs $\""); Index: lib/csu/powerpc/crti.S =================================================================== --- lib/csu/powerpc/crti.S (revision 216309) +++ lib/csu/powerpc/crti.S (working copy) @@ -22,7 +22,10 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - + +#include +__FBSDID("$FreeBSD: head/lib/csu/powerpc/crti.S 96632 2002-05-15 04:19:49Z obrien $"); + .section .init,"ax",@progbits .align 2 .globl _init @@ -44,7 +47,3 @@ _fini: stw 31,12(1) stw 0,20(1) mr 31,1 - - - .section .rodata -.ascii "$FreeBSD: head/lib/csu/powerpc/crti.S 96632 2002-05-15 04:19:49Z obrien $\0" Index: lib/csu/powerpc/crtn.S =================================================================== --- lib/csu/powerpc/crtn.S (revision 216309) +++ lib/csu/powerpc/crtn.S (working copy) @@ -23,6 +23,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: head/lib/csu/powerpc/crtn.S 96632 2002-05-15 04:19:49Z obrien $"); + .section .init,"ax",@progbits lwz 11,0(1) lwz 0,4(11) @@ -39,7 +42,3 @@ lwz 31,-4(11) mr 1,11 blr - - - .section .rodata -.ascii "$FreeBSD: head/lib/csu/powerpc/crtn.S 96632 2002-05-15 04:19:49Z obrien $\0" Index: lib/csu/powerpc64/crt1.c =================================================================== --- lib/csu/powerpc64/crt1.c (revision 216309) +++ lib/csu/powerpc64/crt1.c (working copy) @@ -39,6 +39,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: head/lib/csu/powerpc64/crt1.c 209869 2010-07-10 03:45:55Z nwhitehorn $"); + #ifndef lint #ifndef __GNUC__ #error "GCC is needed to compile this file" @@ -119,5 +122,3 @@ __asm__(".text"); __asm__("eprol:"); __asm__(".previous"); #endif - -__asm__(".ident\t\"$FreeBSD: head/lib/csu/powerpc64/crt1.c 209869 2010-07-10 03:45:55Z nwhitehorn $\""); Index: lib/csu/powerpc64/crti.S =================================================================== --- lib/csu/powerpc64/crti.S (revision 216309) +++ lib/csu/powerpc64/crti.S (working copy) @@ -22,7 +22,10 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - + +#include +__FBSDID("$FreeBSD: head/lib/csu/powerpc64/crti.S 209869 2010-07-10 03:45:55Z nwhitehorn $"); + .section .init,"ax",@progbits .align 2 .globl _init @@ -56,6 +59,3 @@ _fini: stdu 1,-48(1) mflr 0 std 0,64(1) - - .section .rodata -.ascii "$FreeBSD: head/lib/csu/powerpc64/crti.S 209869 2010-07-10 03:45:55Z nwhitehorn $\0" Index: lib/csu/powerpc64/crtn.S =================================================================== --- lib/csu/powerpc64/crtn.S (revision 216309) +++ lib/csu/powerpc64/crtn.S (working copy) @@ -23,6 +23,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: head/lib/csu/powerpc64/crtn.S 209869 2010-07-10 03:45:55Z nwhitehorn $"); + .section .init,"ax",@progbits ld %r1,0(%r1) ld 0,16(%r1) @@ -35,7 +38,3 @@ ld 0,16(%r1) mtlr 0 blr - - - .section .rodata -.ascii "$FreeBSD: head/lib/csu/powerpc64/crtn.S 209869 2010-07-10 03:45:55Z nwhitehorn $\0" Index: lib/csu/sparc64/crt1.c =================================================================== --- lib/csu/sparc64/crt1.c (revision 216309) +++ lib/csu/sparc64/crt1.c (working copy) @@ -30,6 +30,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: head/lib/csu/sparc64/crt1.c 204756 2010-03-05 13:28:05Z uqs $"); + #ifndef lint #ifndef __GNUC__ #error "GCC is needed to compile this file" @@ -121,5 +124,3 @@ __asm__(".text"); __asm__("eprol:"); __asm__(".previous"); #endif - -__asm__(".ident\t\"$FreeBSD: head/lib/csu/sparc64/crt1.c 204756 2010-03-05 13:28:05Z uqs $\""); Index: lib/csu/sparc64/crti.S =================================================================== --- lib/csu/sparc64/crti.S (revision 216309) +++ lib/csu/sparc64/crti.S (working copy) @@ -26,6 +26,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: head/lib/csu/sparc64/crti.S 85612 2001-10-28 00:20:34Z obrien $"); + .file "crti.S" /* The minimum stack frame size (bytes) is: @@ -52,7 +55,3 @@ _init: .align 4 _fini: save %sp,-192,%sp - - - .section .rodata -.ascii "$FreeBSD: head/lib/csu/sparc64/crti.S 85612 2001-10-28 00:20:34Z obrien $\0" Index: lib/csu/sparc64/crtn.S =================================================================== --- lib/csu/sparc64/crtn.S (revision 216309) +++ lib/csu/sparc64/crtn.S (working copy) @@ -26,6 +26,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: head/lib/csu/sparc64/crtn.S 85612 2001-10-28 00:20:34Z obrien $"); + .file "crtn.S" .section .init,"ax",@progbits @@ -37,6 +40,3 @@ .align 4 ret restore - - .section .rodata -.ascii "$FreeBSD: head/lib/csu/sparc64/crtn.S 85612 2001-10-28 00:20:34Z obrien $\0" --------------000105070106050105010000-- From owner-svn-src-projects@FreeBSD.ORG Thu Dec 9 17:39:41 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 08C02106564A; Thu, 9 Dec 2010 17:39:41 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EC0B18FC1A; Thu, 9 Dec 2010 17:39:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oB9HdeQS045235; Thu, 9 Dec 2010 17:39:40 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB9HdeAs045233; Thu, 9 Dec 2010 17:39:40 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201012091739.oB9HdeAs045233@svn.freebsd.org> From: Nathan Whitehorn Date: Thu, 9 Dec 2010 17:39:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216329 - projects/binutils-2.17/gnu/usr.bin/cc/cc_tools X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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, 09 Dec 2010 17:39:41 -0000 Author: nwhitehorn Date: Thu Dec 9 17:39:40 2010 New Revision: 216329 URL: http://svn.freebsd.org/changeset/base/216329 Log: Fix a missing underscore. Modified: projects/binutils-2.17/gnu/usr.bin/cc/cc_tools/auto-host.h Modified: projects/binutils-2.17/gnu/usr.bin/cc/cc_tools/auto-host.h ============================================================================== --- projects/binutils-2.17/gnu/usr.bin/cc/cc_tools/auto-host.h Thu Dec 9 15:28:59 2010 (r216328) +++ projects/binutils-2.17/gnu/usr.bin/cc/cc_tools/auto-host.h Thu Dec 9 17:39:40 2010 (r216329) @@ -891,7 +891,7 @@ /* Define if your PowerPC64 linker only needs function descriptor syms. */ #ifndef USED_FOR_TARGET -# ifdef __powerpc64_ +# ifdef __powerpc64__ # define HAVE_LD_NO_DOT_SYMS 1 # endif #endif From owner-svn-src-projects@FreeBSD.ORG Thu Dec 9 22:01:17 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0BA0C1065740; Thu, 9 Dec 2010 22:01:17 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E95188FC14; Thu, 9 Dec 2010 22:01:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oB9M1Gc9052076; Thu, 9 Dec 2010 22:01:16 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB9M1Gue052062; Thu, 9 Dec 2010 22:01:16 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201012092201.oB9M1Gue052062@svn.freebsd.org> From: Dimitry Andric Date: Thu, 9 Dec 2010 22:01:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216339 - in projects/binutils-2.17: . bin/csh/USD.doc bin/sh cddl/contrib/opensolaris/lib/libzfs/common contrib/bind9 contrib/bind9/bin/check contrib/bind9/bin/dig contrib/bind9/bin/na... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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, 09 Dec 2010 22:01:17 -0000 Author: dim Date: Thu Dec 9 22:01:15 2010 New Revision: 216339 URL: http://svn.freebsd.org/changeset/base/216339 Log: Sync: merge r216133 through r216338 from ^/head. Added: projects/binutils-2.17/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.html - copied unchanged from r216338, head/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.html projects/binutils-2.17/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.pdf - copied unchanged from r216338, head/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.pdf projects/binutils-2.17/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.txt - copied unchanged from r216338, head/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.txt projects/binutils-2.17/contrib/bind9/release-notes.css - copied unchanged from r216338, head/contrib/bind9/release-notes.css projects/binutils-2.17/contrib/bsnmp/lib/snmpcrypto.c - copied unchanged from r216338, head/contrib/bsnmp/lib/snmpcrypto.c projects/binutils-2.17/contrib/bsnmp/snmp_usm/ - copied from r216338, head/contrib/bsnmp/snmp_usm/ projects/binutils-2.17/contrib/bsnmp/snmp_vacm/ - copied from r216338, head/contrib/bsnmp/snmp_vacm/ projects/binutils-2.17/crypto/openssl/ACKNOWLEDGMENTS - copied unchanged from r216338, head/crypto/openssl/ACKNOWLEDGMENTS projects/binutils-2.17/lib/msun/src/e_log2.c - copied unchanged from r216338, head/lib/msun/src/e_log2.c projects/binutils-2.17/lib/msun/src/e_log2f.c - copied unchanged from r216338, head/lib/msun/src/e_log2f.c projects/binutils-2.17/lib/msun/src/k_log.h - copied unchanged from r216338, head/lib/msun/src/k_log.h projects/binutils-2.17/lib/msun/src/k_logf.h - copied unchanged from r216338, head/lib/msun/src/k_logf.h projects/binutils-2.17/share/doc/psd/12.make/stubs - copied unchanged from r216338, head/share/doc/psd/12.make/stubs projects/binutils-2.17/share/doc/psd/12.make/tutorial.ms - copied unchanged from r216338, head/share/doc/psd/12.make/tutorial.ms projects/binutils-2.17/share/doc/psd/18.gprof/abstract.me - copied unchanged from r216338, head/share/doc/psd/18.gprof/abstract.me projects/binutils-2.17/share/doc/psd/18.gprof/gathering.me - copied unchanged from r216338, head/share/doc/psd/18.gprof/gathering.me projects/binutils-2.17/share/doc/psd/18.gprof/header.me - copied unchanged from r216338, head/share/doc/psd/18.gprof/header.me projects/binutils-2.17/share/doc/psd/18.gprof/intro.me - copied unchanged from r216338, head/share/doc/psd/18.gprof/intro.me projects/binutils-2.17/share/doc/psd/18.gprof/postp.me - copied unchanged from r216338, head/share/doc/psd/18.gprof/postp.me projects/binutils-2.17/share/doc/psd/18.gprof/postp1.pic - copied unchanged from r216338, head/share/doc/psd/18.gprof/postp1.pic projects/binutils-2.17/share/doc/psd/18.gprof/postp2.pic - copied unchanged from r216338, head/share/doc/psd/18.gprof/postp2.pic projects/binutils-2.17/share/doc/psd/18.gprof/postp3.pic - copied unchanged from r216338, head/share/doc/psd/18.gprof/postp3.pic projects/binutils-2.17/share/doc/psd/18.gprof/pres1.pic - copied unchanged from r216338, head/share/doc/psd/18.gprof/pres1.pic projects/binutils-2.17/share/doc/psd/18.gprof/pres2.pic - copied unchanged from r216338, head/share/doc/psd/18.gprof/pres2.pic projects/binutils-2.17/share/doc/psd/18.gprof/present.me - copied unchanged from r216338, head/share/doc/psd/18.gprof/present.me projects/binutils-2.17/share/doc/psd/18.gprof/profiling.me - copied unchanged from r216338, head/share/doc/psd/18.gprof/profiling.me projects/binutils-2.17/share/doc/psd/18.gprof/refs.me - copied unchanged from r216338, head/share/doc/psd/18.gprof/refs.me projects/binutils-2.17/share/doc/psd/22.rpcgen/rpcgen.ms - copied unchanged from r216338, head/share/doc/psd/22.rpcgen/rpcgen.ms projects/binutils-2.17/share/doc/psd/22.rpcgen/stubs - copied unchanged from r216338, head/share/doc/psd/22.rpcgen/stubs projects/binutils-2.17/share/doc/psd/23.rpc/rpc.prog.ms - copied unchanged from r216338, head/share/doc/psd/23.rpc/rpc.prog.ms projects/binutils-2.17/share/doc/psd/23.rpc/stubs - copied unchanged from r216338, head/share/doc/psd/23.rpc/stubs projects/binutils-2.17/share/doc/psd/24.xdr/stubs - copied unchanged from r216338, head/share/doc/psd/24.xdr/stubs projects/binutils-2.17/share/doc/psd/24.xdr/xdr.nts.ms - copied unchanged from r216338, head/share/doc/psd/24.xdr/xdr.nts.ms projects/binutils-2.17/share/doc/psd/25.xdrrfc/stubs - copied unchanged from r216338, head/share/doc/psd/25.xdrrfc/stubs projects/binutils-2.17/share/doc/psd/25.xdrrfc/xdr.rfc.ms - copied unchanged from r216338, head/share/doc/psd/25.xdrrfc/xdr.rfc.ms projects/binutils-2.17/share/doc/psd/26.rpcrfc/rpc.rfc.ms - copied unchanged from r216338, head/share/doc/psd/26.rpcrfc/rpc.rfc.ms projects/binutils-2.17/share/doc/psd/26.rpcrfc/stubs - copied unchanged from r216338, head/share/doc/psd/26.rpcrfc/stubs projects/binutils-2.17/share/doc/psd/27.nfsrpc/nfs.rfc.ms - copied unchanged from r216338, head/share/doc/psd/27.nfsrpc/nfs.rfc.ms projects/binutils-2.17/share/doc/psd/27.nfsrpc/stubs - copied unchanged from r216338, head/share/doc/psd/27.nfsrpc/stubs projects/binutils-2.17/share/doc/smm/02.config/0.t - copied unchanged from r216338, head/share/doc/smm/02.config/0.t projects/binutils-2.17/share/doc/smm/02.config/1.t - copied unchanged from r216338, head/share/doc/smm/02.config/1.t projects/binutils-2.17/share/doc/smm/02.config/2.t - copied unchanged from r216338, head/share/doc/smm/02.config/2.t projects/binutils-2.17/share/doc/smm/02.config/3.t - copied unchanged from r216338, head/share/doc/smm/02.config/3.t projects/binutils-2.17/share/doc/smm/02.config/4.t - copied unchanged from r216338, head/share/doc/smm/02.config/4.t projects/binutils-2.17/share/doc/smm/02.config/5.t - copied unchanged from r216338, head/share/doc/smm/02.config/5.t projects/binutils-2.17/share/doc/smm/02.config/6.t - copied unchanged from r216338, head/share/doc/smm/02.config/6.t projects/binutils-2.17/share/doc/smm/02.config/a.t - copied unchanged from r216338, head/share/doc/smm/02.config/a.t projects/binutils-2.17/share/doc/smm/02.config/b.t - copied unchanged from r216338, head/share/doc/smm/02.config/b.t projects/binutils-2.17/share/doc/smm/02.config/c.t - copied unchanged from r216338, head/share/doc/smm/02.config/c.t projects/binutils-2.17/share/doc/smm/02.config/d.t - copied unchanged from r216338, head/share/doc/smm/02.config/d.t projects/binutils-2.17/share/doc/smm/02.config/e.t - copied unchanged from r216338, head/share/doc/smm/02.config/e.t projects/binutils-2.17/share/doc/smm/02.config/spell.ok - copied unchanged from r216338, head/share/doc/smm/02.config/spell.ok projects/binutils-2.17/share/doc/smm/03.fsck/0.t - copied unchanged from r216338, head/share/doc/smm/03.fsck/0.t projects/binutils-2.17/share/doc/smm/03.fsck/1.t - copied unchanged from r216338, head/share/doc/smm/03.fsck/1.t projects/binutils-2.17/share/doc/smm/03.fsck/2.t - copied unchanged from r216338, head/share/doc/smm/03.fsck/2.t projects/binutils-2.17/share/doc/smm/03.fsck/3.t - copied unchanged from r216338, head/share/doc/smm/03.fsck/3.t projects/binutils-2.17/share/doc/smm/03.fsck/4.t - copied unchanged from r216338, head/share/doc/smm/03.fsck/4.t projects/binutils-2.17/share/doc/smm/07.lpr/ - copied from r216338, head/share/doc/smm/07.lpr/ projects/binutils-2.17/share/doc/smm/11.timedop/timed.ms - copied unchanged from r216338, head/share/doc/smm/11.timedop/timed.ms projects/binutils-2.17/share/doc/smm/12.timed/date - copied unchanged from r216338, head/share/doc/smm/12.timed/date projects/binutils-2.17/share/doc/smm/12.timed/loop - copied unchanged from r216338, head/share/doc/smm/12.timed/loop projects/binutils-2.17/share/doc/smm/12.timed/spell.ok - copied unchanged from r216338, head/share/doc/smm/12.timed/spell.ok projects/binutils-2.17/share/doc/smm/12.timed/time - copied unchanged from r216338, head/share/doc/smm/12.timed/time projects/binutils-2.17/share/doc/smm/12.timed/timed.ms - copied unchanged from r216338, head/share/doc/smm/12.timed/timed.ms projects/binutils-2.17/share/doc/smm/12.timed/unused - copied unchanged from r216338, head/share/doc/smm/12.timed/unused projects/binutils-2.17/share/doc/usd/04.csh/csh.1 - copied unchanged from r216338, head/share/doc/usd/04.csh/csh.1 projects/binutils-2.17/share/doc/usd/04.csh/csh.2 - copied unchanged from r216338, head/share/doc/usd/04.csh/csh.2 projects/binutils-2.17/share/doc/usd/04.csh/csh.3 - copied unchanged from r216338, head/share/doc/usd/04.csh/csh.3 projects/binutils-2.17/share/doc/usd/04.csh/csh.4 - copied unchanged from r216338, head/share/doc/usd/04.csh/csh.4 projects/binutils-2.17/share/doc/usd/04.csh/csh.a - copied unchanged from r216338, head/share/doc/usd/04.csh/csh.a projects/binutils-2.17/share/doc/usd/04.csh/csh.g - copied unchanged from r216338, head/share/doc/usd/04.csh/csh.g projects/binutils-2.17/share/doc/usd/04.csh/tabs - copied unchanged from r216338, head/share/doc/usd/04.csh/tabs projects/binutils-2.17/share/doc/usd/05.dc/dc - copied unchanged from r216338, head/share/doc/usd/05.dc/dc projects/binutils-2.17/share/doc/usd/06.bc/bc - copied unchanged from r216338, head/share/doc/usd/06.bc/bc projects/binutils-2.17/share/doc/usd/07.mail/mail0.nr - copied unchanged from r216338, head/share/doc/usd/07.mail/mail0.nr projects/binutils-2.17/share/doc/usd/07.mail/mail1.nr - copied unchanged from r216338, head/share/doc/usd/07.mail/mail1.nr projects/binutils-2.17/share/doc/usd/07.mail/mail2.nr - copied unchanged from r216338, head/share/doc/usd/07.mail/mail2.nr projects/binutils-2.17/share/doc/usd/07.mail/mail3.nr - copied unchanged from r216338, head/share/doc/usd/07.mail/mail3.nr projects/binutils-2.17/share/doc/usd/07.mail/mail4.nr - copied unchanged from r216338, head/share/doc/usd/07.mail/mail4.nr projects/binutils-2.17/share/doc/usd/07.mail/mail5.nr - copied unchanged from r216338, head/share/doc/usd/07.mail/mail5.nr projects/binutils-2.17/share/doc/usd/07.mail/mail6.nr - copied unchanged from r216338, head/share/doc/usd/07.mail/mail6.nr projects/binutils-2.17/share/doc/usd/07.mail/mail7.nr - copied unchanged from r216338, head/share/doc/usd/07.mail/mail7.nr projects/binutils-2.17/share/doc/usd/07.mail/mail8.nr - copied unchanged from r216338, head/share/doc/usd/07.mail/mail8.nr projects/binutils-2.17/share/doc/usd/07.mail/mail9.nr - copied unchanged from r216338, head/share/doc/usd/07.mail/mail9.nr projects/binutils-2.17/share/doc/usd/07.mail/maila.nr - copied unchanged from r216338, head/share/doc/usd/07.mail/maila.nr projects/binutils-2.17/share/man/man9/SYSINIT.9 - copied unchanged from r216338, head/share/man/man9/SYSINIT.9 projects/binutils-2.17/sys/mips/mips/uma_machdep.c - copied unchanged from r216338, head/sys/mips/mips/uma_machdep.c projects/binutils-2.17/sys/powerpc/aim/mmu_oea64.h - copied unchanged from r216338, head/sys/powerpc/aim/mmu_oea64.h projects/binutils-2.17/sys/powerpc/aim/moea64_if.m - copied unchanged from r216338, head/sys/powerpc/aim/moea64_if.m projects/binutils-2.17/sys/powerpc/aim/moea64_native.c - copied unchanged from r216338, head/sys/powerpc/aim/moea64_native.c projects/binutils-2.17/sys/powerpc/powerpc/iommu_if.m - copied unchanged from r216338, head/sys/powerpc/powerpc/iommu_if.m projects/binutils-2.17/sys/x86/x86/busdma_machdep.c - copied unchanged from r216338, head/sys/x86/x86/busdma_machdep.c projects/binutils-2.17/sys/x86/x86/tsc.c - copied unchanged from r216338, head/sys/x86/x86/tsc.c projects/binutils-2.17/tools/regression/lib/msun/test-logarithm.c - copied unchanged from r216338, head/tools/regression/lib/msun/test-logarithm.c projects/binutils-2.17/tools/regression/lib/msun/test-logarithm.t - copied unchanged from r216338, head/tools/regression/lib/msun/test-logarithm.t projects/binutils-2.17/tools/regression/lib/msun/test-nearbyint.c - copied unchanged from r216338, head/tools/regression/lib/msun/test-nearbyint.c projects/binutils-2.17/tools/regression/lib/msun/test-nearbyint.t - copied unchanged from r216338, head/tools/regression/lib/msun/test-nearbyint.t projects/binutils-2.17/tools/regression/usr.bin/printf/regress.m5.out - copied unchanged from r216338, head/tools/regression/usr.bin/printf/regress.m5.out projects/binutils-2.17/usr.sbin/bsnmpd/modules/snmp_usm/ - copied from r216338, head/usr.sbin/bsnmpd/modules/snmp_usm/ projects/binutils-2.17/usr.sbin/bsnmpd/modules/snmp_vacm/ - copied from r216338, head/usr.sbin/bsnmpd/modules/snmp_vacm/ projects/binutils-2.17/usr.sbin/bsnmpd/tools/ - copied from r216338, head/usr.sbin/bsnmpd/tools/ Deleted: projects/binutils-2.17/bin/csh/USD.doc/ projects/binutils-2.17/lib/libc/rpc/PSD.doc/ projects/binutils-2.17/sbin/fsck_ffs/SMM.doc/ projects/binutils-2.17/sys/amd64/amd64/busdma_machdep.c projects/binutils-2.17/sys/amd64/amd64/tsc.c projects/binutils-2.17/sys/i386/i386/busdma_machdep.c projects/binutils-2.17/sys/i386/i386/tsc.c projects/binutils-2.17/usr.bin/bc/USD.doc/ projects/binutils-2.17/usr.bin/dc/USD.doc/ projects/binutils-2.17/usr.bin/gprof/PSD.doc/ projects/binutils-2.17/usr.bin/mail/USD.doc/ projects/binutils-2.17/usr.bin/make/PSD.doc/ projects/binutils-2.17/usr.sbin/config/SMM.doc/ projects/binutils-2.17/usr.sbin/lpr/SMM.doc/ projects/binutils-2.17/usr.sbin/timed/SMM.doc/ projects/binutils-2.17/usr.sbin/usbdevs/ Modified: projects/binutils-2.17/ObsoleteFiles.inc projects/binutils-2.17/bin/sh/jobs.c projects/binutils-2.17/bin/sh/sh.1 projects/binutils-2.17/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c projects/binutils-2.17/contrib/bind9/CHANGES projects/binutils-2.17/contrib/bind9/bin/check/check-tool.c projects/binutils-2.17/contrib/bind9/bin/check/check-tool.h projects/binutils-2.17/contrib/bind9/bin/check/named-checkconf.c projects/binutils-2.17/contrib/bind9/bin/check/named-checkzone.c projects/binutils-2.17/contrib/bind9/bin/dig/host.c projects/binutils-2.17/contrib/bind9/bin/named/client.c projects/binutils-2.17/contrib/bind9/bin/named/include/named/query.h projects/binutils-2.17/contrib/bind9/bin/named/query.c projects/binutils-2.17/contrib/bind9/bin/named/server.c projects/binutils-2.17/contrib/bind9/lib/dns/api projects/binutils-2.17/contrib/bind9/lib/dns/include/dns/view.h projects/binutils-2.17/contrib/bind9/lib/dns/journal.c projects/binutils-2.17/contrib/bind9/lib/dns/rbtdb.c projects/binutils-2.17/contrib/bind9/lib/dns/validator.c projects/binutils-2.17/contrib/bind9/lib/dns/view.c projects/binutils-2.17/contrib/bind9/lib/isc/api projects/binutils-2.17/contrib/bind9/lib/isc/print.c projects/binutils-2.17/contrib/bind9/version projects/binutils-2.17/contrib/bsnmp/lib/asn1.c projects/binutils-2.17/contrib/bsnmp/lib/asn1.h projects/binutils-2.17/contrib/bsnmp/lib/bsnmpclient.3 projects/binutils-2.17/contrib/bsnmp/lib/bsnmplib.3 projects/binutils-2.17/contrib/bsnmp/lib/snmp.c projects/binutils-2.17/contrib/bsnmp/lib/snmp.h projects/binutils-2.17/contrib/bsnmp/lib/snmpagent.c projects/binutils-2.17/contrib/bsnmp/lib/snmpclient.c projects/binutils-2.17/contrib/bsnmp/lib/snmpclient.h projects/binutils-2.17/contrib/bsnmp/lib/snmppriv.h projects/binutils-2.17/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt projects/binutils-2.17/contrib/bsnmp/snmpd/action.c projects/binutils-2.17/contrib/bsnmp/snmpd/bsnmpd.1 projects/binutils-2.17/contrib/bsnmp/snmpd/config.c projects/binutils-2.17/contrib/bsnmp/snmpd/export.c projects/binutils-2.17/contrib/bsnmp/snmpd/main.c projects/binutils-2.17/contrib/bsnmp/snmpd/snmpd.h projects/binutils-2.17/contrib/bsnmp/snmpd/snmpmod.3 projects/binutils-2.17/contrib/bsnmp/snmpd/snmpmod.h projects/binutils-2.17/contrib/bsnmp/snmpd/trans_lsock.c projects/binutils-2.17/contrib/bsnmp/snmpd/trans_udp.c projects/binutils-2.17/contrib/bsnmp/snmpd/trap.c projects/binutils-2.17/contrib/bsnmp/snmpd/tree.def projects/binutils-2.17/contrib/traceroute/as.c projects/binutils-2.17/contrib/traceroute/as.h projects/binutils-2.17/contrib/traceroute/ifaddrlist.c projects/binutils-2.17/contrib/traceroute/traceroute.c projects/binutils-2.17/crypto/openssl/CHANGES projects/binutils-2.17/crypto/openssl/FAQ projects/binutils-2.17/crypto/openssl/Makefile projects/binutils-2.17/crypto/openssl/NEWS projects/binutils-2.17/crypto/openssl/README projects/binutils-2.17/crypto/openssl/crypto/evp/p_sign.c projects/binutils-2.17/crypto/openssl/crypto/evp/p_verify.c projects/binutils-2.17/crypto/openssl/crypto/jpake/jpake.c projects/binutils-2.17/crypto/openssl/crypto/jpake/jpake.h projects/binutils-2.17/crypto/openssl/crypto/jpake/jpake_err.c projects/binutils-2.17/crypto/openssl/crypto/opensslv.h projects/binutils-2.17/crypto/openssl/crypto/stack/safestack.h projects/binutils-2.17/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod projects/binutils-2.17/crypto/openssl/openssl.spec projects/binutils-2.17/crypto/openssl/ssl/s3_clnt.c projects/binutils-2.17/crypto/openssl/ssl/s3_srvr.c projects/binutils-2.17/etc/snmpd.config projects/binutils-2.17/games/bcd/bcd.6 projects/binutils-2.17/games/caesar/caesar.6 projects/binutils-2.17/games/caesar/rot13.sh projects/binutils-2.17/games/factor/factor.6 projects/binutils-2.17/games/morse/morse.6 projects/binutils-2.17/games/number/number.6 projects/binutils-2.17/games/pom/pom.6 projects/binutils-2.17/games/random/random.6 projects/binutils-2.17/lib/csu/amd64/crt1.c projects/binutils-2.17/lib/csu/amd64/crti.S projects/binutils-2.17/lib/csu/amd64/crtn.S projects/binutils-2.17/lib/csu/arm/crt1.c projects/binutils-2.17/lib/csu/arm/crtn.S projects/binutils-2.17/lib/csu/i386-elf/crt1_c.c projects/binutils-2.17/lib/csu/i386-elf/crt1_s.S projects/binutils-2.17/lib/csu/i386-elf/crti.S projects/binutils-2.17/lib/csu/i386-elf/crtn.S projects/binutils-2.17/lib/csu/ia64/crt1.S projects/binutils-2.17/lib/csu/ia64/crti.S projects/binutils-2.17/lib/csu/ia64/crtn.S projects/binutils-2.17/lib/csu/powerpc/crt1.c projects/binutils-2.17/lib/csu/powerpc/crti.S projects/binutils-2.17/lib/csu/powerpc/crtn.S projects/binutils-2.17/lib/csu/powerpc64/crt1.c projects/binutils-2.17/lib/csu/powerpc64/crti.S projects/binutils-2.17/lib/csu/powerpc64/crtn.S projects/binutils-2.17/lib/csu/sparc64/crt1.c projects/binutils-2.17/lib/csu/sparc64/crti.S projects/binutils-2.17/lib/csu/sparc64/crtn.S projects/binutils-2.17/lib/libarchive/archive_read_extract.c projects/binutils-2.17/lib/libarchive/test/Makefile projects/binutils-2.17/lib/libarchive/test/test_acl_freebsd.c projects/binutils-2.17/lib/libbsnmp/libbsnmp/Makefile projects/binutils-2.17/lib/libc/stdio/freopen.c projects/binutils-2.17/lib/libgeom/libgeom.3 projects/binutils-2.17/lib/msun/Makefile projects/binutils-2.17/lib/msun/Symbol.map projects/binutils-2.17/lib/msun/man/log.3 projects/binutils-2.17/lib/msun/man/math.3 projects/binutils-2.17/lib/msun/src/math.h projects/binutils-2.17/lib/msun/src/math_private.h projects/binutils-2.17/libexec/bootpd/rtmsg.c projects/binutils-2.17/libexec/mknetid/parse_group.c projects/binutils-2.17/sbin/geom/class/eli/geli.8 projects/binutils-2.17/sbin/ifconfig/ifconfig.c projects/binutils-2.17/sbin/route/route.c projects/binutils-2.17/secure/lib/libcrypto/Makefile.inc projects/binutils-2.17/secure/lib/libcrypto/man/ASN1_OBJECT_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/ASN1_STRING_length.3 projects/binutils-2.17/secure/lib/libcrypto/man/ASN1_STRING_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3 projects/binutils-2.17/secure/lib/libcrypto/man/ASN1_generate_nconf.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_ctrl.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_f_base64.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_f_buffer.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_f_cipher.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_f_md.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_f_null.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_f_ssl.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_find_type.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_push.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_read.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_s_accept.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_s_bio.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_s_connect.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_s_fd.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_s_file.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_s_mem.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_s_null.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_s_socket.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_set_callback.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_should_retry.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_BLINDING_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_CTX_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_CTX_start.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_add.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_add_word.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_bn2bin.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_cmp.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_copy.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_generate_prime.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_mod_inverse.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_num_bytes.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_rand.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_set_bit.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_swap.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_zero.3 projects/binutils-2.17/secure/lib/libcrypto/man/CONF_modules_free.3 projects/binutils-2.17/secure/lib/libcrypto/man/CONF_modules_load_file.3 projects/binutils-2.17/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3 projects/binutils-2.17/secure/lib/libcrypto/man/DH_generate_key.3 projects/binutils-2.17/secure/lib/libcrypto/man/DH_generate_parameters.3 projects/binutils-2.17/secure/lib/libcrypto/man/DH_get_ex_new_index.3 projects/binutils-2.17/secure/lib/libcrypto/man/DH_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/DH_set_method.3 projects/binutils-2.17/secure/lib/libcrypto/man/DH_size.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_SIG_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_do_sign.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_dup_DH.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_generate_key.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_generate_parameters.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_get_ex_new_index.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_set_method.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_sign.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_size.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_GET_LIB.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_clear_error.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_error_string.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_get_error.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_load_crypto_strings.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_load_strings.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_print_errors.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_put_error.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_remove_state.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_set_mark.3 projects/binutils-2.17/secure/lib/libcrypto/man/EVP_BytesToKey.3 projects/binutils-2.17/secure/lib/libcrypto/man/EVP_DigestInit.3 projects/binutils-2.17/secure/lib/libcrypto/man/EVP_EncryptInit.3 projects/binutils-2.17/secure/lib/libcrypto/man/EVP_OpenInit.3 projects/binutils-2.17/secure/lib/libcrypto/man/EVP_PKEY_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 projects/binutils-2.17/secure/lib/libcrypto/man/EVP_SealInit.3 projects/binutils-2.17/secure/lib/libcrypto/man/EVP_SignInit.3 projects/binutils-2.17/secure/lib/libcrypto/man/EVP_VerifyInit.3 projects/binutils-2.17/secure/lib/libcrypto/man/OBJ_nid2obj.3 projects/binutils-2.17/secure/lib/libcrypto/man/OPENSSL_Applink.3 projects/binutils-2.17/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 projects/binutils-2.17/secure/lib/libcrypto/man/OPENSSL_config.3 projects/binutils-2.17/secure/lib/libcrypto/man/OPENSSL_ia32cap.3 projects/binutils-2.17/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 projects/binutils-2.17/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 projects/binutils-2.17/secure/lib/libcrypto/man/PKCS12_create.3 projects/binutils-2.17/secure/lib/libcrypto/man/PKCS12_parse.3 projects/binutils-2.17/secure/lib/libcrypto/man/PKCS7_decrypt.3 projects/binutils-2.17/secure/lib/libcrypto/man/PKCS7_encrypt.3 projects/binutils-2.17/secure/lib/libcrypto/man/PKCS7_sign.3 projects/binutils-2.17/secure/lib/libcrypto/man/PKCS7_verify.3 projects/binutils-2.17/secure/lib/libcrypto/man/RAND_add.3 projects/binutils-2.17/secure/lib/libcrypto/man/RAND_bytes.3 projects/binutils-2.17/secure/lib/libcrypto/man/RAND_cleanup.3 projects/binutils-2.17/secure/lib/libcrypto/man/RAND_egd.3 projects/binutils-2.17/secure/lib/libcrypto/man/RAND_load_file.3 projects/binutils-2.17/secure/lib/libcrypto/man/RAND_set_rand_method.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_blinding_on.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_check_key.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_generate_key.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_get_ex_new_index.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_print.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_private_encrypt.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_public_encrypt.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_set_method.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_sign.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_size.3 projects/binutils-2.17/secure/lib/libcrypto/man/SMIME_read_PKCS7.3 projects/binutils-2.17/secure/lib/libcrypto/man/SMIME_write_PKCS7.3 projects/binutils-2.17/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 projects/binutils-2.17/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 projects/binutils-2.17/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 projects/binutils-2.17/secure/lib/libcrypto/man/X509_NAME_print_ex.3 projects/binutils-2.17/secure/lib/libcrypto/man/X509_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/bio.3 projects/binutils-2.17/secure/lib/libcrypto/man/blowfish.3 projects/binutils-2.17/secure/lib/libcrypto/man/bn.3 projects/binutils-2.17/secure/lib/libcrypto/man/bn_internal.3 projects/binutils-2.17/secure/lib/libcrypto/man/buffer.3 projects/binutils-2.17/secure/lib/libcrypto/man/crypto.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_DHparams.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_DSAPublicKey.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_RSAPublicKey.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_X509.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_X509_ALGOR.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_X509_CRL.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_X509_NAME.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_X509_REQ.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_X509_SIG.3 projects/binutils-2.17/secure/lib/libcrypto/man/des.3 projects/binutils-2.17/secure/lib/libcrypto/man/dh.3 projects/binutils-2.17/secure/lib/libcrypto/man/dsa.3 projects/binutils-2.17/secure/lib/libcrypto/man/ecdsa.3 projects/binutils-2.17/secure/lib/libcrypto/man/engine.3 projects/binutils-2.17/secure/lib/libcrypto/man/err.3 projects/binutils-2.17/secure/lib/libcrypto/man/evp.3 projects/binutils-2.17/secure/lib/libcrypto/man/hmac.3 projects/binutils-2.17/secure/lib/libcrypto/man/lh_stats.3 projects/binutils-2.17/secure/lib/libcrypto/man/lhash.3 projects/binutils-2.17/secure/lib/libcrypto/man/md5.3 projects/binutils-2.17/secure/lib/libcrypto/man/mdc2.3 projects/binutils-2.17/secure/lib/libcrypto/man/pem.3 projects/binutils-2.17/secure/lib/libcrypto/man/rand.3 projects/binutils-2.17/secure/lib/libcrypto/man/rc4.3 projects/binutils-2.17/secure/lib/libcrypto/man/ripemd.3 projects/binutils-2.17/secure/lib/libcrypto/man/rsa.3 projects/binutils-2.17/secure/lib/libcrypto/man/sha.3 projects/binutils-2.17/secure/lib/libcrypto/man/threads.3 projects/binutils-2.17/secure/lib/libcrypto/man/ui.3 projects/binutils-2.17/secure/lib/libcrypto/man/ui_compat.3 projects/binutils-2.17/secure/lib/libcrypto/man/x509.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CIPHER_get_name.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_COMP_add_compression_method.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_add_session.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_ctrl.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_flush_sessions.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_free.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_new.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_sess_number.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_sessions.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_cert_store.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_info_callback.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_mode.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_options.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_timeout.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_verify.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_use_certificate.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_SESSION_free.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_SESSION_get_time.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_accept.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_alert_type_string.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_clear.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_connect.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_do_handshake.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_free.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_SSL_CTX.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_ciphers.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_client_CA_list.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_current_cipher.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_default_timeout.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_error.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_ex_new_index.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_fd.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_peer_cert_chain.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_peer_certificate.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_rbio.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_session.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_verify_result.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_version.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_library_init.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_load_client_CA_file.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_new.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_pending.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_read.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_rstate_string.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_session_reused.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_set_bio.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_set_connect_state.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_set_fd.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_set_session.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_set_shutdown.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_set_verify_result.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_shutdown.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_state_string.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_want.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_write.3 projects/binutils-2.17/secure/lib/libssl/man/d2i_SSL_SESSION.3 projects/binutils-2.17/secure/lib/libssl/man/ssl.3 projects/binutils-2.17/secure/usr.bin/openssl/man/CA.pl.1 projects/binutils-2.17/secure/usr.bin/openssl/man/asn1parse.1 projects/binutils-2.17/secure/usr.bin/openssl/man/ca.1 projects/binutils-2.17/secure/usr.bin/openssl/man/ciphers.1 projects/binutils-2.17/secure/usr.bin/openssl/man/crl.1 projects/binutils-2.17/secure/usr.bin/openssl/man/crl2pkcs7.1 projects/binutils-2.17/secure/usr.bin/openssl/man/dgst.1 projects/binutils-2.17/secure/usr.bin/openssl/man/dhparam.1 projects/binutils-2.17/secure/usr.bin/openssl/man/dsa.1 projects/binutils-2.17/secure/usr.bin/openssl/man/dsaparam.1 projects/binutils-2.17/secure/usr.bin/openssl/man/ec.1 projects/binutils-2.17/secure/usr.bin/openssl/man/ecparam.1 projects/binutils-2.17/secure/usr.bin/openssl/man/enc.1 projects/binutils-2.17/secure/usr.bin/openssl/man/errstr.1 projects/binutils-2.17/secure/usr.bin/openssl/man/gendsa.1 projects/binutils-2.17/secure/usr.bin/openssl/man/genrsa.1 projects/binutils-2.17/secure/usr.bin/openssl/man/nseq.1 projects/binutils-2.17/secure/usr.bin/openssl/man/ocsp.1 projects/binutils-2.17/secure/usr.bin/openssl/man/openssl.1 projects/binutils-2.17/secure/usr.bin/openssl/man/passwd.1 projects/binutils-2.17/secure/usr.bin/openssl/man/pkcs12.1 projects/binutils-2.17/secure/usr.bin/openssl/man/pkcs7.1 projects/binutils-2.17/secure/usr.bin/openssl/man/pkcs8.1 projects/binutils-2.17/secure/usr.bin/openssl/man/rand.1 projects/binutils-2.17/secure/usr.bin/openssl/man/req.1 projects/binutils-2.17/secure/usr.bin/openssl/man/rsa.1 projects/binutils-2.17/secure/usr.bin/openssl/man/rsautl.1 projects/binutils-2.17/secure/usr.bin/openssl/man/s_client.1 projects/binutils-2.17/secure/usr.bin/openssl/man/s_server.1 projects/binutils-2.17/secure/usr.bin/openssl/man/s_time.1 projects/binutils-2.17/secure/usr.bin/openssl/man/sess_id.1 projects/binutils-2.17/secure/usr.bin/openssl/man/smime.1 projects/binutils-2.17/secure/usr.bin/openssl/man/speed.1 projects/binutils-2.17/secure/usr.bin/openssl/man/spkac.1 projects/binutils-2.17/secure/usr.bin/openssl/man/verify.1 projects/binutils-2.17/secure/usr.bin/openssl/man/version.1 projects/binutils-2.17/secure/usr.bin/openssl/man/x509.1 projects/binutils-2.17/secure/usr.bin/openssl/man/x509v3_config.1 projects/binutils-2.17/share/doc/psd/12.make/Makefile projects/binutils-2.17/share/doc/psd/18.gprof/Makefile projects/binutils-2.17/share/doc/psd/22.rpcgen/Makefile projects/binutils-2.17/share/doc/psd/23.rpc/Makefile projects/binutils-2.17/share/doc/psd/24.xdr/Makefile projects/binutils-2.17/share/doc/psd/25.xdrrfc/Makefile projects/binutils-2.17/share/doc/psd/26.rpcrfc/Makefile projects/binutils-2.17/share/doc/psd/27.nfsrpc/Makefile projects/binutils-2.17/share/doc/smm/02.config/Makefile projects/binutils-2.17/share/doc/smm/03.fsck/Makefile projects/binutils-2.17/share/doc/smm/11.timedop/Makefile projects/binutils-2.17/share/doc/smm/12.timed/Makefile projects/binutils-2.17/share/doc/usd/04.csh/Makefile projects/binutils-2.17/share/doc/usd/05.dc/Makefile projects/binutils-2.17/share/doc/usd/06.bc/Makefile projects/binutils-2.17/share/doc/usd/07.mail/Makefile projects/binutils-2.17/share/man/man3/fpgetround.3 projects/binutils-2.17/share/man/man5/rc.conf.5 projects/binutils-2.17/share/man/man9/Makefile projects/binutils-2.17/share/man/man9/bus_space.9 projects/binutils-2.17/share/misc/committers-ports.dot projects/binutils-2.17/sys/amd64/amd64/exception.S projects/binutils-2.17/sys/amd64/amd64/genassym.c projects/binutils-2.17/sys/amd64/amd64/identcpu.c projects/binutils-2.17/sys/amd64/amd64/machdep.c projects/binutils-2.17/sys/amd64/amd64/vm_machdep.c projects/binutils-2.17/sys/amd64/ia32/ia32_signal.c projects/binutils-2.17/sys/amd64/include/cpu.h projects/binutils-2.17/sys/amd64/include/pcb.h projects/binutils-2.17/sys/amd64/linux32/linux32_sysvec.c projects/binutils-2.17/sys/arm/at91/at91_pmc.c projects/binutils-2.17/sys/cddl/compat/opensolaris/sys/cyclic_impl.h projects/binutils-2.17/sys/cddl/dev/cyclic/cyclic.c projects/binutils-2.17/sys/cddl/dev/cyclic/i386/cyclic_machdep.c projects/binutils-2.17/sys/cddl/dev/dtrace/amd64/dtrace_subr.c projects/binutils-2.17/sys/cddl/dev/dtrace/i386/dtrace_subr.c projects/binutils-2.17/sys/compat/ndis/kern_ndis.c projects/binutils-2.17/sys/compat/ndis/ndis_var.h projects/binutils-2.17/sys/compat/ndis/ntoskrnl_var.h projects/binutils-2.17/sys/compat/ndis/subr_ndis.c projects/binutils-2.17/sys/compat/ndis/subr_ntoskrnl.c projects/binutils-2.17/sys/conf/files.amd64 projects/binutils-2.17/sys/conf/files.i386 projects/binutils-2.17/sys/conf/files.mips projects/binutils-2.17/sys/conf/files.pc98 projects/binutils-2.17/sys/conf/files.powerpc projects/binutils-2.17/sys/dev/aac/aac_cam.c projects/binutils-2.17/sys/dev/acpica/acpi_hpet.c projects/binutils-2.17/sys/dev/ahci/ahci.c projects/binutils-2.17/sys/dev/bwn/if_bwn.c projects/binutils-2.17/sys/dev/e1000/if_em.c projects/binutils-2.17/sys/dev/e1000/if_igb.c projects/binutils-2.17/sys/dev/ichwd/ichwd.c projects/binutils-2.17/sys/dev/ichwd/ichwd.h projects/binutils-2.17/sys/dev/iwn/if_iwn.c projects/binutils-2.17/sys/dev/iwn/if_iwnvar.h projects/binutils-2.17/sys/dev/ixgbe/ixgbe.c projects/binutils-2.17/sys/dev/mfi/mfi_cam.c projects/binutils-2.17/sys/dev/mps/mps.c projects/binutils-2.17/sys/dev/siba/siba_bwn.c projects/binutils-2.17/sys/dev/sis/if_sisreg.h projects/binutils-2.17/sys/dev/usb/net/if_axe.c projects/binutils-2.17/sys/dev/usb/usb_pf.c projects/binutils-2.17/sys/dev/usb/usb_request.c projects/binutils-2.17/sys/dev/wpi/if_wpi.c projects/binutils-2.17/sys/dev/xen/blkfront/blkfront.c projects/binutils-2.17/sys/fs/nfsserver/nfs_nfsdstate.c projects/binutils-2.17/sys/geom/part/g_part_mbr.c projects/binutils-2.17/sys/i386/i386/identcpu.c projects/binutils-2.17/sys/i386/i386/machdep.c projects/binutils-2.17/sys/i386/i386/pmap.c projects/binutils-2.17/sys/i386/include/cpu.h projects/binutils-2.17/sys/kern/init_main.c projects/binutils-2.17/sys/kern/kern_fork.c projects/binutils-2.17/sys/kern/kern_thread.c projects/binutils-2.17/sys/kern/kern_umtx.c projects/binutils-2.17/sys/kern/sched_4bsd.c projects/binutils-2.17/sys/kern/sched_ule.c projects/binutils-2.17/sys/kern/uipc_usrreq.c projects/binutils-2.17/sys/mips/adm5120/adm5120_machdep.c projects/binutils-2.17/sys/mips/alchemy/alchemy_machdep.c projects/binutils-2.17/sys/mips/atheros/ar71xx_machdep.c projects/binutils-2.17/sys/mips/cavium/octeon_machdep.c projects/binutils-2.17/sys/mips/idt/idt_machdep.c projects/binutils-2.17/sys/mips/include/md_var.h projects/binutils-2.17/sys/mips/include/pmap.h projects/binutils-2.17/sys/mips/include/vmparam.h projects/binutils-2.17/sys/mips/malta/malta_machdep.c projects/binutils-2.17/sys/mips/mips/minidump_machdep.c projects/binutils-2.17/sys/mips/mips/mp_machdep.c projects/binutils-2.17/sys/mips/mips/pmap.c projects/binutils-2.17/sys/mips/mips/vm_machdep.c projects/binutils-2.17/sys/mips/rmi/dev/nlge/if_nlge.c projects/binutils-2.17/sys/mips/rmi/xlr_machdep.c projects/binutils-2.17/sys/mips/rmi/xlr_pci.c projects/binutils-2.17/sys/mips/sentry5/s5_machdep.c projects/binutils-2.17/sys/mips/sibyte/sb_machdep.c projects/binutils-2.17/sys/net/if.h projects/binutils-2.17/sys/netinet/ip_fastfwd.c projects/binutils-2.17/sys/netinet/sctp_indata.c projects/binutils-2.17/sys/netinet/sctp_input.c projects/binutils-2.17/sys/netinet/sctp_structs.h projects/binutils-2.17/sys/netinet6/nd6.c projects/binutils-2.17/sys/pc98/pc98/machdep.c projects/binutils-2.17/sys/powerpc/aim/mmu_oea.c projects/binutils-2.17/sys/powerpc/aim/mmu_oea64.c projects/binutils-2.17/sys/powerpc/include/bus_dma.h projects/binutils-2.17/sys/powerpc/include/pmap.h projects/binutils-2.17/sys/powerpc/include/pte.h projects/binutils-2.17/sys/powerpc/powerpc/busdma_machdep.c projects/binutils-2.17/sys/sys/param.h projects/binutils-2.17/sys/sys/proc.h projects/binutils-2.17/sys/sys/queue.h projects/binutils-2.17/sys/teken/teken_subr.h projects/binutils-2.17/sys/vm/vm_map.c projects/binutils-2.17/sys/vm/vm_map.h projects/binutils-2.17/sys/vm/vm_mmap.c projects/binutils-2.17/sys/vm/vm_page.c projects/binutils-2.17/sys/xen/evtchn/evtchn.c projects/binutils-2.17/tools/build/mk/OptionalObsoleteFiles.inc projects/binutils-2.17/tools/regression/lib/msun/Makefile projects/binutils-2.17/tools/regression/lib/msun/test-exponential.c projects/binutils-2.17/tools/regression/lib/msun/test-fma.c projects/binutils-2.17/tools/regression/lib/msun/test-fmaxmin.c projects/binutils-2.17/tools/regression/lib/msun/test-invtrig.c projects/binutils-2.17/tools/regression/lib/msun/test-lrint.c projects/binutils-2.17/tools/regression/lib/msun/test-trig.c projects/binutils-2.17/tools/regression/sockets/unix_gc/unix_gc.c projects/binutils-2.17/tools/regression/usr.bin/printf/regress.sh projects/binutils-2.17/tools/tools/nanobsd/nanobsd.sh projects/binutils-2.17/usr.bin/calendar/calendars/calendar.freebsd projects/binutils-2.17/usr.bin/man/man.sh projects/binutils-2.17/usr.bin/printf/printf.c projects/binutils-2.17/usr.bin/stat/Makefile projects/binutils-2.17/usr.bin/stat/stat.1 projects/binutils-2.17/usr.bin/stat/stat.c projects/binutils-2.17/usr.bin/truss/syscalls.c projects/binutils-2.17/usr.sbin/Makefile.amd64 projects/binutils-2.17/usr.sbin/ac/ac.c projects/binutils-2.17/usr.sbin/boot0cfg/boot0cfg.c projects/binutils-2.17/usr.sbin/bsnmpd/Makefile projects/binutils-2.17/usr.sbin/bsnmpd/bsnmpd/Makefile projects/binutils-2.17/usr.sbin/bsnmpd/modules/Makefile projects/binutils-2.17/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c projects/binutils-2.17/usr.sbin/cxgbtool/cxgbtool.c projects/binutils-2.17/usr.sbin/extattrctl/extattrctl.c projects/binutils-2.17/usr.sbin/fifolog/lib/fifolog_write.h projects/binutils-2.17/usr.sbin/fifolog/lib/fifolog_write_poll.c projects/binutils-2.17/usr.sbin/fwcontrol/fwcontrol.c projects/binutils-2.17/usr.sbin/lpr/Makefile projects/binutils-2.17/usr.sbin/rarpd/rarpd.c projects/binutils-2.17/usr.sbin/sysinstall/dist.c projects/binutils-2.17/usr.sbin/sysinstall/install.c projects/binutils-2.17/usr.sbin/traceroute/Makefile projects/binutils-2.17/usr.sbin/traceroute6/Makefile projects/binutils-2.17/usr.sbin/traceroute6/traceroute6.c projects/binutils-2.17/usr.sbin/usbdump/usbdump.c Directory Properties: projects/binutils-2.17/ (props changed) projects/binutils-2.17/cddl/contrib/opensolaris/ (props changed) projects/binutils-2.17/contrib/bind9/ (props changed) projects/binutils-2.17/contrib/binutils/ (props changed) projects/binutils-2.17/contrib/bzip2/ (props changed) projects/binutils-2.17/contrib/ee/ (props changed) projects/binutils-2.17/contrib/expat/ (props changed) projects/binutils-2.17/contrib/file/ (props changed) projects/binutils-2.17/contrib/gdb/ (props changed) projects/binutils-2.17/contrib/gdtoa/ (props changed) projects/binutils-2.17/contrib/gnu-sort/ (props changed) projects/binutils-2.17/contrib/groff/ (props changed) projects/binutils-2.17/contrib/less/ (props changed) projects/binutils-2.17/contrib/libpcap/ (props changed) projects/binutils-2.17/contrib/llvm/ (props changed) projects/binutils-2.17/contrib/llvm/tools/clang/ (props changed) projects/binutils-2.17/contrib/ncurses/ (props changed) projects/binutils-2.17/contrib/netcat/ (props changed) projects/binutils-2.17/contrib/ntp/ (props changed) projects/binutils-2.17/contrib/one-true-awk/ (props changed) projects/binutils-2.17/contrib/openbsm/ (props changed) projects/binutils-2.17/contrib/openpam/ (props changed) projects/binutils-2.17/contrib/pf/ (props changed) projects/binutils-2.17/contrib/sendmail/ (props changed) projects/binutils-2.17/contrib/tcpdump/ (props changed) projects/binutils-2.17/contrib/tcsh/ (props changed) projects/binutils-2.17/contrib/top/ (props changed) projects/binutils-2.17/contrib/top/install-sh (props changed) projects/binutils-2.17/contrib/tzcode/stdtime/ (props changed) projects/binutils-2.17/contrib/tzcode/zic/ (props changed) projects/binutils-2.17/contrib/tzdata/ (props changed) projects/binutils-2.17/contrib/wpa/ (props changed) projects/binutils-2.17/contrib/xz/ (props changed) projects/binutils-2.17/crypto/openssh/ (props changed) projects/binutils-2.17/crypto/openssl/ (props changed) projects/binutils-2.17/lib/libc/ (props changed) projects/binutils-2.17/lib/libc/stdtime/ (props changed) projects/binutils-2.17/lib/libutil/ (props changed) projects/binutils-2.17/lib/libz/ (props changed) projects/binutils-2.17/sbin/ (props changed) projects/binutils-2.17/sbin/ipfw/ (props changed) projects/binutils-2.17/share/mk/bsd.arch.inc.mk (props changed) projects/binutils-2.17/share/zoneinfo/ (props changed) projects/binutils-2.17/sys/ (props changed) projects/binutils-2.17/sys/amd64/include/xen/ (props changed) projects/binutils-2.17/sys/cddl/contrib/opensolaris/ (props changed) projects/binutils-2.17/sys/contrib/dev/acpica/ (props changed) projects/binutils-2.17/sys/contrib/octeon-sdk/ (props changed) projects/binutils-2.17/sys/contrib/pf/ (props changed) projects/binutils-2.17/sys/contrib/x86emu/ (props changed) projects/binutils-2.17/usr.bin/calendar/ (props changed) projects/binutils-2.17/usr.bin/csup/ (props changed) projects/binutils-2.17/usr.bin/procstat/ (props changed) projects/binutils-2.17/usr.sbin/zic/ (props changed) Modified: projects/binutils-2.17/ObsoleteFiles.inc ============================================================================== --- projects/binutils-2.17/ObsoleteFiles.inc Thu Dec 9 21:31:21 2010 (r216338) +++ projects/binutils-2.17/ObsoleteFiles.inc Thu Dec 9 22:01:15 2010 (r216339) @@ -22,16 +22,33 @@ # grep '+=' /usr/src/tools/build/mk/OptionalObsoleteFiles.inc | sort -u) | \ # sort | uniq -d # +# To find regular duplicates not dependant on optional components, you can +# also use something that will not give you false positives, e.g.: +# for t in `make -V TARGETS universe`; do +# __MAKE_CONF=/dev/null make -f Makefile.inc1 TARGET=$t \ +# -V OLD_FILES -V OLD_LIBS -V OLD_DIRS check-old | \ +# xargs -n1 | sort | uniq -d; +# done +# +# For optional components, you can use the following to see if some entries +# in OptionalObsoleteFiles.inc have been obsoleted by ObsoleteFiles.inc +# for o in tools/build/options/WITH*; do +# __MAKE_CONF=/dev/null make -f Makefile.inc1 -D${o##*/} \ +# -V OLD_FILES -V OLD_LIBS -V OLD_DIRS check-old | \ +# xargs -n1 | sort | uniq -d; +# done +# 20101114: Remove long-obsolete MAKEDEV.8 +OLD_FILES+=usr/share/man/man8/MAKEDEV.8.gz # 20101112: vgonel(9) has gone to private API a while ago OLD_FILES+=usr/share/man/man9/vgonel.9.gz # 20101112: removed gasp.info OLD_FILES+=usr/share/info/gasp.info.gz -# 20101109: headers moved to machine/ to x86/ +# 20101109: headers moved from machine/ to x86/ .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" OLD_FILES+=usr/include/machine/mptable.h .endif -# 20101101: headers moved to machine/ to x86/ +# 20101101: headers moved from machine/ to x86/ .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" OLD_FILES+=usr/include/machine/apicreg.h OLD_FILES+=usr/include/machine/mca.h Modified: projects/binutils-2.17/bin/sh/jobs.c ============================================================================== --- projects/binutils-2.17/bin/sh/jobs.c Thu Dec 9 21:31:21 2010 (r216338) +++ projects/binutils-2.17/bin/sh/jobs.c Thu Dec 9 22:01:15 2010 (r216339) @@ -100,7 +100,8 @@ static void setcurjob(struct job *); static void deljob(struct job *); static struct job *getcurjob(struct job *); #endif -static void showjob(struct job *, pid_t, int); +static void printjobcmd(struct job *); +static void showjob(struct job *, int); /* @@ -205,8 +206,7 @@ fgcmd(int argc __unused, char **argv) jp = getjob(argv[1]); if (jp->jobctl == 0) error("job not created under job control"); - out1str(jp->ps[0].cmd); - out1c('\n'); + printjobcmd(jp); flushout(&output); pgrp = jp->ps[0].pid; tcsetpgrp(ttyfd, pgrp); @@ -235,8 +235,7 @@ bgcmd(int argc, char **argv) jp->foreground = 0; fmtstr(s, 64, "[%td] ", jp - jobtab + 1); out1str(s); - out1str(jp->ps[0].cmd); - out1c('\n'); + printjobcmd(jp); } while (--argc > 1); return 0; } @@ -296,19 +295,33 @@ jobscmd(int argc, char *argv[]) showjobs(0, mode); else while ((id = *argv++) != NULL) - showjob(getjob(id), 0, mode); + showjob(getjob(id), mode); return (0); } static void -showjob(struct job *jp, pid_t pid, int mode) +printjobcmd(struct job *jp) +{ + struct procstat *ps; + int i; + + for (ps = jp->ps, i = jp->nprocs ; --i >= 0 ; ps++) { + out1str(ps->cmd); + if (i > 0) + out1str(" | "); + } + out1c('\n'); +} + +static void +showjob(struct job *jp, int mode) { char s[64]; + char statestr[64]; struct procstat *ps; struct job *j; int col, curr, i, jobno, prev, procno; - pid_t ppid; char c; procno = (mode == SHOWJOBS_PGIDS) ? 1 : jp->nprocs; @@ -321,16 +334,44 @@ showjob(struct job *jp, pid_t pid, int m prev = j - jobtab + 1; } #endif + ps = jp->ps + jp->nprocs - 1; + if (jp->state == 0) { + strcpy(statestr, "Running"); +#if JOBS + } else if (jp->state == JOBSTOPPED) { + while (!WIFSTOPPED(ps->status) && ps > jp->ps) + ps--; + if (WIFSTOPPED(ps->status)) + i = WSTOPSIG(ps->status); + else + i = -1; + if (i > 0 && i < sys_nsig && sys_siglist[i]) + strcpy(statestr, sys_siglist[i]); + else + strcpy(statestr, "Suspended"); +#endif + } else if (WIFEXITED(ps->status)) { + if (WEXITSTATUS(ps->status) == 0) + strcpy(statestr, "Done"); + else + fmtstr(statestr, 64, "Done(%d)", + WEXITSTATUS(ps->status)); + } else { + i = WTERMSIG(ps->status); + if (i > 0 && i < sys_nsig && sys_siglist[i]) + strcpy(statestr, sys_siglist[i]); + else + fmtstr(statestr, 64, "Signal %d", i); + if (WCOREDUMP(ps->status)) + strcat(statestr, " (core dumped)"); + } + for (ps = jp->ps ; ; ps++) { /* for each process */ if (mode == SHOWJOBS_PIDS || mode == SHOWJOBS_PGIDS) { - ppid = (mode == SHOWJOBS_PIDS) ? ps->pid : - getpgid(ps->pid); - out1fmt("%d\n", (int)ppid); + out1fmt("%d\n", (int)ps->pid); goto skip; } - if (mode != SHOWJOBS_VERBOSE && ps != jp->ps && pid == 0) - goto skip; - if (pid != 0 && pid != ps->pid) + if (mode != SHOWJOBS_VERBOSE && ps != jp->ps) goto skip; if (jobno == curr && ps == jp->ps) c = '+'; @@ -349,39 +390,19 @@ showjob(struct job *jp, pid_t pid, int m out1str(s); col += strlen(s); } - s[0] = '\0'; - if (ps != jp->ps) { - *s = '\0'; - } else if (ps->status == -1) { - strcpy(s, "Running"); - } else if (WIFEXITED(ps->status)) { - if (WEXITSTATUS(ps->status) == 0) - strcpy(s, "Done"); - else - fmtstr(s, 64, "Done (%d)", - WEXITSTATUS(ps->status)); - } else { -#if JOBS - if (WIFSTOPPED(ps->status)) - i = WSTOPSIG(ps->status); - else -#endif - i = WTERMSIG(ps->status); - if ((i & 0x7F) < sys_nsig && sys_siglist[i & 0x7F]) - scopy(sys_siglist[i & 0x7F], s); - else - fmtstr(s, 64, "Signal %d", i & 0x7F); - if (WCOREDUMP(ps->status)) - strcat(s, " (core dumped)"); + if (ps == jp->ps) { + out1str(statestr); + col += strlen(statestr); } - out1str(s); - col += strlen(s); do { out1c(' '); col++; } while (col < 30); - out1str(ps->cmd); - out1c('\n'); + if (mode == SHOWJOBS_VERBOSE) { + out1str(ps->cmd); + out1c('\n'); + } else + printjobcmd(jp); skip: if (--procno <= 0) break; } @@ -413,7 +434,7 @@ showjobs(int change, int mode) } if (change && ! jp->changed) continue; - showjob(jp, 0, mode); + showjob(jp, mode); jp->changed = 0; /* Hack: discard jobs for which $! has not been referenced * in interactive mode when they terminate. @@ -769,7 +790,7 @@ forkshell(struct job *jp, union node *n, TRACE(("forkshell(%%%td, %p, %d) called\n", jp - jobtab, (void *)n, mode)); INTOFF; - if (mode == FORK_BG) + if (mode == FORK_BG && (jp == NULL || jp->nprocs == 0)) checkzombies(); flushall(); pid = fork(); @@ -961,7 +982,7 @@ dowait(int block, struct job *job) int done; int stopped; int sig; - int i; + int coredump; in_dowait++; TRACE(("dowait(%d) called\n", block)); @@ -983,7 +1004,7 @@ dowait(int block, struct job *job) INTOFF; thisjob = NULL; for (jp = jobtab ; jp < jobtab + njobs ; jp++) { - if (jp->used) { + if (jp->used && jp->nprocs > 0) { done = 1; stopped = 1; for (sp = jp->ps ; sp < jp->ps + jp->nprocs ; sp++) { @@ -1020,36 +1041,29 @@ dowait(int block, struct job *job) } } INTON; - if (! rootshell || ! iflag || (job && thisjob == job)) { -#if JOBS - if (WIFSTOPPED(status)) - sig = WSTOPSIG(status); - else -#endif - { - if (WIFEXITED(status)) - sig = 0; + if (!thisjob || thisjob->state == 0) + ; + else if ((!rootshell || !iflag || thisjob == job) && + thisjob->foreground && thisjob->state != JOBSTOPPED) { + sig = 0; + coredump = 0; + for (sp = thisjob->ps; sp < thisjob->ps + thisjob->nprocs; sp++) + if (WIFSIGNALED(sp->status)) { + sig = WTERMSIG(sp->status); + coredump = WCOREDUMP(sp->status); + } + if (sig > 0 && sig != SIGINT && sig != SIGPIPE) { + if (sig < sys_nsig && sys_siglist[sig]) + out1str(sys_siglist[sig]); else - sig = WTERMSIG(status); - } - if (sig != 0 && sig != SIGINT && sig != SIGPIPE) { - if (!mflag || - (thisjob->foreground && !WIFSTOPPED(status))) { - i = WTERMSIG(status); - if ((i & 0x7F) < sys_nsig && sys_siglist[i & 0x7F]) - out1str(sys_siglist[i & 0x7F]); - else - out1fmt("Signal %d", i & 0x7F); - if (WCOREDUMP(status)) - out1str(" (core dumped)"); - out1c('\n'); - } else - showjob(thisjob, pid, SHOWJOBS_DEFAULT); + out1fmt("Signal %d", sig); + if (coredump) + out1str(" (core dumped)"); + out1c('\n'); } } else { TRACE(("Not printing status, rootshell=%d, job=%p\n", rootshell, job)); - if (thisjob) - thisjob->changed = 1; + thisjob->changed = 1; } return pid; } @@ -1300,13 +1314,46 @@ cmdputs(const char *s) if (--cmdnleft > 0) *q++ = '{'; subtype = *p++; + if ((subtype & VSTYPE) == VSLENGTH && --cmdnleft > 0) + *q++ = '#'; } else if (c == '=' && subtype != 0) { - *q++ = "}-+?="[(subtype & VSTYPE) - VSNORMAL]; + *q = "}-+?=##%%\0X"[(subtype & VSTYPE) - VSNORMAL]; + if (*q) + q++; + else + cmdnleft++; + if (((subtype & VSTYPE) == VSTRIMLEFTMAX || + (subtype & VSTYPE) == VSTRIMRIGHTMAX) && + --cmdnleft > 0) + *q = q[-1], q++; subtype = 0; } else if (c == CTLENDVAR) { *q++ = '}'; - } else if (c == CTLBACKQ || c == CTLBACKQ+CTLQUOTE) - cmdnleft++; /* ignore it */ + } else if (c == CTLBACKQ || c == CTLBACKQ+CTLQUOTE) { + cmdnleft -= 5; + if (cmdnleft > 0) { + *q++ = '$'; + *q++ = '('; + *q++ = '.'; + *q++ = '.'; + *q++ = '.'; + *q++ = ')'; + } + } else if (c == CTLARI) { + cmdnleft -= 2; + if (cmdnleft > 0) { + *q++ = '$'; + *q++ = '('; + *q++ = '('; + } + p++; + } else if (c == CTLENDARI) { + if (--cmdnleft > 0) { + *q++ = ')'; + *q++ = ')'; + } + } else if (c == CTLQUOTEMARK || c == CTLQUOTEEND) + cmdnleft++; /* ignore */ else *q++ = c; if (--cmdnleft <= 0) { Modified: projects/binutils-2.17/bin/sh/sh.1 ============================================================================== --- projects/binutils-2.17/bin/sh/sh.1 Thu Dec 9 21:31:21 2010 (r216338) +++ projects/binutils-2.17/bin/sh/sh.1 Thu Dec 9 22:01:15 2010 (r216339) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd December 1, 2010 +.Dd December 3, 2010 .Dt SH 1 .Os .Sh NAME @@ -1593,12 +1593,7 @@ To include a .Ql - , make it the first or last character listed. .Ss Built-in Commands -This section lists the commands which -are built-in because they need to perform some operation -that cannot be performed by a separate process. -In addition to -these, built-in versions of essential utilities -are provided for efficiency. +This section lists the built-in commands. .Bl -tag -width indent .It Ic \&: A null command that returns a 0 (true) exit value. @@ -1649,15 +1644,19 @@ subsection. Continue the specified jobs (or the current job if no jobs are given) in the background. +.It Ic bind Oo Fl aeklrsv Oc Oo Ar key Oo Ar command Oc Oc +List or alter key bindings for the line editor. +This command is documented in +.Xr editrc 5 . +.It Ic break Op Ar num +See the +.Sx Flow-Control Constructs +subsection. .It Ic builtin Ar cmd Op Ar arg ... Execute the specified built-in command, .Ar cmd . This is useful when the user wishes to override a shell function with the same name as a built-in command. -.It Ic bind Oo Fl aeklrsv Oc Oo Ar key Oo Ar command Oc Oc -List or alter key bindings for the line editor. -This command is documented in -.Xr editrc 5 . .It Ic cd Oo Fl L | P Oc Op Ar directory Switch to the specified .Ar directory , @@ -1759,6 +1758,10 @@ a shell keyword or an alias for .Ar value . +.It Ic continue Op Ar num +See the +.Sx Flow-Control Constructs +subsection. .It Ic echo Oo Fl e | n Oc Op Ar string ... Print a space-separated list of the arguments to the standard output and append a newline character. Modified: projects/binutils-2.17/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c ============================================================================== --- projects/binutils-2.17/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Thu Dec 9 21:31:21 2010 (r216338) +++ projects/binutils-2.17/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Thu Dec 9 22:01:15 2010 (r216339) @@ -48,11 +48,13 @@ static int read_efi_label(nvlist_t *config, diskaddr_t *sb); +#ifdef sun #if defined(__i386) || defined(__amd64) #define BOOTCMD "installgrub(1M)" #else #define BOOTCMD "installboot(1M)" #endif +#endif /* sun */ /* * ==================================================================== @@ -1889,14 +1891,15 @@ zpool_vdev_attach(zpool_handle_t *zhp, if (ret == 0) { if (rootpool) { - /* - * XXX - This should be removed once we can - * automatically install the bootblocks on the - * newly attached disk. - */ - (void) fprintf(stderr, dgettext(TEXT_DOMAIN, "Please " - "be sure to invoke %s to make '%s' bootable.\n"), - BOOTCMD, new_disk); + (void) fprintf(stderr, dgettext(TEXT_DOMAIN, "If " + "you boot from pool '%s', you may need to update\n" + "boot code on newly attached disk '%s'.\n\n" + "Assuming you use GPT partitioning and 'da0' is " + "your new boot disk\n" + "you may use the following command:\n\n" + "\tgpart bootcode -b /boot/pmbr -p " + "/boot/gptzfsboot -i 1 da0\n\n"), + zhp->zpool_name, new_disk); } return (0); } Modified: projects/binutils-2.17/contrib/bind9/CHANGES ============================================================================== --- projects/binutils-2.17/contrib/bind9/CHANGES Thu Dec 9 21:31:21 2010 (r216338) +++ projects/binutils-2.17/contrib/bind9/CHANGES Thu Dec 9 22:01:15 2010 (r216339) @@ -1,3 +1,55 @@ + + --- 9.6-ESV-R3 released --- + +2972. [bug] win32: address windows socket errors. [RT #21906] + +2971. [bug] Fixed a bug that caused journal files not to be + compacted on Windows systems as a result of + non-POSIX-compliant rename() semantics. [RT #22434] + +2970. [security] Adding a NO DATA negative cache entry failed to clear + any matching RRSIG records. A subsequent lookup of + of NO DATA cache entry could trigger a INSIST when the + unexpected RRSIG was also returned with the NO DATA + cache entry. + + CVE-2010-3613, VU#706148. [RT #22288] + +2969. [security] Fix acl type processing so that allow-query works + in options and view statements. Also add a new + set of tests to verify proper functioning. + + CVE-2010-3615, VU#510208. [RT #22418] + +2968. [security] Named could fail to prove a data set was insecure + before marking it as insecure. One set of conditions + that can trigger this occurs naturally when rolling + DNSKEY algorithms. + + CVE-2010-3614, VU#837744. [RT #22309] + +2967. [bug] 'host -D' now turns on debugging messages earlier. + [RT #22361] + +2966. [bug] isc_print_vsnprintf() failed to check if there was + space available in the buffer when adding a left + justified character with a non zero width, + (e.g. "%-1c"). [RT #22270] + +2964. [bug] view->queryacl was being overloaded. Seperate the + usage into view->queryacl, view->cacheacl and + view->queryonacl. [RT #22114] + +2962. [port] win32: add more dependencies to BINDBuild.dsw. + [RT #22062] + +2952. [port] win32: named-checkzone and named-checkconf failed + to initialise winsock. [RT #21932] + +2951. [bug] named failed to generate a correct signed response + in a optout, delegation only zone with no secure + delegations. [RT #22007] + --- 9.6-ESV-R2 released --- 2939. [func] Check that named successfully skips NSEC3 records Copied: projects/binutils-2.17/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.html (from r216338, head/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.html) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/binutils-2.17/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.html Thu Dec 9 22:01:15 2010 (r216339, copy of r216338, head/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.html) @@ -0,0 +1,225 @@ + + + + + + +
+ +

Introduction

+ +

+ BIND 9.6-ESV-R3 is a maintenance release for BIND 9.6-ESV. +

+

+ This document summarizes changes from BIND 9.6-ESV-R1 to BIND 9.6-ESV-R3. + Please see the CHANGES file in the source code release for a + complete list of all changes. +

+
+ +

Download

+ +

+ The latest release of BIND 9 software can always be found + on our web site at + http://www.isc.org/software/bind. + There you will find additional information about each release, + source code, and some pre-compiled versions for certain operating + systems. +

+
+ +

Support

+ +

Product support information is available on + http://www.isc.org/services/support + for paid support options. Free support is provided by our user + community via a mailing list. Information on all public email + lists is available at + https://lists.isc.org/mailman/listinfo. +

+
+ +

New Features

+ +

9.6-ESV-R2

+ +

None.

+
+

9.6-ESV-R3

+ +

None.

+
+
+ +

Feature Changes

+ +

9.6-ESV-R2

+ +

None.

+
+

9.6-ESV-R3

+ +

None.

+
+
+ +

Security Fixes

+ +

9.6-ESV-R2

+ +

None.

+
+

9.6-ESV-R3

+ +
  • + Adding a NO DATA signed negative response to cache failed to clear + any matching RRSIG records already in cache. A subsequent lookup + of the cached NO DATA entry could crash named (INSIST) when the + unexpected RRSIG was also returned with the NO DATA cache entry. + [RT #22288] [CVE-2010-3613] [VU#706148] +
  • + BIND, acting as a DNSSEC validator, was determining if the NS RRset + is insecure based on a value that could mean either that the RRset + is actually insecure or that there wasn't a matching key for the RRSIG + in the DNSKEY RRset when resuming from validating the DNSKEY RRset. + This can happen when in the middle of a DNSKEY algorithm rollover, + when two different algorithms were used to sign a zone but only the + new set of keys are in the zone DNSKEY RRset. + [RT #22309] [CVE-2010-3614] [VU#837744] +
+
+
+ +

Bug Fixes

+ +

9.6-ESV-R2

+ +
  • + Check that named successfully skips NSEC3 records + that fail to match the NSEC3PARAM record currently + in use. + [RT #21868] +
  • + Worked around a race condition in the cache database memory + handling. Without this fix a DNS cache DB or ADB could + incorrectly stay in an over memory state, effectively refusing + further caching, which subsequently made a BIND 9 caching + server unworkable. + [RT #21818] +
  • + BIND did not properly handle non-cacheable negative responses + from insecure zones. This caused several non-protocol-compliant + zones to become unresolvable. BIND is now more accepting of + responses it receives from less strict servers. + [RT #21555] +
  • + The resolver could attempt to destroy a fetch context too + soon, resulting in a crash. + [RT #19878] +
  • + The placeholder negative caching element was not + properly constructed triggering a crash (INSIST) in + dns_ncache_towire(). + [RT #21346] +
  • + Handle the introduction of new trusted-keys and + DS, DLV RRsets better. + [RT #21097] +
  • + Fix arguments to dns_keytable_findnextkeynode() call. + [RT #20877] +
+
+

9.6-ESV-R3

+ +
  • + Microsoft changed the behavior of sockets between NT/XP based + stacks vs Vista/windows7 stacks. Server 2003/2008 have the older + behavior, 2008r2 has the new behavior. With the change, different + error results are possible, so ISC adapted BIND to handle the new + error results. + This resolves an issue where sockets would shut down on + Windows servers causing named to stop responding to queries. + [RT #21906] +
  • + Windows has non-POSIX compliant behavior in its rename() and unlink() + calls. This caused journal compaction to fail on Windows BIND servers + with the log error: "dns_journal_compact failed: failure". + [RT #22434] +
  • + 'host -D' now turns on debugging messages earlier. + [RT #22361] +
  • + isc_print_vsnprintf() failed to check if there was + space available in the buffer when adding a left + justified character with a non zero width, + (e.g. "%-1c"). + [RT #22270] +
  • + view->queryacl was being overloaded. Seperate the + usage into view->queryacl, view->cacheacl and + view->queryonacl. + [RT #22114] +
  • + win32: add more dependencies to BINDBuild.dsw. + [RT #22062] +
  • + win32: named-checkzone and named-checkconf failed + to initialise winsock. + [RT #21932] +
  • + named failed to generate a correct signed response + in a optout, delegation only zone with no secure + delegations. + [RT #22007] +
+
+
+ +

Known issues in this release

+ +
  • +

    + "make test" will fail on OSX and possibly other operating systems. + The failure occurs in a new test to check for allow-query ACLs. + The failure is caused because the source address is not specified on + the dig commands issued in the test. +

    +

    + If running "make test" is part of your usual acceptance process, + please edit the file bin/tests/system/allow_query/test.sh + and add +

    + -b 10.53.0.2 +

    + to the DIGOPTS line. +

    +
+
+ +

Thank You

+ +

+ Thank you to everyone who assisted us in making this release possible. + If you would like to contribute to ISC to assist us in continuing to make + quality open source software, please visit our donations page at + http://www.isc.org/supportisc. +

+
+
Copied: projects/binutils-2.17/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.pdf (from r216338, head/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.pdf) ============================================================================== Binary file (source and/or target). No diff available. Copied: projects/binutils-2.17/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.txt (from r216338, head/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/binutils-2.17/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.txt Thu Dec 9 22:01:15 2010 (r216339, copy of r216338, head/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.txt) @@ -0,0 +1,133 @@ + __________________________________________________________________ + +Introduction + + BIND 9.6-ESV-R3 is a maintenance release for BIND 9.6-ESV. + + This document summarizes changes from BIND 9.6-ESV-R1 to BIND + 9.6-ESV-R3. Please see the CHANGES file in the source code release for + a complete list of all changes. + +Download + + The latest release of BIND 9 software can always be found on our web + site at http://www.isc.org/software/bind. There you will find + additional information about each release, source code, and some + pre-compiled versions for certain operating systems. + +Support + + Product support information is available on + http://www.isc.org/services/support for paid support options. Free + support is provided by our user community via a mailing list. + Information on all public email lists is available at + https://lists.isc.org/mailman/listinfo. + +New Features + +9.6-ESV-R2 + + None. + +9.6-ESV-R3 + + None. + +Feature Changes + +9.6-ESV-R2 + + None. + +9.6-ESV-R3 + + None. + +Security Fixes + +9.6-ESV-R2 + + None. + +9.6-ESV-R3 + + * Adding a NO DATA signed negative response to cache failed to clear + any matching RRSIG records already in cache. A subsequent lookup of + the cached NO DATA entry could crash named (INSIST) when the + unexpected RRSIG was also returned with the NO DATA cache entry. + [RT #22288] [CVE-2010-3613] [VU#706148] + * BIND, acting as a DNSSEC validator, was determining if the NS RRset + is insecure based on a value that could mean either that the RRset + is actually insecure or that there wasn't a matching key for the + RRSIG in the DNSKEY RRset when resuming from validating the DNSKEY + RRset. This can happen when in the middle of a DNSKEY algorithm + rollover, when two different algorithms were used to sign a zone + but only the new set of keys are in the zone DNSKEY RRset. [RT + #22309] [CVE-2010-3614] [VU#837744] + +Bug Fixes + +9.6-ESV-R2 + + * Check that named successfully skips NSEC3 records that fail to + match the NSEC3PARAM record currently in use. [RT #21868] + * Worked around a race condition in the cache database memory + handling. Without this fix a DNS cache DB or ADB could incorrectly + stay in an over memory state, effectively refusing further caching, + which subsequently made a BIND 9 caching server unworkable. [RT + #21818] + * BIND did not properly handle non-cacheable negative responses from + insecure zones. This caused several non-protocol-compliant zones to + become unresolvable. BIND is now more accepting of responses it + receives from less strict servers. [RT #21555] + * The resolver could attempt to destroy a fetch context too soon, + resulting in a crash. [RT #19878] + * The placeholder negative caching element was not properly + constructed triggering a crash (INSIST) in dns_ncache_towire(). [RT + #21346] + * Handle the introduction of new trusted-keys and DS, DLV RRsets + better. [RT #21097] + * Fix arguments to dns_keytable_findnextkeynode() call. [RT #20877] + +9.6-ESV-R3 + + * Microsoft changed the behavior of sockets between NT/XP based + stacks vs Vista/windows7 stacks. Server 2003/2008 have the older + behavior, 2008r2 has the new behavior. With the change, different + error results are possible, so ISC adapted BIND to handle the new + error results. This resolves an issue where sockets would shut down + on Windows servers causing named to stop responding to queries. [RT + #21906] + * Windows has non-POSIX compliant behavior in its rename() and + unlink() calls. This caused journal compaction to fail on Windows + BIND servers with the log error: "dns_journal_compact failed: + failure". [RT #22434] + * 'host -D' now turns on debugging messages earlier. [RT #22361] + * isc_print_vsnprintf() failed to check if there was space available + in the buffer when adding a left justified character with a non + zero width, (e.g. "%-1c"). [RT #22270] + * view->queryacl was being overloaded. Seperate the usage into + view->queryacl, view->cacheacl and view->queryonacl. [RT #22114] + * win32: add more dependencies to BINDBuild.dsw. [RT #22062] + * win32: named-checkzone and named-checkconf failed to initialise + winsock. [RT #21932] + * named failed to generate a correct signed response in a optout, + delegation only zone with no secure delegations. [RT #22007] + +Known issues in this release + + * "make test" will fail on OSX and possibly other operating systems. + The failure occurs in a new test to check for allow-query ACLs. The + failure is caused because the source address is not specified on + the dig commands issued in the test. + If running "make test" is part of your usual acceptance process, + please edit the file bin/tests/system/allow_query/test.sh and add + -b 10.53.0.2 + to the DIGOPTS line. + +Thank You + + Thank you to everyone who assisted us in making this release possible. + If you would like to contribute to ISC to assist us in continuing to + make quality open source software, please visit our donations page at + http://www.isc.org/supportisc. Modified: projects/binutils-2.17/contrib/bind9/bin/check/check-tool.c ============================================================================== --- projects/binutils-2.17/contrib/bind9/bin/check/check-tool.c Thu Dec 9 21:31:21 2010 (r216338) +++ projects/binutils-2.17/contrib/bind9/bin/check/check-tool.c Thu Dec 9 22:01:15 2010 (r216339) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: check-tool.c,v 1.35.36.3 2009/01/20 02:03:18 marka Exp $ */ +/* $Id: check-tool.c,v 1.35.36.3.24.2 2010/09/07 23:46:25 tbox Exp $ */ /*! \file */ @@ -23,6 +23,10 @@ #include +#ifdef _WIN32 +#include +#endif + #include "check-tool.h" #include #include @@ -662,3 +666,26 @@ dump_zone(const char *zonename, dns_zone return (result); } + +#ifdef _WIN32 +void +InitSockets(void) { + WORD wVersionRequested; + WSADATA wsaData; + int err; + + wVersionRequested = MAKEWORD(2, 0); + + err = WSAStartup( wVersionRequested, &wsaData ); + if (err != 0) { + fprintf(stderr, "WSAStartup() failed: %d\n", err); + exit(1); + } +} + +void +DestroySockets(void) { + WSACleanup(); +} +#endif + Modified: projects/binutils-2.17/contrib/bind9/bin/check/check-tool.h ============================================================================== --- projects/binutils-2.17/contrib/bind9/bin/check/check-tool.h Thu Dec 9 21:31:21 2010 (r216338) +++ projects/binutils-2.17/contrib/bind9/bin/check/check-tool.h Thu Dec 9 22:01:15 2010 (r216339) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2010 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: check-tool.h,v 1.14 2007/06/18 23:47:17 tbox Exp $ */ +/* $Id: check-tool.h,v 1.14.628.2 2010/09/07 23:46:26 tbox Exp $ */ #ifndef CHECK_TOOL_H #define CHECK_TOOL_H @@ -43,6 +43,11 @@ isc_result_t dump_zone(const char *zonename, dns_zone_t *zone, const char *filename, dns_masterformat_t fileformat, const dns_master_style_t *style); +#ifdef _WIN32 +void InitSockets(void); +void DestroySockets(void); +#endif + extern int debug; extern isc_boolean_t nomerge; extern isc_boolean_t docheckmx; Modified: projects/binutils-2.17/contrib/bind9/bin/check/named-checkconf.c ============================================================================== --- projects/binutils-2.17/contrib/bind9/bin/check/named-checkconf.c Thu Dec 9 21:31:21 2010 (r216338) +++ projects/binutils-2.17/contrib/bind9/bin/check/named-checkconf.c Thu Dec 9 22:01:15 2010 (r216339) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2009, 2010 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named-checkconf.c,v 1.46.222.2 2009/02/16 23:47:15 tbox Exp $ */ +/* $Id: named-checkconf.c,v 1.46.222.2.24.2 2010/09/07 23:46:26 tbox Exp $ */ /*! \file */ @@ -453,6 +453,10 @@ main(int argc, char **argv) { if (conffile == NULL || conffile[0] == '\0') conffile = NAMED_CONFFILE; +#ifdef _WIN32 + InitSockets(); +#endif + RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); RUNTIME_CHECK(setup_logging(mctx, stdout, &logc) == ISC_R_SUCCESS); @@ -494,5 +498,9 @@ main(int argc, char **argv) { isc_mem_destroy(&mctx); +#ifdef _WIN32 + DestroySockets(); +#endif + return (exit_status); } Modified: projects/binutils-2.17/contrib/bind9/bin/check/named-checkzone.c ============================================================================== --- projects/binutils-2.17/contrib/bind9/bin/check/named-checkzone.c Thu Dec 9 21:31:21 2010 (r216338) +++ projects/binutils-2.17/contrib/bind9/bin/check/named-checkzone.c Thu Dec 9 22:01:15 2010 (r216339) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Dec 10 23:57:55 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 86C0C106564A; Fri, 10 Dec 2010 23:57:55 +0000 (UTC) (envelope-from jamie@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 74E0F8FC19; Fri, 10 Dec 2010 23:57:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBANvt9b089289; Fri, 10 Dec 2010 23:57:55 GMT (envelope-from jamie@svn.freebsd.org) Received: (from jamie@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBANvtck089284; Fri, 10 Dec 2010 23:57:55 GMT (envelope-from jamie@svn.freebsd.org) Message-Id: <201012102357.oBANvtck089284@svn.freebsd.org> From: Jamie Gritton Date: Fri, 10 Dec 2010 23:57:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216367 - projects/jailconf/usr.sbin/jail X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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, 10 Dec 2010 23:57:55 -0000 Author: jamie Date: Fri Dec 10 23:57:55 2010 New Revision: 216367 URL: http://svn.freebsd.org/changeset/base/216367 Log: run_command (mostly) cleanup: Make the parallelism limit a global instead of always passing it to run_command and finish_command. In the case of an empty command string, try to run any other strings the command may have. Replace JF_BACKGROUND with its sort-of opposite JF_SLEEPQ. Change j->comstring earlier to render JF_RUNQ unncessary. Change the if-else series to a more readable switch statement. Treat IP_STOP_TIMEOUT like a command, calling run_command which then calls term_procs. When the IP_STOP_TIMEOUT "command" finishes, it shouldn't mess with the parallelism limit. Make sufficient checks in finish_command and run_command so that the nonintuitive j->comstring null check isn't necessary to run them. Rename the "waiting" queue to "depend", because the "sleeping" and "runnable" queues are also used to wait for something. Modified: projects/jailconf/usr.sbin/jail/command.c projects/jailconf/usr.sbin/jail/jail.c projects/jailconf/usr.sbin/jail/jailp.h projects/jailconf/usr.sbin/jail/state.c Modified: projects/jailconf/usr.sbin/jail/command.c ============================================================================== --- projects/jailconf/usr.sbin/jail/command.c Fri Dec 10 22:59:09 2010 (r216366) +++ projects/jailconf/usr.sbin/jail/command.c Fri Dec 10 23:57:55 2010 (r216367) @@ -62,6 +62,8 @@ struct phash { pid_t pid; }; +int paralimit = -1; + extern char **environ; static int get_user_info(struct cfjail *j, const char *username, @@ -69,6 +71,7 @@ static int get_user_info(struct cfjail * static void add_proc(struct cfjail *j, pid_t pid); static void clear_procs(struct cfjail *j); static struct cfjail *find_proc(pid_t pid); +static int term_procs(struct cfjail *j); static int check_path(struct cfjail *j, const char *pname, const char *path, int isfile, const char *umount_type); @@ -81,7 +84,7 @@ static int kq; * Run a command associated with a jail, possibly inside the jail. */ int -run_command(struct cfjail *j, int *plimit, enum intparam comparam) +run_command(struct cfjail *j, enum intparam comparam) { const struct passwd *pwd; struct cfstring *comstring, *s; @@ -96,37 +99,47 @@ run_command(struct cfjail *j, int *plimi static char *cleanenv; if (comparam) { - if (comparam == IP_MOUNT_DEVFS - ? !bool_param(j->intparams[IP_MOUNT_DEVFS]) - : j->intparams[comparam] == NULL) - return 0; + switch (comparam) { + case IP_MOUNT_DEVFS: + if (!bool_param(j->intparams[IP_MOUNT_DEVFS])) + return 0; + /* FALLTHROUGH */ + case IP_STOP_TIMEOUT: + j->comstring = COMSTRING_DUMMY; + break; + default: + if (j->intparams[comparam] == NULL) + return 0; + j->comstring = + STAILQ_FIRST(&j->intparams[comparam]->val); + } j->comparam = comparam; - j->comstring = comparam == IP_MOUNT_DEVFS ? COMSTRING_DUMMY - : STAILQ_FIRST(&j->intparams[comparam]->val); - } else { + } else comparam = j->comparam; - if (!(j->flags & JF_RUNQ)) - j->comstring = j->comstring == COMSTRING_DUMMY - ? NULL : STAILQ_NEXT(j->comstring, tq); - } + next_comstring: comstring = j->comstring; - if (comstring == NULL || - (comstring != COMSTRING_DUMMY && comstring->len == 0)) + if (comstring == NULL) return 0; - if (plimit && *plimit == 0) { - j->flags |= JF_RUNQ; + if (paralimit == 0) { requeue(j, &runnable); return 1; } - j->flags &= ~(JF_RUNQ | JF_BACKGROUND); + j->comstring = + comstring == COMSTRING_DUMMY ? NULL : STAILQ_NEXT(comstring, tq); + if (comstring != COMSTRING_DUMMY && comstring->len == 0) + goto next_comstring; /* * Collect exec arguments. Internal commands for network and - * mounting build their own argument lists (XXX they should be - * truly internal). + * mounting build their own argument lists. */ bg = j->flags & JF_FAILED; down = j->flags & (JF_STOP | JF_FAILED); - if (comparam == IP__IP4_IFADDR) { + switch (comparam) { + case IP_STOP_TIMEOUT: + /* This isn't really a command */ + return term_procs(j); + + case IP__IP4_IFADDR: argv = alloca(8 * sizeof(char *)); *(const char **)&argv[0] = _PATH_IFCONFIG; if ((cs = strchr(comstring->s, '|'))) { @@ -157,8 +170,10 @@ run_command(struct cfjail *j, int *plimi *(const char **)&argv[argc] = down ? "-alias" : "alias"; argv[argc + 1] = NULL; j->flags |= JF_IFUP; + break; + #ifdef INET6 - } else if (comparam == IP__IP6_IFADDR) { + case IP__IP6_IFADDR: argv = alloca(8 * sizeof(char *)); *(const char **)&argv[0] = _PATH_IFCONFIG; if ((cs = strchr(comstring->s, '|'))) { @@ -181,8 +196,10 @@ run_command(struct cfjail *j, int *plimi *(const char **)&argv[argc] = down ? "-alias" : "alias"; argv[argc + 1] = NULL; j->flags |= JF_IFUP; + break; #endif - } else if (comparam == IP_VNET_INTERFACE) { + + case IP_VNET_INTERFACE: argv = alloca(5 * sizeof(char *)); *(const char **)&argv[0] = _PATH_IFCONFIG; argv[1] = comstring->s; @@ -192,7 +209,10 @@ run_command(struct cfjail *j, int *plimi jidstr ? jidstr : string_param(j->intparams[KP_NAME]); argv[4] = NULL; j->flags |= JF_IFUP; - } else if (comparam == IP_MOUNT || comparam == IP__MOUNT_FROM_FSTAB) { + break; + + case IP_MOUNT: + case IP__MOUNT_FROM_FSTAB: argv = alloca(8 * sizeof(char *)); comcs = alloca(comstring->len + 1); strcpy(comcs, comstring->s); @@ -201,7 +221,7 @@ run_command(struct cfjail *j, int *plimi cs = strtok(NULL, " \t\f\v\r\n")) argv[argc++] = cs; if (argc == 0) - return 0; + goto next_comstring; if (argc < 3) { jail_warnx(j, "%s: %s: missing information", j->intparams[comparam]->name, comstring->s); @@ -233,7 +253,9 @@ run_command(struct cfjail *j, int *plimi } *(const char **)&argv[1] = "-t"; j->flags |= JF_MOUNTED; - } else if (comparam == IP_MOUNT_DEVFS) { + break; + + case IP_MOUNT_DEVFS: path = string_param(j->intparams[KP_PATH]); if (path == NULL) { jail_warnx(j, "mount.devfs: no path"); @@ -266,7 +288,11 @@ run_command(struct cfjail *j, int *plimi argv[3] = NULL; } j->flags |= JF_MOUNTED; - } else if (comparam == IP_COMMAND && j->name == NULL) { + break; + + case IP_COMMAND: + if (j->name != NULL) + goto default_command; argc = 0; STAILQ_FOREACH(s, &j->intparams[IP_COMMAND]->val, tq) argc++; @@ -276,36 +302,40 @@ run_command(struct cfjail *j, int *plimi argv[argc++] = s->s; argv[argc] = NULL; j->comstring = NULL; - } else if ((cs = strpbrk(comstring->s, "!\"$&'()*;<>?[\\]`{|}~")) && - !(cs[0] == '&' && cs[1] == '\0')) { - argv = alloca(4 * sizeof(char *)); - *(const char **)&argv[0] = _PATH_BSHELL; - *(const char **)&argv[1] = "-c"; - argv[2] = comstring->s; - argv[3] = NULL; - } else { - if (cs) { - *cs = 0; - bg = 1; + break; + + default: + default_command: + if ((cs = strpbrk(comstring->s, "!\"$&'()*;<>?[\\]`{|}~")) && + !(cs[0] == '&' && cs[1] == '\0')) { + argv = alloca(4 * sizeof(char *)); + *(const char **)&argv[0] = _PATH_BSHELL; + *(const char **)&argv[1] = "-c"; + argv[2] = comstring->s; + argv[3] = NULL; + } else { + if (cs) { + *cs = 0; + bg = 1; + } + comcs = alloca(comstring->len + 1); + strcpy(comcs, comstring->s); + argc = 0; + for (cs = strtok(comcs, " \t\f\v\r\n"); cs; + cs = strtok(NULL, " \t\f\v\r\n")) + argc++; + argv = alloca((argc + 1) * sizeof(char *)); + strcpy(comcs, comstring->s); + argc = 0; + for (cs = strtok(comcs, " \t\f\v\r\n"); cs; + cs = strtok(NULL, " \t\f\v\r\n")) + argv[argc++] = cs; + argv[argc] = NULL; } - comcs = alloca(comstring->len + 1); - strcpy(comcs, comstring->s); - argc = 0; - for (cs = strtok(comcs, " \t\f\v\r\n"); cs; - cs = strtok(NULL, " \t\f\v\r\n")) - argc++; - argv = alloca((argc + 1) * sizeof(char *)); - strcpy(comcs, comstring->s); - argc = 0; - for (cs = strtok(comcs, " \t\f\v\r\n"); cs; - cs = strtok(NULL, " \t\f\v\r\n")) - argv[argc++] = cs; - argv[argc] = NULL; } - if (argv[0] == NULL) - return 0; - j->pstatus = 0; + if (argv[0] == NULL) + goto next_comstring; if (int_param(j->intparams[IP_EXEC_TIMEOUT], &timeout) && timeout != 0) { clock_gettime(CLOCK_REALTIME, &j->timeout); @@ -357,10 +387,11 @@ run_command(struct cfjail *j, int *plimi err(1, "fork"); if (pid > 0) { if (bg) { - j->flags |= JF_BACKGROUND; + free(j->comline); + j->comline = NULL; requeue(j, &ready); } else { - --*plimit; + paralimit--; add_proc(j, pid); } return 1; @@ -434,15 +465,18 @@ run_command(struct cfjail *j, int *plimi * Check command exit status */ int -finish_command(struct cfjail *j, int *plimit) +finish_command(struct cfjail *j) { int error; - if (j->flags & (JF_RUNQ | JF_BACKGROUND)) + if (!(j->flags & JF_SLEEPQ)) return 0; - ++*plimit; - if (!TAILQ_EMPTY(&runnable)) - requeue(TAILQ_FIRST(&runnable), &ready); + j->flags &= ~JF_SLEEPQ; + if (j->comparam != IP_STOP_TIMEOUT) { + paralimit++; + if (!TAILQ_EMPTY(&runnable)) + requeue(TAILQ_FIRST(&runnable), &ready); + } error = 0; if (j->flags & JF_TIMEOUT) { j->flags &= ~JF_TIMEOUT; @@ -458,10 +492,12 @@ finish_command(struct cfjail *j, int *pl j->comline, WTERMSIG(j->pstatus)); else jail_warnx(j, "%s: failed", j->comline); + j->pstatus = 0; failed(j); error = -1; } free(j->comline); + j->comline = NULL; return error; } @@ -526,54 +562,6 @@ next_proc(int nonblock) } /* - * Send SIGTERM to all processes in a jail and wait for them to die. - */ -int -term_procs(struct cfjail *j) -{ - struct kinfo_proc *ki; - int i, noted, pcnt, timeout; - - static kvm_t *kd; - - if (!int_param(j->intparams[IP_STOP_TIMEOUT], &timeout)) - timeout = DEFAULT_STOP_TIMEOUT; - else if (timeout == 0) - return 0; - - if (kd == NULL) { - kd = kvm_open(NULL, NULL, NULL, O_RDONLY, "jail"); - if (kd == NULL) - exit(1); - } - - ki = kvm_getprocs(kd, KERN_PROC_PROC, 0, &pcnt); - if (ki == NULL) - exit(1); - noted = 0; - for (i = 0; i < pcnt; i++) - if (ki[i].ki_jid == j->jid && - kill(ki[i].ki_pid, SIGTERM) == 0) { - add_proc(j, ki[i].ki_pid); - if (verbose > 0) { - if (!noted) { - noted = 1; - jail_note(j, "sent SIGTERM to:"); - } - printf(" %d", ki[i].ki_pid); - } - } - if (noted) - printf("\n"); - if (j->nprocs > 0) { - clock_gettime(CLOCK_REALTIME, &j->timeout); - j->timeout.tv_sec += timeout; - return 1; - } - return 0; -} - -/* * Add a process to the hash, tied to a jail. */ static void @@ -593,7 +581,11 @@ add_proc(struct cfjail *j, pid_t pid) ph->pid = pid; LIST_INSERT_HEAD(&phash[pid % PHASH_SIZE], ph, le); j->nprocs++; - if (j->timeout.tv_sec) { + j->flags |= JF_SLEEPQ; + if (j->timeout.tv_sec == 0) + requeue(j, &sleeping); + else { + /* File the jail in the sleep queue acording to its timeout. */ TAILQ_REMOVE(j->queue, j, tq); TAILQ_FOREACH(tj, &sleeping, tq) { if (!tj->timeout.tv_sec || @@ -607,8 +599,7 @@ add_proc(struct cfjail *j, pid_t pid) if (tj == NULL) TAILQ_INSERT_TAIL(&sleeping, j, tq); j->queue = &sleeping; - } else - requeue(j, &sleeping); + } } /* @@ -653,6 +644,54 @@ find_proc(pid_t pid) } /* + * Send SIGTERM to all processes in a jail and wait for them to die. + */ +static int +term_procs(struct cfjail *j) +{ + struct kinfo_proc *ki; + int i, noted, pcnt, timeout; + + static kvm_t *kd; + + if (!int_param(j->intparams[IP_STOP_TIMEOUT], &timeout)) + timeout = DEFAULT_STOP_TIMEOUT; + else if (timeout == 0) + return 0; + + if (kd == NULL) { + kd = kvm_open(NULL, NULL, NULL, O_RDONLY, "jail"); + if (kd == NULL) + exit(1); + } + + ki = kvm_getprocs(kd, KERN_PROC_PROC, 0, &pcnt); + if (ki == NULL) + exit(1); + noted = 0; + for (i = 0; i < pcnt; i++) + if (ki[i].ki_jid == j->jid && + kill(ki[i].ki_pid, SIGTERM) == 0) { + add_proc(j, ki[i].ki_pid); + if (verbose > 0) { + if (!noted) { + noted = 1; + jail_note(j, "sent SIGTERM to:"); + } + printf(" %d", ki[i].ki_pid); + } + } + if (noted) + printf("\n"); + if (j->nprocs > 0) { + clock_gettime(CLOCK_REALTIME, &j->timeout); + j->timeout.tv_sec += timeout; + return 1; + } + return 0; +} + +/* * Look up a user in the passwd and login.conf files. */ static int Modified: projects/jailconf/usr.sbin/jail/jail.c ============================================================================== --- projects/jailconf/usr.sbin/jail/jail.c Fri Dec 10 22:59:09 2010 (r216366) +++ projects/jailconf/usr.sbin/jail/jail.c Fri Dec 10 23:57:55 2010 (r216367) @@ -91,11 +91,10 @@ main(int argc, char **argv) size_t sysvallen; unsigned op, pi; int ch, docf, error, i, oldcl, sysval; - int dflag, iflag, plimit, Rflag; + int dflag, iflag, Rflag; char enforce_statfs[4]; op = 0; - plimit = -1; dflag = iflag = Rflag = 0; docf = 1; cfname = CONF_FILE; @@ -135,9 +134,9 @@ main(int argc, char **argv) docf = 0; break; case 'p': - plimit = strtol(optarg, NULL, 10); - if (plimit == 0) - plimit = -1; + paralimit = strtol(optarg, NULL, 10); + if (paralimit == 0) + paralimit = -1; break; case 'q': verbose = -1; @@ -293,18 +292,18 @@ main(int argc, char **argv) if (j->flags & JF_FAILED) { clear_persist(j); if (j->flags & JF_MOUNTED) { - (void)run_command(j, NULL, IP_MOUNT_DEVFS); - if (run_command(j, NULL, IP__MOUNT_FROM_FSTAB)) - while (run_command(j, NULL, 0)) ; - if (run_command(j, NULL, IP_MOUNT)) - while (run_command(j, NULL, 0)) ; + (void)run_command(j, IP_MOUNT_DEVFS); + if (run_command(j, IP__MOUNT_FROM_FSTAB)) + while (run_command(j, 0)) ; + if (run_command(j, IP_MOUNT)) + while (run_command(j, 0)) ; } if (j->flags & JF_IFUP) { - if (run_command(j, NULL, IP__IP4_IFADDR)) - while (run_command(j, NULL, 0)) ; + if (run_command(j, IP__IP4_IFADDR)) + while (run_command(j, 0)) ; #ifdef INET6 - if (run_command(j, NULL, IP__IP6_IFADDR)) - while (run_command(j, NULL, 0)) ; + if (run_command(j, IP__IP6_IFADDR)) + while (run_command(j, 0)) ; #endif } error = 1; @@ -327,8 +326,7 @@ main(int argc, char **argv) (j->flags & (JF_SET | JF_DEPEND)) == JF_SET ? dflag || bool_param(j->intparams[IP_ALLOW_DYING]) : 0); - if (j->comstring != NULL && - (finish_command(j, &plimit) || run_command(j, &plimit, 0))) + if (finish_command(j) || run_command(j, 0)) continue; switch (j->flags & JF_OP_MASK) { @@ -379,30 +377,30 @@ main(int argc, char **argv) continue; if (j->jid > 0) goto jail_create_done; - if (run_command(j, &plimit, IP__IP4_IFADDR)) + if (run_command(j, IP__IP4_IFADDR)) continue; /* FALLTHROUGH */ case IP__IP4_IFADDR: #ifdef INET6 - if (run_command(j, &plimit, IP__IP6_IFADDR)) + if (run_command(j, IP__IP6_IFADDR)) continue; /* FALLTHROUGH */ case IP__IP6_IFADDR: #endif - if (run_command(j, &plimit, IP_MOUNT)) + if (run_command(j, IP_MOUNT)) continue; /* FALLTHROUGH */ case IP_MOUNT: - if (run_command(j, &plimit, + if (run_command(j, IP__MOUNT_FROM_FSTAB)) continue; /* FALLTHROUGH */ case IP__MOUNT_FROM_FSTAB: - if (run_command(j, &plimit, IP_MOUNT_DEVFS)) + if (run_command(j, IP_MOUNT_DEVFS)) continue; /* FALLTHROUGH */ case IP_MOUNT_DEVFS: - if (run_command(j, &plimit, IP_EXEC_PRESTART)) + if (run_command(j, IP_EXEC_PRESTART)) continue; /* FALLTHROUGH */ case IP_EXEC_PRESTART: @@ -416,19 +414,19 @@ main(int argc, char **argv) jail_note(j, "created\n"); dep_done(j, DF_LIGHT); if (bool_param(j->intparams[KP_VNET]) && - run_command(j, &plimit, IP_VNET_INTERFACE)) + run_command(j, IP_VNET_INTERFACE)) continue; /* FALLTHROUGH */ case IP_VNET_INTERFACE: - if (run_command(j, &plimit, IP_EXEC_START)) + if (run_command(j, IP_EXEC_START)) continue; /* FALLTHROUGH */ case IP_EXEC_START: - if (run_command(j, &plimit, IP_COMMAND)) + if (run_command(j, IP_COMMAND)) continue; /* FALLTHROUGH */ case IP_COMMAND: - if (run_command(j, &plimit, IP_EXEC_POSTSTART)) + if (run_command(j, IP_EXEC_POSTSTART)) continue; /* FALLTHROUGH */ case IP_EXEC_POSTSTART: @@ -482,16 +480,15 @@ main(int argc, char **argv) j->name); goto jail_remove_done; } - if (run_command(j, &plimit, IP_EXEC_PRESTOP)) + if (run_command(j, IP_EXEC_PRESTOP)) continue; /* FALLTHROUGH */ case IP_EXEC_PRESTOP: - if (run_command(j, &plimit, IP_EXEC_STOP)) + if (run_command(j, IP_EXEC_STOP)) continue; /* FALLTHROUGH */ case IP_EXEC_STOP: - j->comparam = IP_STOP_TIMEOUT; - if (term_procs(j)) + if (run_command(j, IP_STOP_TIMEOUT)) continue; /* FALLTHROUGH */ case IP_STOP_TIMEOUT: @@ -502,29 +499,28 @@ main(int argc, char **argv) wild_jail_name(argv[0]) || verbose > 0)) jail_note(j, "removed\n"); dep_done(j, DF_LIGHT); - if (run_command(j, &plimit, IP_EXEC_POSTSTOP)) + if (run_command(j, IP_EXEC_POSTSTOP)) continue; /* FALLTHROUGH */ case IP_EXEC_POSTSTOP: - if (run_command(j, &plimit, IP_MOUNT_DEVFS)) + if (run_command(j, IP_MOUNT_DEVFS)) continue; /* FALLTHROUGH */ case IP_MOUNT_DEVFS: - if (run_command(j, &plimit, - IP__MOUNT_FROM_FSTAB)) + if (run_command(j, IP__MOUNT_FROM_FSTAB)) continue; /* FALLTHROUGH */ case IP__MOUNT_FROM_FSTAB: - if (run_command(j, &plimit, IP_MOUNT)) + if (run_command(j, IP_MOUNT)) continue; /* FALLTHROUGH */ case IP_MOUNT: - if (run_command(j, &plimit, IP__IP4_IFADDR)) + if (run_command(j, IP__IP4_IFADDR)) continue; /* FALLTHROUGH */ case IP__IP4_IFADDR: #ifdef INET6 - if (run_command(j, &plimit, IP__IP6_IFADDR)) + if (run_command(j, IP__IP6_IFADDR)) continue; /* FALLTHROUGH */ case IP__IP6_IFADDR: @@ -536,7 +532,7 @@ main(int argc, char **argv) j->flags &= ~JF_STOP; dep_reset(j); requeue(j, - j->ndeps ? &waiting : &ready); + j->ndeps ? &depend : &ready); } } break; Modified: projects/jailconf/usr.sbin/jail/jailp.h ============================================================================== --- projects/jailconf/usr.sbin/jail/jailp.h Fri Dec 10 22:59:09 2010 (r216366) +++ projects/jailconf/usr.sbin/jail/jailp.h Fri Dec 10 23:57:55 2010 (r216367) @@ -63,8 +63,7 @@ #define JF_MOUNTED 0x0200 /* Filesystems have been mounted */ #define JF_PERSIST 0x0400 /* Jail is temporarily persistent */ #define JF_TIMEOUT 0x0800 /* A command (or process kill) timed out */ -#define JF_RUNQ 0x1000 /* Jail was in the run qeueue */ -#define JF_BACKGROUND 0x2000 /* Command was run in the background */ +#define JF_SLEEPQ 0x2000 /* Waiting on a command and/or timeout */ #define JF_OP_MASK (JF_START | JF_SET | JF_STOP) #define JF_RESTART (JF_START | JF_STOP) @@ -188,10 +187,9 @@ extern void failed(struct cfjail *j); extern void jail_note(const struct cfjail *j, const char *fmt, ...); extern void jail_warnx(const struct cfjail *j, const char *fmt, ...); -extern int run_command(struct cfjail *j, int *plimit, enum intparam comparam); -extern int finish_command(struct cfjail *j, int *plimit); +extern int run_command(struct cfjail *j, enum intparam comparam); +extern int finish_command(struct cfjail *j); extern struct cfjail *next_proc(int nonblock); -extern int term_procs(struct cfjail *j); extern void load_config(void); extern struct cfjail *add_jail(void); @@ -220,6 +218,7 @@ extern int yyparse(void); extern struct cfjails cfjails; extern struct cfjails ready; -extern struct cfjails waiting; +extern struct cfjails depend; extern const char *cfname; +extern int paralimit; extern int verbose; Modified: projects/jailconf/usr.sbin/jail/state.c ============================================================================== --- projects/jailconf/usr.sbin/jail/state.c Fri Dec 10 22:59:09 2010 (r216366) +++ projects/jailconf/usr.sbin/jail/state.c Fri Dec 10 23:57:55 2010 (r216367) @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include "jailp.h" struct cfjails ready = TAILQ_HEAD_INITIALIZER(ready); -struct cfjails waiting = TAILQ_HEAD_INITIALIZER(waiting); +struct cfjails depend = TAILQ_HEAD_INITIALIZER(depend); static void dep_add(struct cfjail *from, struct cfjail *to, unsigned flags); static int cmp_jailptr(const void *a, const void *b); @@ -133,7 +133,7 @@ dep_setup(int docf) requeue(j, &cfjails); dep_done(j, DF_NOFAIL); } - while ((j = TAILQ_FIRST(&waiting)) != NULL) { + while ((j = TAILQ_FIRST(&depend)) != NULL) { jail_warnx(j, "dependency loop"); j->flags |= JF_FAILED; do { @@ -222,7 +222,7 @@ dep_check(struct cfjail *j) } if (ndeps == 0) return 0; - requeue(j, &waiting); + requeue(j, &depend); return 1; } @@ -256,7 +256,7 @@ dep_done(struct cfjail *j, unsigned flag jail_warnx(dj, "skipped"); dj->flags |= JF_FAILED; } - if (!--dj->ndeps && dj->queue == &waiting) + if (!--dj->ndeps && dj->queue == &depend) requeue(dj, &ready); } } @@ -315,7 +315,7 @@ start_state(const char *target, unsigned TAILQ_FOREACH_SAFE(j, &cfjails, tq, tj) { j->flags = (j->flags & JF_FAILED) | state | JF_WILD; dep_reset(j); - requeue(j, j->ndeps ? &waiting : &ready); + requeue(j, j->ndeps ? &depend : &ready); } } else if (wild_jail_name(target)) { /*