Date: Fri, 5 Dec 2014 07:48:27 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275499 - in projects/building-blocks: . bin/sh contrib/binutils/bfd contrib/binutils/bfd/po contrib/binutils/gas/config contrib/elftoolchain/elfcopy contrib/elftoolchain/libelf contrib... Message-ID: <201412050748.sB57mR01048619@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Fri Dec 5 07:48:25 2014 New Revision: 275499 URL: https://svnweb.freebsd.org/changeset/base/275499 Log: MFhead @ r275496 Added: projects/building-blocks/contrib/mdocml/compat_fts.c - copied unchanged from r275496, head/contrib/mdocml/compat_fts.c projects/building-blocks/contrib/mdocml/compat_fts.h - copied unchanged from r275496, head/contrib/mdocml/compat_fts.h projects/building-blocks/contrib/mdocml/configure.local.example - copied unchanged from r275496, head/contrib/mdocml/configure.local.example projects/building-blocks/contrib/mdocml/man.1 - copied unchanged from r275496, head/contrib/mdocml/man.1 projects/building-blocks/contrib/mdocml/test-dirent-namlen.c - copied unchanged from r275496, head/contrib/mdocml/test-dirent-namlen.c projects/building-blocks/contrib/mdocml/test-fts.c - copied unchanged from r275496, head/contrib/mdocml/test-fts.c projects/building-blocks/contrib/mdocml/test-sqlite3.c - copied unchanged from r275496, head/contrib/mdocml/test-sqlite3.c projects/building-blocks/contrib/mdocml/test-wchar.c - copied unchanged from r275496, head/contrib/mdocml/test-wchar.c projects/building-blocks/lib/libelftc/ - copied from r275496, head/lib/libelftc/ projects/building-blocks/sys/amd64/conf/GENERIC-NODEBUG - copied unchanged from r275496, head/sys/amd64/conf/GENERIC-NODEBUG projects/building-blocks/sys/i386/conf/GENERIC-NODEBUG - copied unchanged from r275496, head/sys/i386/conf/GENERIC-NODEBUG projects/building-blocks/sys/pc98/conf/GENERIC-NODEBUG - copied unchanged from r275496, head/sys/pc98/conf/GENERIC-NODEBUG projects/building-blocks/sys/powerpc/conf/GENERIC-NODEBUG - copied unchanged from r275496, head/sys/powerpc/conf/GENERIC-NODEBUG projects/building-blocks/sys/sparc64/conf/GENERIC-NODEBUG - copied unchanged from r275496, head/sys/sparc64/conf/GENERIC-NODEBUG projects/building-blocks/tools/build/options/WITH_ELFTOOLCHAIN_TOOLS - copied unchanged from r275496, head/tools/build/options/WITH_ELFTOOLCHAIN_TOOLS projects/building-blocks/usr.bin/addr2line/ - copied from r275496, head/usr.bin/addr2line/ projects/building-blocks/usr.bin/elfcopy/ - copied from r275496, head/usr.bin/elfcopy/ projects/building-blocks/usr.bin/nm/ - copied from r275496, head/usr.bin/nm/ projects/building-blocks/usr.bin/size/ - copied from r275496, head/usr.bin/size/ projects/building-blocks/usr.bin/strings/ - copied from r275496, head/usr.bin/strings/ Deleted: projects/building-blocks/contrib/mdocml/apropos.c projects/building-blocks/contrib/mdocml/arch.c projects/building-blocks/contrib/mdocml/arch.in projects/building-blocks/contrib/mdocml/att.in projects/building-blocks/contrib/mdocml/config.h.post projects/building-blocks/contrib/mdocml/config.h.pre projects/building-blocks/contrib/mdocml/preconv.1 projects/building-blocks/contrib/mdocml/vol.c projects/building-blocks/contrib/mdocml/vol.in projects/building-blocks/usr.bin/preconv/ Modified: projects/building-blocks/Makefile.inc1 projects/building-blocks/ObsoleteFiles.inc projects/building-blocks/bin/sh/eval.c projects/building-blocks/bin/sh/output.c projects/building-blocks/contrib/binutils/bfd/elf32-arm.c projects/building-blocks/contrib/binutils/bfd/elflink.c projects/building-blocks/contrib/binutils/bfd/po/bfd.pot projects/building-blocks/contrib/binutils/gas/config/tc-arm.c projects/building-blocks/contrib/elftoolchain/elfcopy/archive.c projects/building-blocks/contrib/elftoolchain/elfcopy/ascii.c projects/building-blocks/contrib/elftoolchain/elfcopy/segments.c projects/building-blocks/contrib/elftoolchain/libelf/libelf_convert.m4 projects/building-blocks/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c projects/building-blocks/contrib/elftoolchain/nm/nm.c projects/building-blocks/contrib/elftoolchain/size/size.c projects/building-blocks/contrib/elftoolchain/strings/strings.c projects/building-blocks/contrib/gcc/config/arm/lib1funcs.asm projects/building-blocks/contrib/gcc/config/arm/libunwind.S projects/building-blocks/contrib/gcc/cp/name-lookup.c projects/building-blocks/contrib/gcc/cp/name-lookup.h projects/building-blocks/contrib/libc++/include/type_traits projects/building-blocks/contrib/mdocml/INSTALL projects/building-blocks/contrib/mdocml/LICENSE projects/building-blocks/contrib/mdocml/Makefile projects/building-blocks/contrib/mdocml/Makefile.depend projects/building-blocks/contrib/mdocml/NEWS projects/building-blocks/contrib/mdocml/TODO projects/building-blocks/contrib/mdocml/apropos.1 projects/building-blocks/contrib/mdocml/att.c projects/building-blocks/contrib/mdocml/cgi.c projects/building-blocks/contrib/mdocml/chars.c projects/building-blocks/contrib/mdocml/chars.in projects/building-blocks/contrib/mdocml/compat_fgetln.c projects/building-blocks/contrib/mdocml/compat_getsubopt.c projects/building-blocks/contrib/mdocml/compat_ohash.c projects/building-blocks/contrib/mdocml/compat_reallocarray.c projects/building-blocks/contrib/mdocml/compat_sqlite3_errstr.c projects/building-blocks/contrib/mdocml/compat_strcasestr.c projects/building-blocks/contrib/mdocml/compat_strlcat.c projects/building-blocks/contrib/mdocml/compat_strlcpy.c projects/building-blocks/contrib/mdocml/compat_strsep.c projects/building-blocks/contrib/mdocml/config.h projects/building-blocks/contrib/mdocml/configure projects/building-blocks/contrib/mdocml/demandoc.1 projects/building-blocks/contrib/mdocml/demandoc.c projects/building-blocks/contrib/mdocml/eqn.7 projects/building-blocks/contrib/mdocml/eqn.c projects/building-blocks/contrib/mdocml/eqn_html.c projects/building-blocks/contrib/mdocml/eqn_term.c projects/building-blocks/contrib/mdocml/example.style.css projects/building-blocks/contrib/mdocml/html.c projects/building-blocks/contrib/mdocml/html.h projects/building-blocks/contrib/mdocml/lib.c projects/building-blocks/contrib/mdocml/lib.in projects/building-blocks/contrib/mdocml/libman.h projects/building-blocks/contrib/mdocml/libmandoc.h projects/building-blocks/contrib/mdocml/libmdoc.h projects/building-blocks/contrib/mdocml/libroff.h projects/building-blocks/contrib/mdocml/main.c projects/building-blocks/contrib/mdocml/main.h projects/building-blocks/contrib/mdocml/makewhatis.8 projects/building-blocks/contrib/mdocml/man.c projects/building-blocks/contrib/mdocml/man.cgi.8 projects/building-blocks/contrib/mdocml/man.h projects/building-blocks/contrib/mdocml/man_hash.c projects/building-blocks/contrib/mdocml/man_html.c projects/building-blocks/contrib/mdocml/man_macro.c projects/building-blocks/contrib/mdocml/man_term.c projects/building-blocks/contrib/mdocml/man_validate.c projects/building-blocks/contrib/mdocml/mandoc.1 projects/building-blocks/contrib/mdocml/mandoc.3 projects/building-blocks/contrib/mdocml/mandoc.c projects/building-blocks/contrib/mdocml/mandoc.db.5 projects/building-blocks/contrib/mdocml/mandoc.h projects/building-blocks/contrib/mdocml/mandoc_aux.c projects/building-blocks/contrib/mdocml/mandoc_escape.3 projects/building-blocks/contrib/mdocml/mandocdb.c projects/building-blocks/contrib/mdocml/manpage.c projects/building-blocks/contrib/mdocml/manpath.c projects/building-blocks/contrib/mdocml/mansearch.c projects/building-blocks/contrib/mdocml/mansearch.h projects/building-blocks/contrib/mdocml/mansearch_const.c projects/building-blocks/contrib/mdocml/mchars_alloc.3 projects/building-blocks/contrib/mdocml/mdoc.7 projects/building-blocks/contrib/mdocml/mdoc.c projects/building-blocks/contrib/mdocml/mdoc_argv.c projects/building-blocks/contrib/mdocml/mdoc_hash.c projects/building-blocks/contrib/mdocml/mdoc_html.c projects/building-blocks/contrib/mdocml/mdoc_macro.c projects/building-blocks/contrib/mdocml/mdoc_man.c projects/building-blocks/contrib/mdocml/mdoc_term.c projects/building-blocks/contrib/mdocml/mdoc_validate.c projects/building-blocks/contrib/mdocml/msec.c projects/building-blocks/contrib/mdocml/out.c projects/building-blocks/contrib/mdocml/out.h projects/building-blocks/contrib/mdocml/preconv.c projects/building-blocks/contrib/mdocml/read.c projects/building-blocks/contrib/mdocml/roff.7 projects/building-blocks/contrib/mdocml/roff.c projects/building-blocks/contrib/mdocml/st.c projects/building-blocks/contrib/mdocml/st.in projects/building-blocks/contrib/mdocml/style.css projects/building-blocks/contrib/mdocml/tbl.7 projects/building-blocks/contrib/mdocml/tbl.c projects/building-blocks/contrib/mdocml/tbl_data.c projects/building-blocks/contrib/mdocml/tbl_html.c projects/building-blocks/contrib/mdocml/tbl_layout.c projects/building-blocks/contrib/mdocml/tbl_opts.c projects/building-blocks/contrib/mdocml/tbl_term.c projects/building-blocks/contrib/mdocml/term.c projects/building-blocks/contrib/mdocml/term.h projects/building-blocks/contrib/mdocml/term_ascii.c projects/building-blocks/contrib/mdocml/term_ps.c projects/building-blocks/contrib/mdocml/test-getsubopt.c projects/building-blocks/contrib/mdocml/tree.c projects/building-blocks/contrib/ofed/librdmacm/examples/build/cmatose/Makefile projects/building-blocks/contrib/ofed/librdmacm/examples/build/mckey/Makefile projects/building-blocks/contrib/ofed/librdmacm/examples/build/rping/Makefile projects/building-blocks/contrib/ofed/librdmacm/examples/build/udaddy/Makefile projects/building-blocks/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c projects/building-blocks/contrib/ofed/management/infiniband-diags/src/ibroute.c projects/building-blocks/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c projects/building-blocks/contrib/ofed/management/infiniband-diags/src/ibtracert.c projects/building-blocks/contrib/ofed/management/infiniband-diags/src/saquery.c projects/building-blocks/contrib/ofed/management/infiniband-diags/src/smpquery.c projects/building-blocks/contrib/ofed/usr.bin/Makefile.inc projects/building-blocks/contrib/subversion/subversion/svn/util.c projects/building-blocks/etc/rc projects/building-blocks/etc/rc.subr projects/building-blocks/gnu/usr.bin/binutils/Makefile projects/building-blocks/gnu/usr.bin/binutils/addr2line/addr2line.1 projects/building-blocks/gnu/usr.bin/binutils/nm/nm.1 projects/building-blocks/gnu/usr.bin/binutils/objcopy/objcopy.1 projects/building-blocks/gnu/usr.bin/binutils/objdump/objdump.1 projects/building-blocks/gnu/usr.bin/binutils/readelf/readelf.1 projects/building-blocks/gnu/usr.bin/binutils/size/size.1 projects/building-blocks/gnu/usr.bin/binutils/strings/strings.1 projects/building-blocks/gnu/usr.bin/binutils/strip/strip.1 projects/building-blocks/lib/Makefile projects/building-blocks/lib/libgpio/gpio.c projects/building-blocks/lib/libmandoc/Makefile projects/building-blocks/lib/libxo/Makefile projects/building-blocks/lib/msun/src/e_j0f.c projects/building-blocks/libexec/rtld-elf/rtld.c projects/building-blocks/rescue/rescue/Makefile projects/building-blocks/sbin/ifconfig/Makefile projects/building-blocks/sbin/sysctl/sysctl.c projects/building-blocks/share/man/man4/isp.4 projects/building-blocks/share/man/man5/src.conf.5 projects/building-blocks/share/mk/bsd.cpu.mk projects/building-blocks/share/mk/src.libnames.mk projects/building-blocks/share/mk/src.opts.mk projects/building-blocks/sys/arm/arm/bcopyinout_xscale.S projects/building-blocks/sys/arm/arm/blockio.S projects/building-blocks/sys/arm/arm/cpufunc_asm_armv5_ec.S projects/building-blocks/sys/arm/arm/cpufunc_asm_sheeva.S projects/building-blocks/sys/arm/arm/in_cksum_arm.S projects/building-blocks/sys/arm/arm/locore.S projects/building-blocks/sys/arm/arm/support.S projects/building-blocks/sys/arm/include/asm.h projects/building-blocks/sys/arm/ti/ti_pruss.c projects/building-blocks/sys/boot/mips/beri/loader/loader.ldscript projects/building-blocks/sys/boot/pc98/boot2/boot2.c projects/building-blocks/sys/cam/cam_xpt.c projects/building-blocks/sys/cam/ctl/ctl.c projects/building-blocks/sys/cam/ctl/ctl.h projects/building-blocks/sys/cam/ctl/ctl_backend_block.c projects/building-blocks/sys/cam/ctl/ctl_backend_ramdisk.c projects/building-blocks/sys/cam/ctl/ctl_cmd_table.c projects/building-blocks/sys/cam/ctl/ctl_error.c projects/building-blocks/sys/cam/ctl/ctl_error.h projects/building-blocks/sys/cam/ctl/ctl_ioctl.h projects/building-blocks/sys/cam/ctl/ctl_private.h projects/building-blocks/sys/cam/ctl/ctl_tpc.c projects/building-blocks/sys/cam/ctl/scsi_ctl.c projects/building-blocks/sys/cam/scsi/scsi_all.h projects/building-blocks/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/building-blocks/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/building-blocks/sys/dev/bxe/bxe.c projects/building-blocks/sys/dev/cxgb/cxgb_sge.c projects/building-blocks/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c projects/building-blocks/sys/dev/cxgbe/t4_main.c projects/building-blocks/sys/dev/cxgbe/t4_sge.c projects/building-blocks/sys/dev/cxgbe/tom/t4_cpl_io.c projects/building-blocks/sys/dev/cxgbe/tom/t4_ddp.c projects/building-blocks/sys/dev/e1000/if_igb.c projects/building-blocks/sys/dev/ixgbe/ixgbe.c projects/building-blocks/sys/dev/ixgbe/ixv.c projects/building-blocks/sys/dev/ixl/ixl_txrx.c projects/building-blocks/sys/dev/mxge/if_mxge.c projects/building-blocks/sys/dev/netmap/netmap_freebsd.c projects/building-blocks/sys/dev/oce/oce_if.c projects/building-blocks/sys/dev/pccard/pccardvar.h projects/building-blocks/sys/dev/qlxgbe/ql_isr.c projects/building-blocks/sys/dev/qlxgbe/ql_os.c projects/building-blocks/sys/dev/qlxge/qls_isr.c projects/building-blocks/sys/dev/qlxge/qls_os.c projects/building-blocks/sys/dev/sfxge/sfxge_rx.c projects/building-blocks/sys/dev/sfxge/sfxge_tx.c projects/building-blocks/sys/dev/usb/controller/saf1761_otg.c projects/building-blocks/sys/dev/usb/controller/saf1761_otg.h projects/building-blocks/sys/dev/virtio/block/virtio_blk.c projects/building-blocks/sys/dev/virtio/network/if_vtnet.c projects/building-blocks/sys/dev/vmware/vmxnet3/if_vmx.c projects/building-blocks/sys/dev/vxge/vxge.c projects/building-blocks/sys/geom/raid/md_intel.c projects/building-blocks/sys/kern/kern_linker.c projects/building-blocks/sys/kern/kern_mutex.c projects/building-blocks/sys/kern/kern_proc.c projects/building-blocks/sys/kern/subr_bus.c projects/building-blocks/sys/kern/subr_taskqueue.c projects/building-blocks/sys/kern/uipc_debug.c projects/building-blocks/sys/kern/uipc_domain.c projects/building-blocks/sys/kern/uipc_mbuf.c projects/building-blocks/sys/kern/uipc_sockbuf.c projects/building-blocks/sys/kern/uipc_socket.c projects/building-blocks/sys/kern/uipc_usrreq.c projects/building-blocks/sys/mips/conf/WZR-HPAG300H.hints projects/building-blocks/sys/net/flowtable.c projects/building-blocks/sys/net/ieee8023ad_lacp.c projects/building-blocks/sys/net/if_lagg.c projects/building-blocks/sys/net/if_lagg.h projects/building-blocks/sys/net/if_stf.c projects/building-blocks/sys/net/if_vxlan.c projects/building-blocks/sys/net/netisr.c projects/building-blocks/sys/netinet/in_pcb.h projects/building-blocks/sys/netinet/in_rss.c projects/building-blocks/sys/netinet/ip_icmp.c projects/building-blocks/sys/netinet/ip_input.c projects/building-blocks/sys/netinet/ip_ipsec.c projects/building-blocks/sys/netinet/ip_output.c projects/building-blocks/sys/netinet/sctp_indata.c projects/building-blocks/sys/netinet/sctp_input.c projects/building-blocks/sys/netinet/sctp_os_bsd.h projects/building-blocks/sys/netinet/sctp_output.c projects/building-blocks/sys/netinet/sctp_pcb.c projects/building-blocks/sys/netinet/sctp_structs.h projects/building-blocks/sys/netinet/sctputil.c projects/building-blocks/sys/netinet/tcp_input.c projects/building-blocks/sys/netinet/tcp_reass.c projects/building-blocks/sys/netinet/tcp_syncache.c projects/building-blocks/sys/netinet/tcp_usrreq.c projects/building-blocks/sys/netinet/udp_usrreq.c projects/building-blocks/sys/netinet6/icmp6.c projects/building-blocks/sys/netinet6/in6_pcb.c projects/building-blocks/sys/netinet6/ip6_ipsec.c projects/building-blocks/sys/netinet6/ip6_output.c projects/building-blocks/sys/netinet6/sctp6_usrreq.c projects/building-blocks/sys/netinet6/udp6_usrreq.c projects/building-blocks/sys/netipsec/ipsec.c projects/building-blocks/sys/netipsec/ipsec.h projects/building-blocks/sys/netipsec/ipsec6.h projects/building-blocks/sys/netipsec/ipsec_input.c projects/building-blocks/sys/netipsec/ipsec_mbuf.c projects/building-blocks/sys/netipsec/ipsec_output.c projects/building-blocks/sys/netipsec/key.c projects/building-blocks/sys/netipsec/key.h projects/building-blocks/sys/netipsec/key_debug.c projects/building-blocks/sys/netipsec/key_debug.h projects/building-blocks/sys/netipsec/keydb.h projects/building-blocks/sys/netipsec/keysock.c projects/building-blocks/sys/netipsec/keysock.h projects/building-blocks/sys/netipsec/xform_ah.c projects/building-blocks/sys/netipsec/xform_esp.c projects/building-blocks/sys/netipsec/xform_ipcomp.c projects/building-blocks/sys/netipsec/xform_ipip.c projects/building-blocks/sys/netipsec/xform_tcp.c projects/building-blocks/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c projects/building-blocks/sys/ofed/drivers/net/mlx4/en_rx.c projects/building-blocks/sys/ofed/drivers/net/mlx4/en_tx.c projects/building-blocks/sys/sys/bus.h projects/building-blocks/sys/sys/mbuf.h projects/building-blocks/sys/sys/param.h projects/building-blocks/sys/sys/protosw.h projects/building-blocks/sys/sys/sockbuf.h projects/building-blocks/sys/vm/uma_core.c projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc projects/building-blocks/tools/tools/nanobsd/fill_pkg.sh projects/building-blocks/tools/tools/shlib-compat/shlib-compat.py projects/building-blocks/tools/tools/shlib-compat/test/Makefile.inc projects/building-blocks/tools/tools/shlib-compat/test/regress.sh projects/building-blocks/tools/tools/sysbuild/sysbuild.sh projects/building-blocks/tools/tools/usbtest/Makefile projects/building-blocks/usr.bin/Makefile projects/building-blocks/usr.bin/bluetooth/btsockstat/btsockstat.c projects/building-blocks/usr.bin/man/man.sh projects/building-blocks/usr.bin/mandoc/Makefile projects/building-blocks/usr.bin/netstat/inet.c projects/building-blocks/usr.bin/netstat/netgraph.c projects/building-blocks/usr.bin/netstat/unix.c projects/building-blocks/usr.bin/systat/netstat.c projects/building-blocks/usr.sbin/ctladm/ctladm.8 projects/building-blocks/usr.sbin/ctld/ctld.c projects/building-blocks/usr.sbin/gpioctl/Makefile projects/building-blocks/usr.sbin/gpioctl/gpioctl.c Directory Properties: projects/building-blocks/ (props changed) projects/building-blocks/contrib/binutils/ (props changed) projects/building-blocks/contrib/gcc/ (props changed) projects/building-blocks/contrib/libc++/ (props changed) projects/building-blocks/contrib/mdocml/ (props changed) projects/building-blocks/contrib/subversion/ (props changed) projects/building-blocks/etc/ (props changed) projects/building-blocks/gnu/usr.bin/binutils/ (props changed) projects/building-blocks/sbin/ (props changed) projects/building-blocks/share/ (props changed) projects/building-blocks/share/man/man4/ (props changed) projects/building-blocks/sys/ (props changed) projects/building-blocks/sys/boot/ (props changed) projects/building-blocks/sys/cddl/contrib/opensolaris/ (props changed) Modified: projects/building-blocks/Makefile.inc1 ============================================================================== --- projects/building-blocks/Makefile.inc1 Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/Makefile.inc1 Fri Dec 5 07:48:25 2014 (r275499) @@ -1425,6 +1425,14 @@ _kgzip= usr.sbin/kgzip # If we're given an XAS, don't build binutils. .if ${XAS:M/*} == "" && ${MK_BINUTILS_BOOTSTRAP} != "no" _binutils= gnu/usr.bin/binutils +.if ${MK_ELFTOOLCHAIN_TOOLS} != "no" +_elftctools= lib/libelftc \ + usr.bin/addr2line \ + usr.bin/elfcopy \ + usr.bin/nm \ + usr.bin/size \ + usr.bin/strings +.endif .endif # If an full path to an external cross compiler is given, don't build @@ -1444,6 +1452,7 @@ cross-tools: .MAKE ${_clang_libs} \ ${_clang} \ ${_binutils} \ + ${_elftctools} \ ${_cc} \ usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ ${_btxld} \ @@ -1501,6 +1510,7 @@ native-xtools: .MAKE ${_clang_tblgen} \ usr.bin/ar \ ${_binutils} \ + ${_elftctools} \ ${_cc} \ ${_gcc_tools} \ ${_clang_libs} \ @@ -2059,6 +2069,7 @@ _xb-build-tools: _xb-cross-tools: .for _tool in \ ${_binutils} \ + ${_elftctools} \ usr.bin/ar \ ${_clang_libs} \ ${_clang} \ @@ -2091,6 +2102,7 @@ _xi-cross-tools: @echo "_xi-cross-tools" .for _tool in \ ${_binutils} \ + ${_elftctools} \ usr.bin/ar \ ${_clang_libs} \ ${_clang} \ Modified: projects/building-blocks/ObsoleteFiles.inc ============================================================================== --- projects/building-blocks/ObsoleteFiles.inc Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/ObsoleteFiles.inc Fri Dec 5 07:48:25 2014 (r275499) @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20141202: update to mandoc CVS 20141201 +OLD_FILES+=usr.bin/preconv +OLD_FILES+=share/man/man1/preconv.1.gz # 20141129: mrouted rc.d scripts removed from base OLD_FILES+=etc/rc.d/mrouted # 20141126: convert sbin/mdconfig/tests to ATF format tests Modified: projects/building-blocks/bin/sh/eval.c ============================================================================== --- projects/building-blocks/bin/sh/eval.c Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/bin/sh/eval.c Fri Dec 5 07:48:25 2014 (r275499) @@ -774,15 +774,7 @@ xtracecommand(struct arglist *varlist, s for (sp = arglist->list ; sp ; sp = sp->next) { if (sep != 0) out2c(' '); - /* Disambiguate command looking like assignment. */ - if (sp == arglist->list && - strchr(sp->text, '=') != NULL && - strchr(sp->text, '\'') == NULL) { - out2c('\''); - out2str(sp->text); - out2c('\''); - } else - out2qstr(sp->text); + out2qstr(sp->text); sep = ' '; } out2c('\n'); Modified: projects/building-blocks/bin/sh/output.c ============================================================================== --- projects/building-blocks/bin/sh/output.c Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/bin/sh/output.c Fri Dec 5 07:48:25 2014 (r275499) @@ -122,8 +122,7 @@ outqstr(const char *p, struct output *fi outstr("''", file); return; } - /* Caller will handle '=' if necessary */ - if (p[strcspn(p, "|&;<>()$`\\\"' \t\n*?[~#")] == '\0' || + if (p[strcspn(p, "|&;<>()$`\\\"' \t\n*?[~#=")] == '\0' || strcmp(p, "[") == 0) { outstr(p, file); return; Modified: projects/building-blocks/contrib/binutils/bfd/elf32-arm.c ============================================================================== --- projects/building-blocks/contrib/binutils/bfd/elf32-arm.c Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/binutils/bfd/elf32-arm.c Fri Dec 5 07:48:25 2014 (r275499) @@ -4960,7 +4960,7 @@ elf32_arm_final_link_relocate (reloc_how + input_section->output_offset + rel->r_offset); - value = abs (relocation); + value = llabs (relocation); if (value >= 0x1000) return bfd_reloc_overflow; @@ -4998,7 +4998,7 @@ elf32_arm_final_link_relocate (reloc_how + input_section->output_offset + rel->r_offset); - value = abs (relocation); + value = llabs (relocation); if (value >= 0x1000) return bfd_reloc_overflow; @@ -5984,7 +5984,7 @@ elf32_arm_final_link_relocate (reloc_how /* Calculate the value of the relevant G_n, in encoded constant-with-rotation format. */ - g_n = calculate_group_reloc_mask (abs (signed_value), group, + g_n = calculate_group_reloc_mask (llabs (signed_value), group, &residual); /* Check for overflow if required. */ @@ -5998,7 +5998,7 @@ elf32_arm_final_link_relocate (reloc_how (*_bfd_error_handler) (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"), input_bfd, input_section, - (long) rel->r_offset, abs (signed_value), howto->name); + (long) rel->r_offset, llabs (signed_value), howto->name); return bfd_reloc_overflow; } @@ -6077,7 +6077,7 @@ elf32_arm_final_link_relocate (reloc_how /* Calculate the value of the relevant G_{n-1} to obtain the residual at that stage. */ - calculate_group_reloc_mask (abs (signed_value), group - 1, &residual); + calculate_group_reloc_mask (llabs (signed_value), group - 1, &residual); /* Check for overflow. */ if (residual >= 0x1000) @@ -6085,7 +6085,7 @@ elf32_arm_final_link_relocate (reloc_how (*_bfd_error_handler) (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"), input_bfd, input_section, - (long) rel->r_offset, abs (signed_value), howto->name); + (long) rel->r_offset, llabs (signed_value), howto->name); return bfd_reloc_overflow; } @@ -6160,7 +6160,7 @@ elf32_arm_final_link_relocate (reloc_how /* Calculate the value of the relevant G_{n-1} to obtain the residual at that stage. */ - calculate_group_reloc_mask (abs (signed_value), group - 1, &residual); + calculate_group_reloc_mask (llabs (signed_value), group - 1, &residual); /* Check for overflow. */ if (residual >= 0x100) @@ -6168,7 +6168,7 @@ elf32_arm_final_link_relocate (reloc_how (*_bfd_error_handler) (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"), input_bfd, input_section, - (long) rel->r_offset, abs (signed_value), howto->name); + (long) rel->r_offset, llabs (signed_value), howto->name); return bfd_reloc_overflow; } @@ -6243,7 +6243,7 @@ elf32_arm_final_link_relocate (reloc_how /* Calculate the value of the relevant G_{n-1} to obtain the residual at that stage. */ - calculate_group_reloc_mask (abs (signed_value), group - 1, &residual); + calculate_group_reloc_mask (llabs (signed_value), group - 1, &residual); /* Check for overflow. (The absolute value to go in the place must be divisible by four and, after having been divided by four, must @@ -6253,7 +6253,7 @@ elf32_arm_final_link_relocate (reloc_how (*_bfd_error_handler) (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"), input_bfd, input_section, - (long) rel->r_offset, abs (signed_value), howto->name); + (long) rel->r_offset, llabs (signed_value), howto->name); return bfd_reloc_overflow; } Modified: projects/building-blocks/contrib/binutils/bfd/elflink.c ============================================================================== --- projects/building-blocks/contrib/binutils/bfd/elflink.c Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/binutils/bfd/elflink.c Fri Dec 5 07:48:25 2014 (r275499) @@ -4356,9 +4356,38 @@ elf_link_add_object_symbols (bfd *abfd, --no-add-needed is used. */ if ((elf_dyn_lib_class (abfd) & DYN_NO_NEEDED) != 0) { + bfd_boolean looks_soish; + const char *print_name; + int print_len; + size_t len, lend = 0; + + looks_soish = FALSE; + print_name = soname; + print_len = strlen(soname); + if (strncmp(soname, "lib", 3) == 0) + { + len = print_len; + if (len > 5 && strcmp(soname + len - 2, ".a") == 0) + lend = len - 5; + else + { + while (len > 6 && (ISDIGIT(soname[len - 1]) || + soname[len - 1] == '.')) + len--; + if (strncmp(soname + len - 3, ".so", 3) == 0) + lend = len - 6; + } + if (lend != 0) + { + print_name = soname + 3; + print_len = lend; + looks_soish = TRUE; + } + } + (*_bfd_error_handler) - (_("%B: invalid DSO for symbol `%s' definition"), - abfd, name); + (_("undefined reference to symbol `%s' (try adding -l%s%.*s)"), + name, looks_soish? "" : ":", print_len, print_name); bfd_set_error (bfd_error_bad_value); goto error_free_vers; } Modified: projects/building-blocks/contrib/binutils/bfd/po/bfd.pot ============================================================================== --- projects/building-blocks/contrib/binutils/bfd/po/bfd.pot Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/binutils/bfd/po/bfd.pot Fri Dec 5 07:48:25 2014 (r275499) @@ -2438,9 +2438,9 @@ msgstr "" msgid "Warning: size of symbol `%s' changed from %lu in %B to %lu in %B" msgstr "" -#: elflink.c:4309 +#: elflink.c:4389 #, c-format -msgid "%B: invalid DSO for symbol `%s' definition" +msgid "undefined reference to symbol `%s' (try adding -l%s%.*s)" msgstr "" #: elflink.c:5535 Modified: projects/building-blocks/contrib/binutils/gas/config/tc-arm.c ============================================================================== --- projects/building-blocks/contrib/binutils/gas/config/tc-arm.c Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/binutils/gas/config/tc-arm.c Fri Dec 5 07:48:25 2014 (r275499) @@ -15055,7 +15055,7 @@ static const struct asm_opcode insns[] = TCE(stc, c000000, ec000000, 3, (RCP, RCN, ADDRGLDC), lstc, lstc), TC3(stcl, c400000, ec400000, 3, (RCP, RCN, ADDRGLDC), lstc, lstc), TCE(mcr, e000010, ee000010, 6, (RCP, I7b, RR, RCN, RCN, oI7b), co_reg, co_reg), - TCE(mrc, e100010, ee100010, 6, (RCP, I7b, RR, RCN, RCN, oI7b), co_reg, co_reg), + TCE(mrc, e100010, ee100010, 6, (RCP, I7b, APSR_RR, RCN, RCN, oI7b), co_reg, co_reg), #undef ARM_VARIANT #define ARM_VARIANT &arm_ext_v2s /* ARM 3 - swp instructions. */ @@ -15114,7 +15114,7 @@ static const struct asm_opcode insns[] = TUF(stc2l, c400000, fc400000, 3, (RCP, RCN, ADDRGLDC), lstc, lstc), TUF(cdp2, e000000, fe000000, 6, (RCP, I15b, RCN, RCN, RCN, oI7b), cdp, cdp), TUF(mcr2, e000010, fe000010, 6, (RCP, I7b, RR, RCN, RCN, oI7b), co_reg, co_reg), - TUF(mrc2, e100010, fe100010, 6, (RCP, I7b, RR, RCN, RCN, oI7b), co_reg, co_reg), + TUF(mrc2, e100010, fe100010, 6, (RCP, I7b, APSR_RR, RCN, RCN, oI7b), co_reg, co_reg), #undef ARM_VARIANT #define ARM_VARIANT &arm_ext_v5exp /* ARM Architecture 5TExP. */ Modified: projects/building-blocks/contrib/elftoolchain/elfcopy/archive.c ============================================================================== --- projects/building-blocks/contrib/elftoolchain/elfcopy/archive.c Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/elftoolchain/elfcopy/archive.c Fri Dec 5 07:48:25 2014 (r275499) @@ -350,12 +350,12 @@ ac_detect_ar(int ifd) r = -1; if ((a = archive_read_new()) == NULL) return (0); - archive_read_support_compression_none(a); + archive_read_support_filter_none(a); archive_read_support_format_ar(a); if (archive_read_open_fd(a, ifd, 10240) == ARCHIVE_OK) r = archive_read_next_header(a, &entry); archive_read_close(a); - archive_read_finish(a); + archive_read_free(a); return (r == ARCHIVE_OK); } @@ -386,7 +386,7 @@ ac_read_objs(struct elfcopy *ecp, int if err(EXIT_FAILURE, "lseek failed"); if ((a = archive_read_new()) == NULL) errx(EXIT_FAILURE, "%s", archive_error_string(a)); - archive_read_support_compression_none(a); + archive_read_support_filter_none(a); archive_read_support_format_ar(a); AC(archive_read_open_fd(a, ifd, 10240)); for(;;) { @@ -435,7 +435,7 @@ ac_read_objs(struct elfcopy *ecp, int if } } AC(archive_read_close(a)); - ACV(archive_read_finish(a)); + ACV(archive_read_free(a)); } static void @@ -449,7 +449,7 @@ ac_write_objs(struct elfcopy *ecp, int o if ((a = archive_write_new()) == NULL) errx(EXIT_FAILURE, "%s", archive_error_string(a)); archive_write_set_format_ar_svr4(a); - archive_write_set_compression_none(a); + archive_write_add_filter_none(a); AC(archive_write_open_fd(a, ofd)); /* Write the archive symbol table, even if it's empty. */ @@ -491,7 +491,7 @@ ac_write_objs(struct elfcopy *ecp, int o } AC(archive_write_close(a)); - ACV(archive_write_finish(a)); + ACV(archive_write_free(a)); } static void Modified: projects/building-blocks/contrib/elftoolchain/elfcopy/ascii.c ============================================================================== --- projects/building-blocks/contrib/elftoolchain/elfcopy/ascii.c Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/elftoolchain/elfcopy/ascii.c Fri Dec 5 07:48:25 2014 (r275499) @@ -29,6 +29,7 @@ #include <ctype.h> #include <err.h> #include <gelf.h> +#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> Modified: projects/building-blocks/contrib/elftoolchain/elfcopy/segments.c ============================================================================== --- projects/building-blocks/contrib/elftoolchain/elfcopy/segments.c Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/elftoolchain/elfcopy/segments.c Fri Dec 5 07:48:25 2014 (r275499) @@ -28,6 +28,7 @@ #include <sys/queue.h> #include <err.h> #include <gelf.h> +#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> Modified: projects/building-blocks/contrib/elftoolchain/libelf/libelf_convert.m4 ============================================================================== --- projects/building-blocks/contrib/elftoolchain/libelf/libelf_convert.m4 Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/elftoolchain/libelf/libelf_convert.m4 Fri Dec 5 07:48:25 2014 (r275499) @@ -947,11 +947,6 @@ _libelf_cvt_NOTE_tom(char *dst, size_t d READ_WORD(src, descsz); READ_WORD(src, type); - sz = namesz; - ROUNDUP2(sz, 4); - sz += descsz; - ROUNDUP2(sz, 4); - /* Translate. */ SWAP_WORD(namesz); SWAP_WORD(descsz); @@ -967,6 +962,11 @@ _libelf_cvt_NOTE_tom(char *dst, size_t d dst += sizeof(Elf_Note); count -= hdrsz; + ROUNDUP2(namesz, 4); + ROUNDUP2(descsz, 4); + + sz = namesz + descsz; + if (count < sz || dsz < sz) /* Buffers are too small. */ return (0); @@ -1005,6 +1005,11 @@ _libelf_cvt_NOTE_tof(char *dst, size_t d descsz = en->n_descsz; type = en->n_type; + sz = namesz; + ROUNDUP2(sz, 4); + sz += descsz; + ROUNDUP2(sz, 4); + SWAP_WORD(namesz); SWAP_WORD(descsz); SWAP_WORD(type); @@ -1015,11 +1020,6 @@ _libelf_cvt_NOTE_tof(char *dst, size_t d src += sizeof(Elf_Note); - ROUNDUP2(namesz, 4); - ROUNDUP2(descsz, 4); - - sz = namesz + descsz; - if (count < sz) sz = count; Modified: projects/building-blocks/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c ============================================================================== --- projects/building-blocks/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c Fri Dec 5 07:48:25 2014 (r275499) @@ -156,7 +156,7 @@ static int vector_type_qualifier_init(st static int vector_type_qualifier_push(struct vector_type_qualifier *, enum type_qualifier); -int cpp_demangle_gnu3_push_head; +static int cpp_demangle_gnu3_push_head; /** * @brief Decode the input string by IA-64 C++ ABI style. Modified: projects/building-blocks/contrib/elftoolchain/nm/nm.c ============================================================================== --- projects/building-blocks/contrib/elftoolchain/nm/nm.c Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/elftoolchain/nm/nm.c Fri Dec 5 07:48:25 2014 (r275499) @@ -65,7 +65,7 @@ typedef void (*fn_sym_print)(const GElf_ typedef int (*fn_filter)(char, const GElf_Sym *, const char *); /* output filter list */ -SLIST_HEAD(filter_head, filter_entry) nm_out_filter = +static SLIST_HEAD(filter_head, filter_entry) nm_out_filter = SLIST_HEAD_INITIALIZER(nm_out_filter); struct filter_entry { Modified: projects/building-blocks/contrib/elftoolchain/size/size.c ============================================================================== --- projects/building-blocks/contrib/elftoolchain/size/size.c Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/elftoolchain/size/size.c Fri Dec 5 07:48:25 2014 (r275499) @@ -269,7 +269,7 @@ handle_core_note(Elf *elf, GElf_Ehdr *el static pid_t pid; uintptr_t ver; Elf32_Nhdr *nhdr, nhdr_l; - static int reg_pseudo = 0, reg2_pseudo = 0, regxfp_pseudo = 0; + static int reg_pseudo = 0, reg2_pseudo = 0 /*, regxfp_pseudo = 0*/; char buf[BUF_SIZE], *data, *name; if (elf == NULL || elfhdr == NULL || phdr == NULL) @@ -360,6 +360,7 @@ handle_core_note(Elf *elf, GElf_Ehdr *el text_size_total += nhdr_l.n_descsz; } break; +#if 0 case NT_AUXV: if (style == STYLE_SYSV) { tbl_append(); @@ -390,6 +391,7 @@ handle_core_note(Elf *elf, GElf_Ehdr *el } break; case NT_PSINFO: +#endif case NT_PRPSINFO: { /* FreeBSD 64-bit */ if (nhdr_l.n_descsz == 0x78 && @@ -415,8 +417,10 @@ handle_core_note(Elf *elf, GElf_Ehdr *el } break; } +#if 0 case NT_PSTATUS: case NT_LWPSTATUS: +#endif default: break; } Modified: projects/building-blocks/contrib/elftoolchain/strings/strings.c ============================================================================== --- projects/building-blocks/contrib/elftoolchain/strings/strings.c Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/elftoolchain/strings/strings.c Fri Dec 5 07:48:25 2014 (r275499) @@ -75,9 +75,9 @@ enum encoding_style { (encoding == ENCODING_8BIT && (c) > 127))) -int encoding_size, entire_file, min_len, show_filename, show_loc; -enum encoding_style encoding; -enum radix_style radix; +static int encoding_size, entire_file, min_len, show_filename, show_loc; +static enum encoding_style encoding; +static enum radix_style radix; static struct option strings_longopts[] = { { "all", no_argument, NULL, 'a'}, Modified: projects/building-blocks/contrib/gcc/config/arm/lib1funcs.asm ============================================================================== --- projects/building-blocks/contrib/gcc/config/arm/lib1funcs.asm Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/gcc/config/arm/lib1funcs.asm Fri Dec 5 07:48:25 2014 (r275499) @@ -980,8 +980,6 @@ LSYM(Lover12): RET - FUNC_END aeabi_ldiv0 - FUNC_END aeabi_idiv0 FUNC_END div0 #endif /* L_divmodsi_tools */ Modified: projects/building-blocks/contrib/gcc/config/arm/libunwind.S ============================================================================== --- projects/building-blocks/contrib/gcc/config/arm/libunwind.S Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/gcc/config/arm/libunwind.S Fri Dec 5 07:48:25 2014 (r275499) @@ -26,6 +26,13 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include <machine/acle-compat.h> + +/* Allow the use of VFP instructions */ +#if __ARM_ARCH >= 7 +.fpu vfp +#endif + #ifndef __symbian__ #include "lib1funcs.asm" @@ -66,14 +73,22 @@ ARM_FUNC_START restore_core_regs ARM_FUNC_START gnu_Unwind_Restore_VFP /* Use the generic coprocessor form so that gas doesn't complain on soft-float targets. */ +#if __ARM_ARCH >= 7 + fldmiax r0, {d0-d15} +#else ldc p11,cr0,[r0],{0x21} /* fldmiax r0, {d0-d15} */ +#endif RET /* Store VFR regsters d0-d15 to the address in r0. */ ARM_FUNC_START gnu_Unwind_Save_VFP /* Use the generic coprocessor form so that gas doesn't complain on soft-float targets. */ +#if __ARM_ARCH >= 7 + fstmiax r0, {d0-d15} +#else stc p11,cr0,[r0],{0x21} /* fstmiax r0, {d0-d15} */ +#endif RET /* Wrappers to save core registers, then call the real routine. */ Modified: projects/building-blocks/contrib/gcc/cp/name-lookup.c ============================================================================== --- projects/building-blocks/contrib/gcc/cp/name-lookup.c Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/gcc/cp/name-lookup.c Fri Dec 5 07:48:25 2014 (r275499) @@ -319,35 +319,11 @@ new_class_binding (tree name, tree value cp_class_binding *cb; cxx_binding *binding; - if (VEC_length (cp_class_binding, scope->class_shadowed)) - { - cp_class_binding *old_base; - old_base = VEC_index (cp_class_binding, scope->class_shadowed, 0); - if (VEC_reserve (cp_class_binding, gc, scope->class_shadowed, 1)) - { - /* Fixup the current bindings, as they might have moved. */ - size_t i; - - for (i = 0; - VEC_iterate (cp_class_binding, scope->class_shadowed, i, cb); - i++) - { - cxx_binding **b; - b = &IDENTIFIER_BINDING (cb->identifier); - while (*b != &old_base[i].base) - b = &((*b)->previous); - *b = &cb->base; - } - } - cb = VEC_quick_push (cp_class_binding, scope->class_shadowed, NULL); - } - else cb = VEC_safe_push (cp_class_binding, gc, scope->class_shadowed, NULL); cb->identifier = name; - binding = &cb->base; + cb->base = binding = cxx_binding_make (value, type); binding->scope = scope; - cxx_binding_init (binding, value, type); return binding; } @@ -2501,7 +2477,10 @@ poplevel_class (void) for (i = 0; VEC_iterate (cp_class_binding, level->class_shadowed, i, cb); ++i) - IDENTIFIER_BINDING (cb->identifier) = cb->base.previous; + { + IDENTIFIER_BINDING (cb->identifier) = cb->base->previous; + cxx_binding_free (cb->base); + } ggc_free (level->class_shadowed); level->class_shadowed = NULL; } Modified: projects/building-blocks/contrib/gcc/cp/name-lookup.h ============================================================================== --- projects/building-blocks/contrib/gcc/cp/name-lookup.h Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/gcc/cp/name-lookup.h Fri Dec 5 07:48:25 2014 (r275499) @@ -144,7 +144,7 @@ typedef enum tag_scope { typedef struct cp_class_binding GTY(()) { - cxx_binding base; + cxx_binding *base; /* The bound name. */ tree identifier; } cp_class_binding; Modified: projects/building-blocks/contrib/libc++/include/type_traits ============================================================================== --- projects/building-blocks/contrib/libc++/include/type_traits Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/libc++/include/type_traits Fri Dec 5 07:48:25 2014 (r275499) @@ -439,8 +439,26 @@ template <class _Tp> struct _LIBCPP_TYPE // is_member_function_pointer -template <class _Tp> struct __libcpp_is_member_function_pointer : public false_type {}; -template <class _Tp, class _Up> struct __libcpp_is_member_function_pointer<_Tp _Up::*> : public is_function<_Tp> {}; +// template <class _Tp> struct __libcpp_is_member_function_pointer : public false_type {}; +// template <class _Tp, class _Up> struct __libcpp_is_member_function_pointer<_Tp _Up::*> : public is_function<_Tp> {}; +// + +template <class _MP, bool _IsMemberFuctionPtr, bool _IsMemberObjectPtr> +struct __member_pointer_traits_imp +{ // forward declaration; specializations later +}; + + +namespace __libcpp_is_member_function_pointer_imp { + template <typename _Tp> + char __test(typename std::__member_pointer_traits_imp<_Tp, true, false>::_FnType *); + + template <typename> + std::__two __test(...); +}; + +template <class _Tp> struct __libcpp_is_member_function_pointer + : public integral_constant<bool, sizeof(__libcpp_is_member_function_pointer_imp::__test<_Tp>(nullptr)) == 1> {}; template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_member_function_pointer : public __libcpp_is_member_function_pointer<typename remove_cv<_Tp>::type> {}; @@ -1593,11 +1611,6 @@ __decay_copy(const _Tp& __t) #endif -template <class _MP, bool _IsMemberFuctionPtr, bool _IsMemberObjectPtr> -struct __member_pointer_traits_imp -{ -}; - #ifndef _LIBCPP_HAS_NO_VARIADICS template <class _Rp, class _Class, class ..._Param> @@ -1605,6 +1618,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template <class _Rp, class _Class, class ..._Param> @@ -1612,6 +1626,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template <class _Rp, class _Class, class ..._Param> @@ -1619,6 +1634,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template <class _Rp, class _Class, class ..._Param> @@ -1626,6 +1642,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; #if __has_feature(cxx_reference_qualified_functions) @@ -1635,6 +1652,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class& _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template <class _Rp, class _Class, class ..._Param> @@ -1642,6 +1660,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const& _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template <class _Rp, class _Class, class ..._Param> @@ -1649,6 +1668,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class volatile& _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template <class _Rp, class _Class, class ..._Param> @@ -1656,6 +1676,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const volatile& _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template <class _Rp, class _Class, class ..._Param> @@ -1663,6 +1684,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class&& _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template <class _Rp, class _Class, class ..._Param> @@ -1670,6 +1692,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const&& _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template <class _Rp, class _Class, class ..._Param> @@ -1677,6 +1700,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class volatile&& _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template <class _Rp, class _Class, class ..._Param> @@ -1684,6 +1708,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const volatile&& _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; #endif // __has_feature(cxx_reference_qualified_functions) @@ -1695,6 +1720,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (); }; template <class _Rp, class _Class, class _P0> @@ -1702,6 +1728,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0); }; template <class _Rp, class _Class, class _P0, class _P1> @@ -1709,6 +1736,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0, _P1); }; template <class _Rp, class _Class, class _P0, class _P1, class _P2> @@ -1716,6 +1744,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0, _P1, _P2); }; template <class _Rp, class _Class> @@ -1723,6 +1752,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (); }; template <class _Rp, class _Class, class _P0> @@ -1730,6 +1760,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0); }; template <class _Rp, class _Class, class _P0, class _P1> @@ -1737,6 +1768,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0, _P1); }; template <class _Rp, class _Class, class _P0, class _P1, class _P2> @@ -1744,6 +1776,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0, _P1, _P2); }; template <class _Rp, class _Class> @@ -1751,6 +1784,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (); }; template <class _Rp, class _Class, class _P0> @@ -1758,6 +1792,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0); }; template <class _Rp, class _Class, class _P0, class _P1> @@ -1765,6 +1800,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0, _P1); }; template <class _Rp, class _Class, class _P0, class _P1, class _P2> @@ -1772,6 +1808,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0, _P1, _P2); }; template <class _Rp, class _Class> @@ -1779,6 +1816,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (); }; template <class _Rp, class _Class, class _P0> @@ -1786,6 +1824,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0); }; template <class _Rp, class _Class, class _P0, class _P1> @@ -1793,6 +1832,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0, _P1); }; template <class _Rp, class _Class, class _P0, class _P1, class _P2> @@ -1800,6 +1840,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0, _P1, _P2); }; #endif // _LIBCPP_HAS_NO_VARIADICS @@ -1819,6 +1860,7 @@ struct __member_pointer_traits { // typedef ... _ClassType; // typedef ... _ReturnType; +// typedef ... _FnType; }; // result_of @@ -2526,6 +2568,15 @@ template <class _Tp> struct _LIBCPP_TYPE // is_nothrow_constructible +#if 0 +template <class _Tp, class... _Args> +struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible + : public integral_constant<bool, __is_nothrow_constructible(_Tp(_Args...))> +{ +}; + +#else + #ifndef _LIBCPP_HAS_NO_VARIADICS #if __has_feature(cxx_noexcept) @@ -2664,6 +2715,7 @@ struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_ }; #endif // _LIBCPP_HAS_NO_VARIADICS +#endif // __has_feature(is_nothrow_constructible) // is_nothrow_default_constructible Modified: projects/building-blocks/contrib/mdocml/INSTALL ============================================================================== --- projects/building-blocks/contrib/mdocml/INSTALL Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/mdocml/INSTALL Fri Dec 5 07:48:25 2014 (r275499) @@ -1,4 +1,4 @@ -$Id: INSTALL,v 1.2 2014/08/10 17:22:26 schwarze Exp $ +$Id: INSTALL,v 1.5 2014/08/18 13:27:47 kristaps Exp $ About mdocml, the portable mandoc distribution ---------------------------------------------- @@ -34,19 +34,52 @@ latest bundled and ported versions of ma systems is maintained at <http://mdocml.bsd.lv/ports.html>. If mandoc is installed, you can check the version by running "mandoc -V". -The version contained in this distribution tarball is listed near -the beginning of the file "Makefile". +You can find the version contained in this distribution tarball +by running "./configure". Regarding how packages and ports are maintained for your operating system, please consult your operating system documentation. To install mandoc manually, the following steps are needed: -1. Decide whether you want to build the base tools mandoc(1), -preconv(1) and demandoc(1) only or whether you also want to build the -database tools apropos(1) and makewhatis(8). For the latter, -the following dependencies are required: +1. If you want to build the CGI program, man.cgi(8), too, run the +command "echo BUILD_CGI=1 > configure.local". Then run "cp +cgi.h.examples cgi.h" and edit cgi.h as desired. + +2. Run "./configure". +This script attempts autoconfiguration of mandoc for your system. +Read both its standard output and the file "Makefile.local" it +generates. If anything looks wrong or different from what you +wish, read the file "configure.local.example", create and edit +a file "configure.local", and re-run "./configure" until the +result seems right to you. + +3. Run "make". +Any POSIX-compatible make, in particular both BSD make and GNU make, +should work. If the build fails, look at "configure.local.example" +and go back to step 2. + +4. Run "make -n install" and check whether everything will be +installed to the intended places. Otherwise, put some *DIR variables +into "configure.local" and go back to step 2. -1.1. The SQLite database system, see <http://sqlite.org/>. +5. Run "sudo make install". If you intend to build a binary +package using some kind of fake root mechanism, you may need a +command like "make DESTDIR=... install". Read the *-install targets +in the "Makefile" to understand how DESTDIR is used. + +6. To set up a man.cgi(8) server, read its manual page. + +7. To use mandoc(1) as your man(1) formatter, read the "Deployment" +section below. + + +Understanding mandoc dependencies +--------------------------------- +The mandoc(1), preconv(1), and demandoc(1) utilities have no external +dependencies. However, makewhatis(8) and apropos(1) depend on the +following software: + +1. The SQLite database system, see <http://sqlite.org/>. The recommended version of SQLite is 3.8.4.3 or newer. The mandoc toolset is known to work with version 3.7.5 or newer. Versions older than 3.8.3 may not achieve full performance due to the @@ -57,47 +90,16 @@ problems, apropos(1) is fully usable wit older than 3.7.5 may or may not work, they have not been tested. 1.2. The fts(3) directory traversion functions. -A compatibility version will be bundled for 1.13.2 but is not available -yet. If you want apropos(1) and makewhatis(8) but do not have fts(3), -please stay with mandoc 1.12.3 for now and upgrade first to 1.12.4, -then to 1.13.2 when these versionns are released. Be careful: the +If your system does not have them, the bundled compatibility version +will be used, so you need not worry in that case. But be careful: the glibc version of fts(3) is known to be broken on 32bit platforms, see <https://sourceware.org/bugzilla/show_bug.cgi?id=15838>. +If you run into that problem, set "HAVE_FTS=0" in configure.local. 1.3. Marc Espie's ohash(3) library. If your system does not have it, the bundled compatibility version will be used, so you probably need not worry about it. -2. If you choose to build the database tools, too, decide whether -you also want to build the CGI program, man.cgi(8). - -3. Read the beginning of the file "Makefile" from "USER SETTINGS" -to "END OF USER SETTINGS" and edit it as required. In particular, -disable "BUILD_TARGETS += db-build" if you do not want database -support or enable "BUILD_TARGETS += cgi-build" if you do want -the CGI program. - -4. Run "make". No separate "./configure" or "make depend" steps -are needed. The former is run automatically by "make". The latter -is a maintainer target. If you merely want to build the released -version as opposed to doing active development, there is no need -to regenerate the dependency specifications. Any POSIX-compatible -make, in particular both BSD make and GNU make, should work. - -5. Run "make -n install" and check whether everything will be -installed to the intended places. Otherwise, edit the *DIR variables -in the Makefile until it is. - -6. Run "sudo make install". If you intend to build a binary -package using some kind of fake root mechanism, you may need a -command like "make DESTDIR=... install". Read the *-install targets -in the "Makefile" to understand how DESTDIR is used. - -7. To set up a man.cgi(8) server, read its manual page. - -8. To use mandoc(1) as your man(1) formatter, read the "Deployment" -section below. - Checking autoconfiguration quality ---------------------------------- @@ -130,9 +132,9 @@ please report whatever is missing on you The following steps can be used to manually check the automatic configuration on your platform: -1. Run "make clean". +1. Run "make distclean". -2. Run "make config.h" +2. Run "./configure" 3. Read the file "config.log". It shows the compiler commands used *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412050748.sB57mR01048619>