svn commit: r264004 - in projects/sendfile: . bin/sh cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/lib/libzfs/common contrib/atf contrib/atf/atf-c contrib/atf/atf-c++ contrib/atf/atf-...
Gleb Smirnoff
glebius at FreeBSD.org
Tue Apr 1 14:55:24 UTC 2014
Author: glebius
Date: Tue Apr 1 14:55:20 2014
New Revision: 264004
URL: http://svnweb.freebsd.org/changeset/base/264004
Log:
Merge head/ r258543 through r263998.
Added:
projects/sendfile/contrib/atf/atf-c++/atf-c++.m4
- copied unchanged from r263998, head/contrib/atf/atf-c++/atf-c++.m4
projects/sendfile/contrib/atf/atf-c/atf-c.m4
- copied unchanged from r263998, head/contrib/atf/atf-c/atf-c.m4
projects/sendfile/contrib/atf/atf-c/atf-common.m4
- copied unchanged from r263998, head/contrib/atf/atf-c/atf-common.m4
projects/sendfile/contrib/atf/atf-sh/atf-sh.m4
- copied unchanged from r263998, head/contrib/atf/atf-sh/atf-sh.m4
projects/sendfile/contrib/llvm/patches/patch-r263891-dwarf2-freebsd10.diff
- copied unchanged from r263998, head/contrib/llvm/patches/patch-r263891-dwarf2-freebsd10.diff
projects/sendfile/sys/arm/conf/CHROMEBOOK.hints
- copied unchanged from r263998, head/sys/arm/conf/CHROMEBOOK.hints
projects/sendfile/sys/arm/conf/EXYNOS5250.common
- copied unchanged from r263998, head/sys/arm/conf/EXYNOS5250.common
projects/sendfile/sys/arm/samsung/exynos/chrome_ec.c
- copied unchanged from r263998, head/sys/arm/samsung/exynos/chrome_ec.c
projects/sendfile/sys/arm/samsung/exynos/chrome_ec.h
- copied unchanged from r263998, head/sys/arm/samsung/exynos/chrome_ec.h
projects/sendfile/sys/arm/samsung/exynos/chrome_kb.c
- copied unchanged from r263998, head/sys/arm/samsung/exynos/chrome_kb.c
projects/sendfile/sys/arm/samsung/exynos/chrome_kb.h
- copied unchanged from r263998, head/sys/arm/samsung/exynos/chrome_kb.h
projects/sendfile/sys/arm/samsung/exynos/exynos5_combiner.c
- copied unchanged from r263998, head/sys/arm/samsung/exynos/exynos5_combiner.c
projects/sendfile/sys/arm/samsung/exynos/exynos5_combiner.h
- copied unchanged from r263998, head/sys/arm/samsung/exynos/exynos5_combiner.h
projects/sendfile/sys/arm/samsung/exynos/exynos5_i2c.c
- copied unchanged from r263998, head/sys/arm/samsung/exynos/exynos5_i2c.c
projects/sendfile/sys/arm/samsung/exynos/exynos5_pad.c
- copied unchanged from r263998, head/sys/arm/samsung/exynos/exynos5_pad.c
projects/sendfile/sys/arm/samsung/exynos/exynos5_pad.h
- copied unchanged from r263998, head/sys/arm/samsung/exynos/exynos5_pad.h
projects/sendfile/sys/dev/iwi/if_iwi_ioctl.h
- copied unchanged from r263998, head/sys/dev/iwi/if_iwi_ioctl.h
projects/sendfile/sys/sys/efi.h
- copied unchanged from r263998, head/sys/sys/efi.h
projects/sendfile/usr.bin/mkimg/
- copied from r263998, head/usr.bin/mkimg/
Deleted:
projects/sendfile/sys/cam/ctl/ctl_mem_pool.c
projects/sendfile/sys/cam/ctl/ctl_mem_pool.h
projects/sendfile/sys/ia64/include/efi.h
Modified:
projects/sendfile/Makefile
projects/sendfile/Makefile.inc1
projects/sendfile/bin/sh/var.c
projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool.8
projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
projects/sendfile/contrib/atf/FREEBSD-Xlist
projects/sendfile/contrib/byacc/skeleton.c
projects/sendfile/contrib/jemalloc/ChangeLog
projects/sendfile/contrib/jemalloc/FREEBSD-diffs
projects/sendfile/contrib/jemalloc/VERSION
projects/sendfile/contrib/jemalloc/doc/jemalloc.3
projects/sendfile/contrib/jemalloc/include/jemalloc/internal/hash.h
projects/sendfile/contrib/jemalloc/include/jemalloc/internal/huge.h
projects/sendfile/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h
projects/sendfile/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h
projects/sendfile/contrib/jemalloc/include/jemalloc/internal/private_namespace.h
projects/sendfile/contrib/jemalloc/include/jemalloc/jemalloc.h
projects/sendfile/contrib/jemalloc/src/arena.c
projects/sendfile/contrib/jemalloc/src/huge.c
projects/sendfile/contrib/jemalloc/src/jemalloc.c
projects/sendfile/contrib/jemalloc/src/prof.c
projects/sendfile/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
projects/sendfile/contrib/tzdata/africa
projects/sendfile/contrib/tzdata/antarctica
projects/sendfile/contrib/tzdata/australasia
projects/sendfile/contrib/tzdata/europe
projects/sendfile/contrib/tzdata/zone.tab
projects/sendfile/contrib/wpa/src/drivers/driver_bsd.c
projects/sendfile/etc/mtree/BSD.tests.dist
projects/sendfile/etc/pkg/FreeBSD.conf
projects/sendfile/gnu/lib/Makefile
projects/sendfile/gnu/usr.bin/Makefile
projects/sendfile/include/inttypes.h
projects/sendfile/include/stddef.h
projects/sendfile/include/stdlib.h
projects/sendfile/include/wchar.h
projects/sendfile/lib/atf/libatf-c++/Makefile
projects/sendfile/lib/atf/libatf-c/Makefile
projects/sendfile/lib/libc/capability/cap_rights_init.3
projects/sendfile/lib/libc/gen/cap_rights_get.3
projects/sendfile/lib/libc/gen/cap_sandboxed.3
projects/sendfile/lib/libc/iconv/citrus_bcs_strtol.c
projects/sendfile/lib/libc/iconv/citrus_bcs_strtoul.c
projects/sendfile/lib/libc/iconv/citrus_csmapper.c
projects/sendfile/lib/libc/iconv/citrus_csmapper.h
projects/sendfile/lib/libc/iconv/citrus_db_factory.c
projects/sendfile/lib/libc/iconv/citrus_iconv.c
projects/sendfile/lib/libc/iconv/citrus_lookup.c
projects/sendfile/lib/libc/iconv/citrus_mapper.c
projects/sendfile/lib/libc/iconv/citrus_memstream.c
projects/sendfile/lib/libc/iconv/citrus_mmap.c
projects/sendfile/lib/libc/iconv/citrus_prop.c
projects/sendfile/lib/libc/iconv/citrus_prop.h
projects/sendfile/lib/libc/iconv/citrus_stdenc.c
projects/sendfile/lib/libc/sys/cap_enter.2
projects/sendfile/lib/libc/sys/cap_fcntls_limit.2
projects/sendfile/lib/libc/sys/cap_ioctls_limit.2
projects/sendfile/lib/libc/sys/cap_rights_limit.2
projects/sendfile/lib/libiconv_modules/BIG5/citrus_big5.c
projects/sendfile/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c
projects/sendfile/lib/libiconv_modules/EUCTW/citrus_euctw.c
projects/sendfile/lib/libiconv_modules/ISO2022/citrus_iso2022.c
projects/sendfile/lib/libiconv_modules/UES/citrus_ues.c
projects/sendfile/lib/libiconv_modules/VIQR/citrus_viqr.c
projects/sendfile/lib/libiconv_modules/iconv_none/citrus_iconv_none.c
projects/sendfile/lib/libiconv_modules/iconv_std/citrus_iconv_std.c
projects/sendfile/lib/libiconv_modules/mapper_std/citrus_mapper_std.c
projects/sendfile/lib/libmd/ripemd.3
projects/sendfile/lib/libmd/sha.3
projects/sendfile/lib/libmd/sha256.3
projects/sendfile/lib/libmd/sha512.3
projects/sendfile/release/doc/en_US.ISO8859-1/relnotes/article.xml
projects/sendfile/sbin/mdconfig/tests/legacy_test.sh
projects/sendfile/share/man/man4/Makefile
projects/sendfile/share/man/man7/build.7
projects/sendfile/share/mk/bsd.own.mk
projects/sendfile/share/mk/bsd.prog.mk
projects/sendfile/sys/amd64/amd64/machdep.c
projects/sendfile/sys/amd64/amd64/mp_machdep.c
projects/sendfile/sys/amd64/amd64/pmap.c
projects/sendfile/sys/amd64/amd64/vm_machdep.c
projects/sendfile/sys/amd64/include/metadata.h
projects/sendfile/sys/arm/arm/cpufunc.c
projects/sendfile/sys/arm/arm/identcpu.c
projects/sendfile/sys/arm/arm/machdep.c
projects/sendfile/sys/arm/arm/vfp.c
projects/sendfile/sys/arm/arm/vm_machdep.c
projects/sendfile/sys/arm/conf/ARNDALE
projects/sendfile/sys/arm/conf/CHROMEBOOK
projects/sendfile/sys/arm/include/_types.h
projects/sendfile/sys/arm/include/armreg.h
projects/sendfile/sys/arm/include/fp.h
projects/sendfile/sys/arm/include/vfp.h
projects/sendfile/sys/arm/samsung/exynos/exynos5_ehci.c
projects/sendfile/sys/arm/samsung/exynos/exynos5_fimd.c
projects/sendfile/sys/arm/samsung/exynos/files.exynos5
projects/sendfile/sys/boot/fdt/dts/arm/exynos5250-arndale.dts
projects/sendfile/sys/boot/fdt/dts/arm/exynos5250-chromebook.dts
projects/sendfile/sys/boot/fdt/dts/arm/exynos5250.dtsi
projects/sendfile/sys/boot/i386/efi/main.c
projects/sendfile/sys/cam/ctl/README.ctl.txt
projects/sendfile/sys/cam/ctl/ctl.c
projects/sendfile/sys/cam/ctl/ctl_frontend_cam_sim.c
projects/sendfile/sys/cam/ctl/ctl_frontend_internal.c
projects/sendfile/sys/cam/ctl/ctl_frontend_iscsi.c
projects/sendfile/sys/cam/scsi/scsi_da.c
projects/sendfile/sys/cam/scsi/scsi_enc_ses.c
projects/sendfile/sys/cam/scsi/scsi_pass.c
projects/sendfile/sys/compat/freebsd32/freebsd32_misc.c
projects/sendfile/sys/conf/Makefile.arm
projects/sendfile/sys/conf/files
projects/sendfile/sys/conf/kern.mk
projects/sendfile/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_power.c
projects/sendfile/sys/ddb/db_break.h
projects/sendfile/sys/ddb/db_sym.h
projects/sendfile/sys/ddb/db_variables.h
projects/sendfile/sys/ddb/ddb.h
projects/sendfile/sys/dev/aacraid/aacraid_cam.c
projects/sendfile/sys/dev/aacraid/aacraid_pci.c
projects/sendfile/sys/dev/acpica/acpi.c
projects/sendfile/sys/dev/acpica/acpi_resource.c
projects/sendfile/sys/dev/acpica/acpi_smbat.c
projects/sendfile/sys/dev/advansys/advansys.c
projects/sendfile/sys/dev/advansys/advlib.c
projects/sendfile/sys/dev/advansys/adwcam.c
projects/sendfile/sys/dev/age/if_agevar.h
projects/sendfile/sys/dev/aic7xxx/aic79xx.c
projects/sendfile/sys/dev/alc/if_alcvar.h
projects/sendfile/sys/dev/ale/if_alevar.h
projects/sendfile/sys/dev/bce/if_bcereg.h
projects/sendfile/sys/dev/bge/if_bgereg.h
projects/sendfile/sys/dev/fxp/if_fxpreg.h
projects/sendfile/sys/dev/iwi/if_iwi.c
projects/sendfile/sys/dev/iwi/if_iwireg.h
projects/sendfile/sys/dev/iwi/if_iwivar.h
projects/sendfile/sys/dev/jme/if_jmevar.h
projects/sendfile/sys/dev/msk/if_mskreg.h
projects/sendfile/sys/dev/nfe/if_nfereg.h
projects/sendfile/sys/dev/sge/if_sgereg.h
projects/sendfile/sys/dev/usb/usbdevs
projects/sendfile/sys/dev/usb/wlan/if_run.c
projects/sendfile/sys/dev/vt/hw/efifb/efifb.c
projects/sendfile/sys/dev/vt/hw/vga/vga.c
projects/sendfile/sys/dev/vt/vt.h
projects/sendfile/sys/dev/vt/vt_core.c
projects/sendfile/sys/i386/i386/vm_machdep.c
projects/sendfile/sys/ia64/acpica/OsdEnvironment.c
projects/sendfile/sys/ia64/ia64/clock.c
projects/sendfile/sys/ia64/ia64/dump_machdep.c
projects/sendfile/sys/ia64/ia64/efi.c
projects/sendfile/sys/ia64/ia64/iodev_machdep.c
projects/sendfile/sys/ia64/ia64/machdep.c
projects/sendfile/sys/ia64/ia64/mem.c
projects/sendfile/sys/ia64/ia64/nexus.c
projects/sendfile/sys/ia64/ia64/pmap.c
projects/sendfile/sys/ia64/ia64/sal.c
projects/sendfile/sys/ia64/ia64/trap.c
projects/sendfile/sys/ia64/include/_types.h
projects/sendfile/sys/mips/include/_types.h
projects/sendfile/sys/modules/ctl/Makefile
projects/sendfile/sys/netinet/ip_icmp.c
projects/sendfile/sys/netinet/sctp_constants.h
projects/sendfile/sys/netinet/sctp_pcb.c
projects/sendfile/sys/netinet/sctp_sysctl.h
projects/sendfile/sys/netinet6/ip6_forward.c
projects/sendfile/sys/pci/if_rlreg.h
projects/sendfile/sys/powerpc/include/_types.h
projects/sendfile/sys/sparc64/include/_types.h
projects/sendfile/sys/sys/buf_ring.h
projects/sendfile/sys/sys/stdatomic.h
projects/sendfile/sys/x86/acpica/madt.c
projects/sendfile/sys/x86/include/_types.h
projects/sendfile/tools/tools/nanobsd/nanobsd.sh
projects/sendfile/usr.bin/Makefile
projects/sendfile/usr.bin/atf/atf-sh/Makefile
projects/sendfile/usr.bin/clang/Makefile
projects/sendfile/usr.bin/grep/Makefile
projects/sendfile/usr.bin/kdump/kdump.1
projects/sendfile/usr.bin/kdump/kdump.c
projects/sendfile/usr.bin/units/units.c
projects/sendfile/usr.bin/units/units.lib
Directory Properties:
projects/sendfile/ (props changed)
projects/sendfile/cddl/ (props changed)
projects/sendfile/cddl/contrib/opensolaris/ (props changed)
projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/ (props changed)
projects/sendfile/contrib/atf/ (props changed)
projects/sendfile/contrib/byacc/ (props changed)
projects/sendfile/contrib/llvm/ (props changed)
projects/sendfile/contrib/llvm/tools/clang/ (props changed)
projects/sendfile/contrib/tzdata/ (props changed)
projects/sendfile/contrib/wpa/ (props changed)
projects/sendfile/etc/ (props changed)
projects/sendfile/gnu/lib/ (props changed)
projects/sendfile/include/ (props changed)
projects/sendfile/lib/libc/ (props changed)
projects/sendfile/sbin/ (props changed)
projects/sendfile/share/man/man4/ (props changed)
projects/sendfile/sys/ (props changed)
projects/sendfile/sys/boot/ (props changed)
projects/sendfile/sys/boot/i386/efi/ (props changed)
projects/sendfile/sys/conf/ (props changed)
Modified: projects/sendfile/Makefile
==============================================================================
--- projects/sendfile/Makefile Tue Apr 1 14:54:43 2014 (r264003)
+++ projects/sendfile/Makefile Tue Apr 1 14:55:20 2014 (r264004)
@@ -166,20 +166,6 @@ _TARGET_ARCH= ${TARGET:S/pc98/i386/}
${TARGET_ARCH} != ${MACHINE_ARCH}
_TARGET= ${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/}
.endif
-# Legacy names, for another transition period mips:mips(n32|64)?eb -> mips:mips\1
-.if defined(TARGET) && defined(TARGET_ARCH) && \
- ${TARGET} == "mips" && ${TARGET_ARCH:Mmips*eb}
-_TARGET_ARCH= ${TARGET_ARCH:C/eb$//}
-.warning "TARGET_ARCH of ${TARGET_ARCH} is deprecated in favor of ${_TARGET_ARCH}"
-.endif
-.if defined(TARGET) && ${TARGET} == "mips" && defined(TARGET_BIG_ENDIAN)
-.warning "TARGET_BIG_ENDIAN is no longer necessary for MIPS. Big-endian is not the default."
-.endif
-# arm with TARGET_BIG_ENDIAN -> armeb
-.if defined(TARGET_ARCH) && ${TARGET_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN)
-.warning "TARGET_ARCH of arm with TARGET_BIG_ENDIAN is deprecated. use armeb"
-_TARGET_ARCH=armeb
-.endif
.if defined(TARGET) && !defined(_TARGET)
_TARGET=${TARGET}
.endif
Modified: projects/sendfile/Makefile.inc1
==============================================================================
--- projects/sendfile/Makefile.inc1 Tue Apr 1 14:54:43 2014 (r264003)
+++ projects/sendfile/Makefile.inc1 Tue Apr 1 14:55:20 2014 (r264004)
@@ -240,16 +240,15 @@ BMAKEENV= INSTALL="sh ${.CURDIR}/tools/i
PATH=${BPATH}:${PATH} \
WORLDTMP=${WORLDTMP} \
VERSION="${VERSION}" \
- MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
- COMPILER_TYPE=${COMPILER_TYPE}
+ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
DESTDIR= \
BOOTSTRAPPING=${OSRELDATE} \
SSP_CFLAGS= \
- -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
+ MK_HTML=no MK_INFO=no NO_LINT=yes MK_MAN=no \
-DNO_PIC -DNO_PROFILE -DNO_SHARED \
- -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD -DNO_TESTS
+ -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD MK_TESTS=no
# build-tools stage
TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \
@@ -259,25 +258,24 @@ TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \
BOOTSTRAPPING=${OSRELDATE} \
SSP_CFLAGS= \
-DNO_LINT \
- -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD -DNO_TESTS
+ -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD MK_TESTS=no
# cross-tools stage
XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
- -DWITHOUT_GDB -DNO_TESTS
+ MK_GDB=no MK_TESTS=no
# kernel-tools stage
KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \
PATH=${BPATH}:${PATH} \
WORLDTMP=${WORLDTMP} \
- VERSION="${VERSION}" \
- COMPILER_TYPE=${COMPILER_TYPE}
+ VERSION="${VERSION}"
KTMAKE= TOOLS_PREFIX=${WORLDTMP} MAKEOBJDIRPREFIX=${WORLDTMP} \
${KTMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
DESTDIR= \
BOOTSTRAPPING=${OSRELDATE} \
SSP_CFLAGS= \
- -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
+ MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \
-DNO_PIC -DNO_PROFILE -DNO_SHARED \
-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD
@@ -324,17 +322,6 @@ WMAKEENV+= CC="${XCC} ${XFLAGS}" CXX="${
AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \
OBJDUMP=${XOBJDUMP} RANLIB=${XRANLIB} STRINGS=${XSTRINGS}
-.if ${XCC:T:Mgcc} == "gcc"
-WMAKE_COMPILER_TYPE= gcc
-.elif ${XCC:T:Mclang} == "clang"
-WMAKE_COMPILER_TYPE= clang
-.elif ${MK_CLANG_IS_CC} == "no"
-WMAKE_COMPILER_TYPE= gcc
-.else
-WMAKE_COMPILER_TYPE= clang
-.endif
-IMAKE_COMPILER_TYPE= COMPILER_TYPE=${WMAKE_COMPILER_TYPE}
-
.if ${XCC:M/*}
XFLAGS= --sysroot=${WORLDTMP}
.if defined(CROSS_BINUTILS_PREFIX)
@@ -347,21 +334,18 @@ XFLAGS+= -B${CROSS_BINUTILS_PREFIX}
.else
XFLAGS+= -B${WORLDTMP}/usr/bin
.endif
-.if ${TARGET_ARCH} != ${MACHINE_ARCH} && ${WMAKE_COMPILER_TYPE} == "clang"
-.if (${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "armv6") && \
-${MK_ARM_EABI} != "no"
+.if ${TARGET} == "arm" && ${MK_ARM_EABI} != "no"
+.if ${TARGET_ARCH:M*eb*} == ""
TARGET_ABI= gnueabi
.elif ${TARGET_ARCH} == "armv6hf"
TARGET_ABI= gnueabihf
-.else
-TARGET_ABI= unknown
.endif
+.endif
+TARGET_ABI?= unknown
TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0
XFLAGS+= -target ${TARGET_TRIPLE}
.endif
-.endif
-WMAKEENV+= COMPILER_TYPE=${WMAKE_COMPILER_TYPE}
WMAKE= ${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP}
.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
@@ -409,10 +393,8 @@ LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${OBJTR
PATH=${TMPPATH} \
LIBDIR=/usr/lib32 \
SHLIBDIR=/usr/lib32 \
- LIBPRIVATEDIR=/usr/lib32/private \
- COMPILER_TYPE=${WMAKE_COMPILER_TYPE}
-LIB32WMAKEFLAGS+= \
- CC="${XCC} ${LIB32FLAGS}" \
+ LIBPRIVATEDIR=/usr/lib32/private
+LIB32WMAKEFLAGS+= CC="${XCC} ${LIB32FLAGS}" \
CXX="${XCXX} ${LIB32FLAGS}" \
DESTDIR=${LIB32TMP} \
-DCOMPAT_32BIT \
@@ -420,17 +402,17 @@ LIB32WMAKEFLAGS+= \
-DNO_CPU_CFLAGS \
-DNO_CTF \
-DNO_LINT \
- -DNO_TESTS
+ MK_TESTS=no
LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \
- -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML
+ MK_MAN=no MK_INFO=no MK_HTML=no
LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS \
${IMAKE_INSTALL}
.endif
IMAKEENV= ${CROSSENV:N_LDSCRIPTROOT=*}
IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 \
- ${IMAKE_INSTALL} ${IMAKE_MTREE} ${IMAKE_COMPILER_TYPE}
+ ${IMAKE_INSTALL} ${IMAKE_MTREE}
.if empty(.MAKEFLAGS:M-n)
IMAKEENV+= PATH=${STRICTTMPPATH}:${INSTALLTMP} \
LD_LIBRARY_PATH=${INSTALLTMP} \
@@ -574,8 +556,8 @@ _libraries:
@echo ">>> stage 4.2: building libraries"
@echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; \
- ${WMAKE} -DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
- -DWITHOUT_MAN -DNO_PROFILE -DNO_TESTS libraries
+ ${WMAKE} -DNO_FSCHG MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \
+ -DNO_PROFILE MK_TESTS=no libraries
_depend:
@echo
@echo "--------------------------------------------------------------"
@@ -992,6 +974,8 @@ INSTALLKERNEL= ${_kernel}
.endif
.endfor
+buildkernel ${WMAKE_TGTS} ${.ALLTARGETS:M_*}: .MAKE
+
#
# buildkernel
#
@@ -1502,11 +1486,14 @@ _prebuild_libs= ${_kerberos5_lib_libasn1
lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \
${_secure_lib_libcrypto} ${_lib_libldns} \
${_secure_lib_libssh} ${_secure_lib_libssl}
+.if ${MK_GNUCXX} != "no" && ${MK_CXX} != "no"
+_prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++
+.endif
.if defined(WITH_ATF) || ${MK_TESTS} != "no"
.if !defined(WITH_ATF)
# Ensure that the ATF libraries will be built during make libraries, even
-# though they will have -DNO_TESTS
+# though they will have WITHOUT_TESTS
MAKE+= -DWITH_ATF
.endif
_lib_atf= lib/atf
@@ -1621,11 +1608,11 @@ ${_lib}__PL: .PHONY .MAKE
.if exists(${.CURDIR}/${_lib})
${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_lib} && \
- ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ obj && \
- ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ depend && \
- ${MAKE} -DNO_TESTS -DNO_PROFILE -DNO_PIC \
+ ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj && \
+ ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ depend && \
+ ${MAKE} MK_TESTS=no -DNO_PROFILE -DNO_PIC \
DIRPRFX=${_lib}/ all && \
- ${MAKE} -DNO_TESTS -DNO_PROFILE -DNO_PIC \
+ ${MAKE} MK_TESTS=no -DNO_PROFILE -DNO_PIC \
DIRPRFX=${_lib}/ install
.endif
.endfor
@@ -1635,10 +1622,10 @@ ${_lib}__L: .PHONY .MAKE
.if exists(${.CURDIR}/${_lib})
${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_lib} && \
- ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ obj && \
- ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ depend && \
- ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ all && \
- ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ install
+ ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj && \
+ ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ depend && \
+ ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ all && \
+ ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ install
.endif
.endfor
@@ -1648,11 +1635,11 @@ ${_lib}__L: .PHONY .MAKE
lib/libpam__L: .PHONY .MAKE
${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \
cd ${.CURDIR}/lib/libpam && \
- ${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ obj && \
- ${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ depend && \
- ${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ \
+ ${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ obj && \
+ ${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ depend && \
+ ${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ \
-D_NO_LIBPAM_SO_YET all && \
- ${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ \
+ ${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ \
-D_NO_LIBPAM_SO_YET install
_prereq_libs: ${_prereq_libs:S/$/__PL/}
@@ -1878,9 +1865,9 @@ XDEV_CPUTYPE?=${CPUTYPE}
XDEV_CPUTYPE?=${TARGET_CPUTYPE}
.endif
-NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
- -DWITHOUT_MAN -DWITHOUT_NLS -DNO_PROFILE \
- -DWITHOUT_KERBEROS -DWITHOUT_RESCUE -DNO_TESTS -DNO_WARNS \
+NOFUN=-DNO_FSCHG MK_HTML=no MK_INFO=no -DNO_LINT \
+ MK_MAN=no MK_NLS=no -DNO_PROFILE \
+ MK_KERBEROS=no MK_RESCUE=no MK_TESTS=no -DNO_WARNS \
TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \
CPUTYPE=${XDEV_CPUTYPE}
@@ -1899,7 +1886,7 @@ CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}"
CDTMP= ${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp
CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN}
CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/usr/bin:${PATH} ${MAKE} ${NOFUN}
-XDDESTDIR=${DESTDIR}/${XDTP}
+XDDESTDIR?=${DESTDIR}/${XDTP}
.if !defined(OSREL)
OSREL!= uname -r | sed -e 's/[-(].*//'
.endif
@@ -1932,11 +1919,11 @@ _xb-build-tools:
_xb-cross-tools:
.for _tool in \
- gnu/usr.bin/binutils \
- gnu/usr.bin/cc \
+ ${_binutils} \
usr.bin/ar \
${_clang_libs} \
- ${_clang}
+ ${_clang} \
+ ${_cc}
${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,depend,all)"; \
cd ${.CURDIR}/${_tool} && \
${CDMAKE} DIRPRFX=${_tool}/ obj && \
@@ -1960,10 +1947,11 @@ xdev-install: xdev-build _xi-mtree _xi-c
_xi-cross-tools:
@echo "_xi-cross-tools"
.for _tool in \
- gnu/usr.bin/binutils \
- gnu/usr.bin/cc \
+ ${_binutils} \
usr.bin/ar \
- ${_clang}
+ ${_clang_libs} \
+ ${_clang} \
+ ${_cc}
${_+_}@${ECHODIR} "===> xdev ${_tool} (install)"; \
cd ${.CURDIR}/${_tool}; \
${CDMAKE} DIRPRFX=${_tool}/ install DESTDIR=${XDDESTDIR}
@@ -1990,5 +1978,3 @@ _xi-links:
xdev xdev-build xdev-install:
@echo "*** Error: Both XDEV and XDEV_ARCH must be defined for \"${.TARGET}\" target"
.endif
-
-buildkernel ${WMAKE_TGTS} ${.ALLTARGETS:M_*}: .MAKE
Modified: projects/sendfile/bin/sh/var.c
==============================================================================
--- projects/sendfile/bin/sh/var.c Tue Apr 1 14:54:43 2014 (r264003)
+++ projects/sendfile/bin/sh/var.c Tue Apr 1 14:55:20 2014 (r264004)
@@ -325,10 +325,16 @@ setvareq(char *s, int flags)
mklocal(s);
vp = find_var(s, &vpp, &nlen);
if (vp != NULL) {
- if (vp->flags & VREADONLY)
+ if (vp->flags & VREADONLY) {
+ if ((flags & (VTEXTFIXED|VSTACK)) == 0)
+ ckfree(s);
error("%.*s: is read only", vp->name_len, s);
- if (flags & VNOSET)
+ }
+ if (flags & VNOSET) {
+ if ((flags & (VTEXTFIXED|VSTACK)) == 0)
+ ckfree(s);
return;
+ }
INTOFF;
if (vp->func && (flags & VNOFUNC) == 0)
@@ -361,8 +367,11 @@ setvareq(char *s, int flags)
return;
}
/* not found */
- if (flags & VNOSET)
+ if (flags & VNOSET) {
+ if ((flags & (VTEXTFIXED|VSTACK)) == 0)
+ ckfree(s);
return;
+ }
INTOFF;
vp = ckmalloc(sizeof (*vp));
vp->flags = flags;
Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool.8
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Tue Apr 1 14:54:43 2014 (r264003)
+++ projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Tue Apr 1 14:55:20 2014 (r264004)
@@ -1,5 +1,6 @@
'\" te
.\" Copyright (c) 2012, Martin Matuska <mm at FreeBSD.org>.
+.\" Copyright (c) 2013-2014, Xin Li <delphij at FreeBSD.org>.
.\" All Rights Reserved.
.\"
.\" The contents of this file are subject to the terms of the
@@ -25,7 +26,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd March 20, 2014
+.Dd March 28, 2014
.Dt ZPOOL 8
.Os
.Sh NAME
@@ -70,6 +71,8 @@
.Ar pool ...
.Nm
.Cm get
+.Op Fl Hp
+.Op Fl o Ar field Ns Op , Ns Ar ...
.Ar all | property Ns Op , Ns Ar ...
.Ar pool ...
.Nm
@@ -120,7 +123,7 @@
.Ar device
.Nm
.Cm list
-.Op Fl H
+.Op Fl Hpv
.Op Fl o Ar property Ns Op , Ns Ar ...
.Op Fl T Cm d Ns | Ns Cm u
.Op Ar pool
@@ -1018,6 +1021,8 @@ is currently being used. This may lead t
.It Xo
.Nm
.Cm get
+.Op Fl Hp
+.Op Fl o Ar field Ns Op , Ns Ar ...
.Ar all | property Ns Op , Ns Ar ...
.Ar pool ...
.Xc
@@ -1036,6 +1041,19 @@ the following fields:
See the
.Qq Sx Properties
section for more information on the available pool properties.
+.Pp
+.It Fl H
+Scripted mode. Do not display headers, and separate fields by a single tab
+instead of arbitrary space.
+.It Fl p
+Display numbers in parsable (exact) values.
+.It Fl o Ar field
+A comma-separated list of columns to display.
+.Sy name Ns , Ns
+.Sy property Ns , Ns
+.Sy value Ns , Ns
+.Sy source
+is the default value.
.It Xo
.Nm
.Cm history
@@ -1335,7 +1353,7 @@ Treat exported or foreign devices as ina
.It Xo
.Nm
.Cm list
-.Op Fl Hv
+.Op Fl Hpv
.Op Fl o Ar property Ns Op , Ns Ar ...
.Op Fl T Cm d Ns | Ns Cm u
.Op Ar pool
@@ -1371,6 +1389,8 @@ for unixtime
.It Fl H
Scripted mode. Do not display headers, and separate fields by a single tab
instead of arbitrary space.
+.It Fl p
+Display numbers in parsable (exact) values.
.It Fl v
Show more detailed information.
.It Fl o Ar property Ns Op , Ns Ar ...
Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Tue Apr 1 14:54:43 2014 (r264003)
+++ projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Tue Apr 1 14:55:20 2014 (r264004)
@@ -236,7 +236,7 @@ get_usage(zpool_help_t idx) {
case HELP_LABELCLEAR:
return (gettext("\tlabelclear [-f] <vdev>\n"));
case HELP_LIST:
- return (gettext("\tlist [-Hv] [-o property[,...]] "
+ return (gettext("\tlist [-Hpv] [-o property[,...]] "
"[-T d|u] [pool] ... [interval [count]]\n"));
case HELP_OFFLINE:
return (gettext("\toffline [-t] <pool> <device> ...\n"));
@@ -258,8 +258,8 @@ get_usage(zpool_help_t idx) {
return (gettext("\tupgrade [-v]\n"
"\tupgrade [-V version] <-a | pool ...>\n"));
case HELP_GET:
- return (gettext("\tget <\"all\" | property[,...]> "
- "<pool> ...\n"));
+ return (gettext("\tget [-Hp] [-o \"all\" | field[,...]] "
+ "<\"all\" | property[,...]> <pool> ...\n"));
case HELP_SET:
return (gettext("\tset <property=value> <pool> \n"));
case HELP_SPLIT:
@@ -2765,6 +2765,7 @@ typedef struct list_cbdata {
int cb_namewidth;
boolean_t cb_scripted;
zprop_list_t *cb_proplist;
+ boolean_t cb_literal;
} list_cbdata_t;
/*
@@ -2860,7 +2861,7 @@ print_pool(zpool_handle_t *zhp, list_cbd
zpool_get_prop_int(zhp, pl->pl_prop, NULL) == 0)
propstr = "-";
else if (zpool_get_prop(zhp, pl->pl_prop, property,
- sizeof (property), NULL) != 0)
+ sizeof (property), NULL, cb->cb_literal) != 0)
propstr = "-";
else
propstr = property;
@@ -3011,12 +3012,13 @@ list_callback(zpool_handle_t *zhp, void
}
/*
- * zpool list [-H] [-o prop[,prop]*] [-T d|u] [pool] ... [interval [count]]
+ * zpool list [-Hp] [-o prop[,prop]*] [-T d|u] [pool] ... [interval [count]]
*
* -H Scripted mode. Don't display headers, and separate properties
* by a single tab.
* -o List of properties to display. Defaults to
* "name,size,allocated,free,capacity,health,altroot"
+ * -p Diplay values in parsable (exact) format.
* -T Display a timestamp in date(1) or Unix format
*
* List all pools in the system, whether or not they're healthy. Output space
@@ -3037,7 +3039,7 @@ zpool_do_list(int argc, char **argv)
boolean_t first = B_TRUE;
/* check options */
- while ((c = getopt(argc, argv, ":Ho:T:v")) != -1) {
+ while ((c = getopt(argc, argv, ":Ho:pT:v")) != -1) {
switch (c) {
case 'H':
cb.cb_scripted = B_TRUE;
@@ -3045,6 +3047,9 @@ zpool_do_list(int argc, char **argv)
case 'o':
props = optarg;
break;
+ case 'p':
+ cb.cb_literal = B_TRUE;
+ break;
case 'T':
get_timestamp_arg(*optarg);
break;
@@ -5199,7 +5204,7 @@ get_callback(zpool_handle_t *zhp, void *
}
} else {
if (zpool_get_prop(zhp, pl->pl_prop, value,
- sizeof (value), &srctype) != 0)
+ sizeof (value), &srctype, cbp->cb_literal) != 0)
continue;
zprop_print_one_property(zpool_get_name(zhp), cbp,
@@ -5210,20 +5215,32 @@ get_callback(zpool_handle_t *zhp, void *
return (0);
}
+/*
+ * zpool get [-Hp] [-o "all" | field[,...]] <"all" | property[,...]> <pool> ...
+ *
+ * -H Scripted mode. Don't display headers, and separate properties
+ * by a single tab.
+ * -o List of columns to display. Defaults to
+ * "name,property,value,source".
+ * -p Diplay values in parsable (exact) format.
+ *
+ * Get properties of pools in the system. Output space statistics
+ * for each one as well as other attributes.
+ */
int
zpool_do_get(int argc, char **argv)
{
zprop_get_cbdata_t cb = { 0 };
zprop_list_t fake_name = { 0 };
int ret;
-
- if (argc < 2) {
- (void) fprintf(stderr, gettext("missing property "
- "argument\n"));
- usage(B_FALSE);
- }
+ int c, i;
+ char *value;
cb.cb_first = B_TRUE;
+
+ /*
+ * Set up default columns and sources.
+ */
cb.cb_sources = ZPROP_SRC_ALL;
cb.cb_columns[0] = GET_COL_NAME;
cb.cb_columns[1] = GET_COL_PROPERTY;
@@ -5231,10 +5248,89 @@ zpool_do_get(int argc, char **argv)
cb.cb_columns[3] = GET_COL_SOURCE;
cb.cb_type = ZFS_TYPE_POOL;
- if (zprop_get_list(g_zfs, argv[1], &cb.cb_proplist,
+ /* check options */
+ while ((c = getopt(argc, argv, ":Hpo:")) != -1) {
+ switch (c) {
+ case 'p':
+ cb.cb_literal = B_TRUE;
+ break;
+ case 'H':
+ cb.cb_scripted = B_TRUE;
+ break;
+ case 'o':
+ bzero(&cb.cb_columns, sizeof (cb.cb_columns));
+ i = 0;
+ while (*optarg != '\0') {
+ static char *col_subopts[] =
+ { "name", "property", "value", "source",
+ "all", NULL };
+
+ if (i == ZFS_GET_NCOLS) {
+ (void) fprintf(stderr, gettext("too "
+ "many fields given to -o "
+ "option\n"));
+ usage(B_FALSE);
+ }
+
+ switch (getsubopt(&optarg, col_subopts,
+ &value)) {
+ case 0:
+ cb.cb_columns[i++] = GET_COL_NAME;
+ break;
+ case 1:
+ cb.cb_columns[i++] = GET_COL_PROPERTY;
+ break;
+ case 2:
+ cb.cb_columns[i++] = GET_COL_VALUE;
+ break;
+ case 3:
+ cb.cb_columns[i++] = GET_COL_SOURCE;
+ break;
+ case 4:
+ if (i > 0) {
+ (void) fprintf(stderr,
+ gettext("\"all\" conflicts "
+ "with specific fields "
+ "given to -o option\n"));
+ usage(B_FALSE);
+ }
+ cb.cb_columns[0] = GET_COL_NAME;
+ cb.cb_columns[1] = GET_COL_PROPERTY;
+ cb.cb_columns[2] = GET_COL_VALUE;
+ cb.cb_columns[3] = GET_COL_SOURCE;
+ i = ZFS_GET_NCOLS;
+ break;
+ default:
+ (void) fprintf(stderr,
+ gettext("invalid column name "
+ "'%s'\n"), value);
+ usage(B_FALSE);
+ }
+ }
+ break;
+ case '?':
+ (void) fprintf(stderr, gettext("invalid option '%c'\n"),
+ optopt);
+ usage(B_FALSE);
+ }
+ }
+
+ argc -= optind;
+ argv += optind;
+
+ if (argc < 1) {
+ (void) fprintf(stderr, gettext("missing property "
+ "argument\n"));
+ usage(B_FALSE);
+ }
+
+ if (zprop_get_list(g_zfs, argv[0], &cb.cb_proplist,
ZFS_TYPE_POOL) != 0)
usage(B_FALSE);
+ argc--;
+ argv++;
+
if (cb.cb_proplist != NULL) {
fake_name.pl_prop = ZPOOL_PROP_NAME;
fake_name.pl_width = strlen(gettext("NAME"));
@@ -5242,7 +5338,7 @@ zpool_do_get(int argc, char **argv)
cb.cb_proplist = &fake_name;
}
- ret = for_each_pool(argc - 2, argv + 2, B_TRUE, &cb.cb_proplist,
+ ret = for_each_pool(argc, argv, B_TRUE, &cb.cb_proplist,
get_callback, &cb);
if (cb.cb_proplist == &fake_name)
Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Tue Apr 1 14:54:43 2014 (r264003)
+++ projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Tue Apr 1 14:55:20 2014 (r264004)
@@ -270,7 +270,7 @@ extern int zpool_label_disk(libzfs_handl
*/
extern int zpool_set_prop(zpool_handle_t *, const char *, const char *);
extern int zpool_get_prop(zpool_handle_t *, zpool_prop_t, char *,
- size_t proplen, zprop_source_t *);
+ size_t proplen, zprop_source_t *, boolean_t);
extern uint64_t zpool_get_prop_int(zpool_handle_t *, zpool_prop_t,
zprop_source_t *);
Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Tue Apr 1 14:54:43 2014 (r264003)
+++ projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Tue Apr 1 14:55:20 2014 (r264004)
@@ -2237,8 +2237,8 @@ zfs_prop_get(zfs_handle_t *zhp, zfs_prop
}
if ((zpool_get_prop(zhp->zpool_hdl,
- ZPOOL_PROP_ALTROOT, buf, MAXPATHLEN, NULL)) ||
- (strcmp(root, "-") == 0))
+ ZPOOL_PROP_ALTROOT, buf, MAXPATHLEN, NULL,
+ B_FALSE)) || (strcmp(root, "-") == 0))
root[0] = '\0';
/*
* Special case an alternate root of '/'. This will
Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Tue Apr 1 14:54:43 2014 (r264003)
+++ projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Tue Apr 1 14:55:20 2014 (r264004)
@@ -240,7 +240,7 @@ zpool_pool_state_to_name(pool_state_t st
*/
int
zpool_get_prop(zpool_handle_t *zhp, zpool_prop_t prop, char *buf, size_t len,
- zprop_source_t *srctype)
+ zprop_source_t *srctype, boolean_t literal)
{
uint64_t intval;
const char *strval;
@@ -272,9 +272,7 @@ zpool_get_prop(zpool_handle_t *zhp, zpoo
(void) strlcpy(buf,
zpool_get_prop_string(zhp, prop, &src),
len);
- if (srctype != NULL)
- *srctype = src;
- return (0);
+ break;
}
/* FALLTHROUGH */
default:
@@ -306,12 +304,22 @@ zpool_get_prop(zpool_handle_t *zhp, zpoo
case ZPOOL_PROP_FREE:
case ZPOOL_PROP_FREEING:
case ZPOOL_PROP_EXPANDSZ:
- (void) zfs_nicenum(intval, buf, len);
+ if (literal) {
+ (void) snprintf(buf, len, "%llu",
+ (u_longlong_t)intval);
+ } else {
+ (void) zfs_nicenum(intval, buf, len);
+ }
break;
case ZPOOL_PROP_CAPACITY:
- (void) snprintf(buf, len, "%llu%%",
- (u_longlong_t)intval);
+ if (literal) {
+ (void) snprintf(buf, len, "%llu",
+ (u_longlong_t)intval);
+ } else {
+ (void) snprintf(buf, len, "%llu%%",
+ (u_longlong_t)intval);
+ }
break;
case ZPOOL_PROP_DEDUPRATIO:
@@ -407,7 +415,7 @@ zpool_is_bootable(zpool_handle_t *zhp)
char bootfs[ZPOOL_MAXNAMELEN];
return (zpool_get_prop(zhp, ZPOOL_PROP_BOOTFS, bootfs,
- sizeof (bootfs), NULL) == 0 && strncmp(bootfs, "-",
+ sizeof (bootfs), NULL, B_FALSE) == 0 && strncmp(bootfs, "-",
sizeof (bootfs)) != 0);
}
@@ -806,7 +814,7 @@ zpool_expand_proplist(zpool_handle_t *zh
if (entry->pl_prop != ZPROP_INVAL &&
zpool_get_prop(zhp, entry->pl_prop, buf, sizeof (buf),
- NULL) == 0) {
+ NULL, B_FALSE) == 0) {
if (strlen(buf) > entry->pl_width)
entry->pl_width = strlen(buf);
}
Modified: projects/sendfile/contrib/atf/FREEBSD-Xlist
==============================================================================
--- projects/sendfile/contrib/atf/FREEBSD-Xlist Tue Apr 1 14:54:43 2014 (r264003)
+++ projects/sendfile/contrib/atf/FREEBSD-Xlist Tue Apr 1 14:55:20 2014 (r264004)
@@ -7,7 +7,6 @@ INSTALL
Makefile*
aclocal.m4
admin/
-atf-*/atf-*.m4
atf-config/
atf-report/
atf-run/
Copied: projects/sendfile/contrib/atf/atf-c++/atf-c++.m4 (from r263998, head/contrib/atf/atf-c++/atf-c++.m4)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/sendfile/contrib/atf/atf-c++/atf-c++.m4 Tue Apr 1 14:55:20 2014 (r264004, copy of r263998, head/contrib/atf/atf-c++/atf-c++.m4)
@@ -0,0 +1,48 @@
+dnl
+dnl Automated Testing Framework (atf)
+dnl
+dnl Copyright 2011 Google Inc.
+dnl All rights reserved.
+dnl
+dnl Redistribution and use in source and binary forms, with or without
+dnl modification, are permitted provided that the following conditions are
+dnl met:
+dnl
+dnl * Redistributions of source code must retain the above copyright
+dnl notice, this list of conditions and the following disclaimer.
+dnl * Redistributions in binary form must reproduce the above copyright
+dnl notice, this list of conditions and the following disclaimer in the
+dnl documentation and/or other materials provided with the distribution.
+dnl * Neither the name of Google Inc. nor the names of its contributors
+dnl may be used to endorse or promote products derived from this software
+dnl without specific prior written permission.
+dnl
+dnl THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+dnl "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+dnl LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+dnl A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+dnl OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+dnl SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+dnl LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+dnl DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+dnl THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+dnl (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+dnl OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+dnl
+
+dnl ATF_CHECK_CXX([version-spec])
+dnl
+dnl Checks if atf-c++ is present. If version-spec is provided, ensures that
+dnl the installed version of atf-sh matches the required version. This
+dnl argument must be something like '>= 0.14' and accepts any version
+dnl specification supported by pkg-config.
+dnl
+dnl Defines and substitutes ATF_CXX_CFLAGS and ATF_CXX_LIBS with the compiler
+dnl and linker flags need to build against atf-c++.
+AC_DEFUN([ATF_CHECK_CXX], [
+ spec="atf-c++[]m4_default_nblank([ $1], [])"
+ _ATF_CHECK_ARG_WITH(
+ [PKG_CHECK_MODULES([ATF_CXX], [${spec}],
+ [found=yes found_atf_cxx=yes], [found=no])],
+ [required ${spec} not found])
+])
Copied: projects/sendfile/contrib/atf/atf-c/atf-c.m4 (from r263998, head/contrib/atf/atf-c/atf-c.m4)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/sendfile/contrib/atf/atf-c/atf-c.m4 Tue Apr 1 14:55:20 2014 (r264004, copy of r263998, head/contrib/atf/atf-c/atf-c.m4)
@@ -0,0 +1,48 @@
+dnl
+dnl Automated Testing Framework (atf)
+dnl
+dnl Copyright 2011 Google Inc.
+dnl All rights reserved.
+dnl
+dnl Redistribution and use in source and binary forms, with or without
+dnl modification, are permitted provided that the following conditions are
+dnl met:
+dnl
+dnl * Redistributions of source code must retain the above copyright
+dnl notice, this list of conditions and the following disclaimer.
+dnl * Redistributions in binary form must reproduce the above copyright
+dnl notice, this list of conditions and the following disclaimer in the
+dnl documentation and/or other materials provided with the distribution.
+dnl * Neither the name of Google Inc. nor the names of its contributors
+dnl may be used to endorse or promote products derived from this software
+dnl without specific prior written permission.
+dnl
+dnl THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+dnl "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+dnl LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+dnl A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+dnl OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+dnl SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+dnl LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+dnl DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+dnl THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+dnl (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+dnl OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+dnl
+
+dnl ATF_CHECK_C([version-spec])
+dnl
+dnl Checks if atf-c is present. If version-spec is provided, ensures that
+dnl the installed version of atf-sh matches the required version. This
+dnl argument must be something like '>= 0.14' and accepts any version
+dnl specification supported by pkg-config.
+dnl
+dnl Defines and substitutes ATF_C_CFLAGS and ATF_C_LIBS with the compiler
+dnl and linker flags need to build against atf-c.
+AC_DEFUN([ATF_CHECK_C], [
+ spec="atf-c[]m4_default_nblank([ $1], [])"
+ _ATF_CHECK_ARG_WITH(
+ [PKG_CHECK_MODULES([ATF_C], [${spec}],
+ [found=yes found_atf_c=yes], [found=no])],
+ [required ${spec} not found])
+])
Copied: projects/sendfile/contrib/atf/atf-c/atf-common.m4 (from r263998, head/contrib/atf/atf-c/atf-common.m4)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/sendfile/contrib/atf/atf-c/atf-common.m4 Tue Apr 1 14:55:20 2014 (r264004, copy of r263998, head/contrib/atf/atf-c/atf-common.m4)
@@ -0,0 +1,92 @@
+dnl
+dnl Automated Testing Framework (atf)
+dnl
+dnl Copyright 2011 Google Inc.
+dnl All rights reserved.
+dnl
+dnl Redistribution and use in source and binary forms, with or without
+dnl modification, are permitted provided that the following conditions are
+dnl met:
+dnl
+dnl * Redistributions of source code must retain the above copyright
+dnl notice, this list of conditions and the following disclaimer.
+dnl * Redistributions in binary form must reproduce the above copyright
+dnl notice, this list of conditions and the following disclaimer in the
+dnl documentation and/or other materials provided with the distribution.
+dnl * Neither the name of Google Inc. nor the names of its contributors
+dnl may be used to endorse or promote products derived from this software
+dnl without specific prior written permission.
+dnl
+dnl THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+dnl "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+dnl LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+dnl A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+dnl OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+dnl SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+dnl LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+dnl DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+dnl THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+dnl (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+dnl OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+dnl
+
+dnl ATF_ARG_WITH
+dnl
+dnl Adds a --with-atf flag to the configure script that allows the user to
+dnl enable or disable atf support.
+dnl
+dnl The ATF_CHECK_{C,CXX,SH} macros honor the flag defined herein if
+dnl instantiated. If not instantiated, they will request the presence of
+dnl the libraries unconditionally.
+dnl
+dnl Defines the WITH_ATF Automake conditional if ATF has been found by any
+dnl of the ATF_CHECK_{C,CXX,SH} macros.
+AC_DEFUN([ATF_ARG_WITH], [
+ m4_define([atf_arg_with_called], [yes])
+
+ m4_divert_text([DEFAULTS], [with_atf=auto])
+ AC_ARG_WITH([atf],
+ [AS_HELP_STRING([--with-atf=<yes|no|auto>],
+ [build atf-based test programs])],
+ [with_atf=${withval}], [with_atf=auto])
+
+ m4_divert_text([DEFAULTS], [
+ found_atf_c=no
+ found_atf_cxx=no
+ found_atf_sh=no
+ ])
+ AM_CONDITIONAL([WITH_ATF], [test x"${found_atf_c}" = x"yes" -o \
+ x"${found_atf_cxx}" = x"yes" -o \
+ x"${found_atf_sh}" = x"yes"])
+])
+
+dnl _ATF_CHECK_ARG_WITH(check, error_message)
+dnl
+dnl Internal macro to execute a check conditional on the --with-atf flag
+dnl and handle the result accordingly.
+dnl
+dnl 'check' specifies the piece of code to be run to detect the feature.
+dnl This code must set the 'found' shell variable to yes or no depending
+dnl on the raw result of the check.
+AC_DEFUN([_ATF_CHECK_ARG_WITH], [
+ m4_ifdef([atf_arg_with_called], [
+ m4_fatal([ATF_ARG_WITH must be called after the ATF_CHECK_* checks])
+ ])
+
+ m4_divert_text([DEFAULTS], [with_atf=yes])
+
+ if test x"${with_atf}" = x"no"; then
+ _found=no
+ else
+ $1
+ if test x"${with_atf}" = x"auto"; then
+ _found="${found}"
+ else
+ if test x"${found}" = x"yes"; then
+ _found=yes
+ else
+ AC_MSG_ERROR([$2])
+ fi
+ fi
+ fi
+])
Copied: projects/sendfile/contrib/atf/atf-sh/atf-sh.m4 (from r263998, head/contrib/atf/atf-sh/atf-sh.m4)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/sendfile/contrib/atf/atf-sh/atf-sh.m4 Tue Apr 1 14:55:20 2014 (r264004, copy of r263998, head/contrib/atf/atf-sh/atf-sh.m4)
@@ -0,0 +1,53 @@
+dnl
+dnl Automated Testing Framework (atf)
+dnl
+dnl Copyright 2011 Google Inc.
+dnl All rights reserved.
+dnl
+dnl Redistribution and use in source and binary forms, with or without
+dnl modification, are permitted provided that the following conditions are
+dnl met:
+dnl
+dnl * Redistributions of source code must retain the above copyright
+dnl notice, this list of conditions and the following disclaimer.
+dnl * Redistributions in binary form must reproduce the above copyright
+dnl notice, this list of conditions and the following disclaimer in the
+dnl documentation and/or other materials provided with the distribution.
+dnl * Neither the name of Google Inc. nor the names of its contributors
+dnl may be used to endorse or promote products derived from this software
+dnl without specific prior written permission.
+dnl
+dnl THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+dnl "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+dnl LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+dnl A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+dnl OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+dnl SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+dnl LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+dnl DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+dnl THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+dnl (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+dnl OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+dnl
+
+dnl ATF_CHECK_SH([version-spec])
+dnl
+dnl Checks if atf-sh is present. If version-spec is provided, ensures that
+dnl the installed version of atf-sh matches the required version. This
+dnl argument must be something like '>= 0.14' and accepts any version
+dnl specification supported by pkg-config.
+dnl
+dnl Defines and substitutes ATF_SH with the full path to the atf-sh interpreter.
+AC_DEFUN([ATF_CHECK_SH], [
+ spec="atf-sh[]m4_default_nblank([ $1], [])"
+ _ATF_CHECK_ARG_WITH(
+ [AC_MSG_CHECKING([for ${spec}])
+ PKG_CHECK_EXISTS([${spec}], [found=yes], [found=no])
+ if test "${found}" = yes; then
+ ATF_SH="$(${PKG_CONFIG} --variable=interpreter atf-sh)"
+ AC_SUBST([ATF_SH], [${ATF_SH}])
+ found_atf_sh=yes
+ fi
+ AC_MSG_RESULT([${ATF_SH}])],
+ [required ${spec} not found])
+])
Modified: projects/sendfile/contrib/byacc/skeleton.c
==============================================================================
--- projects/sendfile/contrib/byacc/skeleton.c Tue Apr 1 14:54:43 2014 (r264003)
+++ projects/sendfile/contrib/byacc/skeleton.c Tue Apr 1 14:55:20 2014 (r264004)
@@ -16,9 +16,9 @@
const char *const banner[] =
{
- "#ifndef lint",
- "static const char yysccsid[] = \"@(#)yaccpar 1.9 (Berkeley) 02/21/93\";",
- "#endif",
+ "/* original parser id follows */",
+ "/* yysccsid[] = \"@(#)yaccpar 1.9 (Berkeley) 02/21/93\" */",
+ "/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */",
"",
"#define YYBYACC 1",
CONCAT1("#define YYMAJOR ", YYMAJOR),
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list