Date: Thu, 5 Jan 2012 23:12:20 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r229670 - in user/attilio/vmcontention: . bin/sh cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io contrib/compiler-rt contrib/compiler-rt/lib contrib/groff/tmac contrib/less contr... Message-ID: <201201052312.q05NCKAu060728@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Thu Jan 5 23:12:19 2012 New Revision: 229670 URL: http://svn.freebsd.org/changeset/base/229670 Log: MFC Added: user/attilio/vmcontention/lib/libc/mips/string/strchr.S - copied unchanged from r229659, head/lib/libc/mips/string/strchr.S user/attilio/vmcontention/lib/libc/mips/string/strrchr.S - copied unchanged from r229659, head/lib/libc/mips/string/strrchr.S user/attilio/vmcontention/share/man/man9/memcchr.9 - copied unchanged from r229659, head/share/man/man9/memcchr.9 user/attilio/vmcontention/sys/contrib/xz-embedded/ - copied from r229659, head/sys/contrib/xz-embedded/ user/attilio/vmcontention/sys/dev/sound/pci/emuxkireg.h - copied unchanged from r229659, head/sys/dev/sound/pci/emuxkireg.h user/attilio/vmcontention/sys/geom/uncompress/ - copied from r229659, head/sys/geom/uncompress/ user/attilio/vmcontention/sys/libkern/memcchr.c - copied unchanged from r229659, head/sys/libkern/memcchr.c user/attilio/vmcontention/sys/libkern/strchr.c - copied unchanged from r229659, head/sys/libkern/strchr.c user/attilio/vmcontention/sys/libkern/strrchr.c - copied unchanged from r229659, head/sys/libkern/strrchr.c user/attilio/vmcontention/sys/modules/geom/geom_uncompress/ - copied from r229659, head/sys/modules/geom/geom_uncompress/ user/attilio/vmcontention/tools/build/options/WITHOUT_CAPSICUM - copied unchanged from r229659, head/tools/build/options/WITHOUT_CAPSICUM user/attilio/vmcontention/usr.bin/mkulzma/ - copied from r229659, head/usr.bin/mkulzma/ Replaced: user/attilio/vmcontention/lib/libc/string/strchr.c - copied unchanged from r229659, head/lib/libc/string/strchr.c user/attilio/vmcontention/lib/libc/string/strrchr.c - copied unchanged from r229659, head/lib/libc/string/strrchr.c Deleted: user/attilio/vmcontention/lib/libc/i386/string/index.S user/attilio/vmcontention/lib/libc/i386/string/rindex.S user/attilio/vmcontention/lib/libc/mips/string/index.S user/attilio/vmcontention/lib/libc/mips/string/rindex.S user/attilio/vmcontention/lib/libc/string/index.c user/attilio/vmcontention/lib/libc/string/rindex.c user/attilio/vmcontention/sys/libkern/index.c user/attilio/vmcontention/sys/libkern/rindex.c user/attilio/vmcontention/sys/libkern/skpc.c Modified: user/attilio/vmcontention/Makefile.inc1 user/attilio/vmcontention/bin/sh/exec.c user/attilio/vmcontention/bin/sh/exec.h user/attilio/vmcontention/bin/sh/expand.c user/attilio/vmcontention/bin/sh/expand.h user/attilio/vmcontention/bin/sh/histedit.c user/attilio/vmcontention/bin/sh/input.c user/attilio/vmcontention/bin/sh/input.h user/attilio/vmcontention/bin/sh/main.c user/attilio/vmcontention/bin/sh/main.h user/attilio/vmcontention/bin/sh/myhistedit.h user/attilio/vmcontention/bin/sh/mystring.c user/attilio/vmcontention/bin/sh/mystring.h user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c user/attilio/vmcontention/contrib/compiler-rt/LICENSE.TXT user/attilio/vmcontention/contrib/compiler-rt/lib/trampoline_setup.c user/attilio/vmcontention/contrib/groff/tmac/doc-syms user/attilio/vmcontention/contrib/groff/tmac/groff_mdoc.man user/attilio/vmcontention/contrib/less/command.c user/attilio/vmcontention/contrib/less/prompt.c user/attilio/vmcontention/games/fortune/fortune/fortune.c user/attilio/vmcontention/gnu/usr.bin/gdb/kgdb/main.c user/attilio/vmcontention/include/complex.h user/attilio/vmcontention/include/stdatomic.h user/attilio/vmcontention/include/stdnoreturn.h user/attilio/vmcontention/include/tgmath.h user/attilio/vmcontention/lib/libc/Makefile user/attilio/vmcontention/lib/libc/arm/string/Makefile.inc user/attilio/vmcontention/lib/libc/gen/exec.c user/attilio/vmcontention/lib/libc/gen/getttyent.c user/attilio/vmcontention/lib/libc/gen/timezone.c user/attilio/vmcontention/lib/libc/i386/string/Makefile.inc user/attilio/vmcontention/lib/libc/i386/string/strchr.S user/attilio/vmcontention/lib/libc/i386/string/strrchr.S user/attilio/vmcontention/lib/libc/mips/string/Makefile.inc user/attilio/vmcontention/lib/libc/net/gethostbynis.c user/attilio/vmcontention/lib/libc/net/getnetbynis.c user/attilio/vmcontention/lib/libc/string/Makefile.inc user/attilio/vmcontention/lib/libc/sys/chroot.2 user/attilio/vmcontention/lib/libcam/camlib.c user/attilio/vmcontention/lib/libpmc/pmc.corei7.3 user/attilio/vmcontention/lib/libstand/Makefile user/attilio/vmcontention/lib/libstand/bootp.c user/attilio/vmcontention/lib/libstdthreads/thrd_create.3 user/attilio/vmcontention/lib/libutil/libutil.h user/attilio/vmcontention/lib/libutil/pw_util.c user/attilio/vmcontention/lib/libutil/quotafile.c user/attilio/vmcontention/lib/libvgl/simple.c user/attilio/vmcontention/libexec/mknetid/parse_group.c user/attilio/vmcontention/libexec/rlogind/rlogind.c user/attilio/vmcontention/libexec/rtld-elf/rtld.c user/attilio/vmcontention/release/picobsd/build/Makefile.conf user/attilio/vmcontention/release/picobsd/build/picobsd user/attilio/vmcontention/sbin/bsdlabel/bsdlabel.c user/attilio/vmcontention/sbin/dump/main.c user/attilio/vmcontention/sbin/fsck_ffs/pass2.c user/attilio/vmcontention/sbin/ifconfig/ifconfig.8 user/attilio/vmcontention/sbin/ipfw/main.c user/attilio/vmcontention/sbin/recoverdisk/recoverdisk.1 user/attilio/vmcontention/sbin/shutdown/shutdown.c user/attilio/vmcontention/share/man/man3/ATOMIC_VAR_INIT.3 user/attilio/vmcontention/share/man/man3/tgmath.3 user/attilio/vmcontention/share/man/man4/apic.4 user/attilio/vmcontention/share/man/man4/bce.4 user/attilio/vmcontention/share/man/man4/carp.4 user/attilio/vmcontention/share/man/man5/ar.5 user/attilio/vmcontention/share/man/man5/src.conf.5 user/attilio/vmcontention/share/man/man9/Makefile user/attilio/vmcontention/share/mk/bsd.crunchgen.mk user/attilio/vmcontention/share/mk/bsd.own.mk user/attilio/vmcontention/sys/Makefile user/attilio/vmcontention/sys/arm/conf/KB920X user/attilio/vmcontention/sys/boot/common/interp_parse.c user/attilio/vmcontention/sys/boot/i386/libi386/biospci.c user/attilio/vmcontention/sys/boot/i386/libi386/comconsole.c user/attilio/vmcontention/sys/boot/i386/libi386/libi386.h user/attilio/vmcontention/sys/boot/ofw/common/main.c user/attilio/vmcontention/sys/boot/ofw/libofw/ofw_net.c user/attilio/vmcontention/sys/boot/pc98/boot2/boot1.S user/attilio/vmcontention/sys/boot/pc98/libpc98/comconsole.c user/attilio/vmcontention/sys/boot/userboot/libstand/Makefile user/attilio/vmcontention/sys/cam/ata/ata_da.c user/attilio/vmcontention/sys/cam/scsi/scsi_cd.c user/attilio/vmcontention/sys/cam/scsi/scsi_da.c user/attilio/vmcontention/sys/cam/scsi/scsi_sa.c user/attilio/vmcontention/sys/cam/scsi/scsi_ses.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c user/attilio/vmcontention/sys/compat/linux/linux_ioctl.c user/attilio/vmcontention/sys/conf/files user/attilio/vmcontention/sys/conf/kern.pre.mk user/attilio/vmcontention/sys/conf/options user/attilio/vmcontention/sys/ddb/db_input.c user/attilio/vmcontention/sys/dev/ata/ata-disk.c user/attilio/vmcontention/sys/dev/bxe/if_bxe.c user/attilio/vmcontention/sys/dev/e1000/if_em.c user/attilio/vmcontention/sys/dev/e1000/if_lem.c user/attilio/vmcontention/sys/dev/flash/mx25l.c user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_core.c user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_uncore.c user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_uncore.h user/attilio/vmcontention/sys/dev/hwpmc/pmc_events.h user/attilio/vmcontention/sys/dev/ichwd/ichwd.c user/attilio/vmcontention/sys/dev/ichwd/ichwd.h user/attilio/vmcontention/sys/dev/if_ndis/if_ndis_pccard.c user/attilio/vmcontention/sys/dev/iwn/if_iwn.c user/attilio/vmcontention/sys/dev/mxge/if_mxge.c user/attilio/vmcontention/sys/dev/qlxgb/qla_misc.c user/attilio/vmcontention/sys/dev/qlxgb/qla_os.c user/attilio/vmcontention/sys/dev/sfxge/sfxge_port.c user/attilio/vmcontention/sys/dev/sound/pci/emu10k1.c user/attilio/vmcontention/sys/dev/tws/tws.c user/attilio/vmcontention/sys/dev/uart/uart_bus_pci.c user/attilio/vmcontention/sys/dev/uart/uart_cpu_sparc64.c user/attilio/vmcontention/sys/dev/usb/controller/usb_controller.c user/attilio/vmcontention/sys/fs/ext2fs/ext2_alloc.c user/attilio/vmcontention/sys/fs/nfs/nfsport.h user/attilio/vmcontention/sys/fs/ntfs/ntfs_compr.c user/attilio/vmcontention/sys/fs/ntfs/ntfs_subr.c user/attilio/vmcontention/sys/fs/nullfs/null_subr.c user/attilio/vmcontention/sys/fs/nullfs/null_vfsops.c user/attilio/vmcontention/sys/fs/nullfs/null_vnops.c user/attilio/vmcontention/sys/fs/nwfs/nwfs_vfsops.c user/attilio/vmcontention/sys/fs/smbfs/smbfs_vfsops.c user/attilio/vmcontention/sys/fs/smbfs/smbfs_vnops.c user/attilio/vmcontention/sys/fs/tmpfs/tmpfs_vnops.c user/attilio/vmcontention/sys/gnu/fs/xfs/xfs_vfsops.c user/attilio/vmcontention/sys/i386/ibcs2/ibcs2_socksys.c user/attilio/vmcontention/sys/i386/ibcs2/ibcs2_stat.c user/attilio/vmcontention/sys/i386/include/asm.h user/attilio/vmcontention/sys/ia64/conf/GENERIC user/attilio/vmcontention/sys/kern/kern_intr.c user/attilio/vmcontention/sys/kern/kern_ktr.c user/attilio/vmcontention/sys/kern/kern_linker.c user/attilio/vmcontention/sys/kern/kern_resource.c user/attilio/vmcontention/sys/kern/kern_thread.c user/attilio/vmcontention/sys/kern/kern_uuid.c user/attilio/vmcontention/sys/kern/sched_4bsd.c user/attilio/vmcontention/sys/kern/sched_ule.c user/attilio/vmcontention/sys/kern/subr_hints.c user/attilio/vmcontention/sys/kern/tty_inq.c user/attilio/vmcontention/sys/kern/uipc_mqueue.c user/attilio/vmcontention/sys/libkern/fnmatch.c user/attilio/vmcontention/sys/mips/cavium/usb/octusb.c user/attilio/vmcontention/sys/mips/conf/PB47 user/attilio/vmcontention/sys/mips/include/_stdint.h user/attilio/vmcontention/sys/modules/ath/Makefile user/attilio/vmcontention/sys/modules/kgssapi_krb5/Makefile user/attilio/vmcontention/sys/modules/sound/driver/emu10k1/Makefile user/attilio/vmcontention/sys/net/if.c user/attilio/vmcontention/sys/net/if_var.h user/attilio/vmcontention/sys/net/if_vlan.c user/attilio/vmcontention/sys/net/rtsock.c user/attilio/vmcontention/sys/net80211/ieee80211_ht.c user/attilio/vmcontention/sys/netatalk/aarp.c user/attilio/vmcontention/sys/netatalk/at_control.c user/attilio/vmcontention/sys/netgraph/ng_ksocket.c user/attilio/vmcontention/sys/netinet/if_ether.c user/attilio/vmcontention/sys/netinet/igmp.c user/attilio/vmcontention/sys/netinet/in.c user/attilio/vmcontention/sys/netinet/in_mcast.c user/attilio/vmcontention/sys/netinet/in_pcb.c user/attilio/vmcontention/sys/netinet/in_var.h user/attilio/vmcontention/sys/netinet/ip_carp.c user/attilio/vmcontention/sys/netinet/ip_icmp.c user/attilio/vmcontention/sys/netinet/ip_input.c user/attilio/vmcontention/sys/netinet/raw_ip.c user/attilio/vmcontention/sys/netinet/sctp_bsd_addr.c user/attilio/vmcontention/sys/netinet6/icmp6.c user/attilio/vmcontention/sys/netinet6/in6.c user/attilio/vmcontention/sys/netinet6/in6_ifattach.c user/attilio/vmcontention/sys/netinet6/in6_mcast.c user/attilio/vmcontention/sys/netinet6/in6_var.h user/attilio/vmcontention/sys/netinet6/ip6_input.c user/attilio/vmcontention/sys/netinet6/mld6.c user/attilio/vmcontention/sys/netinet6/nd6.c user/attilio/vmcontention/sys/netinet6/nd6.h user/attilio/vmcontention/sys/netinet6/nd6_rtr.c user/attilio/vmcontention/sys/netipx/ipx.c user/attilio/vmcontention/sys/powerpc/conf/GENERIC user/attilio/vmcontention/sys/powerpc/include/_stdint.h user/attilio/vmcontention/sys/security/mac_lomac/mac_lomac.c user/attilio/vmcontention/sys/sys/cdefs.h user/attilio/vmcontention/sys/sys/libkern.h user/attilio/vmcontention/sys/sys/param.h user/attilio/vmcontention/sys/ufs/ffs/ffs_alloc.c user/attilio/vmcontention/sys/vm/vm_object.c user/attilio/vmcontention/sys/x86/acpica/srat.c user/attilio/vmcontention/tools/regression/msdosfs/msdosfstest-3.sh user/attilio/vmcontention/tools/regression/msdosfs/msdosfstest-4.sh user/attilio/vmcontention/tools/regression/msdosfs/msdosfstest-5.sh user/attilio/vmcontention/tools/regression/msdosfs/msdosfstest-6.sh user/attilio/vmcontention/tools/tools/net80211/wesside/wesside/wesside.c user/attilio/vmcontention/usr.bin/cksum/cksum.c user/attilio/vmcontention/usr.bin/compress/compress.c user/attilio/vmcontention/usr.bin/finger/finger.c user/attilio/vmcontention/usr.bin/hexdump/display.c user/attilio/vmcontention/usr.bin/hexdump/hexdump.c user/attilio/vmcontention/usr.bin/hexdump/hexsyntax.c user/attilio/vmcontention/usr.bin/hexdump/parse.c user/attilio/vmcontention/usr.bin/locate/locate/fastfind.c user/attilio/vmcontention/usr.bin/locate/locate/util.c user/attilio/vmcontention/usr.bin/mail/main.c user/attilio/vmcontention/usr.bin/mail/util.c user/attilio/vmcontention/usr.bin/netstat/if.c user/attilio/vmcontention/usr.bin/netstat/inet.c user/attilio/vmcontention/usr.bin/netstat/inet6.c user/attilio/vmcontention/usr.bin/netstat/sctp.c user/attilio/vmcontention/usr.bin/rlogin/rlogin.c user/attilio/vmcontention/usr.bin/rpcgen/rpc_main.c user/attilio/vmcontention/usr.bin/systat/devs.c user/attilio/vmcontention/usr.bin/systat/netcmds.c user/attilio/vmcontention/usr.bin/systat/netstat.c user/attilio/vmcontention/usr.bin/talk/get_names.c user/attilio/vmcontention/usr.bin/tftp/main.c user/attilio/vmcontention/usr.bin/tr/str.c user/attilio/vmcontention/usr.bin/tset/map.c user/attilio/vmcontention/usr.bin/tset/term.c user/attilio/vmcontention/usr.bin/tset/wrterm.c user/attilio/vmcontention/usr.sbin/bluetooth/sdpd/server.c user/attilio/vmcontention/usr.sbin/bootparamd/bootparamd/bootparamd.c user/attilio/vmcontention/usr.sbin/bsnmpd/modules/snmp_wlan/BEGEMOT-WIRELESS-MIB.txt user/attilio/vmcontention/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_tree.def user/attilio/vmcontention/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c user/attilio/vmcontention/usr.sbin/config/main.c user/attilio/vmcontention/usr.sbin/config/mkmakefile.c user/attilio/vmcontention/usr.sbin/inetd/inetd.c user/attilio/vmcontention/usr.sbin/ipfwpcap/ipfwpcap.c user/attilio/vmcontention/usr.sbin/mptable/mptable.c user/attilio/vmcontention/usr.sbin/mtree/spec.c user/attilio/vmcontention/usr.sbin/newsyslog/newsyslog.c user/attilio/vmcontention/usr.sbin/pkg_install/lib/plist.c user/attilio/vmcontention/usr.sbin/quotaon/quotaon.c user/attilio/vmcontention/usr.sbin/rwhod/rwhod.c user/attilio/vmcontention/usr.sbin/sade/variable.c user/attilio/vmcontention/usr.sbin/uhsoctl/uhsoctl.c Directory Properties: user/attilio/vmcontention/ (props changed) user/attilio/vmcontention/cddl/contrib/opensolaris/ (props changed) user/attilio/vmcontention/contrib/bind9/ (props changed) user/attilio/vmcontention/contrib/binutils/ (props changed) user/attilio/vmcontention/contrib/bzip2/ (props changed) user/attilio/vmcontention/contrib/com_err/ (props changed) user/attilio/vmcontention/contrib/compiler-rt/ (props changed) user/attilio/vmcontention/contrib/dialog/ (props changed) user/attilio/vmcontention/contrib/ee/ (props changed) user/attilio/vmcontention/contrib/expat/ (props changed) user/attilio/vmcontention/contrib/file/ (props changed) user/attilio/vmcontention/contrib/gcc/ (props changed) user/attilio/vmcontention/contrib/gdb/ (props changed) user/attilio/vmcontention/contrib/gdtoa/ (props changed) user/attilio/vmcontention/contrib/gnu-sort/ (props changed) user/attilio/vmcontention/contrib/groff/ (props changed) user/attilio/vmcontention/contrib/less/ (props changed) user/attilio/vmcontention/contrib/libarchive/ (props changed) user/attilio/vmcontention/contrib/libarchive/cpio/ (props changed) user/attilio/vmcontention/contrib/libarchive/libarchive/ (props changed) user/attilio/vmcontention/contrib/libarchive/libarchive_fe/ (props changed) user/attilio/vmcontention/contrib/libarchive/tar/ (props changed) user/attilio/vmcontention/contrib/libcxxrt/ (props changed) user/attilio/vmcontention/contrib/libpcap/ (props changed) user/attilio/vmcontention/contrib/libstdc++/ (props changed) user/attilio/vmcontention/contrib/llvm/ (props changed) user/attilio/vmcontention/contrib/llvm/tools/clang/ (props changed) user/attilio/vmcontention/contrib/ncurses/ (props changed) user/attilio/vmcontention/contrib/netcat/ (props changed) user/attilio/vmcontention/contrib/ntp/ (props changed) user/attilio/vmcontention/contrib/one-true-awk/ (props changed) user/attilio/vmcontention/contrib/openbsm/ (props changed) user/attilio/vmcontention/contrib/openpam/ (props changed) user/attilio/vmcontention/contrib/openresolv/ (props changed) user/attilio/vmcontention/contrib/pf/ (props changed) user/attilio/vmcontention/contrib/sendmail/ (props changed) user/attilio/vmcontention/contrib/tcpdump/ (props changed) user/attilio/vmcontention/contrib/tcsh/ (props changed) user/attilio/vmcontention/contrib/tnftp/ (props changed) user/attilio/vmcontention/contrib/top/ (props changed) user/attilio/vmcontention/contrib/top/install-sh (props changed) user/attilio/vmcontention/contrib/tzcode/stdtime/ (props changed) user/attilio/vmcontention/contrib/tzcode/zic/ (props changed) user/attilio/vmcontention/contrib/tzdata/ (props changed) user/attilio/vmcontention/contrib/wpa/ (props changed) user/attilio/vmcontention/contrib/xz/ (props changed) user/attilio/vmcontention/crypto/heimdal/ (props changed) user/attilio/vmcontention/crypto/openssh/ (props changed) user/attilio/vmcontention/crypto/openssl/ (props changed) user/attilio/vmcontention/gnu/lib/ (props changed) user/attilio/vmcontention/gnu/usr.bin/binutils/ (props changed) user/attilio/vmcontention/gnu/usr.bin/cc/cc_tools/ (props changed) user/attilio/vmcontention/gnu/usr.bin/gdb/ (props changed) user/attilio/vmcontention/lib/libc/ (props changed) user/attilio/vmcontention/lib/libc/stdtime/ (props changed) user/attilio/vmcontention/lib/libutil/ (props changed) user/attilio/vmcontention/lib/libz/ (props changed) user/attilio/vmcontention/sbin/ (props changed) user/attilio/vmcontention/sbin/ipfw/ (props changed) user/attilio/vmcontention/share/mk/bsd.arch.inc.mk (props changed) user/attilio/vmcontention/share/zoneinfo/ (props changed) user/attilio/vmcontention/sys/ (props changed) user/attilio/vmcontention/sys/amd64/include/xen/ (props changed) user/attilio/vmcontention/sys/boot/ (props changed) user/attilio/vmcontention/sys/boot/i386/efi/ (props changed) user/attilio/vmcontention/sys/boot/ia64/efi/ (props changed) user/attilio/vmcontention/sys/boot/ia64/ski/ (props changed) user/attilio/vmcontention/sys/boot/powerpc/boot1.chrp/ (props changed) user/attilio/vmcontention/sys/boot/powerpc/ofw/ (props changed) user/attilio/vmcontention/sys/cddl/contrib/opensolaris/ (props changed) user/attilio/vmcontention/sys/conf/ (props changed) user/attilio/vmcontention/sys/contrib/dev/acpica/ (props changed) user/attilio/vmcontention/sys/contrib/octeon-sdk/ (props changed) user/attilio/vmcontention/sys/contrib/pf/ (props changed) user/attilio/vmcontention/sys/contrib/x86emu/ (props changed) user/attilio/vmcontention/usr.bin/calendar/ (props changed) user/attilio/vmcontention/usr.bin/csup/ (props changed) user/attilio/vmcontention/usr.bin/procstat/ (props changed) user/attilio/vmcontention/usr.sbin/ndiscvt/ (props changed) user/attilio/vmcontention/usr.sbin/rtadvctl/ (props changed) user/attilio/vmcontention/usr.sbin/rtadvd/ (props changed) user/attilio/vmcontention/usr.sbin/rtsold/ (props changed) user/attilio/vmcontention/usr.sbin/zic/ (props changed) Modified: user/attilio/vmcontention/Makefile.inc1 ============================================================================== --- user/attilio/vmcontention/Makefile.inc1 Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/Makefile.inc1 Thu Jan 5 23:12:19 2012 (r229670) @@ -15,6 +15,8 @@ # -DNO_WWWUPDATE do not update www in ${MAKE} update # -DNO_CTF do not run the DTrace CTF conversion tools on built objects # LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list +# LOCAL_TOOL_DIRS="list of dirs" to add additional dirs to the build-tools +# list # TARGET="machine" to crossbuild world for a different machine type # TARGET_ARCH= may be required when a TARGET supports multiple endians @@ -104,6 +106,8 @@ CLEANDIR= clean cleandepend CLEANDIR= cleandir .endif +LOCAL_TOOL_DIRS?= '' + CVS?= cvs CVSFLAGS?= -A -P -d -I! SVN?= svn @@ -1101,6 +1105,7 @@ build-tools: bin/csh \ bin/sh \ ${_rescue} \ + ${LOCAL_TOOL_DIRS} \ lib/ncurses/ncurses \ lib/ncurses/ncursesw \ ${_share} \ Modified: user/attilio/vmcontention/bin/sh/exec.c ============================================================================== --- user/attilio/vmcontention/bin/sh/exec.c Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/bin/sh/exec.c Thu Jan 5 23:12:19 2012 (r229670) @@ -100,6 +100,7 @@ static void tryexec(char *, char **, cha static void printentry(struct tblentry *, int); static struct tblentry *cmdlookup(const char *, int); static void delete_cmd_entry(void); +static void addcmdentry(const char *, struct cmdentry *); @@ -593,7 +594,7 @@ delete_cmd_entry(void) * the same name. */ -void +static void addcmdentry(const char *name, struct cmdentry *entry) { struct tblentry *cmdp; Modified: user/attilio/vmcontention/bin/sh/exec.h ============================================================================== --- user/attilio/vmcontention/bin/sh/exec.h Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/bin/sh/exec.h Thu Jan 5 23:12:19 2012 (r229670) @@ -70,7 +70,6 @@ void find_command(const char *, struct c int find_builtin(const char *, int *); void hashcd(void); void changepath(const char *); -void addcmdentry(const char *, struct cmdentry *); void defun(const char *, union node *); int unsetfunc(const char *); int typecmd_impl(int, char **, int, const char *); Modified: user/attilio/vmcontention/bin/sh/expand.c ============================================================================== --- user/attilio/vmcontention/bin/sh/expand.c Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/bin/sh/expand.c Thu Jan 5 23:12:19 2012 (r229670) @@ -113,6 +113,7 @@ static void expmeta(char *, char *); static void addfname(char *); static struct strlist *expsort(struct strlist *); static struct strlist *msort(struct strlist *, int); +static int patmatch(const char *, const char *, int); static char *cvtnum(int, char *); static int collate_range_cmp(wchar_t, wchar_t); @@ -1441,61 +1442,67 @@ match_charclass(const char *p, wchar_t c * Returns true if the pattern matches the string. */ -int +static int patmatch(const char *pattern, const char *string, int squoted) { const char *p, *q, *end; + const char *bt_p, *bt_q; char c; wchar_t wc, wc2; p = pattern; q = string; + bt_p = NULL; + bt_q = NULL; for (;;) { switch (c = *p++) { case '\0': - goto breakloop; + if (*q != '\0') + goto backtrack; + return 1; case CTLESC: if (squoted && *q == CTLESC) q++; if (*q++ != *p++) - return 0; + goto backtrack; break; case CTLQUOTEMARK: continue; case '?': if (squoted && *q == CTLESC) q++; - if (localeisutf8) + if (*q == '\0') + return 0; + if (localeisutf8) { wc = get_wc(&q); - else + /* + * A '?' does not match invalid UTF-8 but a + * '*' does, so backtrack. + */ + if (wc == 0) + goto backtrack; + } else wc = (unsigned char)*q++; - if (wc == '\0') - return 0; break; case '*': c = *p; while (c == CTLQUOTEMARK || c == '*') c = *++p; - if (c != CTLESC && c != CTLQUOTEMARK && - c != '?' && c != '*' && c != '[') { - while (*q != c) { - if (squoted && *q == CTLESC && - q[1] == c) - break; - if (*q == '\0') - return 0; - if (squoted && *q == CTLESC) - q++; - q++; - } - } - do { - if (patmatch(p, q, squoted)) - return 1; - if (squoted && *q == CTLESC) - q++; - } while (*q++ != '\0'); - return 0; + /* + * If the pattern ends here, we know the string + * matches without needing to look at the rest of it. + */ + if (c == '\0') + return 1; + /* + * First try the shortest match for the '*' that + * could work. We can forget any earlier '*' since + * there is no way having it match more characters + * can help us, given that we are already here. + */ + bt_p = p; + bt_q = q; + break; case '[': { const char *endp; int invert, found; @@ -1507,7 +1514,7 @@ patmatch(const char *pattern, const char for (;;) { while (*endp == CTLQUOTEMARK) endp++; - if (*endp == '\0') + if (*endp == 0) goto dft; /* no matching ] */ if (*endp == CTLESC) endp++; @@ -1522,12 +1529,14 @@ patmatch(const char *pattern, const char found = 0; if (squoted && *q == CTLESC) q++; - if (localeisutf8) + if (*q == '\0') + return 0; + if (localeisutf8) { chr = get_wc(&q); - else + if (chr == 0) + goto backtrack; + } else chr = (unsigned char)*q++; - if (chr == '\0') - return 0; c = *p++; do { if (c == CTLQUOTEMARK) @@ -1568,21 +1577,34 @@ patmatch(const char *pattern, const char } } while ((c = *p++) != ']'); if (found == invert) - return 0; + goto backtrack; break; } dft: default: if (squoted && *q == CTLESC) q++; - if (*q++ != c) + if (*q == '\0') + return 0; + if (*q++ == c) + break; +backtrack: + /* + * If we have a mismatch (other than hitting the end + * of the string), go back to the last '*' seen and + * have it match one additional character. + */ + if (bt_p == NULL) + return 0; + if (squoted && *bt_q == CTLESC) + bt_q++; + if (*bt_q == '\0') return 0; + bt_q++; + p = bt_p; + q = bt_q; break; } } -breakloop: - if (*q != '\0') - return 0; - return 1; } Modified: user/attilio/vmcontention/bin/sh/expand.h ============================================================================== --- user/attilio/vmcontention/bin/sh/expand.h Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/bin/sh/expand.h Thu Jan 5 23:12:19 2012 (r229670) @@ -60,6 +60,5 @@ union node; void expandhere(union node *, int); void expandarg(union node *, struct arglist *, int); void expari(int); -int patmatch(const char *, const char *, int); void rmescapes(char *); int casematch(union node *, const char *); Modified: user/attilio/vmcontention/bin/sh/histedit.c ============================================================================== --- user/attilio/vmcontention/bin/sh/histedit.c Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/bin/sh/histedit.c Thu Jan 5 23:12:19 2012 (r229670) @@ -70,6 +70,8 @@ int displayhist; static FILE *el_in, *el_out, *el_err; static char *fc_replace(const char *, char *, char *); +static int not_fcnumber(const char *); +static int str_to_event(const char *, int); /* * Set history and editing status. Called whenever the status may @@ -425,7 +427,7 @@ fc_replace(const char *s, char *p, char return (dest); } -int +static int not_fcnumber(const char *s) { if (s == NULL) @@ -435,7 +437,7 @@ not_fcnumber(const char *s) return (!is_number(s)); } -int +static int str_to_event(const char *str, int last) { HistEvent he; Modified: user/attilio/vmcontention/bin/sh/input.c ============================================================================== --- user/attilio/vmcontention/bin/sh/input.c Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/bin/sh/input.c Thu Jan 5 23:12:19 2012 (r229670) @@ -106,6 +106,7 @@ EditLine *el; /* cookie for editline p static void pushfile(void); static int preadfd(void); +static void popstring(void); #ifdef mkinit INCLUDE "input.h" @@ -372,7 +373,7 @@ pushstring(char *s, int len, void *ap) INTON; } -void +static void popstring(void) { struct strpush *sp = parsefile->strpush; Modified: user/attilio/vmcontention/bin/sh/input.h ============================================================================== --- user/attilio/vmcontention/bin/sh/input.h Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/bin/sh/input.h Thu Jan 5 23:12:19 2012 (r229670) @@ -53,7 +53,6 @@ int preadbuffer(void); int preadateof(void); void pungetc(void); void pushstring(char *, int, void *); -void popstring(void); void setinputfile(const char *, int); void setinputfd(int, int); void setinputstring(char *, int); Modified: user/attilio/vmcontention/bin/sh/main.c ============================================================================== --- user/attilio/vmcontention/bin/sh/main.c Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/bin/sh/main.c Thu Jan 5 23:12:19 2012 (r229670) @@ -79,6 +79,7 @@ int rootshell; struct jmploc main_handler; int localeisutf8, initial_localeisutf8; +static void cmdloop(int); static void read_profile(char *); static char *find_dot_file(char *); @@ -184,7 +185,7 @@ state4: /* XXX ??? - why isn't this befo * loop; it turns on prompting if the shell is interactive. */ -void +static void cmdloop(int top) { union node *n; Modified: user/attilio/vmcontention/bin/sh/main.h ============================================================================== --- user/attilio/vmcontention/bin/sh/main.h Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/bin/sh/main.h Thu Jan 5 23:12:19 2012 (r229670) @@ -38,4 +38,3 @@ extern int rootshell; /* true if we aren extern struct jmploc main_handler; /* top level exception handler */ void readcmdfile(const char *); -void cmdloop(int); Modified: user/attilio/vmcontention/bin/sh/myhistedit.h ============================================================================== --- user/attilio/vmcontention/bin/sh/myhistedit.h Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/bin/sh/myhistedit.h Thu Jan 5 23:12:19 2012 (r229670) @@ -39,6 +39,4 @@ extern int displayhist; void histedit(void); void sethistsize(const char *); void setterm(const char *); -int not_fcnumber(const char *); -int str_to_event(const char *, int); Modified: user/attilio/vmcontention/bin/sh/mystring.c ============================================================================== --- user/attilio/vmcontention/bin/sh/mystring.c Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/bin/sh/mystring.c Thu Jan 5 23:12:19 2012 (r229670) @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); * * equal(s1, s2) Return true if strings are equal. * scopy(from, to) Copy a string. - * scopyn(from, to, n) Like scopy, but checks for overflow. * number(s) Convert a string of digits to an integer. * is_number(s) Return true if s is a string of digits. */ @@ -67,24 +66,6 @@ char nullstr[1]; /* zero length string /* - * scopyn - copy a string from "from" to "to", truncating the string - * if necessary. "To" is always nul terminated, even if - * truncation is performed. "Size" is the size of "to". - */ - -void -scopyn(const char *from, char *to, int size) -{ - - while (--size > 0) { - if ((*to++ = *from++) == '\0') - return; - } - *to = '\0'; -} - - -/* * prefix -- see if pfx is a prefix of string. */ Modified: user/attilio/vmcontention/bin/sh/mystring.h ============================================================================== --- user/attilio/vmcontention/bin/sh/mystring.h Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/bin/sh/mystring.h Thu Jan 5 23:12:19 2012 (r229670) @@ -35,7 +35,6 @@ #include <string.h> -void scopyn(const char *, char *, int); int prefix(const char *, const char *); int number(const char *); int is_number(const char *); Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c Thu Jan 5 23:12:19 2012 (r229670) @@ -82,7 +82,7 @@ main(int argc, char *argv[]) fds[n++] = open(file, O_RDWR | O_APPEND | O_CREAT | O_DSYNC | O_LARGEFILE | O_NOCTTY | O_NONBLOCK | O_NDELAY | O_RSYNC | - O_SYNC | O_TRUNC | O_XATTR); + O_SYNC | O_TRUNC | O_XATTR, 0666); fds[n++] = open(file, O_RDWR); (void) lseek(fds[n - 1], 123, SEEK_SET); Modified: user/attilio/vmcontention/contrib/compiler-rt/LICENSE.TXT ============================================================================== --- user/attilio/vmcontention/contrib/compiler-rt/LICENSE.TXT Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/contrib/compiler-rt/LICENSE.TXT Thu Jan 5 23:12:19 2012 (r229670) @@ -14,7 +14,7 @@ Full text of the relevant licenses is in University of Illinois/NCSA Open Source License -Copyright (c) 2009-2010 by the contributors listed in CREDITS.TXT +Copyright (c) 2009-2012 by the contributors listed in CREDITS.TXT All rights reserved. @@ -55,7 +55,7 @@ SOFTWARE. ============================================================================== -Copyright (c) 2009-2010 by the contributors listed in CREDITS.TXT +Copyright (c) 2009-2012 by the contributors listed in CREDITS.TXT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal Modified: user/attilio/vmcontention/contrib/compiler-rt/lib/trampoline_setup.c ============================================================================== --- user/attilio/vmcontention/contrib/compiler-rt/lib/trampoline_setup.c Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/contrib/compiler-rt/lib/trampoline_setup.c Thu Jan 5 23:12:19 2012 (r229670) @@ -44,4 +44,4 @@ void __trampoline_setup(uint32_t* trampO /* clear instruction cache */ __clear_cache(trampOnStack, &trampOnStack[10]); } -#endif /* __ppc__ */ +#endif /* __ppc__ && !defined(__powerpc64__) */ Modified: user/attilio/vmcontention/contrib/groff/tmac/doc-syms ============================================================================== --- user/attilio/vmcontention/contrib/groff/tmac/doc-syms Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/contrib/groff/tmac/doc-syms Thu Jan 5 23:12:19 2012 (r229670) @@ -605,6 +605,8 @@ .ds doc-str-St--isoC \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:1990 .as doc-str-St--isoC " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St]\*[Rq]) .als doc-str-St--isoC-90 doc-str-St--isoC +.ds doc-str-St--isoC-2011 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:2011 +.as doc-str-St--isoC-2011 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^11\*[doc-str-St]\*[Rq]) .ds doc-str-St--isoC-99 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:1999 .as doc-str-St--isoC-99 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^99\*[doc-str-St]\*[Rq]) .ds doc-str-St--isoC-amd1 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/AMD1:1995 @@ -613,8 +615,6 @@ .as doc-str-St--isoC-tcor1 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Technical Corrigendum 1\*[Rq]) .ds doc-str-St--isoC-tcor2 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/TCOR2:1995 .as doc-str-St--isoC-tcor2 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Technical Corrigendum 2\*[Rq]) -.ds doc-str-St--isoC-11 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:2011 -.as doc-str-St--isoC-11 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^11\*[doc-str-St]\*[Rq]) . .\" POSIX Part 1: System API .ds doc-str-St--p1003.1 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1 Modified: user/attilio/vmcontention/contrib/groff/tmac/groff_mdoc.man ============================================================================== --- user/attilio/vmcontention/contrib/groff/tmac/groff_mdoc.man Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/contrib/groff/tmac/groff_mdoc.man Thu Jan 5 23:12:19 2012 (r229670) @@ -2038,8 +2038,8 @@ are: .St -isoC-90 .It Li \-isoC\-99 .St -isoC-99 -.It Li \-isoC\-11 -.St -isoC-11 +.It Li \-isoC\-2011 +.St -isoC-2011 .El .Pp . Modified: user/attilio/vmcontention/contrib/less/command.c ============================================================================== --- user/attilio/vmcontention/contrib/less/command.c Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/contrib/less/command.c Thu Jan 5 23:12:19 2012 (r229670) @@ -105,7 +105,7 @@ cmd_exec() start_mca(action, prompt, mlist, cmdflags) int action; char *prompt; - void *mlist; + void constant *mlist; int cmdflags; { mca = action; @@ -686,7 +686,7 @@ make_display() static void prompt() { - register char *p; + register char constant *p; if (ungot != NULL) { @@ -1461,7 +1461,7 @@ commands() error("Command not available", NULL_PARG); break; } - start_mca(A_EXAMINE, "Examine: ", (void*)ml_examine, 0); + start_mca(A_EXAMINE, "Examine: ", ml_examine, 0); c = getcc(); goto again; #else @@ -1491,7 +1491,7 @@ commands() error("WARNING: This file was viewed via LESSOPEN", NULL_PARG); } - start_mca(A_SHELL, "!", (void*)ml_shell, 0); + start_mca(A_SHELL, "!", ml_shell, 0); /* * Expand the editor prototype string * and pass it to the system to execute. @@ -1655,7 +1655,7 @@ commands() error("Command not available", NULL_PARG); break; } - start_mca(A_SHELL, "!", (void*)ml_shell, 0); + start_mca(A_SHELL, "!", ml_shell, 0); c = getcc(); goto again; #else @@ -1706,7 +1706,7 @@ commands() if (badmark(c)) break; pipec = c; - start_mca(A_PIPE, "!", (void*)ml_shell, 0); + start_mca(A_PIPE, "!", ml_shell, 0); c = getcc(); goto again; #else Modified: user/attilio/vmcontention/contrib/less/prompt.c ============================================================================== --- user/attilio/vmcontention/contrib/less/prompt.c Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/contrib/less/prompt.c Thu Jan 5 23:12:19 2012 (r229670) @@ -394,9 +394,9 @@ protochar(c, where, iseditproto) * where to resume parsing the string. * We must keep track of nested IFs and skip them properly. */ - static char * + static char constant * skipcond(p) - register char *p; + register char constant *p; { register int iflevel; @@ -452,9 +452,9 @@ skipcond(p) /* * Decode a char that represents a position on the screen. */ - static char * + static char constant * wherechar(p, wp) - char *p; + char constant *p; int *wp; { switch (*p) @@ -478,10 +478,10 @@ wherechar(p, wp) */ public char * pr_expand(proto, maxwidth) - char *proto; + char constant *proto; int maxwidth; { - register char *p; + register char constant *p; register int c; int where; @@ -555,7 +555,7 @@ pr_expand(proto, maxwidth) public char * eq_message() { - return (pr_expand((char*)eqproto, 0)); + return (pr_expand(eqproto, 0)); } /* @@ -572,7 +572,7 @@ pr_string() type = (!less_is_more) ? pr_type : pr_type ? 0 : 1; prompt = pr_expand((ch_getflags() & CH_HELPFILE) ? - (char*)hproto : prproto[type], + hproto : prproto[type], sc_width-so_s_width-so_e_width-2); new_file = 0; return (prompt); @@ -584,5 +584,5 @@ pr_string() public char * wait_message() { - return (pr_expand((char*)wproto, sc_width-so_s_width-so_e_width-2)); + return (pr_expand(wproto, sc_width-so_s_width-so_e_width-2)); } Modified: user/attilio/vmcontention/games/fortune/fortune/fortune.c ============================================================================== --- user/attilio/vmcontention/games/fortune/fortune/fortune.c Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/games/fortune/fortune/fortune.c Thu Jan 5 23:12:19 2012 (r229670) @@ -683,7 +683,7 @@ all_forts(FILEDESC *fp, char *offensive) obscene->fd = fd; obscene->inf = NULL; obscene->path = offensive; - if ((sp = rindex(offensive, '/')) == NULL) + if ((sp = strrchr(offensive, '/')) == NULL) obscene->name = offensive; else obscene->name = ++sp; @@ -785,7 +785,7 @@ is_fortfile(const char *file, char **dat } } - if ((sp = rindex(file, '/')) == NULL) + if ((sp = strrchr(file, '/')) == NULL) sp = file; else sp++; @@ -797,7 +797,7 @@ is_fortfile(const char *file, char **dat DPRINTF(2, (stderr, "FALSE (check fortunes only)\n")); return (FALSE); } - if ((sp = rindex(sp, '.')) != NULL) { + if ((sp = strrchr(sp, '.')) != NULL) { sp++; for (i = 0; suflist[i] != NULL; i++) if (strcmp(sp, suflist[i]) == 0) { Modified: user/attilio/vmcontention/gnu/usr.bin/gdb/kgdb/main.c ============================================================================== --- user/attilio/vmcontention/gnu/usr.bin/gdb/kgdb/main.c Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/gnu/usr.bin/gdb/kgdb/main.c Thu Jan 5 23:12:19 2012 (r229670) @@ -83,7 +83,7 @@ usage(void) { fprintf(stderr, - "usage: %s [-afqv] [-d crashdir] [-c core | -n dumpnr | -r device]\n" + "usage: %s [-afqvw] [-d crashdir] [-c core | -n dumpnr | -r device]\n" "\t[kernel [core]]\n", getprogname()); exit(1); } Modified: user/attilio/vmcontention/include/complex.h ============================================================================== --- user/attilio/vmcontention/include/complex.h Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/include/complex.h Thu Jan 5 23:12:19 2012 (r229670) @@ -29,18 +29,20 @@ #ifndef _COMPLEX_H #define _COMPLEX_H +#include <sys/cdefs.h> + #ifdef __GNUC__ #if __STDC_VERSION__ < 199901 #define _Complex __complex__ #endif -#define _Complex_I 1.0fi +#define _Complex_I ((float _Complex)1.0i) +_Static_assert(__generic(_Complex_I, float _Complex, 1, 0), + "_Complex_I must be of type float _Complex"); #endif #define complex _Complex #define I _Complex_I -#include <sys/cdefs.h> - __BEGIN_DECLS double cabs(double complex); Modified: user/attilio/vmcontention/include/stdatomic.h ============================================================================== --- user/attilio/vmcontention/include/stdatomic.h Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/include/stdatomic.h Thu Jan 5 23:12:19 2012 (r229670) @@ -106,13 +106,13 @@ enum memory_order { #if defined(__CLANG_ATOMICS) #define atomic_thread_fence(order) __atomic_thread_fence(order) -#define atomic_signal_fence(order) __asm volatile ("" : : : "memory"); +#define atomic_signal_fence(order) __asm volatile ("" : : : "memory") #elif defined(__GNUC_ATOMICS) #define atomic_thread_fence(order) __atomic_thread_fence(order) #define atomic_signal_fence(order) __atomic_signal_fence(order) #else #define atomic_thread_fence(order) __sync_synchronize() -#define atomic_signal_fence(order) __asm volatile ("" : : : "memory"); +#define atomic_signal_fence(order) __asm volatile ("" : : : "memory") #endif /* Modified: user/attilio/vmcontention/include/stdnoreturn.h ============================================================================== --- user/attilio/vmcontention/include/stdnoreturn.h Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/include/stdnoreturn.h Thu Jan 5 23:12:19 2012 (r229670) @@ -26,11 +26,13 @@ * $FreeBSD$ */ +#ifdef __cplusplus +#error "<stdnoreturn.h> cannot be used in combination with C++11." +#endif + #ifndef noreturn -#if !defined(__cplusplus) || __cplusplus < 201103L #include <sys/cdefs.h> #define noreturn _Noreturn -#endif #endif /* !noreturn */ Modified: user/attilio/vmcontention/include/tgmath.h ============================================================================== --- user/attilio/vmcontention/include/tgmath.h Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/include/tgmath.h Thu Jan 5 23:12:19 2012 (r229670) @@ -2,6 +2,9 @@ * Copyright (c) 2004 Stefan Farfeleder. * All rights reserved. * + * Copyright (c) 2012 Ed Schouten <ed@FreeBSD.org> + * All rights reserved. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -33,17 +36,17 @@ #include <math.h> /* - * This implementation of <tgmath.h> requires two implementation-dependent - * macros to be defined: - * __tg_impl_simple(x, y, z, fn, fnf, fnl, ...) + * This implementation of <tgmath.h> uses the two following macros, + * which are based on the macros described in C11 proposal N1404: + * __tg_impl_simple(x, y, z, fnl, fn, fnf, ...) * Invokes fnl() if the corresponding real type of x, y or z is long * double, fn() if it is double or any has an integer type, and fnf() * otherwise. - * __tg_impl_full(x, y, z, fn, fnf, fnl, cfn, cfnf, cfnl, ...) - * Invokes [c]fnl() if the corresponding real type of x, y or z is long + * __tg_impl_full(x, y, cfnl, cfn, cfnf, fnl, fn, fnf, ...) + * Invokes [c]fnl() if the corresponding real type of x or y is long * double, [c]fn() if it is double or any has an integer type, and * [c]fnf() otherwise. The function with the 'c' prefix is called if - * any of x, y or z is a complex number. + * any of x or y is a complex number. * Both macros call the chosen function with all additional arguments passed * to them, as given by __VA_ARGS__. * @@ -52,45 +55,59 @@ * double complex regardless of the argument types. */ -#if __GNUC_PREREQ__(3, 1) -#define __tg_type(e, t) __builtin_types_compatible_p(__typeof__(e), t) -#define __tg_type3(e1, e2, e3, t) \ - (__tg_type(e1, t) || __tg_type(e2, t) || __tg_type(e3, t)) -#define __tg_type_corr(e1, e2, e3, t) \ - (__tg_type3(e1, e2, e3, t) || __tg_type3(e1, e2, e3, t _Complex)) -#define __tg_integer(e1, e2, e3) \ - (((__typeof__(e1))1.5 == 1) || ((__typeof__(e2))1.5 == 1) || \ - ((__typeof__(e3))1.5 == 1)) -#define __tg_is_complex(e1, e2, e3) \ - (__tg_type3(e1, e2, e3, float _Complex) || \ - __tg_type3(e1, e2, e3, double _Complex) || \ - __tg_type3(e1, e2, e3, long double _Complex) || \ - __tg_type3(e1, e2, e3, __typeof__(_Complex_I))) - -#define __tg_impl_simple(x, y, z, fn, fnf, fnl, ...) \ - __builtin_choose_expr(__tg_type_corr(x, y, z, long double), \ - fnl(__VA_ARGS__), __builtin_choose_expr( \ - __tg_type_corr(x, y, z, double) || __tg_integer(x, y, z),\ - fn(__VA_ARGS__), fnf(__VA_ARGS__))) - -#define __tg_impl_full(x, y, z, fn, fnf, fnl, cfn, cfnf, cfnl, ...) \ - __builtin_choose_expr(__tg_is_complex(x, y, z), \ - __tg_impl_simple(x, y, z, cfn, cfnf, cfnl, __VA_ARGS__), \ - __tg_impl_simple(x, y, z, fn, fnf, fnl, __VA_ARGS__)) - -#else /* __GNUC__ */ +#ifndef __generic #error "<tgmath.h> not implemented for this compiler" -#endif /* !__GNUC__ */ +#endif + +#define __tg_generic_simple(x, fnl, fn, fnf) \ + __generic(x, long double _Complex, fnl, \ + __generic(x, double _Complex, fn, \ + __generic(x, float _Complex, fnf, \ + __generic(x, long double, fnl, \ + __generic(x, float, fnf, fn))))) +#define __tg_impl_simple(x, y, z, fnl, fn, fnf, ...) \ + __tg_generic_simple(x, \ + __tg_generic_simple(y, \ + __tg_generic_simple(z, fnl, fnl, fnl), \ + __tg_generic_simple(z, fnl, fnl, fnl), \ + __tg_generic_simple(z, fnl, fnl, fnl)), \ + __tg_generic_simple(y, \ + __tg_generic_simple(z, fnl, fnl, fnl), \ + __tg_generic_simple(z, fnl, fn , fn ), \ + __tg_generic_simple(z, fnl, fn , fn )), \ + __tg_generic_simple(y, \ + __tg_generic_simple(z, fnl, fnl, fnl), \ + __tg_generic_simple(z, fnl, fn , fn ), \ + __tg_generic_simple(z, fnl, fn , fnf)))(__VA_ARGS__) +#define __tg_generic_full(x, cfnl, cfn, cfnf, fnl, fn, fnf) \ + __generic(x, long double _Complex, cfnl, \ + __generic(x, double _Complex, cfn, \ + __generic(x, float _Complex, cfnf, \ + __generic(x, long double, fnl, \ + __generic(x, float, fnf, fn))))) +#define __tg_impl_full(x, y, cfnl, cfn, cfnf, fnl, fn, fnf, ...) \ + __tg_generic_full(x, \ + __tg_generic_full(y, cfnl, cfnl, cfnl, cfnl, cfnl, cfnl), \ + __tg_generic_full(y, cfnl, cfn , cfn , cfnl, cfn , cfn ), \ + __tg_generic_full(y, cfnl, cfn , cfnf, cfnl, cfn , cfnf), \ + __tg_generic_full(y, cfnl, cfnl, cfnl, fnl , fnl , fnl ), \ + __tg_generic_full(y, cfnl, cfn , cfn , fnl , fn , fn ), \ + __tg_generic_full(y, cfnl, cfn , cfnf, fnl , fn , fnf )) \ + (__VA_ARGS__) /* Macros to save lots of repetition below */ #define __tg_simple(x, fn) \ - __tg_impl_simple(x, x, x, fn, fn##f, fn##l, x) + __tg_impl_simple(x, x, x, fn##l, fn, fn##f, x) #define __tg_simple2(x, y, fn) \ - __tg_impl_simple(x, x, y, fn, fn##f, fn##l, x, y) + __tg_impl_simple(x, x, y, fn##l, fn, fn##f, x, y) +#define __tg_simple3(x, y, z, fn) \ + __tg_impl_simple(x, y, z, fn##l, fn, fn##f, x, y, z) #define __tg_simplev(x, fn, ...) \ - __tg_impl_simple(x, x, x, fn, fn##f, fn##l, __VA_ARGS__) + __tg_impl_simple(x, x, x, fn##l, fn, fn##f, __VA_ARGS__) #define __tg_full(x, fn) \ - __tg_impl_full(x, x, x, fn, fn##f, fn##l, c##fn, c##fn##f, c##fn##l, x) + __tg_impl_full(x, x, c##fn##l, c##fn, c##fn##f, fn##l, fn, fn##f, x) +#define __tg_full2(x, y, fn) \ + __tg_impl_full(x, y, c##fn##l, c##fn, c##fn##f, fn##l, fn, fn##f, x, y) /* 7.22#4 -- These macros expand to real or complex functions, depending on * the type of their arguments. */ @@ -108,13 +125,12 @@ #define tanh(x) __tg_full(x, tanh) #define exp(x) __tg_full(x, exp) #define log(x) __tg_full(x, log) -#define pow(x, y) __tg_impl_full(x, x, y, pow, powf, powl, \ - cpow, cpowf, cpowl, x, y) +#define pow(x, y) __tg_full2(x, y, pow) #define sqrt(x) __tg_full(x, sqrt) /* "The corresponding type-generic macro for fabs and cabs is fabs." */ -#define fabs(x) __tg_impl_full(x, x, x, fabs, fabsf, fabsl, \ - cabs, cabsf, cabsl, x) +#define fabs(x) __tg_impl_full(x, x, cabsl, cabs, cabsf, \ + fabsl, fabs, fabsf, x) /* 7.22#5 -- These macros are only defined for arguments with real type. */ #define atan2(x, y) __tg_simple2(x, y, atan2) @@ -127,7 +143,7 @@ #define expm1(x) __tg_simple(x, expm1) #define fdim(x, y) __tg_simple2(x, y, fdim) #define floor(x) __tg_simple(x, floor) -#define fma(x, y, z) __tg_impl_simple(x, y, z, fma, fmaf, fmal, x, y, z) +#define fma(x, y, z) __tg_simple3(x, y, z, fma) #define fmax(x, y) __tg_simple2(x, y, fmax) #define fmin(x, y) __tg_simple2(x, y, fmin) #define fmod(x, y) __tg_simple2(x, y, fmod) @@ -148,8 +164,8 @@ #define nextafter(x, y) __tg_simple2(x, y, nextafter) #define nexttoward(x, y) __tg_simplev(x, nexttoward, x, y) #define remainder(x, y) __tg_simple2(x, y, remainder) -#define remquo(x, y, z) __tg_impl_simple(x, x, y, remquo, remquof, \ - remquol, x, y, z) +#define remquo(x, y, z) __tg_impl_simple(x, x, y, remquol, remquo, \ + remquof, x, y, z) #define rint(x) __tg_simple(x, rint) #define round(x) __tg_simple(x, round) #define scalbn(x, y) __tg_simplev(x, scalbn, x, y) Modified: user/attilio/vmcontention/lib/libc/Makefile ============================================================================== --- user/attilio/vmcontention/lib/libc/Makefile Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/lib/libc/Makefile Thu Jan 5 23:12:19 2012 (r229670) @@ -127,8 +127,8 @@ SRCS+= ${_src} KQSRCS= adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c iordi3.c \ lshldi3.c lshrdi3.c moddi3.c muldi3.c negdi2.c notdi2.c qdivrem.c \ subdi3.c ucmpdi2.c udivdi3.c umoddi3.c xordi3.c -KSRCS= bcmp.c ffs.c ffsl.c fls.c flsl.c index.c mcount.c rindex.c \ - strcat.c strcmp.c strcpy.c strlen.c strncpy.c +KSRCS= bcmp.c ffs.c ffsl.c fls.c flsl.c mcount.c strcat.c strchr.c \ + strcmp.c strcpy.c strlen.c strncpy.c strrchr.c libkern: libkern.gen libkern.${LIBC_ARCH} Modified: user/attilio/vmcontention/lib/libc/arm/string/Makefile.inc ============================================================================== --- user/attilio/vmcontention/lib/libc/arm/string/Makefile.inc Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/lib/libc/arm/string/Makefile.inc Thu Jan 5 23:12:19 2012 (r229670) @@ -1,7 +1,6 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD$ -MDSRCS+=bcmp.c bcopy.S bzero.S ffs.S index.c memchr.c memcmp.S memcpy.S \ - memmove.S memset.S rindex.c strcat.c strchr.c strcmp.S strcpy.c \ - strlen.S strncmp.S strrchr.c swab.c wcschr.c wcscmp.c wcslen.c \ - wmemchr.c +MDSRCS+=bcmp.c bcopy.S bzero.S ffs.S memchr.c memcmp.S memcpy.S \ + memmove.S memset.S strcat.c strchr.c strcmp.S strcpy.c strlen.S \ + strncmp.S strrchr.c swab.c wcschr.c wcscmp.c wcslen.c wmemchr.c Modified: user/attilio/vmcontention/lib/libc/gen/exec.c ============================================================================== --- user/attilio/vmcontention/lib/libc/gen/exec.c Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/lib/libc/gen/exec.c Thu Jan 5 23:12:19 2012 (r229670) @@ -159,7 +159,7 @@ execvPe(const char *name, const char *pa eacces = 0; /* If it's an absolute or relative path name, it's easy. */ - if (index(name, '/')) { + if (strchr(name, '/')) { bp = name; cur = NULL; goto retry; Modified: user/attilio/vmcontention/lib/libc/gen/getttyent.c ============================================================================== --- user/attilio/vmcontention/lib/libc/gen/getttyent.c Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/lib/libc/gen/getttyent.c Thu Jan 5 23:12:19 2012 (r229670) @@ -78,7 +78,7 @@ getttyent(void) if (!fgets(p = line, lbsize, tf)) return (NULL); /* extend buffer if line was too big, and retry */ - while (!index(p, '\n') && !feof(tf)) { + while (!strchr(p, '\n') && !feof(tf)) { i = strlen(p); lbsize += MALLOCCHUNK; if ((p = realloc(line, lbsize)) == NULL) { @@ -148,7 +148,7 @@ getttyent(void) tty.ty_comment = p; if (*p == 0) tty.ty_comment = 0; - if ( (p = index(p, '\n')) ) + if ((p = strchr(p, '\n'))) *p = '\0'; return (&tty); } @@ -196,7 +196,7 @@ static char * value(char *p) { - return ((p = index(p, '=')) ? ++p : NULL); + return ((p = strchr(p, '=')) ? ++p : NULL); } int Modified: user/attilio/vmcontention/lib/libc/gen/timezone.c ============================================================================== --- user/attilio/vmcontention/lib/libc/gen/timezone.c Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/lib/libc/gen/timezone.c Thu Jan 5 23:12:19 2012 (r229670) @@ -59,7 +59,7 @@ timezone(int zone, int dst) *end; if ( (beg = getenv("TZNAME")) ) { /* set in environment */ - if ( (end = index(beg, ',')) ) {/* "PST,PDT" */ + if ((end = strchr(beg, ','))) { /* "PST,PDT" */ if (dst) return(++end); *end = '\0'; Modified: user/attilio/vmcontention/lib/libc/i386/string/Makefile.inc ============================================================================== --- user/attilio/vmcontention/lib/libc/i386/string/Makefile.inc Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/lib/libc/i386/string/Makefile.inc Thu Jan 5 23:12:19 2012 (r229670) @@ -1,7 +1,6 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD$ -MDSRCS+=bcmp.S bcopy.S bzero.S ffs.S index.S memchr.S memcmp.S memcpy.S \ - memmove.S memset.S rindex.S strcat.S strchr.S strcmp.S strcpy.S \ - strncmp.S strrchr.S swab.S wcschr.S wcscmp.S wcslen.S \ - wmemchr.S +MDSRCS+=bcmp.S bcopy.S bzero.S ffs.S memchr.S memcmp.S memcpy.S memmove.S \ + memset.S strcat.S strchr.S strcmp.S strcpy.S strncmp.S strrchr.S \ + swab.S wcschr.S wcscmp.S wcslen.S wmemchr.S Modified: user/attilio/vmcontention/lib/libc/i386/string/strchr.S ============================================================================== --- user/attilio/vmcontention/lib/libc/i386/string/strchr.S Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/lib/libc/i386/string/strchr.S Thu Jan 5 23:12:19 2012 (r229670) @@ -63,4 +63,6 @@ L2: ret END(strchr) +WEAK_ALIAS(index, strchr) + .section .note.GNU-stack,"",%progbits Modified: user/attilio/vmcontention/lib/libc/i386/string/strrchr.S ============================================================================== --- user/attilio/vmcontention/lib/libc/i386/string/strrchr.S Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/lib/libc/i386/string/strrchr.S Thu Jan 5 23:12:19 2012 (r229670) @@ -64,4 +64,6 @@ L2: ret END(strrchr) +WEAK_ALIAS(rindex, strrchr) + .section .note.GNU-stack,"",%progbits Modified: user/attilio/vmcontention/lib/libc/mips/string/Makefile.inc ============================================================================== --- user/attilio/vmcontention/lib/libc/mips/string/Makefile.inc Thu Jan 5 23:11:05 2012 (r229669) +++ user/attilio/vmcontention/lib/libc/mips/string/Makefile.inc Thu Jan 5 23:12:19 2012 (r229670) @@ -1,8 +1,8 @@ # $NetBSD: Makefile.inc,v 1.2 2000/10/10 21:51:54 jeffs Exp $ # $FreeBSD$ -SRCS+= bcmp.S bcopy.S bzero.S ffs.S index.S memchr.c memcmp.c memset.c \ +SRCS+= bcmp.S bcopy.S bzero.S ffs.S memchr.c memcmp.c memset.c \ memcpy.S memmove.S \ - rindex.S strcat.c strcmp.S strcpy.c strcspn.c strlen.S \ - strncat.c strncmp.c strncpy.c strpbrk.c strsep.c \ + strcat.c strchr.S strcmp.S strcpy.c strcspn.c strlen.S \ + strncat.c strncmp.c strncpy.c strrchr.S strpbrk.c strsep.c \ strspn.c strstr.c swab.c Copied: user/attilio/vmcontention/lib/libc/mips/string/strchr.S (from r229659, head/lib/libc/mips/string/strchr.S) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/lib/libc/mips/string/strchr.S Thu Jan 5 23:12:19 2012 (r229670, copy of r229659, head/lib/libc/mips/string/strchr.S) @@ -0,0 +1,61 @@ +/* $NetBSD: index.S,v 1.8 2005/04/22 06:59:00 simonb Exp $ */ + +/*- + * Copyright (c) 1991, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Ralph Campbell. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include <machine/asm.h> +__FBSDID("$FreeBSD$"); + +#if defined(LIBC_SCCS) && !defined(lint) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201052312.q05NCKAu060728>