svn commit: r262490 - in projects/sendfile: . bin/sh cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/lib/libdtrace/common c...
Gleb Smirnoff
glebius at FreeBSD.org
Tue Feb 25 19:12:36 UTC 2014
Author: glebius
Date: Tue Feb 25 19:12:31 2014
New Revision: 262490
URL: http://svnweb.freebsd.org/changeset/base/262490
Log:
Merge head up to r262489.
Added:
projects/sendfile/contrib/dma/
- copied from r262489, head/contrib/dma/
projects/sendfile/contrib/libucl/
- copied from r262489, head/contrib/libucl/
projects/sendfile/etc/dma/
- copied from r262489, head/etc/dma/
projects/sendfile/lib/libucl/
- copied from r262489, head/lib/libucl/
projects/sendfile/libexec/dma/
- copied from r262489, head/libexec/dma/
projects/sendfile/libexec/dma-mbox-create/
- copied from r262489, head/libexec/dma-mbox-create/
projects/sendfile/sys/arm/conf/IMX6
- copied unchanged from r262489, head/sys/arm/conf/IMX6
projects/sendfile/sys/arm/conf/QUARTZ
- copied unchanged from r262489, head/sys/arm/conf/QUARTZ
projects/sendfile/sys/arm/freescale/imx/imx6_mp.c
- copied unchanged from r262489, head/sys/arm/freescale/imx/imx6_mp.c
projects/sendfile/sys/boot/Makefile.mips
- copied unchanged from r262489, head/sys/boot/Makefile.mips
projects/sendfile/sys/boot/fdt/dts/vybrid-quartz.dts
- copied unchanged from r262489, head/sys/boot/fdt/dts/vybrid-quartz.dts
projects/sendfile/sys/boot/ficl/mips64/
- copied from r262489, head/sys/boot/ficl/mips64/
projects/sendfile/sys/boot/mips/
- copied from r262489, head/sys/boot/mips/
projects/sendfile/sys/boot/userboot/zfs/
- copied from r262489, head/sys/boot/userboot/zfs/
projects/sendfile/sys/dev/etherswitch/arswitch/arswitch_8327.c
- copied unchanged from r262489, head/sys/dev/etherswitch/arswitch/arswitch_8327.c
projects/sendfile/sys/dev/etherswitch/arswitch/arswitch_8327.h
- copied unchanged from r262489, head/sys/dev/etherswitch/arswitch/arswitch_8327.h
projects/sendfile/sys/dev/iwn/if_iwn_ioctl.h
- copied unchanged from r262489, head/sys/dev/iwn/if_iwn_ioctl.h
projects/sendfile/tools/build/options/WITHOUT_DMAGENT
- copied unchanged from r262489, head/tools/build/options/WITHOUT_DMAGENT
projects/sendfile/tools/tools/iwn/
- copied from r262489, head/tools/tools/iwn/
projects/sendfile/usr.sbin/pmcstat/pmcpl_annotate_cg.c
- copied unchanged from r262489, head/usr.sbin/pmcstat/pmcpl_annotate_cg.c
projects/sendfile/usr.sbin/pmcstat/pmcpl_annotate_cg.h
- copied unchanged from r262489, head/usr.sbin/pmcstat/pmcpl_annotate_cg.h
Deleted:
projects/sendfile/contrib/libyaml/
projects/sendfile/lib/libyaml/
Modified:
projects/sendfile/ObsoleteFiles.inc
projects/sendfile/bin/sh/sh.1
projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d
projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d
projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool.8
projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c
projects/sendfile/contrib/llvm/tools/clang/lib/Driver/ToolChains.h
projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Expression/IRExecutionUnit.h
projects/sendfile/contrib/llvm/tools/lldb/source/Core/ArchSpec.cpp
projects/sendfile/contrib/llvm/tools/lldb/source/Expression/ClangExpressionParser.cpp
projects/sendfile/contrib/llvm/tools/lldb/source/Expression/IRExecutionUnit.cpp
projects/sendfile/contrib/llvm/tools/lldb/source/Expression/IRForTarget.cpp
projects/sendfile/contrib/llvm/tools/lldb/source/Host/common/FileSpec.cpp
projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
projects/sendfile/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp
projects/sendfile/contrib/serf/CHANGES
projects/sendfile/contrib/serf/README
projects/sendfile/contrib/serf/SConstruct
projects/sendfile/contrib/serf/auth/auth.c
projects/sendfile/contrib/serf/auth/auth.h
projects/sendfile/contrib/serf/auth/auth_basic.c
projects/sendfile/contrib/serf/auth/auth_digest.c
projects/sendfile/contrib/serf/auth/auth_spnego.c
projects/sendfile/contrib/serf/auth/auth_spnego.h
projects/sendfile/contrib/serf/auth/auth_spnego_gss.c
projects/sendfile/contrib/serf/auth/auth_spnego_sspi.c
projects/sendfile/contrib/serf/buckets/headers_buckets.c
projects/sendfile/contrib/serf/buckets/response_buckets.c
projects/sendfile/contrib/serf/buckets/socket_buckets.c
projects/sendfile/contrib/serf/buckets/ssl_buckets.c
projects/sendfile/contrib/serf/build/check.py
projects/sendfile/contrib/serf/build/gen_def.py
projects/sendfile/contrib/serf/build/serf.pc.in
projects/sendfile/contrib/serf/context.c
projects/sendfile/contrib/serf/outgoing.c
projects/sendfile/contrib/serf/serf.h
projects/sendfile/contrib/serf/serf_private.h
projects/sendfile/contrib/serf/ssltunnel.c
projects/sendfile/contrib/subversion/CHANGES
projects/sendfile/contrib/subversion/Makefile.in
projects/sendfile/contrib/subversion/NOTICE
projects/sendfile/contrib/subversion/build-outputs.mk
projects/sendfile/contrib/subversion/build.conf
projects/sendfile/contrib/subversion/configure
projects/sendfile/contrib/subversion/configure.ac
projects/sendfile/contrib/subversion/subversion/include/private/svn_auth_private.h
projects/sendfile/contrib/subversion/subversion/include/private/svn_diff_tree.h
projects/sendfile/contrib/subversion/subversion/include/private/svn_mutex.h
projects/sendfile/contrib/subversion/subversion/include/svn_auth.h
projects/sendfile/contrib/subversion/subversion/include/svn_client.h
projects/sendfile/contrib/subversion/subversion/include/svn_config.h
projects/sendfile/contrib/subversion/subversion/include/svn_diff.h
projects/sendfile/contrib/subversion/subversion/include/svn_dirent_uri.h
projects/sendfile/contrib/subversion/subversion/include/svn_io.h
projects/sendfile/contrib/subversion/subversion/include/svn_repos.h
projects/sendfile/contrib/subversion/subversion/include/svn_version.h
projects/sendfile/contrib/subversion/subversion/include/svn_wc.h
projects/sendfile/contrib/subversion/subversion/libsvn_client/copy.c
projects/sendfile/contrib/subversion/subversion/libsvn_client/log.c
projects/sendfile/contrib/subversion/subversion/libsvn_client/prop_commands.c
projects/sendfile/contrib/subversion/subversion/libsvn_client/update.c
projects/sendfile/contrib/subversion/subversion/libsvn_client/util.c
projects/sendfile/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c
projects/sendfile/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h
projects/sendfile/contrib/subversion/subversion/libsvn_fs_fs/rep-cache.c
projects/sendfile/contrib/subversion/subversion/libsvn_ra_serf/commit.c
projects/sendfile/contrib/subversion/subversion/libsvn_ra_serf/util.c
projects/sendfile/contrib/subversion/subversion/libsvn_repos/commit.c
projects/sendfile/contrib/subversion/subversion/libsvn_repos/reporter.c
projects/sendfile/contrib/subversion/subversion/libsvn_subr/auth.c
projects/sendfile/contrib/subversion/subversion/libsvn_subr/cache-membuffer.c
projects/sendfile/contrib/subversion/subversion/libsvn_subr/cmdline.c
projects/sendfile/contrib/subversion/subversion/libsvn_subr/internal_statements.h
projects/sendfile/contrib/subversion/subversion/libsvn_subr/io.c
projects/sendfile/contrib/subversion/subversion/libsvn_subr/sqlite.c
projects/sendfile/contrib/subversion/subversion/libsvn_subr/sqlite3wrapper.c
projects/sendfile/contrib/subversion/subversion/libsvn_subr/subst.c
projects/sendfile/contrib/subversion/subversion/libsvn_subr/sysinfo.c
projects/sendfile/contrib/subversion/subversion/libsvn_subr/win32_crypto.c
projects/sendfile/contrib/subversion/subversion/libsvn_wc/conflicts.h
projects/sendfile/contrib/subversion/subversion/libsvn_wc/diff_local.c
projects/sendfile/contrib/subversion/subversion/libsvn_wc/upgrade.c
projects/sendfile/contrib/subversion/subversion/libsvn_wc/wc-checks.h
projects/sendfile/contrib/subversion/subversion/libsvn_wc/wc-metadata.h
projects/sendfile/contrib/subversion/subversion/libsvn_wc/wc-metadata.sql
projects/sendfile/contrib/subversion/subversion/libsvn_wc/wc-queries.h
projects/sendfile/contrib/subversion/subversion/libsvn_wc/wc-queries.sql
projects/sendfile/contrib/subversion/subversion/libsvn_wc/wc.h
projects/sendfile/contrib/subversion/subversion/libsvn_wc/wc_db.c
projects/sendfile/contrib/subversion/subversion/libsvn_wc/wc_db.h
projects/sendfile/contrib/subversion/subversion/libsvn_wc/wc_db_util.c
projects/sendfile/contrib/subversion/subversion/svn/conflict-callbacks.c
projects/sendfile/contrib/subversion/subversion/svn/status-cmd.c
projects/sendfile/contrib/subversion/subversion/svn/svn.c
projects/sendfile/contrib/subversion/subversion/svnserve/svnserve.c
projects/sendfile/etc/Makefile
projects/sendfile/etc/mtree/BSD.root.dist
projects/sendfile/etc/mtree/BSD.var.dist
projects/sendfile/etc/periodic/security/800.loginfail
projects/sendfile/kerberos5/lib/libasn1/Makefile
projects/sendfile/kerberos5/lib/libgssapi_spnego/Makefile
projects/sendfile/kerberos5/lib/libhdb/Makefile
projects/sendfile/kerberos5/lib/libhx509/Makefile
projects/sendfile/lib/Makefile
projects/sendfile/lib/libc/iconv/citrus_prop.c
projects/sendfile/lib/libc/iconv/citrus_prop.h
projects/sendfile/lib/libc/sys/mq_getattr.2
projects/sendfile/lib/libiconv_modules/BIG5/citrus_big5.c
projects/sendfile/lib/libiconv_modules/HZ/citrus_hz.c
projects/sendfile/lib/libiconv_modules/VIQR/citrus_viqr.c
projects/sendfile/libexec/Makefile
projects/sendfile/libexec/bootpd/rtmsg.c
projects/sendfile/libexec/comsat/comsat.8
projects/sendfile/libexec/comsat/comsat.c
projects/sendfile/libexec/fingerd/fingerd.8
projects/sendfile/libexec/fingerd/fingerd.c
projects/sendfile/libexec/fingerd/pathnames.h
projects/sendfile/libexec/ftpd/extern.h
projects/sendfile/libexec/ftpd/ftpcmd.y
projects/sendfile/libexec/ftpd/ftpd.8
projects/sendfile/libexec/ftpd/ftpd.c
projects/sendfile/libexec/ftpd/logwtmp.c
projects/sendfile/libexec/ftpd/pathnames.h
projects/sendfile/libexec/ftpd/popen.c
projects/sendfile/libexec/getty/extern.h
projects/sendfile/libexec/getty/getty.8
projects/sendfile/libexec/getty/gettytab.5
projects/sendfile/libexec/getty/gettytab.h
projects/sendfile/libexec/getty/init.c
projects/sendfile/libexec/getty/main.c
projects/sendfile/libexec/getty/pathnames.h
projects/sendfile/libexec/getty/subr.c
projects/sendfile/libexec/getty/ttys.5
projects/sendfile/libexec/mknetid/parse_group.c
projects/sendfile/libexec/rbootd/bpf.c
projects/sendfile/libexec/rbootd/conf.c
projects/sendfile/libexec/rbootd/defs.h
projects/sendfile/libexec/rbootd/parseconf.c
projects/sendfile/libexec/rbootd/pathnames.h
projects/sendfile/libexec/rbootd/rbootd.8
projects/sendfile/libexec/rbootd/rbootd.c
projects/sendfile/libexec/rbootd/rmp.h
projects/sendfile/libexec/rbootd/rmp_var.h
projects/sendfile/libexec/rbootd/rmpproto.c
projects/sendfile/libexec/rbootd/utils.c
projects/sendfile/libexec/revnetgroup/parse_netgroup.c
projects/sendfile/libexec/rlogind/rlogind.8
projects/sendfile/libexec/rlogind/rlogind.c
projects/sendfile/libexec/rpc.rstatd/rpc.rstatd.8
projects/sendfile/libexec/rpc.rstatd/rstatd.c
projects/sendfile/libexec/rpc.rusersd/extern.h
projects/sendfile/libexec/rpc.rusersd/rpc.rusersd.8
projects/sendfile/libexec/rpc.rusersd/rusers_proc.c
projects/sendfile/libexec/rpc.rusersd/rusersd.c
projects/sendfile/libexec/rpc.rwalld/rpc.rwalld.8
projects/sendfile/libexec/rshd/rshd.8
projects/sendfile/libexec/rshd/rshd.c
projects/sendfile/libexec/rtld-elf/malloc.c
projects/sendfile/libexec/rtld-elf/xmalloc.c
projects/sendfile/libexec/talkd/announce.c
projects/sendfile/libexec/talkd/print.c
projects/sendfile/libexec/talkd/process.c
projects/sendfile/libexec/talkd/table.c
projects/sendfile/libexec/talkd/talkd.8
projects/sendfile/libexec/talkd/talkd.c
projects/sendfile/libexec/tftpd/tftpd.8
projects/sendfile/libexec/tftpd/tftpd.c
projects/sendfile/release/Makefile
projects/sendfile/release/doc/en_US.ISO8859-1/relnotes/article.xml
projects/sendfile/release/picobsd/floppy.tree/etc/rc.conf (contents, props changed)
projects/sendfile/sbin/fsck_ffs/fsck.h
projects/sendfile/sbin/fsck_ffs/fsutil.c
projects/sendfile/share/man/man4/ada.4
projects/sendfile/share/man/man4/atp.4
projects/sendfile/share/man/man4/gpio.4
projects/sendfile/share/man/man4/gpioiic.4
projects/sendfile/share/man/man4/gpioled.4
projects/sendfile/share/man/man5/src.conf.5
projects/sendfile/share/man/man7/hier.7
projects/sendfile/share/misc/bsd-family-tree
projects/sendfile/share/mk/bsd.libnames.mk
projects/sendfile/share/mk/bsd.own.mk
projects/sendfile/share/mk/bsd.sys.mk
projects/sendfile/share/termcap/termcap.src
projects/sendfile/sys/amd64/amd64/pmap.c
projects/sendfile/sys/amd64/include/vmm.h (contents, props changed)
projects/sendfile/sys/amd64/vmm/intel/vmcs.h
projects/sendfile/sys/amd64/vmm/intel/vmx.c
projects/sendfile/sys/amd64/vmm/intel/vmx.h
projects/sendfile/sys/amd64/vmm/io/vioapic.c
projects/sendfile/sys/amd64/vmm/io/vlapic.c
projects/sendfile/sys/amd64/vmm/io/vlapic.h
projects/sendfile/sys/amd64/vmm/io/vlapic_priv.h
projects/sendfile/sys/amd64/vmm/vmm.c
projects/sendfile/sys/amd64/vmm/vmm_lapic.c
projects/sendfile/sys/amd64/vmm/x86.c
projects/sendfile/sys/arm/arm/cpufunc.c
projects/sendfile/sys/arm/arm/cpufunc_asm_armv4.S
projects/sendfile/sys/arm/arm/cpufunc_asm_armv6.S
projects/sendfile/sys/arm/arm/cpufunc_asm_armv7.S
projects/sendfile/sys/arm/arm/locore.S
projects/sendfile/sys/arm/arm/machdep.c
projects/sendfile/sys/arm/arm/mp_machdep.c
projects/sendfile/sys/arm/conf/WANDBOARD.common
projects/sendfile/sys/arm/freescale/imx/files.imx6
projects/sendfile/sys/arm/freescale/imx/imx51_tzicreg.h
projects/sendfile/sys/arm/freescale/imx/imx6_anatop.c
projects/sendfile/sys/arm/freescale/imx/imx6_anatopreg.h
projects/sendfile/sys/arm/freescale/imx/imx6_anatopvar.h
projects/sendfile/sys/arm/freescale/imx/imx6_machdep.c
projects/sendfile/sys/arm/freescale/imx/std.imx6
projects/sendfile/sys/arm/freescale/vybrid/vf_ccm.c
projects/sendfile/sys/arm/freescale/vybrid/vf_iomuxc.c
projects/sendfile/sys/arm/include/cpufunc.h
projects/sendfile/sys/arm/include/physmem.h
projects/sendfile/sys/arm/include/smp.h
projects/sendfile/sys/arm/mv/armadaxp/armadaxp_mp.c
projects/sendfile/sys/arm/samsung/exynos/exynos5_mp.c
projects/sendfile/sys/arm/ti/omap4/omap4_mp.c
projects/sendfile/sys/arm/ti/twl/twl_vreg.c
projects/sendfile/sys/boot/common/Makefile.inc
projects/sendfile/sys/boot/common/bootstrap.h
projects/sendfile/sys/boot/common/module.c
projects/sendfile/sys/boot/fdt/Makefile
projects/sendfile/sys/boot/fdt/dts/am335x.dtsi
projects/sendfile/sys/boot/fdt/dts/beaglebone-black.dts
projects/sendfile/sys/boot/fdt/dts/imx6.dtsi
projects/sendfile/sys/boot/fdt/dts/vybrid-colibri-vf50.dts
projects/sendfile/sys/boot/fdt/dts/vybrid-cosmic.dts
projects/sendfile/sys/boot/fdt/dts/vybrid.dtsi
projects/sendfile/sys/boot/fdt/fdt_loader_cmd.c
projects/sendfile/sys/boot/ficl/Makefile
projects/sendfile/sys/boot/uboot/common/main.c
projects/sendfile/sys/boot/userboot/Makefile
projects/sendfile/sys/boot/userboot/userboot/Makefile
projects/sendfile/sys/boot/userboot/userboot/conf.c
projects/sendfile/sys/boot/userboot/userboot/devicename.c
projects/sendfile/sys/boot/userboot/userboot/main.c
projects/sendfile/sys/cddl/compat/opensolaris/sys/kmem.h
projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
projects/sendfile/sys/cddl/dev/systrace/systrace.c
projects/sendfile/sys/conf/files
projects/sendfile/sys/dev/ath/ath_hal/ah_regdomain.c
projects/sendfile/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h
projects/sendfile/sys/dev/etherswitch/arswitch/arswitch.c
projects/sendfile/sys/dev/etherswitch/arswitch/arswitch_phy.c
projects/sendfile/sys/dev/etherswitch/arswitch/arswitch_reg.c
projects/sendfile/sys/dev/etherswitch/arswitch/arswitch_vlans.c
projects/sendfile/sys/dev/etherswitch/arswitch/arswitch_vlans.h
projects/sendfile/sys/dev/etherswitch/arswitch/arswitchvar.h
projects/sendfile/sys/dev/gpio/ofw_gpiobus.c
projects/sendfile/sys/dev/iwn/if_iwn.c
projects/sendfile/sys/dev/iwn/if_iwn_debug.h
projects/sendfile/sys/dev/iwn/if_iwnreg.h
projects/sendfile/sys/dev/iwn/if_iwnvar.h
projects/sendfile/sys/dev/netmap/netmap.c
projects/sendfile/sys/dev/netmap/netmap_freebsd.c
projects/sendfile/sys/dev/sound/pcm/sound.c
projects/sendfile/sys/dev/syscons/syscons.h
projects/sendfile/sys/dev/usb/controller/uss820dci.c
projects/sendfile/sys/dev/usb/input/atp.c
projects/sendfile/sys/dev/usb/input/wsp.c
projects/sendfile/sys/dev/usb/net/usb_ethernet.c
projects/sendfile/sys/dev/usb/quirk/usb_quirk.c
projects/sendfile/sys/dev/usb/wlan/if_run.c
projects/sendfile/sys/dev/usb/wlan/if_runvar.h
projects/sendfile/sys/fs/ext2fs/ext2_vfsops.c
projects/sendfile/sys/fs/ext2fs/ext2fs.h
projects/sendfile/sys/i386/i386/pmap.c
projects/sendfile/sys/kern/kern_descrip.c
projects/sendfile/sys/kern/kern_sdt.c
projects/sendfile/sys/mips/conf/DB120.hints
projects/sendfile/sys/mips/include/bootinfo.h
projects/sendfile/sys/net/flowtable.c
projects/sendfile/sys/net/if_pfsync.h
projects/sendfile/sys/net/rtsock.c
projects/sendfile/sys/netinet/icmp_var.h
projects/sendfile/sys/netinet/igmp_var.h
projects/sendfile/sys/netinet/in.h
projects/sendfile/sys/netinet/ip_carp.c
projects/sendfile/sys/netinet/pim_var.h
projects/sendfile/sys/netinet/sctp_input.c
projects/sendfile/sys/netinet/sctp_output.c
projects/sendfile/sys/netinet/tcp_var.h
projects/sendfile/sys/netinet/udp_var.h
projects/sendfile/sys/netinet6/in6_mcast.c
projects/sendfile/sys/netinet6/pim6_var.h
projects/sendfile/sys/netipsec/ipsec.h
projects/sendfile/sys/netipsec/key_var.h
projects/sendfile/sys/sparc64/pci/fire.c
projects/sendfile/sys/sparc64/sparc64/spitfire.c
projects/sendfile/sys/sys/capability.h
projects/sendfile/sys/sys/socket.h
projects/sendfile/sys/sys/sysctl.h
projects/sendfile/tests/sys/kern/unix_seqpacket_test.c
projects/sendfile/tools/build/mk/OptionalObsoleteFiles.inc
projects/sendfile/usr.bin/clang/lldb/Makefile
projects/sendfile/usr.bin/dtc/fdt.cc
projects/sendfile/usr.bin/hexdump/parse.c
projects/sendfile/usr.bin/iscsictl/iscsictl.8
projects/sendfile/usr.bin/kdump/kdump.c
projects/sendfile/usr.bin/svn/lib/libapr_util/apu_config.h
projects/sendfile/usr.bin/svn/svn_private_config.h
projects/sendfile/usr.sbin/bhyve/bhyverun.c
projects/sendfile/usr.sbin/bhyve/pci_emul.c
projects/sendfile/usr.sbin/bhyve/pci_emul.h
projects/sendfile/usr.sbin/bhyve/pci_passthru.c
projects/sendfile/usr.sbin/bhyve/pit_8254.c
projects/sendfile/usr.sbin/bhyve/virtio.h
projects/sendfile/usr.sbin/bhyveload/bhyveload.c
projects/sendfile/usr.sbin/btxld/btxld.c
projects/sendfile/usr.sbin/pkg/Makefile
projects/sendfile/usr.sbin/pkg/config.c
projects/sendfile/usr.sbin/pkg/pkg.c
projects/sendfile/usr.sbin/pmcstat/Makefile
projects/sendfile/usr.sbin/pmcstat/pmcstat.c
projects/sendfile/usr.sbin/pmcstat/pmcstat.h
projects/sendfile/usr.sbin/pmcstat/pmcstat_log.c
Directory Properties:
projects/sendfile/ (props changed)
projects/sendfile/cddl/ (props changed)
projects/sendfile/cddl/contrib/opensolaris/ (props changed)
projects/sendfile/contrib/llvm/ (props changed)
projects/sendfile/contrib/llvm/tools/clang/ (props changed)
projects/sendfile/contrib/llvm/tools/lldb/ (props changed)
projects/sendfile/contrib/serf/ (props changed)
projects/sendfile/contrib/subversion/ (props changed)
projects/sendfile/etc/ (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/amd64/vmm/ (props changed)
projects/sendfile/sys/boot/ (props changed)
projects/sendfile/sys/cddl/contrib/opensolaris/ (props changed)
projects/sendfile/sys/conf/ (props changed)
projects/sendfile/usr.sbin/bhyve/ (props changed)
projects/sendfile/usr.sbin/bhyveload/ (props changed)
Modified: projects/sendfile/ObsoleteFiles.inc
==============================================================================
--- projects/sendfile/ObsoleteFiles.inc Tue Feb 25 18:44:33 2014 (r262489)
+++ projects/sendfile/ObsoleteFiles.inc Tue Feb 25 19:12:31 2014 (r262490)
@@ -38,6 +38,11 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20140223: Remove libyaml
+OLD_FILES+=usr/lib/private/libyaml.a
+OLD_FILES+=usr/lib/private/libyaml.so
+OLD_FILES+=usr/lib/private/libyaml.so.1
+OLD_FILES+=usr/lib/private/libyaml_p.a
# 20140216: new clang import which bumps version from 3.3 to 3.4.
OLD_FILES+=usr/bin/llvm-prof
OLD_FILES+=usr/bin/llvm-ranlib
Modified: projects/sendfile/bin/sh/sh.1
==============================================================================
--- projects/sendfile/bin/sh/sh.1 Tue Feb 25 18:44:33 2014 (r262489)
+++ projects/sendfile/bin/sh/sh.1 Tue Feb 25 19:12:31 2014 (r262490)
@@ -40,14 +40,14 @@
.Nd command interpreter (shell)
.Sh SYNOPSIS
.Nm
-.Op Fl /+abCEefIimnPpTuVvx
+.Op Fl /+abCEefhIimnPpTuVvx
.Op Fl /+o Ar longname
.Oo
.Ar script
.Op Ar arg ...
.Oc
.Nm
-.Op Fl /+abCEefIimnPpTuVvx
+.Op Fl /+abCEefhIimnPpTuVvx
.Op Fl /+o Ar longname
.Fl c Ar string
.Oo
@@ -55,7 +55,7 @@
.Op Ar arg ...
.Oc
.Nm
-.Op Fl /+abCEefIimnPpTuVvx
+.Op Fl /+abCEefhIimnPpTuVvx
.Op Fl /+o Ar longname
.Fl s
.Op Ar arg ...
Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d Tue Feb 25 18:44:33 2014 (r262489)
+++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d Tue Feb 25 19:12:31 2014 (r262490)
@@ -24,8 +24,6 @@
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/*
* ASSERTION:
* Checks that setting "bufresize" to "auto" will cause buffer
@@ -34,14 +32,8 @@
* SECTION: Buffers and Buffering/Buffer Resizing Policy;
* Options and Tunables/bufsize;
* Options and Tunables/bufresize
- *
- * NOTES:
- * We use the undocumented "preallocate" option to make sure dtrace(1M)
- * has enough space in its heap to allocate a buffer as large as the
- * kernel's trace buffer.
*/
-#pragma D option preallocate=100t
#pragma D option bufresize=auto
#pragma D option bufsize=100t
Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d Tue Feb 25 18:44:33 2014 (r262489)
+++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d Tue Feb 25 19:12:31 2014 (r262490)
@@ -24,8 +24,6 @@
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/*
* ASSERTION:
* Checks that setting "bufresize" to "auto" will cause buffer
@@ -34,14 +32,8 @@
* SECTION: Buffers and Buffering/Buffer Resizing Policy;
* Options and Tunables/aggsize;
* Options and Tunables/bufresize
- *
- * NOTES:
- * We use the undocumented "preallocate" option to make sure dtrace(1M)
- * has enough space in its heap to allocate a buffer as large as the
- * kernel's trace buffer.
*/
-#pragma D option preallocate=100t
#pragma D option bufresize=auto
#pragma D option aggsize=100t
Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool.8
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Tue Feb 25 18:44:33 2014 (r262489)
+++ projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Tue Feb 25 19:12:31 2014 (r262490)
@@ -1960,5 +1960,5 @@ implementation of this manual page was i
The
.Cm spare
feature requires a utility to detect zpool degradation and initiate
-disk replacement within the zpool. FreeBSD does not provide such a
-utility at this time.
+disk replacement within the zpool.
+FreeBSD does not provide such a utility at this time.
Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c Tue Feb 25 18:44:33 2014 (r262489)
+++ projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c Tue Feb 25 19:12:31 2014 (r262490)
@@ -24,8 +24,6 @@
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/*
* Copyright (c) 2012 by Delphix. All rights reserved.
*/
@@ -906,30 +904,6 @@ dt_options_load(dtrace_hdl_t *dtp)
return (0);
}
-/*ARGSUSED*/
-static int
-dt_opt_preallocate(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
-{
- dtrace_optval_t size;
- void *p;
-
- if (arg == NULL || dt_optval_parse(arg, &size) != 0)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
-
- if (size > SIZE_MAX)
- size = SIZE_MAX;
-
- if ((p = dt_zalloc(dtp, size)) == NULL) {
- do {
- size /= 2;
- } while ((p = dt_zalloc(dtp, size)) == NULL);
- }
-
- dt_free(dtp, p);
-
- return (0);
-}
-
typedef struct dt_option {
const char *o_name;
int (*o_func)(dtrace_hdl_t *, const char *, uintptr_t);
@@ -968,7 +942,6 @@ static const dt_option_t _dtrace_ctoptio
{ "linktype", dt_opt_linktype },
{ "nolibs", dt_opt_cflags, DTRACE_C_NOLIBS },
{ "pgmax", dt_opt_pgmax },
- { "preallocate", dt_opt_preallocate },
{ "pspec", dt_opt_cflags, DTRACE_C_PSPEC },
{ "setenv", dt_opt_setenv, 1 },
{ "stdc", dt_opt_stdc },
Modified: projects/sendfile/contrib/llvm/tools/clang/lib/Driver/ToolChains.h
==============================================================================
--- projects/sendfile/contrib/llvm/tools/clang/lib/Driver/ToolChains.h Tue Feb 25 18:44:33 2014 (r262489)
+++ projects/sendfile/contrib/llvm/tools/clang/lib/Driver/ToolChains.h Tue Feb 25 19:12:31 2014 (r262490)
@@ -512,7 +512,12 @@ public:
virtual void
AddClangCXXStdlibIncludeArgs(const llvm::opt::ArgList &DriverArgs,
llvm::opt::ArgStringList &CC1Args) const;
-
+ virtual bool IsIntegratedAssemblerDefault() const {
+ if (getTriple().getArch() == llvm::Triple::ppc ||
+ getTriple().getArch() == llvm::Triple::ppc64)
+ return true;
+ return Generic_ELF::IsIntegratedAssemblerDefault();
+ }
virtual bool UseSjLjExceptions() const;
protected:
Modified: projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Expression/IRExecutionUnit.h
==============================================================================
--- projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Expression/IRExecutionUnit.h Tue Feb 25 18:44:33 2014 (r262489)
+++ projects/sendfile/contrib/llvm/tools/lldb/include/lldb/Expression/IRExecutionUnit.h Tue Feb 25 19:12:31 2014 (r262490)
@@ -18,7 +18,6 @@
#include <map>
// Other libraries and framework includes
-#include "llvm/ADT/StringRef.h"
#include "llvm/IR/Module.h"
// Project includes
@@ -288,7 +287,8 @@ private:
/// Allocated space.
//------------------------------------------------------------------
virtual uint8_t *allocateCodeSection(uintptr_t Size, unsigned Alignment,
- unsigned SectionID);
+ unsigned SectionID,
+ llvm::StringRef SectionName);
//------------------------------------------------------------------
/// Allocate space for data, and add it to the m_spaceBlocks map
@@ -309,7 +309,9 @@ private:
/// Allocated space.
//------------------------------------------------------------------
virtual uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment,
- unsigned SectionID, bool IsReadOnly);
+ unsigned SectionID,
+ llvm::StringRef SectionName,
+ bool IsReadOnly);
//------------------------------------------------------------------
/// Allocate space for a global variable, and add it to the
@@ -337,7 +339,13 @@ private:
/// @return
/// True in case of failure, false in case of success.
//------------------------------------------------------------------
- bool applyPermissions(std::string *ErrMsg) { return false; }
+ virtual bool finalizeMemory(std::string *ErrMsg) {
+ // TODO: Ensure that the instruction cache is flushed because
+ // relocations are updated by dy-load. See:
+ // sys::Memory::InvalidateInstructionCache
+ // llvm::SectionMemoryManager
+ return false;
+ }
//------------------------------------------------------------------
/// Passthrough interface stub
@@ -347,38 +355,6 @@ private:
//------------------------------------------------------------------
/// Passthrough interface stub
//------------------------------------------------------------------
- virtual uint8_t* startExceptionTable(const llvm::Function* F,
- uintptr_t &ActualSize);
-
- //------------------------------------------------------------------
- /// Complete the exception table for a function, and add it to the
- /// m_exception_tables map
- ///
- /// @param[in] F
- /// The function whose exception table is being written.
- ///
- /// @param[in] TableStart
- /// The first byte of the exception table.
- ///
- /// @param[in] TableEnd
- /// The last byte of the exception table.
- ///
- /// @param[in] FrameRegister
- /// I don't know what this does, but it's passed through.
- //------------------------------------------------------------------
- virtual void endExceptionTable(const llvm::Function *F,
- uint8_t *TableStart,
- uint8_t *TableEnd,
- uint8_t* FrameRegister);
-
- //------------------------------------------------------------------
- /// Passthrough interface stub
- //------------------------------------------------------------------
- virtual void deallocateExceptionTable(void *ET);
-
- //------------------------------------------------------------------
- /// Passthrough interface stub
- //------------------------------------------------------------------
virtual size_t GetDefaultCodeSlabSize() {
return m_default_mm_ap->GetDefaultCodeSlabSize();
}
@@ -416,7 +392,7 @@ private:
}
virtual void registerEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) {
- return m_default_mm_ap->registerEHFrames(llvm::StringRef((const char *)Addr, Size));
+ return m_default_mm_ap->registerEHFrames(Addr, LoadAddr, Size);
}
//------------------------------------------------------------------
Modified: projects/sendfile/contrib/llvm/tools/lldb/source/Core/ArchSpec.cpp
==============================================================================
--- projects/sendfile/contrib/llvm/tools/lldb/source/Core/ArchSpec.cpp Tue Feb 25 18:44:33 2014 (r262489)
+++ projects/sendfile/contrib/llvm/tools/lldb/source/Core/ArchSpec.cpp Tue Feb 25 19:12:31 2014 (r262490)
@@ -158,60 +158,60 @@ ArchSpec::AutoComplete (const char *name
#define SUBTYPE_MASK 0x00FFFFFFu
static const ArchDefinitionEntry g_macho_arch_entries[] =
{
- { ArchSpec::eCore_arm_generic , llvm::MachO::CPUTypeARM , CPU_ANY, UINT32_MAX , UINT32_MAX },
- { ArchSpec::eCore_arm_generic , llvm::MachO::CPUTypeARM , 0 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_arm_armv4 , llvm::MachO::CPUTypeARM , 5 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_arm_armv4t , llvm::MachO::CPUTypeARM , 5 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_arm_armv6 , llvm::MachO::CPUTypeARM , 6 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_arm_armv6m , llvm::MachO::CPUTypeARM , 14 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_arm_armv5 , llvm::MachO::CPUTypeARM , 7 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_arm_armv5e , llvm::MachO::CPUTypeARM , 7 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_arm_armv5t , llvm::MachO::CPUTypeARM , 7 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_arm_xscale , llvm::MachO::CPUTypeARM , 8 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_arm_armv7 , llvm::MachO::CPUTypeARM , 9 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_arm_armv7f , llvm::MachO::CPUTypeARM , 10 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_arm_armv7s , llvm::MachO::CPUTypeARM , 11 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_arm_armv7k , llvm::MachO::CPUTypeARM , 12 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_arm_armv7m , llvm::MachO::CPUTypeARM , 15 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_arm_armv7em , llvm::MachO::CPUTypeARM , 16 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_thumb , llvm::MachO::CPUTypeARM , 0 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_thumbv4t , llvm::MachO::CPUTypeARM , 5 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_thumbv5 , llvm::MachO::CPUTypeARM , 7 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_thumbv5e , llvm::MachO::CPUTypeARM , 7 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_thumbv6 , llvm::MachO::CPUTypeARM , 6 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_thumbv6m , llvm::MachO::CPUTypeARM , 14 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_thumbv7 , llvm::MachO::CPUTypeARM , 9 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_thumbv7f , llvm::MachO::CPUTypeARM , 10 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_thumbv7s , llvm::MachO::CPUTypeARM , 11 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_thumbv7k , llvm::MachO::CPUTypeARM , 12 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_thumbv7m , llvm::MachO::CPUTypeARM , 15 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_thumbv7em , llvm::MachO::CPUTypeARM , 16 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_ppc_generic , llvm::MachO::CPUTypePowerPC , CPU_ANY, UINT32_MAX , UINT32_MAX },
- { ArchSpec::eCore_ppc_generic , llvm::MachO::CPUTypePowerPC , 0 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_ppc_ppc601 , llvm::MachO::CPUTypePowerPC , 1 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_ppc_ppc602 , llvm::MachO::CPUTypePowerPC , 2 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_ppc_ppc603 , llvm::MachO::CPUTypePowerPC , 3 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_ppc_ppc603e , llvm::MachO::CPUTypePowerPC , 4 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_ppc_ppc603ev , llvm::MachO::CPUTypePowerPC , 5 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_ppc_ppc604 , llvm::MachO::CPUTypePowerPC , 6 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_ppc_ppc604e , llvm::MachO::CPUTypePowerPC , 7 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_ppc_ppc620 , llvm::MachO::CPUTypePowerPC , 8 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_ppc_ppc750 , llvm::MachO::CPUTypePowerPC , 9 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_ppc_ppc7400 , llvm::MachO::CPUTypePowerPC , 10 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_ppc_ppc7450 , llvm::MachO::CPUTypePowerPC , 11 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_ppc_ppc970 , llvm::MachO::CPUTypePowerPC , 100 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_ppc64_generic , llvm::MachO::CPUTypePowerPC64 , 0 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_ppc64_ppc970_64 , llvm::MachO::CPUTypePowerPC64 , 100 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_x86_32_i386 , llvm::MachO::CPUTypeI386 , 3 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_x86_32_i486 , llvm::MachO::CPUTypeI386 , 4 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_x86_32_i486sx , llvm::MachO::CPUTypeI386 , 0x84 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_x86_32_i386 , llvm::MachO::CPUTypeI386 , CPU_ANY, UINT32_MAX , UINT32_MAX },
- { ArchSpec::eCore_x86_64_x86_64 , llvm::MachO::CPUTypeX86_64 , 3 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_x86_64_x86_64 , llvm::MachO::CPUTypeX86_64 , 4 , UINT32_MAX , SUBTYPE_MASK },
- { ArchSpec::eCore_x86_64_x86_64 , llvm::MachO::CPUTypeX86_64 , CPU_ANY, UINT32_MAX , UINT32_MAX },
+ { ArchSpec::eCore_arm_generic , llvm::MachO::CPU_TYPE_ARM , CPU_ANY, UINT32_MAX , UINT32_MAX },
+ { ArchSpec::eCore_arm_generic , llvm::MachO::CPU_TYPE_ARM , 0 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_arm_armv4 , llvm::MachO::CPU_TYPE_ARM , 5 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_arm_armv4t , llvm::MachO::CPU_TYPE_ARM , 5 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_arm_armv6 , llvm::MachO::CPU_TYPE_ARM , 6 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_arm_armv6m , llvm::MachO::CPU_TYPE_ARM , 14 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_arm_armv5 , llvm::MachO::CPU_TYPE_ARM , 7 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_arm_armv5e , llvm::MachO::CPU_TYPE_ARM , 7 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_arm_armv5t , llvm::MachO::CPU_TYPE_ARM , 7 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_arm_xscale , llvm::MachO::CPU_TYPE_ARM , 8 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_arm_armv7 , llvm::MachO::CPU_TYPE_ARM , 9 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_arm_armv7f , llvm::MachO::CPU_TYPE_ARM , 10 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_arm_armv7s , llvm::MachO::CPU_TYPE_ARM , 11 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_arm_armv7k , llvm::MachO::CPU_TYPE_ARM , 12 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_arm_armv7m , llvm::MachO::CPU_TYPE_ARM , 15 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_arm_armv7em , llvm::MachO::CPU_TYPE_ARM , 16 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_thumb , llvm::MachO::CPU_TYPE_ARM , 0 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_thumbv4t , llvm::MachO::CPU_TYPE_ARM , 5 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_thumbv5 , llvm::MachO::CPU_TYPE_ARM , 7 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_thumbv5e , llvm::MachO::CPU_TYPE_ARM , 7 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_thumbv6 , llvm::MachO::CPU_TYPE_ARM , 6 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_thumbv6m , llvm::MachO::CPU_TYPE_ARM , 14 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_thumbv7 , llvm::MachO::CPU_TYPE_ARM , 9 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_thumbv7f , llvm::MachO::CPU_TYPE_ARM , 10 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_thumbv7s , llvm::MachO::CPU_TYPE_ARM , 11 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_thumbv7k , llvm::MachO::CPU_TYPE_ARM , 12 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_thumbv7m , llvm::MachO::CPU_TYPE_ARM , 15 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_thumbv7em , llvm::MachO::CPU_TYPE_ARM , 16 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_ppc_generic , llvm::MachO::CPU_TYPE_POWERPC , CPU_ANY, UINT32_MAX , UINT32_MAX },
+ { ArchSpec::eCore_ppc_generic , llvm::MachO::CPU_TYPE_POWERPC , 0 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_ppc_ppc601 , llvm::MachO::CPU_TYPE_POWERPC , 1 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_ppc_ppc602 , llvm::MachO::CPU_TYPE_POWERPC , 2 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_ppc_ppc603 , llvm::MachO::CPU_TYPE_POWERPC , 3 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_ppc_ppc603e , llvm::MachO::CPU_TYPE_POWERPC , 4 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_ppc_ppc603ev , llvm::MachO::CPU_TYPE_POWERPC , 5 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_ppc_ppc604 , llvm::MachO::CPU_TYPE_POWERPC , 6 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_ppc_ppc604e , llvm::MachO::CPU_TYPE_POWERPC , 7 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_ppc_ppc620 , llvm::MachO::CPU_TYPE_POWERPC , 8 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_ppc_ppc750 , llvm::MachO::CPU_TYPE_POWERPC , 9 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_ppc_ppc7400 , llvm::MachO::CPU_TYPE_POWERPC , 10 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_ppc_ppc7450 , llvm::MachO::CPU_TYPE_POWERPC , 11 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_ppc_ppc970 , llvm::MachO::CPU_TYPE_POWERPC , 100 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_ppc64_generic , llvm::MachO::CPU_TYPE_POWERPC64 , 0 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_ppc64_ppc970_64 , llvm::MachO::CPU_TYPE_POWERPC64 , 100 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_x86_32_i386 , llvm::MachO::CPU_TYPE_I386 , 3 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_x86_32_i486 , llvm::MachO::CPU_TYPE_I386 , 4 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_x86_32_i486sx , llvm::MachO::CPU_TYPE_I386 , 0x84 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_x86_32_i386 , llvm::MachO::CPU_TYPE_I386 , CPU_ANY, UINT32_MAX , UINT32_MAX },
+ { ArchSpec::eCore_x86_64_x86_64 , llvm::MachO::CPU_TYPE_X86_64 , 3 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_x86_64_x86_64 , llvm::MachO::CPU_TYPE_X86_64 , 4 , UINT32_MAX , SUBTYPE_MASK },
+ { ArchSpec::eCore_x86_64_x86_64 , llvm::MachO::CPU_TYPE_X86_64 , CPU_ANY, UINT32_MAX , UINT32_MAX },
// Catch any unknown mach architectures so we can always use the object and symbol mach-o files
- { ArchSpec::eCore_uknownMach32 , 0 , 0 , 0xFF000000u, 0x00000000u },
- { ArchSpec::eCore_uknownMach64 , llvm::MachO::CPUArchABI64 , 0 , 0xFF000000u, 0x00000000u }
+ { ArchSpec::eCore_uknownMach32 , 0 , 0 , 0xFF000000u, 0x00000000u },
+ { ArchSpec::eCore_uknownMach64 , llvm::MachO::CPU_ARCH_ABI64 , 0 , 0xFF000000u, 0x00000000u }
};
static const ArchDefinition g_macho_arch_def = {
eArchTypeMachO,
Modified: projects/sendfile/contrib/llvm/tools/lldb/source/Expression/ClangExpressionParser.cpp
==============================================================================
--- projects/sendfile/contrib/llvm/tools/lldb/source/Expression/ClangExpressionParser.cpp Tue Feb 25 18:44:33 2014 (r262489)
+++ projects/sendfile/contrib/llvm/tools/lldb/source/Expression/ClangExpressionParser.cpp Tue Feb 25 19:12:31 2014 (r262490)
@@ -52,7 +52,7 @@
#include "llvm/ADT/StringRef.h"
#include "llvm/ExecutionEngine/ExecutionEngine.h"
#include "llvm/Support/Debug.h"
-#include "llvm/Support/PathV1.h"
+#include "llvm/Support/FileSystem.h"
#include "llvm/Support/TargetSelect.h"
#if defined (USE_STANDARD_JIT)
@@ -77,19 +77,16 @@ using namespace lldb_private;
//===----------------------------------------------------------------------===//
std::string GetBuiltinIncludePath(const char *Argv0) {
- llvm::sys::Path P =
- llvm::sys::Path::GetMainExecutable(Argv0,
- (void*)(intptr_t) GetBuiltinIncludePath);
-
- if (!P.isEmpty()) {
- P.eraseComponent(); // Remove /clang from foo/bin/clang
- P.eraseComponent(); // Remove /bin from foo/bin
-
+ SmallString<128> P(llvm::sys::fs::getMainExecutable(
+ Argv0, (void *)(intptr_t) GetBuiltinIncludePath));
+
+ if (!P.empty()) {
+ llvm::sys::path::remove_filename(P); // Remove /clang from foo/bin/clang
+ llvm::sys::path::remove_filename(P); // Remove /bin from foo/bin
+
// Get foo/lib/clang/<version>/include
- P.appendComponent("lib");
- P.appendComponent("clang");
- P.appendComponent(CLANG_VERSION_STRING);
- P.appendComponent("include");
+ llvm::sys::path::append(P, "lib", "clang", CLANG_VERSION_STRING,
+ "include");
}
return P.str();
Modified: projects/sendfile/contrib/llvm/tools/lldb/source/Expression/IRExecutionUnit.cpp
==============================================================================
--- projects/sendfile/contrib/llvm/tools/lldb/source/Expression/IRExecutionUnit.cpp Tue Feb 25 18:44:33 2014 (r262489)
+++ projects/sendfile/contrib/llvm/tools/lldb/source/Expression/IRExecutionUnit.cpp Tue Feb 25 19:12:31 2014 (r262490)
@@ -490,11 +490,12 @@ IRExecutionUnit::MemoryManager::allocate
uint8_t *
IRExecutionUnit::MemoryManager::allocateCodeSection(uintptr_t Size,
unsigned Alignment,
- unsigned SectionID)
+ unsigned SectionID,
+ llvm::StringRef SectionName)
{
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
- uint8_t *return_value = m_default_mm_ap->allocateCodeSection(Size, Alignment, SectionID);
+ uint8_t *return_value = m_default_mm_ap->allocateCodeSection(Size, Alignment, SectionID, SectionName);
m_parent.m_records.push_back(AllocationRecord((uintptr_t)return_value,
lldb::ePermissionsReadable | lldb::ePermissionsExecutable,
@@ -515,11 +516,12 @@ uint8_t *
IRExecutionUnit::MemoryManager::allocateDataSection(uintptr_t Size,
unsigned Alignment,
unsigned SectionID,
+ llvm::StringRef SectionName,
bool IsReadOnly)
{
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
- uint8_t *return_value = m_default_mm_ap->allocateDataSection(Size, Alignment, SectionID, IsReadOnly);
+ uint8_t *return_value = m_default_mm_ap->allocateDataSection(Size, Alignment, SectionID, SectionName, IsReadOnly);
m_parent.m_records.push_back(AllocationRecord((uintptr_t)return_value,
lldb::ePermissionsReadable | lldb::ePermissionsWritable,
@@ -563,28 +565,6 @@ IRExecutionUnit::MemoryManager::dealloca
m_default_mm_ap->deallocateFunctionBody(Body);
}
-uint8_t*
-IRExecutionUnit::MemoryManager::startExceptionTable(const llvm::Function* F,
- uintptr_t &ActualSize)
-{
- return m_default_mm_ap->startExceptionTable(F, ActualSize);
-}
-
-void
-IRExecutionUnit::MemoryManager::endExceptionTable(const llvm::Function *F,
- uint8_t *TableStart,
- uint8_t *TableEnd,
- uint8_t* FrameRegister)
-{
- m_default_mm_ap->endExceptionTable(F, TableStart, TableEnd, FrameRegister);
-}
-
-void
-IRExecutionUnit::MemoryManager::deallocateExceptionTable(void *ET)
-{
- m_default_mm_ap->deallocateExceptionTable (ET);
-}
-
lldb::addr_t
IRExecutionUnit::GetRemoteAddressForLocal (lldb::addr_t local_address)
{
Modified: projects/sendfile/contrib/llvm/tools/lldb/source/Expression/IRForTarget.cpp
==============================================================================
--- projects/sendfile/contrib/llvm/tools/lldb/source/Expression/IRForTarget.cpp Tue Feb 25 18:44:33 2014 (r262489)
+++ projects/sendfile/contrib/llvm/tools/lldb/source/Expression/IRForTarget.cpp Tue Feb 25 19:12:31 2014 (r262490)
@@ -357,6 +357,20 @@ IRForTarget::ResolveFunctionPointers(llv
if (value_ptr)
*value_ptr = value;
+ // If we are replacing a function with the nobuiltin attribute, it may
+ // be called with the builtin attribute on call sites. Remove any such
+ // attributes since it's illegal to have a builtin call to something
+ // other than a nobuiltin function.
+ if (fun->hasFnAttribute(llvm::Attribute::NoBuiltin)) {
+ llvm::Attribute builtin = llvm::Attribute::get(fun->getContext(), llvm::Attribute::Builtin);
+
+ for (auto u = fun->use_begin(), e = fun->use_end(); u != e; ++u) {
+ if (auto call = dyn_cast<CallInst>(*u)) {
+ call->removeAttribute(AttributeSet::FunctionIndex, builtin);
+ }
+ }
+ }
+
fun->replaceAllUsesWith(value);
}
Modified: projects/sendfile/contrib/llvm/tools/lldb/source/Host/common/FileSpec.cpp
==============================================================================
--- projects/sendfile/contrib/llvm/tools/lldb/source/Host/common/FileSpec.cpp Tue Feb 25 18:44:33 2014 (r262489)
+++ projects/sendfile/contrib/llvm/tools/lldb/source/Host/common/FileSpec.cpp Tue Feb 25 19:12:31 2014 (r262490)
@@ -570,9 +570,8 @@ FileSpec::ResolveExecutableLocation ()
if (file_cstr)
{
const std::string file_str (file_cstr);
- llvm::sys::Path path = llvm::sys::Program::FindProgramByName (file_str);
- const std::string &path_str = path.str();
- llvm::StringRef dir_ref = llvm::sys::path::parent_path(path_str);
+ std::string path = llvm::sys::FindProgramByName (file_str);
+ llvm::StringRef dir_ref = llvm::sys::path::parent_path(path);
//llvm::StringRef dir_ref = path.getDirname();
if (! dir_ref.empty())
{
Modified: projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
==============================================================================
--- projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp Tue Feb 25 18:44:33 2014 (r262489)
+++ projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp Tue Feb 25 19:12:31 2014 (r262490)
@@ -10,6 +10,7 @@
#include "DisassemblerLLVMC.h"
#include "llvm-c/Disassembler.h"
+#include "llvm/ADT/OwningPtr.h"
#include "llvm/MC/MCAsmInfo.h"
#include "llvm/MC/MCContext.h"
#include "llvm/MC/MCDisassembler.h"
@@ -17,6 +18,7 @@
#include "llvm/MC/MCInstPrinter.h"
#include "llvm/MC/MCInstrInfo.h"
#include "llvm/MC/MCRegisterInfo.h"
+#include "llvm/MC/MCRelocationInfo.h"
#include "llvm/MC/MCSubtargetInfo.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/MemoryObject.h"
@@ -430,23 +432,30 @@ DisassemblerLLVMC::LLVMCDisassembler::LL
m_subtarget_info_ap.reset(curr_target->createMCSubtargetInfo(triple, "",
features_str));
- m_asm_info_ap.reset(curr_target->createMCAsmInfo(triple));
-
+ m_asm_info_ap.reset(curr_target->createMCAsmInfo(*curr_target->createMCRegInfo(triple), triple));
+
if (m_instr_info_ap.get() == NULL || m_reg_info_ap.get() == NULL || m_subtarget_info_ap.get() == NULL || m_asm_info_ap.get() == NULL)
{
m_is_valid = false;
return;
}
- m_context_ap.reset(new llvm::MCContext(*m_asm_info_ap.get(), *(m_reg_info_ap.get()), 0));
+ m_context_ap.reset(new llvm::MCContext(m_asm_info_ap.get(), m_reg_info_ap.get(), 0));
m_disasm_ap.reset(curr_target->createMCDisassembler(*m_subtarget_info_ap.get()));
- if (m_disasm_ap.get())
+ if (m_disasm_ap.get() && m_context_ap.get())
{
+ llvm::OwningPtr<llvm::MCRelocationInfo> RelInfo(curr_target->createMCRelocationInfo(triple, *m_context_ap.get()));
+ if (!RelInfo)
+ {
+ m_is_valid = false;
+ return;
+ }
m_disasm_ap->setupForSymbolicDisassembly(NULL,
- DisassemblerLLVMC::SymbolLookupCallback,
- (void *) &owner,
- m_context_ap.get());
+ DisassemblerLLVMC::SymbolLookupCallback,
+ (void *) &owner,
+ m_context_ap.get(),
+ RelInfo);
unsigned asm_printer_variant;
if (flavor == ~0U)
Modified: projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
==============================================================================
--- projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp Tue Feb 25 18:44:33 2014 (r262489)
+++ projects/sendfile/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp Tue Feb 25 19:12:31 2014 (r262490)
@@ -25,7 +25,7 @@
#include "Utility/ARM_DWARF_Registers.h"
#include "llvm/Support/MathExtras.h" // for SignExtend32 template function
- // and CountTrailingZeros_32 function
+ // and countTrailingZeros function
using namespace lldb;
using namespace lldb_private;
@@ -47,7 +47,7 @@ using namespace lldb_private;
static uint32_t
CountITSize (uint32_t ITMask) {
// First count the trailing zeros of the IT mask.
- uint32_t TZ = llvm::CountTrailingZeros_32(ITMask);
+ uint32_t TZ = llvm::countTrailingZeros(ITMask);
if (TZ > 3)
{
#ifdef LLDB_CONFIGURATION_DEBUG
Modified: projects/sendfile/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp
==============================================================================
--- projects/sendfile/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp Tue Feb 25 18:44:33 2014 (r262489)
+++ projects/sendfile/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp Tue Feb 25 19:12:31 2014 (r262490)
@@ -1476,6 +1476,9 @@ ClangASTType::GetTypeClass () const
case clang::Type::Decltype: break;
case clang::Type::TemplateSpecialization: break;
case clang::Type::Atomic: break;
+
+ // pointer type decayed from an array or function type.
+ case clang::Type::Decayed: break;
}
// We don't know hot to display this type...
return lldb::eTypeClassOther;
@@ -1913,6 +1916,10 @@ ClangASTType::GetEncoding (uint64_t &cou
case clang::Type::TemplateSpecialization:
case clang::Type::Atomic:
break;
+
+ // pointer type decayed from an array or function type.
+ case clang::Type::Decayed:
+ break;
}
count = 0;
return lldb::eEncodingInvalid;
@@ -2041,6 +2048,10 @@ ClangASTType::GetFormat () const
case clang::Type::TemplateSpecialization:
case clang::Type::Atomic:
break;
+
+ // pointer type decayed from an array or function type.
+ case clang::Type::Decayed:
+ break;
}
// We don't know hot to display this type...
return lldb::eFormatBytes;
@@ -5227,6 +5238,9 @@ ClangASTType::GetDeclContextForType () c
case clang::Type::InjectedClassName: break;
case clang::Type::DependentName: break;
case clang::Type::Atomic: break;
+
+ // pointer type decayed from an array or function type.
+ case clang::Type::Decayed: break;
}
// No DeclContext in this type...
return NULL;
Modified: projects/sendfile/contrib/serf/CHANGES
==============================================================================
--- projects/sendfile/contrib/serf/CHANGES Tue Feb 25 18:44:33 2014 (r262489)
+++ projects/sendfile/contrib/serf/CHANGES Tue Feb 25 19:12:31 2014 (r262490)
@@ -1,4 +1,59 @@
-Serf 1.3.0 [2013-07-23, from /tags/1.3.0]
+Serf 1.3.4 [2014-02-08, from /tags/1.3.4, rxxxx]
+ Fix issue #119: Endless loop during ssl tunnel setup with Negotiate authn
+ Fix issue #123: Can't setup ssl tunnel which sends Connection close header
+ Fix a race condition when initializing OpenSSL from multiple threads (r2263)
+ Fix issue #138: Incorrect pkg-config file when GSSAPI isn't configured
+
+
+Serf 1.3.3 [2013-12-09, from /tags/1.3.3, r2242]
+ Fix issue 129: Try more addresses of multihomed servers
+ Handle X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE correctly (r2225)
+ Return APR_TIMEUP from poll() to enable detecting connection timeouts (r2183)
+
+
+Serf 1.3.2 [2013-10-04, from /tags/1.3.2, r2195]
+ Fix issue 130: HTTP headers should be treated case-insensitively
+ Fix issue 126: Compilation breaks with Codewarrior compiler
+ Fix crash during cleanup of SSL buckets in apr_terminate() (r2145)
+ Fix Windows build: Also export functions with capital letters in .def file
+ Fix host header when url contains a username or password (r2170)
+ Ensure less TCP package fragmentation on Windows (r2145)
+ Handle authentication for responses to HEAD requests (r2178,-9)
+ Improve serf_get: add option to add request headers, allow url with query,
+ allow HEAD requests (r2143,r2175,-6)
+ Improve RFC conformance: don't expect body for certain responses (r2011,-2)
+ Do not invoke progress callback when no data was received (r2144)
+ And more test suite fixes and build warning cleanups
+ SCons-related fixes:
+ Fix build when GSSAPI not in default include path (2155)
+ Fix OpenBSD build: always map all LIBPATH entries into RPATH (r2156)
+ Checksum generation in Windows shared libraries for release builds (2162)
+ Mac OS X: Use MAJOR version only in dylib install name (r2161)
+ Use both MAJOR and MINOR version for the shared library name (2163)
+ Fix the .pc file when installing serf in a non-default LIBDIR (r2191)
+
+
+Serf 1.3.1 [2013-08-15, from /tags/1.3.1, r2138]
+ Fix issue 77: Endless loop if server doesn't accept Negotiate authentication.
+ Fix issue 114: ssl/tls renegotiation fails
+ Fix issue 120: error with ssl tunnel over proxy with KeepAlive off and
+ Basic authentication.
+ Fixed bugs with authentication (r2057,2115,2118)
+ SCons-related fixes:
+ Fix issue 111: add flag to set custom library path
+ Fix issue 112: add soname
+ Fix issue 113: add gssapi libs in the serf pc file
+ Fix issue 115: Setting RPATH on Solaris broken in SConstruct
+ Fix issue 116: scons check should return non-zero exit staths
+ Fix issue 121: make CFLAGS, LIBS, LINKFLAGS and CPPFLAGS take a space-
+ separated list of flags.
+ Fix issue 122: make scons PREFIX create the folder if it doesn't exist
+ Mac OS X: Fix scons --install-sandbox
+ Solaris: Fix build with cc, don't use unsupported compiler flags
+ Require SCons version 2.3.0 or higher now (for the soname support).
+
+
+Serf 1.3.0 [2013-07-23, from /tags/1.3.0, r2074]
Fix issue 83: use PATH rather than URI within an ssltunnel (r1952)
Fix issue 108: improved error reporting from the underlying socket (r1951)
NEW: Switch to the SCons build system; retire serfmake, serf.mak, autotools
Modified: projects/sendfile/contrib/serf/README
==============================================================================
--- projects/sendfile/contrib/serf/README Tue Feb 25 18:44:33 2014 (r262489)
+++ projects/sendfile/contrib/serf/README Tue Feb 25 19:12:31 2014 (r262490)
@@ -18,14 +18,14 @@ kept to a minimum to provide high perfor
1.1. SCons build system
-serf uses SCons 2.x for its build system. If it is not installed on
+serf uses SCons 2.3 for its build system. If it is not installed on
your system, then you can install it onto your system. If you do not
have permissions, then you can download and install the "local"
version into your home directory. When installed privately, simply
create a symlink for 'scons' in your PATH to /path/to/scons/scons.py.
Fetch the scons-local package:
- http://prdownloads.sourceforge.net/scons/scons-local-2.0.1.tar.gz
+ http://prdownloads.sourceforge.net/scons/scons-local-2.3.0.tar.gz
1.2 Building serf
@@ -54,6 +54,12 @@ distinct directory from the source), you
$ scons -Y /path/to/serf/source
+If you plan to install the library on a system that uses different
+paths for architecture dependent files, specify LIBDIR. LIBDIR defaults
+to /usr/local/lib otherwise. Example for a 64 bit GNU/Linux system:
+
+$ scons PREFIX=/usr/ LIBDIR=/usr/lib64
+
At any point, the current settings can be examined:
$ scons --help
@@ -74,6 +80,13 @@ specified on the install command line:
$ scons PREFIX=/some/path install
+Distribution package maintainers regulary install to a buildroot, and
+would normally use something like below in their build systems, with
+placeholders for the specific paths:
+
+$ scons PREFIX=/usr/ LIBDIR=/usr/lib64
+$ scons install --install-sandbox=/path/to/buildroot
+
1.4 Cleaning up the build
Modified: projects/sendfile/contrib/serf/SConstruct
==============================================================================
--- projects/sendfile/contrib/serf/SConstruct Tue Feb 25 18:44:33 2014 (r262489)
+++ projects/sendfile/contrib/serf/SConstruct Tue Feb 25 19:12:31 2014 (r262490)
@@ -19,6 +19,8 @@ import sys
import os
import re
+EnsureSConsVersion(2,3,0)
+
HEADER_FILES = ['serf.h',
'serf_bucket_types.h',
'serf_bucket_util.h',
@@ -34,23 +36,35 @@ def _converter(val):
if val == 'none':
val = []
else:
- val = val.split(',')
+ val = val.split(' ')
return val
def RawListVariable(key, help, default):
"""
The input parameters describe a 'raw string list' option. This class
- accepts a comma separated list and converts it to a space separated
- list.
+ accepts a space-separated string and converts it to a list.
"""
return (key, '%s' % (help), default, None, lambda val: _converter(val))
+# Custom path validator, creates directory when a specified option is set.
+# To be used to ensure a PREFIX directory is only created when installing.
+def createPathIsDirCreateWithTarget(target):
+ def my_validator(key, val, env):
+ build_targets = (map(str, BUILD_TARGETS))
+ if target in build_targets:
+ return PathVariable.PathIsDirCreate(key, val, env)
+ else:
+ return PathVariable.PathAccept(key, val, env)
+ return my_validator
+
# default directories
if sys.platform == 'win32':
+ default_incdir='..'
default_libdir='..'
default_prefix='Debug'
else:
- default_libdir='/usr'
+ default_incdir='/usr'
+ default_libdir='$PREFIX/lib'
default_prefix='/usr/local'
opts = Variables(files=[SAVED_CONFIG])
@@ -58,22 +72,26 @@ opts.AddVariables(
PathVariable('PREFIX',
'Directory to install under',
default_prefix,
- PathVariable.PathIsDir),
+ createPathIsDirCreateWithTarget('install')),
+ PathVariable('LIBDIR',
+ 'Directory to install architecture dependent libraries under',
+ default_libdir,
+ createPathIsDirCreateWithTarget('install')),
PathVariable('APR',
"Path to apr-1-config, or to APR's install area",
- default_libdir,
+ default_incdir,
PathVariable.PathAccept),
PathVariable('APU',
"Path to apu-1-config, or to APR's install area",
- default_libdir,
+ default_incdir,
PathVariable.PathAccept),
PathVariable('OPENSSL',
"Path to OpenSSL's install area",
- default_libdir,
+ default_incdir,
PathVariable.PathIsDir),
PathVariable('ZLIB',
"Path to zlib's install area",
- default_libdir,
+ default_incdir,
PathVariable.PathIsDir),
PathVariable('GSSAPI',
"Path to GSSAPI's install area",
@@ -86,14 +104,14 @@ opts.AddVariables(
"Enable using a static compiled APR",
False),
RawListVariable('CC', "Command name or path of the C compiler", None),
- RawListVariable('CFLAGS', "Extra flags for the C compiler (comma separated)",
+ RawListVariable('CFLAGS', "Extra flags for the C compiler (space-separated)",
None),
RawListVariable('LIBS', "Extra libraries passed to the linker, "
- "e.g. -l<library> (comma separated)", None),
- RawListVariable('LINKFLAGS', "Extra flags for the linker (comma separated)",
+ "e.g. \"-l<library1> -l<library2>\" (space separated)", None),
+ RawListVariable('LINKFLAGS', "Extra flags for the linker (space-separated)",
None),
RawListVariable('CPPFLAGS', "Extra flags for the C preprocessor "
- "(comma separated)", None),
+ "(space separated)", None),
)
if sys.platform == 'win32':
@@ -146,6 +164,8 @@ match = re.search('SERF_MAJOR_VERSION ([
re.DOTALL)
MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
env.Append(MAJOR=str(MAJOR))
+env.Append(MINOR=str(MINOR))
+env.Append(PATCH=str(PATCH))
# Calling external programs is okay if we're not cleaning or printing help.
# (cleaning: no sense in fetching information; help: we may not know where
@@ -181,10 +201,18 @@ opts.Save(SAVED_CONFIG, env)
# PLATFORM-SPECIFIC BUILD TWEAKS
thisdir = os.getcwd()
-libdir = '$PREFIX/lib'
+libdir = '$LIBDIR'
incdir = '$PREFIX/include/serf-$MAJOR'
-LIBNAME = 'libserf-${MAJOR}'
+# This version string is used in the dynamic library name, and for Mac OS X also
+# for the current_version and compatibility_version options in the .dylib
+#
+# Unfortunately we can't set the .dylib compatibility_version option separately
+# from current_version, so don't use the PATCH level to avoid that build and
+# runtime patch levels have to be identical.
+env['SHLIBVERSION'] = '%d.%d.%d' % (MAJOR, MINOR, 0)
+
+LIBNAME = 'libserf-%d' % (MAJOR,)
if sys.platform != 'win32':
LIBNAMESTATIC = LIBNAME
else:
@@ -196,23 +224,17 @@ env.Append(RPATH=libdir,
if sys.platform == 'darwin':
# linkflags.append('-Wl,-install_name, at executable_path/%s.dylib' % (LIBNAME,))
env.Append(LINKFLAGS='-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,))
- # 'man ld' says positive non-zero for the first number, so we add one.
- # Mac's interpretation of compatibility is the same as our MINOR version.
- env.Append(LINKFLAGS='-Wl,-compatibility_version,%d' % (MINOR+1,))
- env.Append(LINKFLAGS='-Wl,-current_version,%d.%d' % (MINOR+1, PATCH,))
if sys.platform != 'win32':
### gcc only. figure out appropriate test / better way to check these
### flags, and check for gcc.
env.Append(CFLAGS='-std=c89')
- env.Append(CCFLAGS=[
- '-Wdeclaration-after-statement',
- '-Wmissing-prototypes',
- ])
- ### -Wall is not available on Solaris
+ ### These warnings are not available on Solaris
if sys.platform != 'sunos5':
- env.Append(CCFLAGS='-Wall')
+ env.Append(CCFLAGS=['-Wdeclaration-after-statement',
+ '-Wmissing-prototypes',
+ '-Wall'])
if debug:
env.Append(CCFLAGS='-g')
@@ -239,6 +261,7 @@ else:
# Optimize for speed, use DLL runtime
env.Append(CCFLAGS=['/O2', '/MD'])
env.Append(CPPDEFINES='NDEBUG')
+ env.Append(LINKFLAGS='/RELEASE')
# PLAN THE BUILD
SHARED_SOURCES = []
@@ -334,28 +357,32 @@ else:
# If build with gssapi, get its information and define SERF_HAVE_GSSAPI
if gssapi and CALLOUT_OKAY:
- env.ParseConfig('$GSSAPI --libs gssapi')
+ env.ParseConfig('$GSSAPI --cflags gssapi')
+ def parse_libs(env, cmd, unique=1):
+ env['GSSAPI_LIBS'] = cmd.strip()
+ return env.MergeFlags(cmd, unique)
+ env.ParseConfig('$GSSAPI --libs gssapi', parse_libs)
env.Append(CPPDEFINES='SERF_HAVE_GSSAPI')
if sys.platform == 'win32':
env.Append(CPPDEFINES=['SERF_HAVE_SSPI'])
-# On Solaris, the -R values that APR describes never make it into actual
+# On some systems, the -R values that APR describes never make it into actual
# RPATH flags. We'll manually map all directories in LIBPATH into new
# flags to set RPATH values.
-if sys.platform == 'sunos5':
- for d in env['LIBPATH']:
- env.Append(RPATH=d)
+for d in env['LIBPATH']:
+ env.Append(RPATH=':'+d)
# Set up the construction of serf-*.pc
-# TODO: add gssapi libs
pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,),
env.File('build/serf.pc.in'),
SUBST_DICT = {
'@MAJOR@': str(MAJOR),
'@PREFIX@': '$PREFIX',
+ '@LIBDIR@': '$LIBDIR',
'@INCLUDE_SUBDIR@': 'serf-%d' % (MAJOR,),
'@VERSION@': '%d.%d.%d' % (MAJOR, MINOR, PATCH),
- '@LIBS@': '%s %s -lz' % (apu_libs, apr_libs),
+ '@LIBS@': '%s %s %s -lz' % (apu_libs, apr_libs,
+ env.get('GSSAPI_LIBS', '')),
})
env.Default(lib_static, lib_shared, pkgconfig)
@@ -371,16 +398,22 @@ if CALLOUT_OKAY:
# INSTALLATION STUFF
install_static = env.Install(libdir, lib_static)
-install_shared = env.Install(libdir, lib_shared)
+install_shared = env.InstallVersionedLib(libdir, lib_shared)
if sys.platform == 'darwin':
+ # Change the shared library install name (id) to its final name and location.
+ # Notes:
+ # If --install-sandbox=<path> is specified, install_shared_path will point
+ # to a path in the sandbox. We can't use that path because the sandbox is
+ # only a temporary location. The id should be the final target path.
+ # Also, we shouldn't use the complete version number for id, as that'll
+ # make applications depend on the exact major.minor.patch version of serf.
+
install_shared_path = install_shared[0].abspath
+ target_install_shared_path = os.path.join(libdir, '%s.dylib' % LIBNAME)
env.AddPostAction(install_shared, ('install_name_tool -id %s %s'
- % (install_shared_path,
+ % (target_install_shared_path,
install_shared_path)))
- ### construct shared lib symlinks. this also means install the lib
- ### as libserf-2.1.0.0.dylib, then add the symlinks.
- ### note: see InstallAs
env.Alias('install-lib', [install_static, install_shared,
])
Modified: projects/sendfile/contrib/serf/auth/auth.c
==============================================================================
--- projects/sendfile/contrib/serf/auth/auth.c Tue Feb 25 18:44:33 2014 (r262489)
+++ projects/sendfile/contrib/serf/auth/auth.c Tue Feb 25 19:12:31 2014 (r262490)
@@ -23,7 +23,8 @@
#include <apr_lib.h>
static apr_status_t
-default_auth_response_handler(peer_t peer,
+default_auth_response_handler(const serf__authn_scheme_t *scheme,
+ peer_t peer,
int code,
serf_connection_t *conn,
serf_request_t *request,
@@ -151,6 +152,17 @@ static int handle_auth_headers(int code,
if (!auth_hdr)
continue;
+ if (code == 401) {
+ authn_info = serf__get_authn_info_for_server(conn);
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list