Date: Sun, 16 Jun 2013 15:35:14 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r251806 - in user/attilio/vmobj-readlock: . bin/sh contrib/cvs contrib/llvm/lib/Target/X86 contrib/llvm/lib/Target/X86/AsmParser contrib/llvm/tools/clang/include/clang/Basic contrib/llv... Message-ID: <201306161535.r5GFZEDS074039@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Sun Jun 16 15:35:13 2013 New Revision: 251806 URL: http://svnweb.freebsd.org/changeset/base/251806 Log: MFC Added: user/attilio/vmobj-readlock/sys/xen/hvm.h - copied unchanged from r251805, user/attilio/vmcontention/sys/xen/hvm.h - copied from r251805, user/attilio/vmcontention/sys/xen/interface/arch-arm/ user/attilio/vmobj-readlock/sys/xen/interface/arch-arm.h - copied unchanged from r251805, user/attilio/vmcontention/sys/xen/interface/arch-arm.h - copied from r251805, user/attilio/vmcontention/sys/xen/interface/arch-ia64/ user/attilio/vmobj-readlock/sys/xen/interface/io/fsif.h - copied unchanged from r251805, user/attilio/vmcontention/sys/xen/interface/io/fsif.h user/attilio/vmobj-readlock/sys/xen/interface/io/libxenvchan.h - copied unchanged from r251805, user/attilio/vmcontention/sys/xen/interface/io/libxenvchan.h user/attilio/vmobj-readlock/sys/xen/interface/io/usbif.h - copied unchanged from r251805, user/attilio/vmcontention/sys/xen/interface/io/usbif.h user/attilio/vmobj-readlock/sys/xen/interface/io/vscsiif.h - copied unchanged from r251805, user/attilio/vmcontention/sys/xen/interface/io/vscsiif.h user/attilio/vmobj-readlock/sys/xen/interface/mem_event.h - copied unchanged from r251805, user/attilio/vmcontention/sys/xen/interface/mem_event.h user/attilio/vmobj-readlock/sys/xen/interface/tmem.h - copied unchanged from r251805, user/attilio/vmcontention/sys/xen/interface/tmem.h - copied from r251805, user/attilio/vmcontention/sys/xen/interface/xsm/ user/attilio/vmobj-readlock/tools/regression/bin/sh/builtins/local2.0 - copied unchanged from r251805, user/attilio/vmcontention/tools/regression/bin/sh/builtins/local2.0 user/attilio/vmobj-readlock/tools/regression/bin/sh/builtins/local3.0 - copied unchanged from r251805, user/attilio/vmcontention/tools/regression/bin/sh/builtins/local3.0 user/attilio/vmobj-readlock/tools/tools/ath/ath_ee_9300_print/ - copied from r251805, user/attilio/vmcontention/tools/tools/ath/ath_ee_9300_print/ Directory Properties: user/attilio/vmobj-readlock/sys/xen/interface/arch-arm/ (props changed) user/attilio/vmobj-readlock/sys/xen/interface/arch-ia64/ (props changed) user/attilio/vmobj-readlock/sys/xen/interface/xsm/ (props changed) Deleted: user/attilio/vmobj-readlock/contrib/cvs/ user/attilio/vmobj-readlock/gnu/usr.bin/cvs/ user/attilio/vmobj-readlock/lib/libcompiler_rt/__sync_fetch_and_add_4.c user/attilio/vmobj-readlock/lib/libcompiler_rt/__sync_fetch_and_and_4.c user/attilio/vmobj-readlock/lib/libcompiler_rt/__sync_fetch_and_op_n.h user/attilio/vmobj-readlock/lib/libcompiler_rt/__sync_fetch_and_or_4.c user/attilio/vmobj-readlock/lib/libcompiler_rt/__sync_fetch_and_sub_4.c user/attilio/vmobj-readlock/lib/libcompiler_rt/__sync_fetch_and_xor_4.c user/attilio/vmobj-readlock/lib/libcompiler_rt/__sync_lock_test_and_set_4.c user/attilio/vmobj-readlock/lib/libcompiler_rt/__sync_synchronize.c user/attilio/vmobj-readlock/lib/libcompiler_rt/__sync_val_compare_and_swap_4.c user/attilio/vmobj-readlock/lib/libcompiler_rt/__sync_val_compare_and_swap_n.h user/attilio/vmobj-readlock/share/doc/psd/28.cvs/ user/attilio/vmobj-readlock/sys/xen/interface/hvm/vmx_assist.h Modified: user/attilio/vmobj-readlock/Makefile user/attilio/vmobj-readlock/Makefile.inc1 user/attilio/vmobj-readlock/ObsoleteFiles.inc user/attilio/vmobj-readlock/UPDATING user/attilio/vmobj-readlock/bin/sh/sh.1 user/attilio/vmobj-readlock/contrib/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp user/attilio/vmobj-readlock/contrib/llvm/lib/Target/X86/X86InstrInfo.td user/attilio/vmobj-readlock/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def user/attilio/vmobj-readlock/contrib/llvm/tools/clang/include/clang/Basic/Builtins.h user/attilio/vmobj-readlock/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsAArch64.def user/attilio/vmobj-readlock/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsARM.def user/attilio/vmobj-readlock/contrib/llvm/tools/clang/lib/Basic/Targets.cpp user/attilio/vmobj-readlock/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp user/attilio/vmobj-readlock/etc/inetd.conf user/attilio/vmobj-readlock/etc/mtree/BSD.usr.dist user/attilio/vmobj-readlock/gnu/usr.bin/Makefile user/attilio/vmobj-readlock/lib/libcompiler_rt/Makefile user/attilio/vmobj-readlock/sbin/camcontrol/fwdownload.c user/attilio/vmobj-readlock/sbin/hastd/refcnt.h user/attilio/vmobj-readlock/share/doc/psd/Makefile user/attilio/vmobj-readlock/share/man/man4/filemon.4 user/attilio/vmobj-readlock/share/man/man5/src.conf.5 user/attilio/vmobj-readlock/share/man/man9/pci.9 user/attilio/vmobj-readlock/share/misc/bsd-family-tree user/attilio/vmobj-readlock/share/mk/bsd.own.mk user/attilio/vmobj-readlock/share/mk/bsd.subdir.mk user/attilio/vmobj-readlock/share/mk/sys.mk user/attilio/vmobj-readlock/sys/amd64/amd64/genassym.c user/attilio/vmobj-readlock/sys/amd64/amd64/pmap.c user/attilio/vmobj-readlock/sys/amd64/include/pmap.h user/attilio/vmobj-readlock/sys/amd64/include/xen/xen-os.h user/attilio/vmobj-readlock/sys/amd64/vmm/io/vlapic.c user/attilio/vmobj-readlock/sys/arm/arm/stdatomic.c user/attilio/vmobj-readlock/sys/cam/ata/ata_da.c user/attilio/vmobj-readlock/sys/cam/scsi/scsi_da.c user/attilio/vmobj-readlock/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c user/attilio/vmobj-readlock/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h user/attilio/vmobj-readlock/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c user/attilio/vmobj-readlock/sys/dev/ath/if_ath_btcoex.c user/attilio/vmobj-readlock/sys/dev/ath/if_ath_lna_div.c user/attilio/vmobj-readlock/sys/dev/ath/if_ath_lna_div.h user/attilio/vmobj-readlock/sys/dev/bge/if_bge.c user/attilio/vmobj-readlock/sys/dev/puc/pucdata.c user/attilio/vmobj-readlock/sys/dev/rt/if_rt.c user/attilio/vmobj-readlock/sys/dev/usb/net/if_aue.c user/attilio/vmobj-readlock/sys/dev/usb/net/if_mos.c user/attilio/vmobj-readlock/sys/dev/usb/net/if_rue.c user/attilio/vmobj-readlock/sys/dev/usb/net/if_smsc.c user/attilio/vmobj-readlock/sys/dev/usb/net/if_udav.c user/attilio/vmobj-readlock/sys/dev/virtio/network/if_vtnet.c user/attilio/vmobj-readlock/sys/dev/xen/blkfront/blkfront.c user/attilio/vmobj-readlock/sys/dev/xen/blkfront/block.h user/attilio/vmobj-readlock/sys/dev/xen/netfront/netfront.c user/attilio/vmobj-readlock/sys/i386/include/xen/xen-os.h user/attilio/vmobj-readlock/sys/kern/kern_event.c user/attilio/vmobj-readlock/sys/kern/kern_hhook.c user/attilio/vmobj-readlock/sys/kern/kern_khelp.c user/attilio/vmobj-readlock/sys/mips/mips/stdatomic.c user/attilio/vmobj-readlock/sys/net/if_vlan.c user/attilio/vmobj-readlock/sys/net80211/ieee80211_var.h user/attilio/vmobj-readlock/sys/sparc64/include/atomic.h user/attilio/vmobj-readlock/sys/sparc64/sparc64/pmap.c user/attilio/vmobj-readlock/sys/sys/cdefs.h user/attilio/vmobj-readlock/sys/sys/hhook.h user/attilio/vmobj-readlock/sys/sys/module_khelp.h user/attilio/vmobj-readlock/sys/sys/stdatomic.h user/attilio/vmobj-readlock/sys/xen/interface/arch-ia64.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/arch-x86/cpuid.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/arch-x86/hvm/save.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/arch-x86/xen-mca.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/arch-x86/xen-x86_32.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/arch-x86/xen-x86_64.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/arch-x86/xen.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/arch-x86_32.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/arch-x86_64.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/domctl.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/elfnote.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/event_channel.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/features.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/grant_table.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/hvm/hvm_info_table.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/hvm/hvm_op.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/hvm/ioreq.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/hvm/params.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/hvm/save.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/io/blkif.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/io/netif.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/io/pciif.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/io/protocols.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/io/ring.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/io/xs_wire.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/kexec.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/memory.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/nmi.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/physdev.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/platform.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/sched.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/sysctl.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/trace.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/vcpu.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/version.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/xen-compat.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/xen.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/interface/xenoprof.h (contents, props changed) user/attilio/vmobj-readlock/sys/xen/xenstore/xenstore.c user/attilio/vmobj-readlock/tools/build/mk/OptionalObsoleteFiles.inc user/attilio/vmobj-readlock/tools/build/options/WITHOUT_KERBEROS_SUPPORT user/attilio/vmobj-readlock/tools/tools/ath/Makefile user/attilio/vmobj-readlock/tools/tools/ath/athspectral/athspectral.c user/attilio/vmobj-readlock/tools/tools/nanobsd/gateworks/common user/attilio/vmobj-readlock/usr.sbin/bsdconfig/bsdconfig user/attilio/vmobj-readlock/usr.sbin/bsdconfig/share/packages/packages.subr Directory Properties: user/attilio/vmobj-readlock/ (props changed) user/attilio/vmobj-readlock/contrib/llvm/ (props changed) user/attilio/vmobj-readlock/contrib/llvm/tools/clang/ (props changed) user/attilio/vmobj-readlock/sbin/ (props changed) user/attilio/vmobj-readlock/share/man/man4/ (props changed) user/attilio/vmobj-readlock/sys/ (props changed) user/attilio/vmobj-readlock/sys/amd64/include/xen/ (props changed) user/attilio/vmobj-readlock/sys/amd64/vmm/ (props changed) user/attilio/vmobj-readlock/sys/xen/interface/ (props changed) user/attilio/vmobj-readlock/sys/xen/interface/COPYING (props changed) user/attilio/vmobj-readlock/sys/xen/interface/acm.h (props changed) user/attilio/vmobj-readlock/sys/xen/interface/acm_ops.h (props changed) user/attilio/vmobj-readlock/sys/xen/interface/arch-arm/hvm/ (props changed) user/attilio/vmobj-readlock/sys/xen/interface/arch-ia64/hvm/ (props changed) user/attilio/vmobj-readlock/sys/xen/interface/arch-powerpc.h (props changed) user/attilio/vmobj-readlock/sys/xen/interface/arch-x86/ (props changed) user/attilio/vmobj-readlock/sys/xen/interface/arch-x86/hvm/ (props changed) user/attilio/vmobj-readlock/sys/xen/interface/callback.h (props changed) user/attilio/vmobj-readlock/sys/xen/interface/dom0_ops.h (props changed) user/attilio/vmobj-readlock/sys/xen/interface/elfstructs.h (props changed) user/attilio/vmobj-readlock/sys/xen/interface/foreign/ (props changed) user/attilio/vmobj-readlock/sys/xen/interface/foreign/Makefile (props changed) user/attilio/vmobj-readlock/sys/xen/interface/foreign/mkchecker.py (props changed) user/attilio/vmobj-readlock/sys/xen/interface/foreign/mkheader.py (props changed) user/attilio/vmobj-readlock/sys/xen/interface/foreign/reference.size (props changed) user/attilio/vmobj-readlock/sys/xen/interface/foreign/structs.py (props changed) user/attilio/vmobj-readlock/sys/xen/interface/hvm/ (props changed) user/attilio/vmobj-readlock/sys/xen/interface/hvm/e820.h (props changed) user/attilio/vmobj-readlock/sys/xen/interface/io/ (props changed) user/attilio/vmobj-readlock/sys/xen/interface/io/console.h (props changed) user/attilio/vmobj-readlock/sys/xen/interface/io/fbif.h (props changed) user/attilio/vmobj-readlock/sys/xen/interface/io/kbdif.h (props changed) user/attilio/vmobj-readlock/sys/xen/interface/io/tpmif.h (props changed) user/attilio/vmobj-readlock/sys/xen/interface/io/xenbus.h (props changed) user/attilio/vmobj-readlock/sys/xen/interface/libelf.h (props changed) user/attilio/vmobj-readlock/sys/xen/interface/xencomm.h (props changed) Modified: user/attilio/vmobj-readlock/Makefile ============================================================================== --- user/attilio/vmobj-readlock/Makefile Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/Makefile Sun Jun 16 15:35:13 2013 (r251806) @@ -209,6 +209,12 @@ cleanworld: # Handle the user-driven targets, using the source relative mk files. # +.if empty(.MAKEFLAGS:M-n) +# skip this for -n to avoid changing previous behavior of +# 'make -n buildworld' etc. +${TGTS}: .MAKE +.endif + ${TGTS}: ${_+_}@cd ${.CURDIR}; ${_MAKE} ${.TARGET} Modified: user/attilio/vmobj-readlock/Makefile.inc1 ============================================================================== --- user/attilio/vmobj-readlock/Makefile.inc1 Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/Makefile.inc1 Sun Jun 16 15:35:13 2013 (r251806) @@ -263,6 +263,13 @@ WMAKEENV= ${CROSSENV} \ VERSION="${VERSION}" \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} + +# make hierarchy +HMAKE= PATH=${TMPPATH} ${MAKE} LOCAL_MTREE=${LOCAL_MTREE} +.if defined(NO_ROOT) +HMAKE+= PATH=${TMPPATH} METALOG=${METALOG} -DNO_ROOT +.endif + .if ${MK_CDDL} == "no" WMAKEENV+= NO_CTF=1 .endif @@ -1367,12 +1374,7 @@ cross-tools: # hierarchy - ensure that all the needed directories are present # hierarchy hier: -.if defined(NO_ROOT) - cd ${.CURDIR}/etc; ${MAKE} LOCAL_MTREE=${LOCAL_MTREE} \ - -DNO_ROOT METALOG=${METALOG} distrib-dirs -.else - cd ${.CURDIR}/etc; ${MAKE} LOCAL_MTREE=${LOCAL_MTREE} distrib-dirs -.endif + cd ${.CURDIR}/etc && ${HMAKE} distrib-dirs # # libraries - build all libraries, and install them under ${DESTDIR}. @@ -1890,3 +1892,5 @@ _xi-links: xdev xdev-build xdev-install: @echo "*** Error: Both XDEV and XDEV_ARCH must be defined for \"${.TARGET}\" target" .endif + +buildkernel ${WMAKE_TGTS} ${.ALLTARGETS:M_*}: .MAKE Modified: user/attilio/vmobj-readlock/ObsoleteFiles.inc ============================================================================== --- user/attilio/vmobj-readlock/ObsoleteFiles.inc Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/ObsoleteFiles.inc Sun Jun 16 15:35:13 2013 (r251806) @@ -38,6 +38,33 @@ # xargs -n1 | sort | uniq -d; # done +# 20130614: remove CVS from base +OLD_FILES+=usr/bin/cvs +OLD_FILES+=usr/bin/cvsbug +OLD_FILES+=usr/share/examples/cvs/contrib/README +OLD_FILES+=usr/share/examples/cvs/contrib/clmerge +OLD_FILES+=usr/share/examples/cvs/contrib/cln_hist +OLD_FILES+=usr/share/examples/cvs/contrib/commit_prep +OLD_FILES+=usr/share/examples/cvs/contrib/cvs2vendor +OLD_FILES+=usr/share/examples/cvs/contrib/cvs_acls +OLD_FILES+=usr/share/examples/cvs/contrib/cvscheck +OLD_FILES+=usr/share/examples/cvs/contrib/cvscheck.man +OLD_FILES+=usr/share/examples/cvs/contrib/cvshelp.man +OLD_FILES+=usr/share/examples/cvs/contrib/descend.man +OLD_FILES+=usr/share/examples/cvs/contrib/easy-import +OLD_FILES+=usr/share/examples/cvs/contrib/intro.doc +OLD_FILES+=usr/share/examples/cvs/contrib/log +OLD_FILES+=usr/share/examples/cvs/contrib/log_accum +OLD_FILES+=usr/share/examples/cvs/contrib/mfpipe +OLD_FILES+=usr/share/examples/cvs/contrib/rcs-to-cvs +OLD_FILES+=usr/share/examples/cvs/contrib/rcs2log +OLD_FILES+=usr/share/examples/cvs/contrib/rcslock +OLD_FILES+=usr/share/examples/cvs/contrib/sccs2rcs +OLD_FILES+=usr/share/info/cvs.info.gz +OLD_FILES+=usr/share/info/cvsclient.info.gz +OLD_FILES+=usr/share/man/man1/cvs.1.gz +OLD_FILES+=usr/share/man/man5/cvs.5.gz +OLD_FILES+=usr/share/man/man8/cvsbug.8.gz # 20130417: nfs fha moved from nfsserver to nfs OLD_FILES+=usr/include/nfsserver/nfs_fha.h # 20130411: new clang import which bumps version from 3.2 to 3.3. Modified: user/attilio/vmobj-readlock/UPDATING ============================================================================== --- user/attilio/vmobj-readlock/UPDATING Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/UPDATING Sun Jun 16 15:35:13 2013 (r251806) @@ -31,6 +31,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20130615: + CVS has been removed from the base system. An exact copy + of the code is available from the devel/cvs port. + 20130613: Some people report the following error after the switch to bmake: Modified: user/attilio/vmobj-readlock/bin/sh/sh.1 ============================================================================== --- user/attilio/vmobj-readlock/bin/sh/sh.1 Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/bin/sh/sh.1 Sun Jun 16 15:35:13 2013 (r251806) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd June 5, 2013 +.Dd June 14, 2013 .Dt SH 1 .Os .Sh NAME @@ -1036,6 +1036,9 @@ The current working directory as set by The file creation mask as set by .Ic umask . .It +Resource limits as set by +.Ic ulimit . +.It References to open files. .It Traps as set by Modified: user/attilio/vmobj-readlock/contrib/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp ============================================================================== --- user/attilio/vmobj-readlock/contrib/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/contrib/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp Sun Jun 16 15:35:13 2013 (r251806) @@ -2306,25 +2306,25 @@ MatchAndEmitInstruction(SMLoc IDLoc, uns unsigned Match1, Match2, Match3, Match4; Match1 = MatchInstructionImpl(Operands, Inst, ErrorInfoIgnore, - isParsingIntelSyntax()); + MatchingInlineAsm, isParsingIntelSyntax()); // If this returned as a missing feature failure, remember that. if (Match1 == Match_MissingFeature) ErrorInfoMissingFeature = ErrorInfoIgnore; Tmp[Base.size()] = Suffixes[1]; Match2 = MatchInstructionImpl(Operands, Inst, ErrorInfoIgnore, - isParsingIntelSyntax()); + MatchingInlineAsm, isParsingIntelSyntax()); // If this returned as a missing feature failure, remember that. if (Match2 == Match_MissingFeature) ErrorInfoMissingFeature = ErrorInfoIgnore; Tmp[Base.size()] = Suffixes[2]; Match3 = MatchInstructionImpl(Operands, Inst, ErrorInfoIgnore, - isParsingIntelSyntax()); + MatchingInlineAsm, isParsingIntelSyntax()); // If this returned as a missing feature failure, remember that. if (Match3 == Match_MissingFeature) ErrorInfoMissingFeature = ErrorInfoIgnore; Tmp[Base.size()] = Suffixes[3]; Match4 = MatchInstructionImpl(Operands, Inst, ErrorInfoIgnore, - isParsingIntelSyntax()); + MatchingInlineAsm, isParsingIntelSyntax()); // If this returned as a missing feature failure, remember that. if (Match4 == Match_MissingFeature) ErrorInfoMissingFeature = ErrorInfoIgnore; Modified: user/attilio/vmobj-readlock/contrib/llvm/lib/Target/X86/X86InstrInfo.td ============================================================================== --- user/attilio/vmobj-readlock/contrib/llvm/lib/Target/X86/X86InstrInfo.td Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/contrib/llvm/lib/Target/X86/X86InstrInfo.td Sun Jun 16 15:35:13 2013 (r251806) @@ -884,12 +884,12 @@ def PUSHF64 : I<0x9C, RawFrm, (outs), let Defs = [EDI, ESI, EBP, EBX, EDX, ECX, EAX, ESP], Uses = [ESP], mayLoad = 1, neverHasSideEffects = 1, SchedRW = [WriteLoad] in { -def POPA32 : I<0x61, RawFrm, (outs), (ins), "popa{l|d}", [], IIC_POP_A>, +def POPA32 : I<0x61, RawFrm, (outs), (ins), "popa{l}", [], IIC_POP_A>, Requires<[In32BitMode]>; } let Defs = [ESP], Uses = [EDI, ESI, EBP, EBX, EDX, ECX, EAX, ESP], mayStore = 1, neverHasSideEffects = 1, SchedRW = [WriteStore] in { -def PUSHA32 : I<0x60, RawFrm, (outs), (ins), "pusha{l|d}", [], IIC_PUSH_A>, +def PUSHA32 : I<0x60, RawFrm, (outs), (ins), "pusha{l}", [], IIC_PUSH_A>, Requires<[In32BitMode]>; } @@ -1867,6 +1867,9 @@ def : MnemonicAlias<"pushf", "pushfl", def : MnemonicAlias<"pushf", "pushfq", "att">, Requires<[In64BitMode]>; def : MnemonicAlias<"pushfd", "pushfl", "att">; +def : MnemonicAlias<"popad", "popa", "intel">, Requires<[In32BitMode]>; +def : MnemonicAlias<"pushad", "pusha", "intel">, Requires<[In32BitMode]>; + def : MnemonicAlias<"repe", "rep", "att">; def : MnemonicAlias<"repz", "rep", "att">; def : MnemonicAlias<"repnz", "repne", "att">; @@ -1919,29 +1922,31 @@ def : MnemonicAlias<"fucomip", "fucompi def : MnemonicAlias<"fwait", "wait", "att">; -class CondCodeAlias<string Prefix,string Suffix, string OldCond, string NewCond> +class CondCodeAlias<string Prefix,string Suffix, string OldCond, string NewCond, + string VariantName> : MnemonicAlias<!strconcat(Prefix, OldCond, Suffix), - !strconcat(Prefix, NewCond, Suffix)>; + !strconcat(Prefix, NewCond, Suffix), VariantName>; /// IntegerCondCodeMnemonicAlias - This multiclass defines a bunch of /// MnemonicAlias's that canonicalize the condition code in a mnemonic, for /// example "setz" -> "sete". -multiclass IntegerCondCodeMnemonicAlias<string Prefix, string Suffix> { - def C : CondCodeAlias<Prefix, Suffix, "c", "b">; // setc -> setb - def Z : CondCodeAlias<Prefix, Suffix, "z" , "e">; // setz -> sete - def NA : CondCodeAlias<Prefix, Suffix, "na", "be">; // setna -> setbe - def NB : CondCodeAlias<Prefix, Suffix, "nb", "ae">; // setnb -> setae - def NC : CondCodeAlias<Prefix, Suffix, "nc", "ae">; // setnc -> setae - def NG : CondCodeAlias<Prefix, Suffix, "ng", "le">; // setng -> setle - def NL : CondCodeAlias<Prefix, Suffix, "nl", "ge">; // setnl -> setge - def NZ : CondCodeAlias<Prefix, Suffix, "nz", "ne">; // setnz -> setne - def PE : CondCodeAlias<Prefix, Suffix, "pe", "p">; // setpe -> setp - def PO : CondCodeAlias<Prefix, Suffix, "po", "np">; // setpo -> setnp - - def NAE : CondCodeAlias<Prefix, Suffix, "nae", "b">; // setnae -> setb - def NBE : CondCodeAlias<Prefix, Suffix, "nbe", "a">; // setnbe -> seta - def NGE : CondCodeAlias<Prefix, Suffix, "nge", "l">; // setnge -> setl - def NLE : CondCodeAlias<Prefix, Suffix, "nle", "g">; // setnle -> setg +multiclass IntegerCondCodeMnemonicAlias<string Prefix, string Suffix, + string V = ""> { + def C : CondCodeAlias<Prefix, Suffix, "c", "b", V>; // setc -> setb + def Z : CondCodeAlias<Prefix, Suffix, "z" , "e", V>; // setz -> sete + def NA : CondCodeAlias<Prefix, Suffix, "na", "be", V>; // setna -> setbe + def NB : CondCodeAlias<Prefix, Suffix, "nb", "ae", V>; // setnb -> setae + def NC : CondCodeAlias<Prefix, Suffix, "nc", "ae", V>; // setnc -> setae + def NG : CondCodeAlias<Prefix, Suffix, "ng", "le", V>; // setng -> setle + def NL : CondCodeAlias<Prefix, Suffix, "nl", "ge", V>; // setnl -> setge + def NZ : CondCodeAlias<Prefix, Suffix, "nz", "ne", V>; // setnz -> setne + def PE : CondCodeAlias<Prefix, Suffix, "pe", "p", V>; // setpe -> setp + def PO : CondCodeAlias<Prefix, Suffix, "po", "np", V>; // setpo -> setnp + + def NAE : CondCodeAlias<Prefix, Suffix, "nae", "b", V>; // setnae -> setb + def NBE : CondCodeAlias<Prefix, Suffix, "nbe", "a", V>; // setnbe -> seta + def NGE : CondCodeAlias<Prefix, Suffix, "nge", "l", V>; // setnge -> setl + def NLE : CondCodeAlias<Prefix, Suffix, "nle", "g", V>; // setnle -> setg } // Aliases for set<CC> @@ -1949,9 +1954,11 @@ defm : IntegerCondCodeMnemonicAlias<"set // Aliases for j<CC> defm : IntegerCondCodeMnemonicAlias<"j", "">; // Aliases for cmov<CC>{w,l,q} -defm : IntegerCondCodeMnemonicAlias<"cmov", "w">; -defm : IntegerCondCodeMnemonicAlias<"cmov", "l">; -defm : IntegerCondCodeMnemonicAlias<"cmov", "q">; +defm : IntegerCondCodeMnemonicAlias<"cmov", "w", "att">; +defm : IntegerCondCodeMnemonicAlias<"cmov", "l", "att">; +defm : IntegerCondCodeMnemonicAlias<"cmov", "q", "att">; +// No size suffix for intel-style asm. +defm : IntegerCondCodeMnemonicAlias<"cmov", "", "intel">; //===----------------------------------------------------------------------===// Modified: user/attilio/vmobj-readlock/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def ============================================================================== --- user/attilio/vmobj-readlock/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def Sun Jun 16 15:35:13 2013 (r251806) @@ -70,6 +70,8 @@ // f -> this is a libc/libm function without the '__builtin_' prefix. It can // be followed by ':headername:' to state which header this function // comes from. +// i -> this is a runtime library implemented function without the +// '__builtin_' prefix. It will be implemented in compiter-rt or libgcc. // p:N: -> this is a printf-like function whose Nth argument is the format // string. // P:N: -> similar to the p:N: attribute, but the function is like vprintf Modified: user/attilio/vmobj-readlock/contrib/llvm/tools/clang/include/clang/Basic/Builtins.h ============================================================================== --- user/attilio/vmobj-readlock/contrib/llvm/tools/clang/include/clang/Basic/Builtins.h Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/contrib/llvm/tools/clang/include/clang/Basic/Builtins.h Sun Jun 16 15:35:13 2013 (r251806) @@ -128,6 +128,13 @@ public: return strchr(GetRecord(ID).Attributes, 'f') != 0; } + /// \brief Determines whether this builtin is a predefined compiler-rt/libgcc + /// function, such as "__clear_cache", where we know the signature a + /// priori. + bool isPredefinedRuntimeFunction(unsigned ID) const { + return strchr(GetRecord(ID).Attributes, 'i') != 0; + } + /// \brief Determines whether this builtin has custom typechecking. bool hasCustomTypechecking(unsigned ID) const { return strchr(GetRecord(ID).Attributes, 't') != 0; Modified: user/attilio/vmobj-readlock/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsAArch64.def ============================================================================== --- user/attilio/vmobj-readlock/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsAArch64.def Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsAArch64.def Sun Jun 16 15:35:13 2013 (r251806) @@ -15,4 +15,4 @@ // The format of this database matches clang/Basic/Builtins.def. // In libgcc -BUILTIN(__clear_cache, "vv*v*", "") +BUILTIN(__clear_cache, "vv*v*", "i") Modified: user/attilio/vmobj-readlock/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsARM.def ============================================================================== --- user/attilio/vmobj-readlock/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsARM.def Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsARM.def Sun Jun 16 15:35:13 2013 (r251806) @@ -15,7 +15,7 @@ // The format of this database matches clang/Basic/Builtins.def. // In libgcc -BUILTIN(__clear_cache, "v.", "") +BUILTIN(__clear_cache, "v.", "i") BUILTIN(__builtin_thread_pointer, "v*", "") // Saturating arithmetic Modified: user/attilio/vmobj-readlock/contrib/llvm/tools/clang/lib/Basic/Targets.cpp ============================================================================== --- user/attilio/vmobj-readlock/contrib/llvm/tools/clang/lib/Basic/Targets.cpp Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/contrib/llvm/tools/clang/lib/Basic/Targets.cpp Sun Jun 16 15:35:13 2013 (r251806) @@ -3533,8 +3533,8 @@ class ARMTargetInfo : public TargetInfo // the kernel which on armv6 and newer uses ldrex and strex. The net result // is that if we assume the kernel is at least as recent as the hardware, // it is safe to use atomic instructions on armv6 and newer. - if (T.getOS() != llvm::Triple::Linux) - return false; + if (T.getOS() != llvm::Triple::Linux && T.getOS() != llvm::Triple::FreeBSD) + return false; StringRef ArchName = T.getArchName(); if (T.getArch() == llvm::Triple::arm) { if (!ArchName.startswith("armv")) Modified: user/attilio/vmobj-readlock/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp ============================================================================== --- user/attilio/vmobj-readlock/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp Sun Jun 16 15:35:13 2013 (r251806) @@ -8671,7 +8671,8 @@ Decl *Sema::ActOnStartOfFunctionDef(Scop // Builtin functions cannot be defined. if (unsigned BuiltinID = FD->getBuiltinID()) { - if (!Context.BuiltinInfo.isPredefinedLibFunction(BuiltinID)) { + if (!Context.BuiltinInfo.isPredefinedLibFunction(BuiltinID) && + !Context.BuiltinInfo.isPredefinedRuntimeFunction(BuiltinID)) { Diag(FD->getLocation(), diag::err_builtin_definition) << FD; FD->setInvalidDecl(); } Modified: user/attilio/vmobj-readlock/etc/inetd.conf ============================================================================== --- user/attilio/vmobj-readlock/etc/inetd.conf Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/etc/inetd.conf Sun Jun 16 15:35:13 2013 (r251806) @@ -58,8 +58,8 @@ # --allow-root path correctly or you open a trivial to exploit but # deadly security hole. # -#cvspserver stream tcp nowait root /usr/bin/cvs cvs --allow-root=/your/cvsroot/here pserver -#cvspserver stream tcp nowait root /usr/bin/cvs cvs --allow-root=/your/cvsroot/here kserver +#cvspserver stream tcp nowait root /usr/local/bin/cvs cvs --allow-root=/your/cvsroot/here pserver +#cvspserver stream tcp nowait root /usr/local/bin/cvs cvs --allow-root=/your/cvsroot/here kserver # # RPC based services (you MUST have rpcbind running to use these) # Modified: user/attilio/vmobj-readlock/etc/mtree/BSD.usr.dist ============================================================================== --- user/attilio/vmobj-readlock/etc/mtree/BSD.usr.dist Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/etc/mtree/BSD.usr.dist Sun Jun 16 15:35:13 2013 (r251806) @@ -148,8 +148,6 @@ .. 27.nfsrfc .. - 28.cvs - .. .. smm 01.setup @@ -223,10 +221,6 @@ .. csh .. - cvs - contrib - .. - .. cvsup .. diskless Modified: user/attilio/vmobj-readlock/gnu/usr.bin/Makefile ============================================================================== --- user/attilio/vmobj-readlock/gnu/usr.bin/Makefile Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/gnu/usr.bin/Makefile Sun Jun 16 15:35:13 2013 (r251806) @@ -4,7 +4,6 @@ SUBDIR= ${_binutils} \ ${_cc} \ - ${_cvs} \ dialog \ diff \ diff3 \ @@ -26,10 +25,6 @@ _groff= groff .endif .endif -.if ${MK_CVS} != "no" -_cvs= cvs -.endif - .if ${MK_GPL_DTC} != "no" _dtc= dtc .endif Modified: user/attilio/vmobj-readlock/lib/libcompiler_rt/Makefile ============================================================================== --- user/attilio/vmobj-readlock/lib/libcompiler_rt/Makefile Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/lib/libcompiler_rt/Makefile Sun Jun 16 15:35:13 2013 (r251806) @@ -28,6 +28,7 @@ SRCF= absvdi2 \ ashlti3 \ ashrdi3 \ ashrti3 \ + clear_cache \ clzdi2 \ clzsi2 \ clzti2 \ @@ -125,11 +126,6 @@ SRCF= absvdi2 \ umoddi3 \ umodti3 -# Don't build clear_cache on ARM with clang as it is a builtin there. -.if ${MACHINE_CPUARCH} != "arm" || ${COMPILER_TYPE} != "clang" -SRCF+= clear_cache -.endif - # These are already shipped by libc.a on arm and mips .if ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" SRCF+= adddf3 \ @@ -158,14 +154,9 @@ SRCF+= divsi3 \ # FreeBSD-specific atomic intrinsics. .if ${MACHINE_CPUARCH} == "arm" -SRCF+= __sync_fetch_and_add_4 \ - __sync_fetch_and_and_4 \ - __sync_fetch_and_or_4 \ - __sync_fetch_and_sub_4 \ - __sync_fetch_and_xor_4 \ - __sync_lock_test_and_set_4 \ - __sync_synchronize \ - __sync_val_compare_and_swap_4 +.PATH: ${.CURDIR}/../../sys/arm/arm + +SRCF+= stdatomic .elif ${MACHINE_CPUARCH} == "mips" .PATH: ${.CURDIR}/../../sys/mips/mips Modified: user/attilio/vmobj-readlock/sbin/camcontrol/fwdownload.c ============================================================================== --- user/attilio/vmobj-readlock/sbin/camcontrol/fwdownload.c Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/sbin/camcontrol/fwdownload.c Sun Jun 16 15:35:13 2013 (r251806) @@ -370,17 +370,15 @@ fw_download_img(struct cam_device *cam_d } if (!sim_mode) { /* Execute the command. */ - if (cam_send_ccb(cam_dev, ccb) < 0) { + if (cam_send_ccb(cam_dev, ccb) < 0 || + (ccb->ccb_h.status & CAM_STATUS_MASK) != + CAM_REQ_CMP) { warnx("Error writing image to device"); if (printerrors) cam_error_print(cam_dev, ccb, CAM_ESF_ALL, CAM_EPF_ALL, stderr); goto bailout; } - if (ccb->ataio.res.status != 0 /*&& !last_pkt*/) { - cam_error_print(cam_dev, ccb, CAM_ESF_ALL, - CAM_EPF_ALL, stderr); - } } /* Prepare next round. */ pkt_count++; Modified: user/attilio/vmobj-readlock/sbin/hastd/refcnt.h ============================================================================== --- user/attilio/vmobj-readlock/sbin/hastd/refcnt.h Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/sbin/hastd/refcnt.h Sun Jun 16 15:35:13 2013 (r251806) @@ -32,24 +32,24 @@ #ifndef __REFCNT_H__ #define __REFCNT_H__ -#include <machine/atomic.h> +#include <stdatomic.h> #include "pjdlog.h" -typedef unsigned int refcnt_t; +typedef atomic_uint refcnt_t; static __inline void refcnt_init(refcnt_t *count, unsigned int v) { - *count = v; + atomic_init(count, v); } static __inline void refcnt_acquire(refcnt_t *count) { - atomic_add_acq_int(count, 1); + atomic_fetch_add_explicit(count, 1, memory_order_acquire); } static __inline unsigned int @@ -58,7 +58,7 @@ refcnt_release(refcnt_t *count) unsigned int old; /* XXX: Should this have a rel membar? */ - old = atomic_fetchadd_int(count, -1); + old = atomic_fetch_sub(count, 1); PJDLOG_ASSERT(old > 0); return (old - 1); } Modified: user/attilio/vmobj-readlock/share/doc/psd/Makefile ============================================================================== --- user/attilio/vmobj-readlock/share/doc/psd/Makefile Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/share/doc/psd/Makefile Sun Jun 16 15:35:13 2013 (r251806) @@ -35,7 +35,6 @@ SUBDIR+=22.rpcgen \ 24.xdr \ 25.xdrrfc \ 26.rpcrfc \ - 27.nfsrpc \ - 28.cvs + 27.nfsrpc .include <bsd.subdir.mk> Modified: user/attilio/vmobj-readlock/share/man/man4/filemon.4 ============================================================================== --- user/attilio/vmobj-readlock/share/man/man4/filemon.4 Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/share/man/man4/filemon.4 Sun Jun 16 15:35:13 2013 (r251806) @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 30, 2012 +.Dd June 14, 2013 .Dt FILEMON 4 .Os .Sh NAME @@ -126,6 +126,7 @@ is set to indicate the error. #include <dev/filemon/filemon.h> #include <fcntl.h> #include <err.h> +#include <unistd.h> static void open_filemon(void) @@ -133,29 +134,24 @@ open_filemon(void) pid_t child; int fm_fd, fm_log; - if ((fm_fd = open("/dev/filemon", O_RDWR)) == -1) + if ((fm_fd = open("/dev/filemon", O_RDWR | O_CLOEXEC)) == -1) err(1, "open(\e"/dev/filemon\e", O_RDWR)"); if ((fm_log = open("filemon.out", - O_CREAT | O_WRONLY | O_TRUNC, DEFFILEMODE)) == -1) + O_CREAT | O_WRONLY | O_TRUNC | O_CLOEXEC, DEFFILEMODE)) == -1) err(1, "open(filemon.out)"); if (ioctl(fm_fd, FILEMON_SET_FD, &fm_log) == -1) err(1, "Cannot set filemon log file descriptor"); - /* Set up these two fd's to close on exec. */ - (void)fcntl(fm_fd, F_SETFD, FD_CLOEXEC); - (void)fcntl(fm_log, F_SETFD, FD_CLOEXEC); if ((child = fork()) == 0) { child = getpid(); if (ioctl(fm_fd, FILEMON_SET_PID, &child) == -1) err(1, "Cannot set filemon PID"); /* Do something here. */ - return 0; } else { wait(&child); close(fm_fd); } - return 0; } .Ed .Pp Modified: user/attilio/vmobj-readlock/share/man/man5/src.conf.5 ============================================================================== --- user/attilio/vmobj-readlock/share/man/man5/src.conf.5 Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/share/man/man5/src.conf.5 Sun Jun 16 15:35:13 2013 (r251806) @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. -.\" from FreeBSD: head/tools/build/options/makeman 236279 2012-05-30 02:37:20Z gjb +.\" from FreeBSD: head/tools/build/options/makeman 251685 2013-06-13 13:05:08Z emaste .\" $FreeBSD$ -.Dd June 7, 2013 +.Dd June 15, 2013 .Dt SRC.CONF 5 .Os .Sh NAME @@ -387,9 +387,6 @@ similar to DWARF and the venerable stabs Set to not build .Xr ctm 1 and related utilities. -.It Va WITHOUT_CVS -.\" from FreeBSD: head/tools/build/options/WITHOUT_CVS 156932 2006-03-21 07:50:50Z ru -Set to not build CVS. .It Va WITHOUT_CXX .\" from FreeBSD: head/tools/build/options/WITHOUT_CXX 220402 2011-04-06 20:19:07Z uqs Set to not build @@ -637,9 +634,8 @@ When set, the following options are also is set explicitly) .El .It Va WITHOUT_KERBEROS_SUPPORT -.\" from FreeBSD: head/tools/build/options/WITHOUT_KERBEROS_SUPPORT 156932 2006-03-21 07:50:50Z ru +.\" from FreeBSD: head/tools/build/options/WITHOUT_KERBEROS_SUPPORT 251794 2013-06-15 20:29:07Z eadler Set to build some programs without Kerberos support, like -.Xr cvs 1 , .Xr ssh 1 , .Xr telnet 1 , .Xr sshd 8 , @@ -685,10 +681,11 @@ Setting this variable will enable the LD .Xr dig 1 and .Xr host 1 . -When set, the following options are also in effect: +When set, it also enforces the following options: .Pp -.Bl -inset -compact -.It Va WITHOUT_BIND_UTILS +.Bl -item -compact +.It +.Va WITHOUT_BIND_UTILS .El .It Va WITHOUT_LEGACY_CONSOLE .\" from FreeBSD: head/tools/build/options/WITHOUT_LEGACY_CONSOLE 249966 2013-04-27 04:09:09Z eadler @@ -701,9 +698,9 @@ and On amd64, set to not build 32-bit library set and a .Nm ld-elf32.so.1 runtime linker. -.It Va WITHOUT_LIBCPLUSPLUS -.\" from FreeBSD: head/tools/build/options/WITHOUT_LIBCPLUSPLUS 246262 2013-02-02 22:42:46Z dim -Set to avoid building libcxxrt and libc++. +.It Va WITH_LIBCPLUSPLUS +.\" from FreeBSD: head/tools/build/options/WITH_LIBCPLUSPLUS 228082 2011-11-28 17:56:46Z dim +Set to build libcxxrt and libc++. .It Va WITHOUT_LIBPTHREAD .\" from FreeBSD: head/tools/build/options/WITHOUT_LIBPTHREAD 188848 2009-02-20 11:09:55Z mtm Set to not build the Modified: user/attilio/vmobj-readlock/share/man/man9/pci.9 ============================================================================== --- user/attilio/vmobj-readlock/share/man/man9/pci.9 Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/share/man/man9/pci.9 Sun Jun 16 15:35:13 2013 (r251806) @@ -485,13 +485,13 @@ A driver is only allowed to use either M but not both. .Pp The -.Fn pci_count_msi +.Fn pci_msi_count function returns the maximum number of MSI messages supported by the device .Fa dev . If the device does not support MSI, then -.Fn pci_count_msi +.Fn pci_msi_count returns zero. .Pp The @@ -538,13 +538,13 @@ The function returns zero on success and an error on failure. .Pp The -.Fn pci_count_msix +.Fn pci_msix_count function returns the maximum number of MSI-X messages supported by the device .Fa dev . If the device does not support MSI-X, then -.Fn pci_count_msix +.Fn pci_msix_count returns zero. .Pp The Modified: user/attilio/vmobj-readlock/share/misc/bsd-family-tree ============================================================================== --- user/attilio/vmobj-readlock/share/misc/bsd-family-tree Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/share/misc/bsd-family-tree Sun Jun 16 15:35:13 2013 (r251806) @@ -638,6 +638,6 @@ Steven M. Schultz for providing 2.8BSD, -- Copyright (c) 1997-2012 Wolfram Schneider <wosch@FreeBSD.ORG> -URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree +URL: http://svnweb.freebsd.org/base/head/share/misc/bsd-family-tree $FreeBSD$ Modified: user/attilio/vmobj-readlock/share/mk/bsd.own.mk ============================================================================== --- user/attilio/vmobj-readlock/share/mk/bsd.own.mk Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/share/mk/bsd.own.mk Sun Jun 16 15:35:13 2013 (r251806) @@ -272,7 +272,6 @@ __DEFAULT_YES_OPTIONS = \ CROSS_COMPILER \ CRYPT \ CTM \ - CVS \ CXX \ DICT \ DYNAMICROOT \ Modified: user/attilio/vmobj-readlock/share/mk/bsd.subdir.mk ============================================================================== --- user/attilio/vmobj-readlock/share/mk/bsd.subdir.mk Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/share/mk/bsd.subdir.mk Sun Jun 16 15:35:13 2013 (r251806) @@ -36,14 +36,14 @@ __<bsd.subdir.mk>__: DISTRIBUTION?= base .if !target(distribute) -distribute: +distribute: .MAKE .for dist in ${DISTRIBUTION} ${_+_}cd ${.CURDIR}; \ ${MAKE} install -DNO_SUBDIR DESTDIR=${DISTDIR}/${dist} SHARED=copies .endfor .endif -_SUBDIR: .USE +_SUBDIR: .USE .MAKE .if defined(SUBDIR) && !empty(SUBDIR) && !defined(NO_SUBDIR) @${_+_}set -e; for entry in ${SUBDIR}; do \ if test -d ${.CURDIR}/$${entry}.${MACHINE_ARCH}; then \ @@ -60,7 +60,7 @@ _SUBDIR: .USE done .endif -${SUBDIR}: .PHONY +${SUBDIR}: .PHONY .MAKE ${_+_}@if test -d ${.TARGET}.${MACHINE_ARCH}; then \ cd ${.CURDIR}/${.TARGET}.${MACHINE_ARCH}; \ else \ @@ -81,7 +81,7 @@ ${__stage}${__target}: ${__stage}${__target}: _SUBDIR .endif .endfor -${__target}: +${__target}: .MAKE ${_+_}set -e; cd ${.CURDIR}; ${MAKE} build${__target}; ${MAKE} install${__target} .endfor Modified: user/attilio/vmobj-readlock/share/mk/sys.mk ============================================================================== --- user/attilio/vmobj-readlock/share/mk/sys.mk Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/share/mk/sys.mk Sun Jun 16 15:35:13 2013 (r251806) @@ -95,7 +95,13 @@ ECHODIR ?= true .endif .endif -.if !empty(.MAKEFLAGS:M-n) && ${.MAKEFLAGS:M-n} == "-n" +.if defined(.PARSEDIR) +# _+_ appears to be a workaround for the special src .MAKE not working. +# setting it to + interferes with -N +_+_ ?= +.elif !empty(.MAKEFLAGS:M-n) && ${.MAKEFLAGS:M-n} == "-n" +# the check above matches only a single -n, so -n -n will result +# in _+_ = + _+_ ?= .else _+_ ?= + Modified: user/attilio/vmobj-readlock/sys/amd64/amd64/genassym.c ============================================================================== --- user/attilio/vmobj-readlock/sys/amd64/amd64/genassym.c Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/sys/amd64/amd64/genassym.c Sun Jun 16 15:35:13 2013 (r251806) @@ -109,7 +109,6 @@ ASSYM(addr_PML4map, addr_PML4map); ASSYM(addr_PML4pml4e, addr_PML4pml4e); ASSYM(PDESIZE, sizeof(pd_entry_t)); ASSYM(PTESIZE, sizeof(pt_entry_t)); -ASSYM(PTESHIFT, PTESHIFT); ASSYM(PAGE_SHIFT, PAGE_SHIFT); ASSYM(PAGE_MASK, PAGE_MASK); ASSYM(PDRSHIFT, PDRSHIFT); Modified: user/attilio/vmobj-readlock/sys/amd64/amd64/pmap.c ============================================================================== --- user/attilio/vmobj-readlock/sys/amd64/amd64/pmap.c Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/sys/amd64/amd64/pmap.c Sun Jun 16 15:35:13 2013 (r251806) @@ -320,9 +320,6 @@ static void _pmap_unwire_ptp(pmap_t pmap static int pmap_unuse_pt(pmap_t, vm_offset_t, pd_entry_t, vm_page_t *); static vm_offset_t pmap_kmem_choose(vm_offset_t addr); -CTASSERT(1 << PDESHIFT == sizeof(pd_entry_t)); -CTASSERT(1 << PTESHIFT == sizeof(pt_entry_t)); - /* * Move the kernel virtual free pointer to the next * 2MB. This is used to help improve performance Modified: user/attilio/vmobj-readlock/sys/amd64/include/pmap.h ============================================================================== --- user/attilio/vmobj-readlock/sys/amd64/include/pmap.h Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/sys/amd64/include/pmap.h Sun Jun 16 15:35:13 2013 (r251806) @@ -157,11 +157,6 @@ typedef u_int64_t pt_entry_t; typedef u_int64_t pdp_entry_t; typedef u_int64_t pml4_entry_t; -#define PML4ESHIFT (3) -#define PDPESHIFT (3) -#define PTESHIFT (3) -#define PDESHIFT (3) - /* * Address of current address space page table maps and directories. */ Modified: user/attilio/vmobj-readlock/sys/amd64/include/xen/xen-os.h ============================================================================== --- user/attilio/vmobj-readlock/sys/amd64/include/xen/xen-os.h Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/sys/amd64/include/xen/xen-os.h Sun Jun 16 15:35:13 2013 (r251806) @@ -13,16 +13,21 @@ #define CONFIG_X86_PAE #endif +#ifdef LOCORE +#define __ASSEMBLY__ +#endif + #if !defined(__XEN_INTERFACE_VERSION__) -/* - * Can update to a more recent version when we implement - * the hypercall page - */ -#define __XEN_INTERFACE_VERSION__ 0x00030204 +#define __XEN_INTERFACE_VERSION__ 0x00030208 #endif +#define GRANT_REF_INVALID 0xffffffff + #include <xen/interface/xen.h> +/* Everything below this point is not included by assembler (.S) files. */ +#ifndef __ASSEMBLY__ + /* Force a proper event-channel callback from Xen. */ void force_evtchn_callback(void); @@ -43,10 +48,6 @@ static inline void rep_nop(void) void *bootmem_alloc(unsigned int size); void bootmem_free(void *ptr, unsigned int size); - -/* Everything below this point is not included by assembler (.S) files. */ -#ifndef __ASSEMBLY__ - void printk(const char *fmt, ...); /* some function prototypes */ @@ -128,14 +129,14 @@ do { #else #endif -#ifndef mb -#define mb() __asm__ __volatile__("mfence":::"memory") +#ifndef xen_mb +#define xen_mb() mb() #endif -#ifndef rmb -#define rmb() __asm__ __volatile__("lfence":::"memory"); +#ifndef xen_rmb +#define xen_rmb() rmb() #endif -#ifndef wmb -#define wmb() barrier() +#ifndef xen_wmb +#define xen_wmb() wmb() #endif #ifdef SMP #define smp_mb() mb() Modified: user/attilio/vmobj-readlock/sys/amd64/vmm/io/vlapic.c ============================================================================== --- user/attilio/vmobj-readlock/sys/amd64/vmm/io/vlapic.c Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/sys/amd64/vmm/io/vlapic.c Sun Jun 16 15:35:13 2013 (r251806) @@ -465,7 +465,7 @@ lapic_process_icr(struct vlapic *vlapic, break; } - while ((i = cpusetobj_ffs(&dmask)) != 0) { + while ((i = CPU_FFS(&dmask)) != 0) { i--; CPU_CLR(i, &dmask); if (mode == APIC_DELMODE_FIXED) { Modified: user/attilio/vmobj-readlock/sys/arm/arm/stdatomic.c ============================================================================== --- user/attilio/vmobj-readlock/sys/arm/arm/stdatomic.c Sun Jun 16 15:26:06 2013 (r251805) +++ user/attilio/vmobj-readlock/sys/arm/arm/stdatomic.c Sun Jun 16 15:35:13 2013 (r251806) @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> #include <machine/cpufunc.h> +#include <machine/sysarch.h> #ifdef _KERNEL #include "opt_global.h" @@ -41,7 +42,7 @@ __FBSDID("$FreeBSD$"); * Executing statements with interrupts disabled. */ -#ifndef SMP +#if defined(_KERNEL) && !defined(SMP) #define WITHOUT_INTERRUPTS(s) do { \ register_t regs; \ \ @@ -49,7 +50,7 @@ __FBSDID("$FreeBSD$"); do s while (0); \ intr_restore(regs); \ } while (0) -#endif /* !SMP */ +#endif /* _KERNEL && !SMP */ /* * Memory barriers. @@ -62,18 +63,30 @@ __FBSDID("$FreeBSD$"); * should make <stdatomic.h>'s atomic_exchange_explicit() work reliably. */ +#if defined(_KERNEL) && !defined(SMP) static inline void do_sync(void) { -#if defined(_KERNEL) && !defined(SMP) __asm volatile ("" : : : "memory"); +} #elif defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) +static inline void +do_sync(void) +{ + __asm volatile ("dmb" : : : "memory"); -#else /* __ARM_ARCH_6__ */ +} +#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || \ + defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || \ + defined(__ARM_ARCH_6ZK__) +static inline void +do_sync(void) +{ + __asm volatile ("mcr p15, 0, %0, c7, c10, 5" : : "r" (0) : "memory"); -#endif } +#endif #if defined(__CLANG_ATOMICS) || defined(__GNUC_ATOMICS) @@ -88,11 +101,7 @@ do_sync(void) /* These systems should be supported by the compiler. */ -#elif defined(_KERNEL) - -#ifdef SMP -#error "On SMP systems we should have proper atomic operations." -#endif +#else /* __ARM_ARCH_5__ */ /* Clang doesn't allow us to reimplement builtins without this. */ #ifdef __clang__ @@ -103,10 +112,14 @@ do_sync(void) void __sync_synchronize(void) { - - do_sync(); } +#ifdef _KERNEL + +#ifdef SMP +#error "On SMP systems we should have proper atomic operations." +#endif + /* * On uniprocessor systems, we can perform the atomic operations by * disabling interrupts. @@ -182,20 +195,154 @@ EMIT_ALL_OPS_N(2, uint16_t) EMIT_ALL_OPS_N(4, uint32_t) EMIT_ALL_OPS_N(8, uint64_t) -#else /* !__ARM_ARCH_6__ && !__ARM_ARCH_7__ && !_KERNEL */ +#else /* !_KERNEL */ + +/* + * For userspace on uniprocessor systems, we can implement the atomic + * operations by using a Restartable Atomic Sequence. This makes the + * kernel restart the code from the beginning when interrupted. + */ + +#define EMIT_LOAD_N(N, uintN_t) \ +uintN_t \ +__atomic_load_##N(uintN_t *mem, int model __unused) \ +{ \ + \ + return (*mem); \ +} + +#define EMIT_STORE_N(N, uintN_t) \ +void \ +__atomic_store_##N(uintN_t *mem, uintN_t val, int model __unused) \ +{ \ + \ + *mem = val; \ +} + +#define EMIT_EXCHANGE_N(N, uintN_t, ldr, str) \ +uintN_t \ +__atomic_exchange_##N(uintN_t *mem, uintN_t val, int model __unused) \ +{ \ + uint32_t old, temp, ras_start; \ + \ + ras_start = ARM_RAS_START; \ + __asm volatile ( \ + /* Set up Restartable Atomic Sequence. */ \ + "1:" \ + "\tadr %2, 1b\n" \ + "\tstr %2, [%5]\n" \ + "\tadr %2, 2f\n" \ + "\tstr %2, [%5, #4]\n" \ + \ + "\t"ldr" %0, %4\n" /* Load old value. */ \ + "\t"str" %3, %1\n" /* Store new value. */ \ + \ + /* Tear down Restartable Atomic Sequence. */ \ + "2:" \ + "\tmov %2, #0x00000000\n" \ + "\tstr %2, [%5]\n" \ + "\tmov %2, #0xffffffff\n" \ + "\tstr %2, [%5, #4]\n" \ + : "=&r" (old), "=m" (*mem), "=&r" (temp) \ + : "r" (val), "m" (*mem), "r" (ras_start)); \ + return (old); \ +} + +#define EMIT_COMPARE_EXCHANGE_N(N, uintN_t, ldr, streq) \ +_Bool \ +__atomic_compare_exchange_##N(uintN_t *mem, uintN_t *pexpected, \ + uintN_t desired, int success __unused, int failure __unused) \ +{ \ + uint32_t expected, old, temp, ras_start; \ + \ + expected = *pexpected; \ + ras_start = ARM_RAS_START; \ + __asm volatile ( \ + /* Set up Restartable Atomic Sequence. */ \ + "1:" \ + "\tadr %2, 1b\n" \ + "\tstr %2, [%6]\n" \ + "\tadr %2, 2f\n" \ + "\tstr %2, [%6, #4]\n" \ + \ + "\t"ldr" %0, %5\n" /* Load old value. */ \ + "\tcmp %0, %3\n" /* Compare to expected value. */\ + "\t"streq" %4, %1\n" /* Store new value. */ \ + \ + /* Tear down Restartable Atomic Sequence. */ \ + "2:" \ + "\tmov %2, #0x00000000\n" \ + "\tstr %2, [%6]\n" \ + "\tmov %2, #0xffffffff\n" \ + "\tstr %2, [%6, #4]\n" \ + : "=&r" (old), "=m" (*mem), "=&r" (temp) \ + : "r" (expected), "r" (desired), "m" (*mem), \ + "r" (ras_start)); \ + if (old == expected) { \ + return (1); \ + } else { \ + *pexpected = old; \ + return (0); \ + } \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306161535.r5GFZEDS074039>