svn commit: r227756 - in user/attilio/vmcontention: . cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zstreamdump cddl/usr.bin/zstreamdump cddl/usr.sbin/zdb contrib/binutils/ld/emulpa...

Attilio Rao attilio at FreeBSD.org
Sun Nov 20 15:06:40 UTC 2011


Author: attilio
Date: Sun Nov 20 15:06:39 2011
New Revision: 227756
URL: http://svn.freebsd.org/changeset/base/227756

Log:
  MFC

Added:
  user/attilio/vmcontention/contrib/binutils/ld/emulparams/elf64ppc_fbsd.sh
     - copied unchanged from r227754, head/contrib/binutils/ld/emulparams/elf64ppc_fbsd.sh
  user/attilio/vmcontention/include/_xlocale_ctype.h
     - copied unchanged from r227754, head/include/_xlocale_ctype.h
  user/attilio/vmcontention/include/xlocale.h
     - copied unchanged from r227754, head/include/xlocale.h
  user/attilio/vmcontention/lib/libc/locale/DESIGN.xlocale
     - copied unchanged from r227754, head/lib/libc/locale/DESIGN.xlocale
  user/attilio/vmcontention/lib/libc/locale/ctype.c
     - copied unchanged from r227754, head/lib/libc/locale/ctype.c
  user/attilio/vmcontention/lib/libc/locale/duplocale.3
     - copied unchanged from r227754, head/lib/libc/locale/duplocale.3
  user/attilio/vmcontention/lib/libc/locale/freelocale.3
     - copied unchanged from r227754, head/lib/libc/locale/freelocale.3
  user/attilio/vmcontention/lib/libc/locale/newlocale.3
     - copied unchanged from r227754, head/lib/libc/locale/newlocale.3
  user/attilio/vmcontention/lib/libc/locale/querylocale.3
     - copied unchanged from r227754, head/lib/libc/locale/querylocale.3
  user/attilio/vmcontention/lib/libc/locale/uselocale.3
     - copied unchanged from r227754, head/lib/libc/locale/uselocale.3
  user/attilio/vmcontention/lib/libc/locale/xlocale.3
     - copied unchanged from r227754, head/lib/libc/locale/xlocale.3
  user/attilio/vmcontention/lib/libc/locale/xlocale.c
     - copied unchanged from r227754, head/lib/libc/locale/xlocale.c
  user/attilio/vmcontention/lib/libc/locale/xlocale_private.h
     - copied unchanged from r227754, head/lib/libc/locale/xlocale_private.h
  user/attilio/vmcontention/sys/dev/cesa/
     - copied from r227754, head/sys/dev/cesa/
  user/attilio/vmcontention/sys/kern/kern_ffclock.c
     - copied unchanged from r227754, head/sys/kern/kern_ffclock.c
  user/attilio/vmcontention/sys/mips/conf/std.XLP
     - copied unchanged from r227754, head/sys/mips/conf/std.XLP
  user/attilio/vmcontention/sys/sys/_ffcounter.h
     - copied unchanged from r227754, head/sys/sys/_ffcounter.h
  user/attilio/vmcontention/sys/sys/timeffc.h
     - copied unchanged from r227754, head/sys/sys/timeffc.h
Deleted:
  user/attilio/vmcontention/sys/mips/nlm/uart_bus_xlp_iodi.c
Modified:
  user/attilio/vmcontention/Makefile.inc1
  user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zdb/zdb.8
  user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.1
  user/attilio/vmcontention/cddl/usr.bin/zstreamdump/Makefile
  user/attilio/vmcontention/cddl/usr.sbin/zdb/Makefile
  user/attilio/vmcontention/contrib/gcc/config/rs6000/freebsd.h
  user/attilio/vmcontention/contrib/gdtoa/gdtoaimp.h
  user/attilio/vmcontention/contrib/gdtoa/strtod.c
  user/attilio/vmcontention/contrib/gdtoa/strtodg.c
  user/attilio/vmcontention/contrib/gdtoa/strtof.c
  user/attilio/vmcontention/contrib/gdtoa/strtorQ.c
  user/attilio/vmcontention/contrib/gdtoa/strtord.c
  user/attilio/vmcontention/contrib/gdtoa/strtorx.c
  user/attilio/vmcontention/contrib/llvm/tools/clang/include/clang/AST/ASTContext.h
  user/attilio/vmcontention/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def
  user/attilio/vmcontention/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticGroups.td
  user/attilio/vmcontention/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
  user/attilio/vmcontention/contrib/llvm/tools/clang/include/clang/Serialization/ASTBitCodes.h
  user/attilio/vmcontention/contrib/llvm/tools/clang/lib/AST/ASTContext.cpp
  user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
  user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp
  user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp
  user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Serialization/ASTReader.cpp
  user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Serialization/ASTWriter.cpp
  user/attilio/vmcontention/gnu/usr.bin/binutils/ld/Makefile.powerpc
  user/attilio/vmcontention/gnu/usr.bin/binutils/ld/Makefile.powerpc64
  user/attilio/vmcontention/include/Makefile
  user/attilio/vmcontention/include/locale.h
  user/attilio/vmcontention/include/runetype.h
  user/attilio/vmcontention/include/stdlib.h
  user/attilio/vmcontention/lib/libc/gdtoa/machdep_ldisQ.c
  user/attilio/vmcontention/lib/libc/gdtoa/machdep_ldisd.c
  user/attilio/vmcontention/lib/libc/gdtoa/machdep_ldisx.c
  user/attilio/vmcontention/lib/libc/gen/fnmatch.c
  user/attilio/vmcontention/lib/libc/gen/glob.c
  user/attilio/vmcontention/lib/libc/locale/Makefile.inc
  user/attilio/vmcontention/lib/libc/locale/Symbol.map
  user/attilio/vmcontention/lib/libc/locale/ascii.c
  user/attilio/vmcontention/lib/libc/locale/big5.c
  user/attilio/vmcontention/lib/libc/locale/btowc.c
  user/attilio/vmcontention/lib/libc/locale/collate.c
  user/attilio/vmcontention/lib/libc/locale/collate.h
  user/attilio/vmcontention/lib/libc/locale/collcmp.c
  user/attilio/vmcontention/lib/libc/locale/euc.c
  user/attilio/vmcontention/lib/libc/locale/gb18030.c
  user/attilio/vmcontention/lib/libc/locale/gb2312.c
  user/attilio/vmcontention/lib/libc/locale/gbk.c
  user/attilio/vmcontention/lib/libc/locale/lmessages.c
  user/attilio/vmcontention/lib/libc/locale/lmessages.h
  user/attilio/vmcontention/lib/libc/locale/lmonetary.c
  user/attilio/vmcontention/lib/libc/locale/lmonetary.h
  user/attilio/vmcontention/lib/libc/locale/lnumeric.c
  user/attilio/vmcontention/lib/libc/locale/lnumeric.h
  user/attilio/vmcontention/lib/libc/locale/localeconv.3
  user/attilio/vmcontention/lib/libc/locale/localeconv.c
  user/attilio/vmcontention/lib/libc/locale/mblen.c
  user/attilio/vmcontention/lib/libc/locale/mblocal.h
  user/attilio/vmcontention/lib/libc/locale/mbrlen.c
  user/attilio/vmcontention/lib/libc/locale/mbrtowc.c
  user/attilio/vmcontention/lib/libc/locale/mbsinit.c
  user/attilio/vmcontention/lib/libc/locale/mbsnrtowcs.c
  user/attilio/vmcontention/lib/libc/locale/mbsrtowcs.c
  user/attilio/vmcontention/lib/libc/locale/mbstowcs.c
  user/attilio/vmcontention/lib/libc/locale/mbtowc.c
  user/attilio/vmcontention/lib/libc/locale/mskanji.c
  user/attilio/vmcontention/lib/libc/locale/nextwctype.c
  user/attilio/vmcontention/lib/libc/locale/nl_langinfo.c
  user/attilio/vmcontention/lib/libc/locale/none.c
  user/attilio/vmcontention/lib/libc/locale/runetype.c
  user/attilio/vmcontention/lib/libc/locale/setlocale.c
  user/attilio/vmcontention/lib/libc/locale/setrunelocale.c
  user/attilio/vmcontention/lib/libc/locale/table.c
  user/attilio/vmcontention/lib/libc/locale/tolower.c
  user/attilio/vmcontention/lib/libc/locale/toupper.c
  user/attilio/vmcontention/lib/libc/locale/utf8.c
  user/attilio/vmcontention/lib/libc/locale/wcrtomb.c
  user/attilio/vmcontention/lib/libc/locale/wcsftime.c
  user/attilio/vmcontention/lib/libc/locale/wcsnrtombs.c
  user/attilio/vmcontention/lib/libc/locale/wcsrtombs.c
  user/attilio/vmcontention/lib/libc/locale/wcstod.c
  user/attilio/vmcontention/lib/libc/locale/wcstof.c
  user/attilio/vmcontention/lib/libc/locale/wcstoimax.c
  user/attilio/vmcontention/lib/libc/locale/wcstol.c
  user/attilio/vmcontention/lib/libc/locale/wcstold.c
  user/attilio/vmcontention/lib/libc/locale/wcstoll.c
  user/attilio/vmcontention/lib/libc/locale/wcstombs.c
  user/attilio/vmcontention/lib/libc/locale/wcstoul.c
  user/attilio/vmcontention/lib/libc/locale/wcstoull.c
  user/attilio/vmcontention/lib/libc/locale/wcstoumax.c
  user/attilio/vmcontention/lib/libc/locale/wctob.c
  user/attilio/vmcontention/lib/libc/locale/wctomb.c
  user/attilio/vmcontention/lib/libc/locale/wctrans.c
  user/attilio/vmcontention/lib/libc/locale/wctype.c
  user/attilio/vmcontention/lib/libc/locale/wcwidth.c
  user/attilio/vmcontention/lib/libc/regex/regcomp.c
  user/attilio/vmcontention/lib/libc/stdio/Symbol.map
  user/attilio/vmcontention/lib/libc/stdio/asprintf.c
  user/attilio/vmcontention/lib/libc/stdio/fgetwc.c
  user/attilio/vmcontention/lib/libc/stdio/fgetwln.c
  user/attilio/vmcontention/lib/libc/stdio/fgetws.c
  user/attilio/vmcontention/lib/libc/stdio/fprintf.c
  user/attilio/vmcontention/lib/libc/stdio/fputwc.c
  user/attilio/vmcontention/lib/libc/stdio/fputws.c
  user/attilio/vmcontention/lib/libc/stdio/fscanf.c
  user/attilio/vmcontention/lib/libc/stdio/fwprintf.c
  user/attilio/vmcontention/lib/libc/stdio/fwscanf.c
  user/attilio/vmcontention/lib/libc/stdio/getwc.c
  user/attilio/vmcontention/lib/libc/stdio/getwchar.c
  user/attilio/vmcontention/lib/libc/stdio/local.h
  user/attilio/vmcontention/lib/libc/stdio/printf.c
  user/attilio/vmcontention/lib/libc/stdio/printfcommon.h
  user/attilio/vmcontention/lib/libc/stdio/putwc.c
  user/attilio/vmcontention/lib/libc/stdio/putwchar.c
  user/attilio/vmcontention/lib/libc/stdio/scanf.c
  user/attilio/vmcontention/lib/libc/stdio/snprintf.c
  user/attilio/vmcontention/lib/libc/stdio/sprintf.c
  user/attilio/vmcontention/lib/libc/stdio/sscanf.c
  user/attilio/vmcontention/lib/libc/stdio/swprintf.c
  user/attilio/vmcontention/lib/libc/stdio/swscanf.c
  user/attilio/vmcontention/lib/libc/stdio/ungetwc.c
  user/attilio/vmcontention/lib/libc/stdio/vasprintf.c
  user/attilio/vmcontention/lib/libc/stdio/vdprintf.c
  user/attilio/vmcontention/lib/libc/stdio/vfprintf.c
  user/attilio/vmcontention/lib/libc/stdio/vfscanf.c
  user/attilio/vmcontention/lib/libc/stdio/vfwprintf.c
  user/attilio/vmcontention/lib/libc/stdio/vfwscanf.c
  user/attilio/vmcontention/lib/libc/stdio/vprintf.c
  user/attilio/vmcontention/lib/libc/stdio/vscanf.c
  user/attilio/vmcontention/lib/libc/stdio/vsnprintf.c
  user/attilio/vmcontention/lib/libc/stdio/vsprintf.c
  user/attilio/vmcontention/lib/libc/stdio/vsscanf.c
  user/attilio/vmcontention/lib/libc/stdio/vswprintf.c
  user/attilio/vmcontention/lib/libc/stdio/vswscanf.c
  user/attilio/vmcontention/lib/libc/stdio/vwprintf.c
  user/attilio/vmcontention/lib/libc/stdio/vwscanf.c
  user/attilio/vmcontention/lib/libc/stdio/wprintf.c
  user/attilio/vmcontention/lib/libc/stdio/wscanf.c
  user/attilio/vmcontention/lib/libc/stdlib/Symbol.map
  user/attilio/vmcontention/lib/libc/stdlib/atof.c
  user/attilio/vmcontention/lib/libc/stdlib/atoi.c
  user/attilio/vmcontention/lib/libc/stdlib/atol.c
  user/attilio/vmcontention/lib/libc/stdlib/atoll.c
  user/attilio/vmcontention/lib/libc/stdlib/strfmon.c
  user/attilio/vmcontention/lib/libc/stdlib/strtoimax.c
  user/attilio/vmcontention/lib/libc/stdlib/strtol.c
  user/attilio/vmcontention/lib/libc/stdlib/strtoll.c
  user/attilio/vmcontention/lib/libc/stdlib/strtoul.c
  user/attilio/vmcontention/lib/libc/stdlib/strtoull.c
  user/attilio/vmcontention/lib/libc/stdlib/strtoumax.c
  user/attilio/vmcontention/lib/libc/stdtime/strftime.c
  user/attilio/vmcontention/lib/libc/stdtime/strptime.c
  user/attilio/vmcontention/lib/libc/stdtime/timelocal.c
  user/attilio/vmcontention/lib/libc/stdtime/timelocal.h
  user/attilio/vmcontention/lib/libc/string/Symbol.map
  user/attilio/vmcontention/lib/libc/string/strcasecmp.c
  user/attilio/vmcontention/lib/libc/string/strcasestr.c
  user/attilio/vmcontention/lib/libc/string/strcoll.c
  user/attilio/vmcontention/lib/libc/string/strxfrm.c
  user/attilio/vmcontention/lib/libc/string/wcscoll.c
  user/attilio/vmcontention/lib/libc/string/wcswidth.c
  user/attilio/vmcontention/lib/libc/string/wcsxfrm.c
  user/attilio/vmcontention/lib/librt/timer.c
  user/attilio/vmcontention/libexec/rtld-elf/rtld.c
  user/attilio/vmcontention/release/doc/en_US.ISO8859-1/hardware/article.sgml
  user/attilio/vmcontention/release/doc/share/misc/dev.archlist.txt
  user/attilio/vmcontention/sbin/ifconfig/af_inet.c
  user/attilio/vmcontention/share/man/man4/u3g.4
  user/attilio/vmcontention/share/man/man4/uark.4
  user/attilio/vmcontention/share/man/man4/ubsa.4
  user/attilio/vmcontention/share/man/man4/ubser.4
  user/attilio/vmcontention/share/man/man4/uchcom.4
  user/attilio/vmcontention/share/man/man4/ucycom.4
  user/attilio/vmcontention/share/man/man4/ufoma.4
  user/attilio/vmcontention/share/man/man4/uftdi.4
  user/attilio/vmcontention/share/man/man4/uipaq.4
  user/attilio/vmcontention/share/man/man4/umcs.4
  user/attilio/vmcontention/share/man/man4/umct.4
  user/attilio/vmcontention/share/man/man4/umodem.4
  user/attilio/vmcontention/share/man/man4/uplcom.4
  user/attilio/vmcontention/share/man/man4/uslcom.4
  user/attilio/vmcontention/share/man/man4/uvisor.4
  user/attilio/vmcontention/share/man/man4/uvscom.4
  user/attilio/vmcontention/share/man/man9/VOP_VPTOCNP.9
  user/attilio/vmcontention/share/misc/committers-ports.dot
  user/attilio/vmcontention/sys/amd64/linux32/linux32_proto.h
  user/attilio/vmcontention/sys/amd64/linux32/linux32_syscall.h
  user/attilio/vmcontention/sys/amd64/linux32/linux32_syscalls.c
  user/attilio/vmcontention/sys/amd64/linux32/linux32_sysent.c
  user/attilio/vmcontention/sys/amd64/linux32/linux32_systrace_args.c
  user/attilio/vmcontention/sys/amd64/linux32/syscalls.master
  user/attilio/vmcontention/sys/arm/conf/DB-88F6XXX
  user/attilio/vmcontention/sys/arm/conf/SHEEVAPLUG
  user/attilio/vmcontention/sys/arm/mv/files.mv
  user/attilio/vmcontention/sys/arm/xscale/ixp425/avila_ata.c
  user/attilio/vmcontention/sys/boot/fdt/dts/db88f6281.dts
  user/attilio/vmcontention/sys/boot/fdt/dts/sheevaplug.dts
  user/attilio/vmcontention/sys/boot/forth/loader.conf
  user/attilio/vmcontention/sys/boot/i386/loader/Makefile
  user/attilio/vmcontention/sys/boot/ofw/Makefile.inc
  user/attilio/vmcontention/sys/boot/powerpc/Makefile.inc
  user/attilio/vmcontention/sys/boot/uboot/Makefile.inc
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
  user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_proto.h
  user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_syscall.h
  user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_syscalls.c
  user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_sysent.c
  user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_systrace_args.c
  user/attilio/vmcontention/sys/compat/freebsd32/syscalls.master
  user/attilio/vmcontention/sys/compat/linux/linux_file.c
  user/attilio/vmcontention/sys/compat/linux/linux_file.h
  user/attilio/vmcontention/sys/compat/svr4/svr4_fcntl.c
  user/attilio/vmcontention/sys/compat/svr4/svr4_proto.h
  user/attilio/vmcontention/sys/compat/svr4/svr4_syscall.h
  user/attilio/vmcontention/sys/compat/svr4/svr4_syscallnames.c
  user/attilio/vmcontention/sys/compat/svr4/svr4_sysent.c
  user/attilio/vmcontention/sys/compat/svr4/syscalls.master
  user/attilio/vmcontention/sys/conf/NOTES
  user/attilio/vmcontention/sys/conf/files
  user/attilio/vmcontention/sys/conf/options
  user/attilio/vmcontention/sys/dev/ahci/ahci.c
  user/attilio/vmcontention/sys/dev/ata/ata-disk.c
  user/attilio/vmcontention/sys/dev/ata/ata-pci.c
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
  user/attilio/vmcontention/sys/dev/ath/if_ath.c
  user/attilio/vmcontention/sys/dev/dc/dcphy.c
  user/attilio/vmcontention/sys/dev/dc/if_dc.c
  user/attilio/vmcontention/sys/dev/dc/if_dcreg.h
  user/attilio/vmcontention/sys/dev/gpio/gpiobus.c
  user/attilio/vmcontention/sys/dev/mii/mii.c
  user/attilio/vmcontention/sys/dev/mii/miivar.h
  user/attilio/vmcontention/sys/dev/mvs/mvs_pci.c
  user/attilio/vmcontention/sys/dev/mvs/mvs_soc.c
  user/attilio/vmcontention/sys/dev/ppbus/ppbconf.c
  user/attilio/vmcontention/sys/dev/ppc/ppc.c
  user/attilio/vmcontention/sys/dev/sfxge/sfxge.h
  user/attilio/vmcontention/sys/dev/sfxge/sfxge_intr.c
  user/attilio/vmcontention/sys/dev/sfxge/sfxge_port.c
  user/attilio/vmcontention/sys/dev/siba/siba_core.c
  user/attilio/vmcontention/sys/dev/siis/siis.c
  user/attilio/vmcontention/sys/dev/usb/usb_util.c
  user/attilio/vmcontention/sys/dev/usb/usb_util.h
  user/attilio/vmcontention/sys/dev/usb/usbdevs
  user/attilio/vmcontention/sys/fs/devfs/devfs_vnops.c
  user/attilio/vmcontention/sys/fs/nfs/nfsclstate.h
  user/attilio/vmcontention/sys/fs/nfsclient/nfs_clstate.c
  user/attilio/vmcontention/sys/fs/nullfs/null_subr.c
  user/attilio/vmcontention/sys/fs/nullfs/null_vnops.c
  user/attilio/vmcontention/sys/fs/pseudofs/pseudofs_vnops.c
  user/attilio/vmcontention/sys/i386/ibcs2/ibcs2_fcntl.c
  user/attilio/vmcontention/sys/i386/ibcs2/ibcs2_proto.h
  user/attilio/vmcontention/sys/i386/ibcs2/ibcs2_syscall.h
  user/attilio/vmcontention/sys/i386/ibcs2/ibcs2_sysent.c
  user/attilio/vmcontention/sys/i386/ibcs2/syscalls.master
  user/attilio/vmcontention/sys/i386/linux/linux_proto.h
  user/attilio/vmcontention/sys/i386/linux/linux_syscall.h
  user/attilio/vmcontention/sys/i386/linux/linux_syscalls.c
  user/attilio/vmcontention/sys/i386/linux/linux_sysent.c
  user/attilio/vmcontention/sys/i386/linux/linux_systrace_args.c
  user/attilio/vmcontention/sys/i386/linux/syscalls.master
  user/attilio/vmcontention/sys/kern/init_sysent.c
  user/attilio/vmcontention/sys/kern/kern_synch.c
  user/attilio/vmcontention/sys/kern/kern_tc.c
  user/attilio/vmcontention/sys/kern/kern_thr.c
  user/attilio/vmcontention/sys/kern/subr_bus.c
  user/attilio/vmcontention/sys/kern/subr_firmware.c
  user/attilio/vmcontention/sys/kern/subr_rtc.c
  user/attilio/vmcontention/sys/kern/syscalls.c
  user/attilio/vmcontention/sys/kern/syscalls.master
  user/attilio/vmcontention/sys/kern/systrace_args.c
  user/attilio/vmcontention/sys/kern/vfs_cache.c
  user/attilio/vmcontention/sys/kern/vfs_default.c
  user/attilio/vmcontention/sys/kern/vfs_syscalls.c
  user/attilio/vmcontention/sys/mips/conf/XLP
  user/attilio/vmcontention/sys/mips/conf/XLP64
  user/attilio/vmcontention/sys/mips/conf/XLPN32
  user/attilio/vmcontention/sys/mips/mips/cache.c
  user/attilio/vmcontention/sys/mips/nlm/hal/bridge.h
  user/attilio/vmcontention/sys/mips/nlm/hal/cop2.h
  user/attilio/vmcontention/sys/mips/nlm/hal/cpucontrol.h
  user/attilio/vmcontention/sys/mips/nlm/hal/haldefs.h
  user/attilio/vmcontention/sys/mips/nlm/hal/iomap.h
  user/attilio/vmcontention/sys/mips/nlm/hal/mips-extns.h
  user/attilio/vmcontention/sys/mips/nlm/hal/mmu.h
  user/attilio/vmcontention/sys/mips/nlm/hal/pcibus.h
  user/attilio/vmcontention/sys/mips/nlm/hal/uart.h
  user/attilio/vmcontention/sys/mips/nlm/std.xlp
  user/attilio/vmcontention/sys/mips/nlm/uart_pci_xlp.c
  user/attilio/vmcontention/sys/mips/nlm/usb_init.c
  user/attilio/vmcontention/sys/modules/Makefile
  user/attilio/vmcontention/sys/nfsclient/nfs_krpc.c
  user/attilio/vmcontention/sys/sys/bus.h
  user/attilio/vmcontention/sys/sys/syscall.h
  user/attilio/vmcontention/sys/sys/syscall.mk
  user/attilio/vmcontention/sys/sys/sysproto.h
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/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	Sun Nov 20 15:00:45 2011	(r227755)
+++ user/attilio/vmcontention/Makefile.inc1	Sun Nov 20 15:06:39 2011	(r227756)
@@ -291,7 +291,7 @@ LIB32CPUFLAGS=	-mcpu=powerpc
 LIB32CPUFLAGS=	-mcpu=${TARGET_CPUTYPE}
 .endif
 LIB32WMAKEENV=	MACHINE=powerpc MACHINE_ARCH=powerpc \
-		LD="${LD} -m elf32ppc"
+		LD="${LD} -m elf32ppc_fbsd"
 .endif
 
 

Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zdb/zdb.8
==============================================================================
--- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Sun Nov 20 15:00:45 2011	(r227755)
+++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Sun Nov 20 15:06:39 2011	(r227756)
@@ -3,7 +3,8 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH zdb 1M "31 Oct 2005" "SunOS 5.11" "System Administration Commands"
+.\" Portions Copyright 2011 Martin Matuska <mm at FreeBSD.org>
+.TH ZDB 8 "Oct 31, 2005"
 .SH NAME
 zdb \- ZFS debugger
 .SH SYNOPSIS
@@ -15,70 +16,50 @@ zdb \- ZFS debugger
 .SH DESCRIPTION
 .sp
 .LP
-The \fBzdb\fR command is used by support engineers to diagnose failures and gather statistics. Since the \fBZFS\fR file system is always consistent on disk and is self-repairing, \fBzdb\fR should only be run under the direction by a support engineer.
+The \fBzdb\fR command is used by support engineers to diagnose failures and
+gather statistics. Since the \fBZFS\fR file system is always consistent on disk
+and is self-repairing, \fBzdb\fR should only be run under the direction by a
+support engineer.
 .sp
 .LP
-If no arguments are specified, \fBzdb\fR, performs basic consistency checks on the pool and associated datasets, and report any problems detected.
+If no arguments are specified, \fBzdb\fR, performs basic consistency checks on
+the pool and associated datasets, and report any problems detected.
 .sp
 .LP
-Any options supported by this command are internal to Sun and subject to change at any time.
+Any options supported by this command are internal to Sun and subject to change
+at any time.
 .SH EXIT STATUS
 .sp
 .LP
 The following exit values are returned:
 .sp
 .ne 2
-.mk
 .na
 \fB\fB0\fR\fR
 .ad
 .RS 5n
-.rt  
 The pool is consistent.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fB1\fR\fR
 .ad
 .RS 5n
-.rt  
 An error was detected.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fB2\fR\fR
 .ad
 .RS 5n
-.rt  
 Invalid command line options were specified.
 .RE
 
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
-.sp
-
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-AvailabilitySUNWzfsu
-_
-Interface StabilityUnstable
-.TE
-
 .SH SEE ALSO
 .sp
 .LP
-\fBzfs\fR(1M), \fBzpool\fR(1M), \fBattributes\fR(5)
+zfs(8), zpool(8)

Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.1
==============================================================================
--- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.1	Sun Nov 20 15:00:45 2011	(r227755)
+++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.1	Sun Nov 20 15:06:39 2011	(r227756)
@@ -3,7 +3,8 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with
 .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH zstreamdump 1M "21 Sep 2009" "SunOS 5.11" "System Administration Commands"
+.\" Portions Copyright 2011 Martin Matuska <mm at FreeBSD.org>
+.TH ZSTREAMDUMP 1 "Sep 21, 2009"
 .SH NAME
 zstreamdump \- filter data in zfs send stream
 .SH SYNOPSIS
@@ -15,14 +16,15 @@ zstreamdump \- filter data in zfs send s
 .SH DESCRIPTION
 .sp
 .LP
-The \fBzstreamdump\fR utility reads from the output of the \fBzfs send\fR command, then displays headers and some statistics from that output.  See \fBzfs\fR(1M).
+The \fBzstreamdump\fR utility reads from the output of the \fBzfs send\fR
+command, then displays headers and some statistics from that output.  See
+\fBzfs\fR(1M).
 .SH OPTIONS
 .sp
 .LP
 The following options are supported:
 .sp
 .ne 2
-.mk
 .na
 \fB\fB-C\fR\fR
 .ad
@@ -33,7 +35,6 @@ Suppress the validation of checksums.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fB-v\fR\fR
 .ad
@@ -42,26 +43,7 @@ Suppress the validation of checksums.
 Verbose. Dump all headers, not only begin and end headers.
 .RE
 
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
-.sp
-
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-AvailabilitySUNWzfsu
-_
-Interface StabilityUncommitted
-.TE
-
 .SH SEE ALSO
 .sp
 .LP
-\fBzfs\fR(1M), \fBattributes\fR(5)
+zfs(8)

Modified: user/attilio/vmcontention/cddl/usr.bin/zstreamdump/Makefile
==============================================================================
--- user/attilio/vmcontention/cddl/usr.bin/zstreamdump/Makefile	Sun Nov 20 15:00:45 2011	(r227755)
+++ user/attilio/vmcontention/cddl/usr.bin/zstreamdump/Makefile	Sun Nov 20 15:06:39 2011	(r227756)
@@ -24,4 +24,6 @@ LDADD=	-lm -lnvpair -lumem -lzpool -lpth
 
 CSTD=	c99
 
+MANFILTER=	sed -e '/^$$/d'
+
 .include <bsd.prog.mk>

Modified: user/attilio/vmcontention/cddl/usr.sbin/zdb/Makefile
==============================================================================
--- user/attilio/vmcontention/cddl/usr.sbin/zdb/Makefile	Sun Nov 20 15:00:45 2011	(r227755)
+++ user/attilio/vmcontention/cddl/usr.sbin/zdb/Makefile	Sun Nov 20 15:06:39 2011	(r227756)
@@ -27,5 +27,6 @@ DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} $
 	${LIBUUTIL} ${LIBZFS} ${LIBZPOOL}
 LDADD=	-lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs -lzpool
 
+MANFILTER=	sed -e '/^$$/d'
 
 .include <bsd.prog.mk>

Copied: user/attilio/vmcontention/contrib/binutils/ld/emulparams/elf64ppc_fbsd.sh (from r227754, head/contrib/binutils/ld/emulparams/elf64ppc_fbsd.sh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/attilio/vmcontention/contrib/binutils/ld/emulparams/elf64ppc_fbsd.sh	Sun Nov 20 15:06:39 2011	(r227756, copy of r227754, head/contrib/binutils/ld/emulparams/elf64ppc_fbsd.sh)
@@ -0,0 +1,3 @@
+. ${srcdir}/emulparams/elf64ppc.sh
+. ${srcdir}/emulparams/elf_fbsd.sh
+

Modified: user/attilio/vmcontention/contrib/gcc/config/rs6000/freebsd.h
==============================================================================
--- user/attilio/vmcontention/contrib/gcc/config/rs6000/freebsd.h	Sun Nov 20 15:00:45 2011	(r227755)
+++ user/attilio/vmcontention/contrib/gcc/config/rs6000/freebsd.h	Sun Nov 20 15:06:39 2011	(r227756)
@@ -193,7 +193,7 @@ extern int dot_symbols;
 #undef	LINK_OS_FREEBSD_SPEC
 #define	ASM_DEFAULT_SPEC	"-mppc%{!m32:64}"
 #define	ASM_SPEC		"%{m32:-a32}%{!m32:-a64} " SVR4_ASM_SPEC
-#define	LINK_OS_FREEBSD_SPEC	"%{m32:-melf32ppc}%{!m32:-melf64ppc} " LINK_OS_FREEBSD_SPEC_DEF
+#define	LINK_OS_FREEBSD_SPEC	"%{m32:-melf32ppc_fbsd}%{!m32:-melf64ppc_fbsd} " LINK_OS_FREEBSD_SPEC_DEF
 #endif
 
 /* _init and _fini functions are built from bits spread across many

Modified: user/attilio/vmcontention/contrib/gdtoa/gdtoaimp.h
==============================================================================
--- user/attilio/vmcontention/contrib/gdtoa/gdtoaimp.h	Sun Nov 20 15:00:45 2011	(r227755)
+++ user/attilio/vmcontention/contrib/gdtoa/gdtoaimp.h	Sun Nov 20 15:06:39 2011	(r227756)
@@ -201,6 +201,7 @@ THIS SOFTWARE.
 #include "namespace.h"
 #include <pthread.h>
 #include "un-namespace.h"
+#include "xlocale_private.h"
 
 #ifdef KR_headers
 #define Char char
@@ -525,11 +526,11 @@ extern void memcpy_D2A ANSI((void*, cons
 #define	strtoIQ		__strtoIQ
 #define	strtoIx		__strtoIx
 #define	strtoIxL	__strtoIxL
-#define	strtord		__strtord
+#define	strtord_l		__strtord_l
 #define	strtordd	__strtordd
 #define	strtorf		__strtorf
-#define	strtorQ		__strtorQ
-#define	strtorx		__strtorx
+#define	strtorQ_l		__strtorQ_l
+#define	strtorx_l		__strtorx_l
 #define	strtorxL	__strtorxL
 #define	strtodI		__strtodI
 #define	strtopd		__strtopd
@@ -634,7 +635,7 @@ extern void memcpy_D2A ANSI((void*, cons
  extern Bigint *s2b ANSI((CONST char*, int, int, ULong, int));
  extern Bigint *set_ones ANSI((Bigint*, int));
  extern char *strcp ANSI((char*, const char*));
- extern int strtodg ANSI((CONST char*, char**, FPI*, Long*, ULong*));
+ extern int strtodg_l ANSI((CONST char*, char**, FPI*, Long*, ULong*, locale_t));
 
  extern int strtoId ANSI((CONST char *, char **, double *, double *));
  extern int strtoIdd ANSI((CONST char *, char **, double *, double *));
@@ -644,17 +645,18 @@ extern void memcpy_D2A ANSI((void*, cons
  extern int strtoIx ANSI((CONST char *, char **, void *, void *));
  extern int strtoIxL ANSI((CONST char *, char **, void *, void *));
  extern double strtod ANSI((const char *s00, char **se));
+ extern double strtod_l ANSI((const char *s00, char **se, locale_t));
  extern int strtopQ ANSI((CONST char *, char **, Void *));
  extern int strtopf ANSI((CONST char *, char **, float *));
  extern int strtopd ANSI((CONST char *, char **, double *));
  extern int strtopdd ANSI((CONST char *, char **, double *));
  extern int strtopx ANSI((CONST char *, char **, Void *));
  extern int strtopxL ANSI((CONST char *, char **, Void *));
- extern int strtord ANSI((CONST char *, char **, int, double *));
+ extern int strtord_l ANSI((CONST char *, char **, int, double *, locale_t));
  extern int strtordd ANSI((CONST char *, char **, int, double *));
  extern int strtorf ANSI((CONST char *, char **, int, float *));
- extern int strtorQ ANSI((CONST char *, char **, int, void *));
- extern int strtorx ANSI((CONST char *, char **, int, void *));
+ extern int strtorQ_l ANSI((CONST char *, char **, int, void *, locale_t));
+ extern int strtorx_l ANSI((CONST char *, char **, int, void *, locale_t));
  extern int strtorxL ANSI((CONST char *, char **, int, void *));
  extern Bigint *sum ANSI((Bigint*, Bigint*));
  extern int trailz ANSI((Bigint*));

Modified: user/attilio/vmcontention/contrib/gdtoa/strtod.c
==============================================================================
--- user/attilio/vmcontention/contrib/gdtoa/strtod.c	Sun Nov 20 15:00:45 2011	(r227755)
+++ user/attilio/vmcontention/contrib/gdtoa/strtod.c	Sun Nov 20 15:06:39 2011	(r227756)
@@ -82,11 +82,11 @@ sulp
 #endif /*}*/
 
  double
-strtod
+strtod_l
 #ifdef KR_headers
-	(s00, se) CONST char *s00; char **se;
+	(s00, se, loc) CONST char *s00; char **se; locale_t loc
 #else
-	(CONST char *s00, char **se)
+	(CONST char *s00, char **se, locale_t loc)
 #endif
 {
 #ifdef Avoid_Underflow
@@ -108,14 +108,14 @@ strtod
 #endif
 #ifdef USE_LOCALE /*{{*/
 #ifdef NO_LOCALE_CACHE
-	char *decimalpoint = localeconv()->decimal_point;
+	char *decimalpoint = localeconv_l(loc)->decimal_point;
 	int dplen = strlen(decimalpoint);
 #else
 	char *decimalpoint;
 	static char *decimalpoint_cache;
 	static int dplen;
 	if (!(s0 = decimalpoint_cache)) {
-		s0 = localeconv()->decimal_point;
+		s0 = localeconv_l(loc)->decimal_point;
 		if ((decimalpoint_cache = (char*)MALLOC(strlen(s0) + 1))) {
 			strcpy(decimalpoint_cache, s0);
 			s0 = decimalpoint_cache;
@@ -1074,3 +1074,14 @@ strtod
 	return sign ? -dval(&rv) : dval(&rv);
 	}
 
+ double
+strtod
+#ifdef KR_headers
+	(s00, se, loc) CONST char *s00; char **se; locale_t
+#else
+	(CONST char *s00, char **se)
+#endif
+{
+	return strtod_l(s00, se, __get_locale());
+}
+

Modified: user/attilio/vmcontention/contrib/gdtoa/strtodg.c
==============================================================================
--- user/attilio/vmcontention/contrib/gdtoa/strtodg.c	Sun Nov 20 15:00:45 2011	(r227755)
+++ user/attilio/vmcontention/contrib/gdtoa/strtodg.c	Sun Nov 20 15:06:39 2011	(r227756)
@@ -313,12 +313,12 @@ mantbits(U *d)
 	}
 
  int
-strtodg
+strtodg_l
 #ifdef KR_headers
-	(s00, se, fpi, exp, bits)
-	CONST char *s00; char **se; FPI *fpi; Long *exp; ULong *bits;
+	(s00, se, fpi, exp, bits, loc)
+	CONST char *s00; char **se; FPI *fpi; Long *exp; ULong *bits; locale_t loc;
 #else
-	(CONST char *s00, char **se, FPI *fpi, Long *exp, ULong *bits)
+	(CONST char *s00, char **se, FPI *fpi, Long *exp, ULong *bits, locale_t loc)
 #endif
 {
 	int abe, abits, asub;
@@ -334,14 +334,14 @@ strtodg
 	Bigint *ab, *bb, *bb1, *bd, *bd0, *bs, *delta, *rvb, *rvb0;
 #ifdef USE_LOCALE /*{{*/
 #ifdef NO_LOCALE_CACHE
-	char *decimalpoint = localeconv()->decimal_point;
+	char *decimalpoint = localeconv_l(loc)->decimal_point;
 	int dplen = strlen(decimalpoint);
 #else
 	char *decimalpoint;
 	static char *decimalpoint_cache;
 	static int dplen;
 	if (!(s0 = decimalpoint_cache)) {
-		s0 = localeconv()->decimal_point;
+		s0 = localeconv_l(loc)->decimal_point;
 		if ((decimalpoint_cache = (char*)MALLOC(strlen(s0) + 1))) {
 			strcpy(decimalpoint_cache, s0);
 			s0 = decimalpoint_cache;

Modified: user/attilio/vmcontention/contrib/gdtoa/strtof.c
==============================================================================
--- user/attilio/vmcontention/contrib/gdtoa/strtof.c	Sun Nov 20 15:00:45 2011	(r227755)
+++ user/attilio/vmcontention/contrib/gdtoa/strtof.c	Sun Nov 20 15:06:39 2011	(r227756)
@@ -35,9 +35,9 @@ THIS SOFTWARE.
 
  float
 #ifdef KR_headers
-strtof(s, sp) CONST char *s; char **sp;
+strtof_l(s, sp, loc) CONST char *s; char **sp; locale_t loc;
 #else
-strtof(CONST char *s, char **sp)
+strtof_l(CONST char *s, char **sp, locale_t loc)
 #endif
 {
 	static FPI fpi0 = { 24, 1-127-24+1,  254-127-24+1, 1, SI };
@@ -51,7 +51,7 @@ strtof(CONST char *s, char **sp)
 #define fpi &fpi0
 #endif
 
-	k = strtodg(s, sp, fpi, &exp, bits);
+	k = strtodg_l(s, sp, fpi, &exp, bits, loc);
 	switch(k & STRTOG_Retmask) {
 	  case STRTOG_NoNumber:
 	  case STRTOG_Zero:
@@ -82,3 +82,13 @@ strtof(CONST char *s, char **sp)
 		u.L[0] |= 0x80000000L;
 	return u.f;
 	}
+ float
+#ifdef KR_headers
+strtof(s, sp) CONST char *s; char **sp;
+#else
+strtof(CONST char *s, char **sp)
+#endif
+{
+	return strtof_l(s, sp, __get_locale());
+}
+

Modified: user/attilio/vmcontention/contrib/gdtoa/strtorQ.c
==============================================================================
--- user/attilio/vmcontention/contrib/gdtoa/strtorQ.c	Sun Nov 20 15:00:45 2011	(r227755)
+++ user/attilio/vmcontention/contrib/gdtoa/strtorQ.c	Sun Nov 20 15:06:39 2011	(r227756)
@@ -103,9 +103,10 @@ ULtoQ(ULong *L, ULong *bits, Long exp, i
 
  int
 #ifdef KR_headers
-strtorQ(s, sp, rounding, L) CONST char *s; char **sp; int rounding; void *L;
+strtorQ_l(s, sp, rounding, L, locale) CONST char *s; char **sp; int rounding;
+void *L; locale_t locale;
 #else
-strtorQ(CONST char *s, char **sp, int rounding, void *L)
+strtorQ_l(CONST char *s, char **sp, int rounding, void *L, locale_t locale)
 #endif
 {
 	static FPI fpi0 = { 113, 1-16383-113+1, 32766-16383-113+1, 1, SI };
@@ -120,7 +121,7 @@ strtorQ(CONST char *s, char **sp, int ro
 		fpi1.rounding = rounding;
 		fpi = &fpi1;
 		}
-	k = strtodg(s, sp, fpi, &exp, bits);
+	k = strtodg_l(s, sp, fpi, &exp, bits, locale);
 	ULtoQ((ULong*)L, bits, exp, k);
 	return k;
 	}

Modified: user/attilio/vmcontention/contrib/gdtoa/strtord.c
==============================================================================
--- user/attilio/vmcontention/contrib/gdtoa/strtord.c	Sun Nov 20 15:00:45 2011	(r227755)
+++ user/attilio/vmcontention/contrib/gdtoa/strtord.c	Sun Nov 20 15:06:39 2011	(r227756)
@@ -70,9 +70,10 @@ ULtod(ULong *L, ULong *bits, Long exp, i
 
  int
 #ifdef KR_headers
-strtord(s, sp, rounding, d) CONST char *s; char **sp; int rounding; double *d;
+strtord_l(s, sp, rounding, d, locale) CONST char *s; char **sp; int rounding;
+double *d; locale_t locale;
 #else
-strtord(CONST char *s, char **sp, int rounding, double *d)
+strtord_l(CONST char *s, char **sp, int rounding, double *d, locale_t locale)
 #endif
 {
 	static FPI fpi0 = { 53, 1-1023-53+1, 2046-1023-53+1, 1, SI };
@@ -87,7 +88,8 @@ strtord(CONST char *s, char **sp, int ro
 		fpi1.rounding = rounding;
 		fpi = &fpi1;
 		}
-	k = strtodg(s, sp, fpi, &exp, bits);
+	k = strtodg_l(s, sp, fpi, &exp, bits, locale);
 	ULtod((ULong*)d, bits, exp, k);
 	return k;
 	}
+

Modified: user/attilio/vmcontention/contrib/gdtoa/strtorx.c
==============================================================================
--- user/attilio/vmcontention/contrib/gdtoa/strtorx.c	Sun Nov 20 15:00:45 2011	(r227755)
+++ user/attilio/vmcontention/contrib/gdtoa/strtorx.c	Sun Nov 20 15:06:39 2011	(r227756)
@@ -106,9 +106,10 @@ ULtox(UShort *L, ULong *bits, Long exp, 
 
  int
 #ifdef KR_headers
-strtorx(s, sp, rounding, L) CONST char *s; char **sp; int rounding; void *L;
+strtorx_l(s, sp, rounding, L, locale) CONST char *s; char **sp; int rounding;
+void *L; locale_t locale;
 #else
-strtorx(CONST char *s, char **sp, int rounding, void *L)
+strtorx_l(CONST char *s, char **sp, int rounding, void *L, locale_t locale)
 #endif
 {
 	static FPI fpi0 = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, SI };
@@ -123,7 +124,7 @@ strtorx(CONST char *s, char **sp, int ro
 		fpi1.rounding = rounding;
 		fpi = &fpi1;
 		}
-	k = strtodg(s, sp, fpi, &exp, bits);
+	k = strtodg_l(s, sp, fpi, &exp, bits, locale);
 	ULtox((UShort*)L, bits, exp, k);
 	return k;
 	}

Modified: user/attilio/vmcontention/contrib/llvm/tools/clang/include/clang/AST/ASTContext.h
==============================================================================
--- user/attilio/vmcontention/contrib/llvm/tools/clang/include/clang/AST/ASTContext.h	Sun Nov 20 15:00:45 2011	(r227755)
+++ user/attilio/vmcontention/contrib/llvm/tools/clang/include/clang/AST/ASTContext.h	Sun Nov 20 15:06:39 2011	(r227756)
@@ -229,6 +229,9 @@ class ASTContext : public llvm::RefCount
   /// \brief The type for the C sigjmp_buf type.
   TypeDecl *sigjmp_bufDecl;
 
+  /// \brief The type for the C ucontext_t type.
+  TypeDecl *ucontext_tDecl;
+
   /// \brief Type for the Block descriptor for Blocks CodeGen.
   ///
   /// Since this is only used for generation of debug info, it is not
@@ -955,6 +958,18 @@ public:
     return QualType();
   }
 
+  /// \brief Set the type for the C ucontext_t type.
+  void setucontext_tDecl(TypeDecl *ucontext_tDecl) {
+    this->ucontext_tDecl = ucontext_tDecl;
+  }
+
+  /// \brief Retrieve the C ucontext_t type.
+  QualType getucontext_tType() const {
+    if (ucontext_tDecl)
+      return getTypeDeclType(ucontext_tDecl);
+    return QualType();
+  }
+
   /// \brief The result type of logical operations, '<', '>', '!=', etc.
   QualType getLogicalOperationType() const {
     return getLangOptions().CPlusPlus ? BoolTy : IntTy;
@@ -1099,7 +1114,8 @@ public:
   enum GetBuiltinTypeError {
     GE_None,              //< No error
     GE_Missing_stdio,     //< Missing a type from <stdio.h>
-    GE_Missing_setjmp     //< Missing a type from <setjmp.h>
+    GE_Missing_setjmp,    //< Missing a type from <setjmp.h>
+    GE_Missing_ucontext   //< Missing a type from <ucontext.h>
   };
 
   /// GetBuiltinType - Return the type for the specified builtin.  If 

Modified: user/attilio/vmcontention/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def
==============================================================================
--- user/attilio/vmcontention/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def	Sun Nov 20 15:00:45 2011	(r227755)
+++ user/attilio/vmcontention/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def	Sun Nov 20 15:06:39 2011	(r227756)
@@ -39,6 +39,7 @@
 //  P -> FILE
 //  J -> jmp_buf
 //  SJ -> sigjmp_buf
+//  K -> ucontext_t
 //  . -> "...".  This may only occur at the end of the function list.
 //
 // Types may be prefixed with the following modifiers:
@@ -480,111 +481,111 @@ BUILTIN(__builtin_alloca, "v*z"   , "n")
 // FIXME: These assume that char -> i8, short -> i16, int -> i32,
 // long long -> i64.
 
-BUILTIN(__sync_fetch_and_add, "v.", "")
-BUILTIN(__sync_fetch_and_add_1, "ccD*c.", "n")
-BUILTIN(__sync_fetch_and_add_2, "ssD*s.", "n")
-BUILTIN(__sync_fetch_and_add_4, "iiD*i.", "n")
-BUILTIN(__sync_fetch_and_add_8, "LLiLLiD*LLi.", "n")
-BUILTIN(__sync_fetch_and_add_16, "LLLiLLLiD*LLLi.", "n")
-
-BUILTIN(__sync_fetch_and_sub, "v.", "")
-BUILTIN(__sync_fetch_and_sub_1, "ccD*c.", "n")
-BUILTIN(__sync_fetch_and_sub_2, "ssD*s.", "n")
-BUILTIN(__sync_fetch_and_sub_4, "iiD*i.", "n")
-BUILTIN(__sync_fetch_and_sub_8, "LLiLLiD*LLi.", "n")
-BUILTIN(__sync_fetch_and_sub_16, "LLLiLLLiD*LLLi.", "n")
-
-BUILTIN(__sync_fetch_and_or, "v.", "")
-BUILTIN(__sync_fetch_and_or_1, "ccD*c.", "n")
-BUILTIN(__sync_fetch_and_or_2, "ssD*s.", "n")
-BUILTIN(__sync_fetch_and_or_4, "iiD*i.", "n")
-BUILTIN(__sync_fetch_and_or_8, "LLiLLiD*LLi.", "n")
-BUILTIN(__sync_fetch_and_or_16, "LLLiLLLiD*LLLi.", "n")
-
-BUILTIN(__sync_fetch_and_and, "v.", "")
-BUILTIN(__sync_fetch_and_and_1, "ccD*c.", "n")
-BUILTIN(__sync_fetch_and_and_2, "ssD*s.", "n")
-BUILTIN(__sync_fetch_and_and_4, "iiD*i.", "n")
-BUILTIN(__sync_fetch_and_and_8, "LLiLLiD*LLi.", "n")
-BUILTIN(__sync_fetch_and_and_16, "LLLiLLLiD*LLLi.", "n")
-
-BUILTIN(__sync_fetch_and_xor, "v.", "")
-BUILTIN(__sync_fetch_and_xor_1, "ccD*c.", "n")
-BUILTIN(__sync_fetch_and_xor_2, "ssD*s.", "n")
-BUILTIN(__sync_fetch_and_xor_4, "iiD*i.", "n")
-BUILTIN(__sync_fetch_and_xor_8, "LLiLLiD*LLi.", "n")
-BUILTIN(__sync_fetch_and_xor_16, "LLLiLLLiD*LLLi.", "n")
-
-
-BUILTIN(__sync_add_and_fetch, "v.", "")
-BUILTIN(__sync_add_and_fetch_1, "ccD*c.", "n")
-BUILTIN(__sync_add_and_fetch_2, "ssD*s.", "n")
-BUILTIN(__sync_add_and_fetch_4, "iiD*i.", "n")
-BUILTIN(__sync_add_and_fetch_8, "LLiLLiD*LLi.", "n")
-BUILTIN(__sync_add_and_fetch_16, "LLLiLLLiD*LLLi.", "n")
-
-BUILTIN(__sync_sub_and_fetch, "v.", "")
-BUILTIN(__sync_sub_and_fetch_1, "ccD*c.", "n")
-BUILTIN(__sync_sub_and_fetch_2, "ssD*s.", "n")
-BUILTIN(__sync_sub_and_fetch_4, "iiD*i.", "n")
-BUILTIN(__sync_sub_and_fetch_8, "LLiLLiD*LLi.", "n")
-BUILTIN(__sync_sub_and_fetch_16, "LLLiLLLiD*LLLi.", "n")
-
-BUILTIN(__sync_or_and_fetch, "v.", "")
-BUILTIN(__sync_or_and_fetch_1, "ccD*c.", "n")
-BUILTIN(__sync_or_and_fetch_2, "ssD*s.", "n")
-BUILTIN(__sync_or_and_fetch_4, "iiD*i.", "n")
-BUILTIN(__sync_or_and_fetch_8, "LLiLLiD*LLi.", "n")
-BUILTIN(__sync_or_and_fetch_16, "LLLiLLLiD*LLLi.", "n")
-
-BUILTIN(__sync_and_and_fetch, "v.", "")
-BUILTIN(__sync_and_and_fetch_1, "ccD*c.", "n")
-BUILTIN(__sync_and_and_fetch_2, "ssD*s.", "n")
-BUILTIN(__sync_and_and_fetch_4, "iiD*i.", "n")
-BUILTIN(__sync_and_and_fetch_8, "LLiLLiD*LLi.", "n")
-BUILTIN(__sync_and_and_fetch_16, "LLLiLLLiD*LLLi.", "n")
-
-BUILTIN(__sync_xor_and_fetch, "v.", "")
-BUILTIN(__sync_xor_and_fetch_1, "ccD*c.", "n")
-BUILTIN(__sync_xor_and_fetch_2, "ssD*s.", "n")
-BUILTIN(__sync_xor_and_fetch_4, "iiD*i.", "n")
-BUILTIN(__sync_xor_and_fetch_8, "LLiLLiD*LLi.", "n")
-BUILTIN(__sync_xor_and_fetch_16, "LLLiLLLiD*LLLi.", "n")
-
-BUILTIN(__sync_bool_compare_and_swap, "v.", "")
-BUILTIN(__sync_bool_compare_and_swap_1, "bcD*cc.", "n")
-BUILTIN(__sync_bool_compare_and_swap_2, "bsD*ss.", "n")
-BUILTIN(__sync_bool_compare_and_swap_4, "biD*ii.", "n")
-BUILTIN(__sync_bool_compare_and_swap_8, "bLLiD*LLiLLi.", "n")
-BUILTIN(__sync_bool_compare_and_swap_16, "bLLLiD*LLLiLLLi.", "n")
-
-BUILTIN(__sync_val_compare_and_swap, "v.", "")
-BUILTIN(__sync_val_compare_and_swap_1, "ccD*cc.", "n")
-BUILTIN(__sync_val_compare_and_swap_2, "ssD*ss.", "n")
-BUILTIN(__sync_val_compare_and_swap_4, "iiD*ii.", "n")
-BUILTIN(__sync_val_compare_and_swap_8, "LLiLLiD*LLiLLi.", "n")
-BUILTIN(__sync_val_compare_and_swap_16, "LLLiLLLiD*LLLiLLLi.", "n")
-
-BUILTIN(__sync_lock_test_and_set, "v.", "")
-BUILTIN(__sync_lock_test_and_set_1, "ccD*c.", "n")
-BUILTIN(__sync_lock_test_and_set_2, "ssD*s.", "n")
-BUILTIN(__sync_lock_test_and_set_4, "iiD*i.", "n")
-BUILTIN(__sync_lock_test_and_set_8, "LLiLLiD*LLi.", "n")
-BUILTIN(__sync_lock_test_and_set_16, "LLLiLLLiD*LLLi.", "n")
-
-BUILTIN(__sync_lock_release, "v.", "")
-BUILTIN(__sync_lock_release_1, "vcD*.", "n")
-BUILTIN(__sync_lock_release_2, "vsD*.", "n")
-BUILTIN(__sync_lock_release_4, "viD*.", "n")
-BUILTIN(__sync_lock_release_8, "vLLiD*.", "n")
-BUILTIN(__sync_lock_release_16, "vLLLiD*.", "n")
-
-BUILTIN(__sync_swap, "v.", "")
-BUILTIN(__sync_swap_1, "ccD*c.", "n")
-BUILTIN(__sync_swap_2, "ssD*s.", "n")
-BUILTIN(__sync_swap_4, "iiD*i.", "n")
-BUILTIN(__sync_swap_8, "LLiLLiD*LLi.", "n")
-BUILTIN(__sync_swap_16, "LLLiLLLiD*LLLi.", "n")
+BUILTIN(__sync_fetch_and_add, "v.", "t")
+BUILTIN(__sync_fetch_and_add_1, "ccD*c.", "nt")
+BUILTIN(__sync_fetch_and_add_2, "ssD*s.", "nt")
+BUILTIN(__sync_fetch_and_add_4, "iiD*i.", "nt")
+BUILTIN(__sync_fetch_and_add_8, "LLiLLiD*LLi.", "nt")
+BUILTIN(__sync_fetch_and_add_16, "LLLiLLLiD*LLLi.", "nt")
+
+BUILTIN(__sync_fetch_and_sub, "v.", "t")
+BUILTIN(__sync_fetch_and_sub_1, "ccD*c.", "nt")
+BUILTIN(__sync_fetch_and_sub_2, "ssD*s.", "nt")
+BUILTIN(__sync_fetch_and_sub_4, "iiD*i.", "nt")
+BUILTIN(__sync_fetch_and_sub_8, "LLiLLiD*LLi.", "nt")
+BUILTIN(__sync_fetch_and_sub_16, "LLLiLLLiD*LLLi.", "nt")
+
+BUILTIN(__sync_fetch_and_or, "v.", "t")
+BUILTIN(__sync_fetch_and_or_1, "ccD*c.", "nt")
+BUILTIN(__sync_fetch_and_or_2, "ssD*s.", "nt")
+BUILTIN(__sync_fetch_and_or_4, "iiD*i.", "nt")
+BUILTIN(__sync_fetch_and_or_8, "LLiLLiD*LLi.", "nt")
+BUILTIN(__sync_fetch_and_or_16, "LLLiLLLiD*LLLi.", "nt")
+
+BUILTIN(__sync_fetch_and_and, "v.", "t")
+BUILTIN(__sync_fetch_and_and_1, "ccD*c.", "tn")
+BUILTIN(__sync_fetch_and_and_2, "ssD*s.", "tn")
+BUILTIN(__sync_fetch_and_and_4, "iiD*i.", "tn")
+BUILTIN(__sync_fetch_and_and_8, "LLiLLiD*LLi.", "tn")
+BUILTIN(__sync_fetch_and_and_16, "LLLiLLLiD*LLLi.", "tn")
+
+BUILTIN(__sync_fetch_and_xor, "v.", "t")
+BUILTIN(__sync_fetch_and_xor_1, "ccD*c.", "tn")
+BUILTIN(__sync_fetch_and_xor_2, "ssD*s.", "tn")
+BUILTIN(__sync_fetch_and_xor_4, "iiD*i.", "tn")
+BUILTIN(__sync_fetch_and_xor_8, "LLiLLiD*LLi.", "tn")
+BUILTIN(__sync_fetch_and_xor_16, "LLLiLLLiD*LLLi.", "tn")
+
+
+BUILTIN(__sync_add_and_fetch, "v.", "t")
+BUILTIN(__sync_add_and_fetch_1, "ccD*c.", "tn")
+BUILTIN(__sync_add_and_fetch_2, "ssD*s.", "tn")
+BUILTIN(__sync_add_and_fetch_4, "iiD*i.", "tn")
+BUILTIN(__sync_add_and_fetch_8, "LLiLLiD*LLi.", "tn")
+BUILTIN(__sync_add_and_fetch_16, "LLLiLLLiD*LLLi.", "tn")
+
+BUILTIN(__sync_sub_and_fetch, "v.", "t")
+BUILTIN(__sync_sub_and_fetch_1, "ccD*c.", "tn")
+BUILTIN(__sync_sub_and_fetch_2, "ssD*s.", "tn")
+BUILTIN(__sync_sub_and_fetch_4, "iiD*i.", "tn")
+BUILTIN(__sync_sub_and_fetch_8, "LLiLLiD*LLi.", "tn")
+BUILTIN(__sync_sub_and_fetch_16, "LLLiLLLiD*LLLi.", "tn")
+
+BUILTIN(__sync_or_and_fetch, "v.", "t")
+BUILTIN(__sync_or_and_fetch_1, "ccD*c.", "tn")
+BUILTIN(__sync_or_and_fetch_2, "ssD*s.", "tn")
+BUILTIN(__sync_or_and_fetch_4, "iiD*i.", "tn")
+BUILTIN(__sync_or_and_fetch_8, "LLiLLiD*LLi.", "tn")
+BUILTIN(__sync_or_and_fetch_16, "LLLiLLLiD*LLLi.", "tn")
+
+BUILTIN(__sync_and_and_fetch, "v.", "t")
+BUILTIN(__sync_and_and_fetch_1, "ccD*c.", "tn")
+BUILTIN(__sync_and_and_fetch_2, "ssD*s.", "tn")
+BUILTIN(__sync_and_and_fetch_4, "iiD*i.", "tn")
+BUILTIN(__sync_and_and_fetch_8, "LLiLLiD*LLi.", "tn")
+BUILTIN(__sync_and_and_fetch_16, "LLLiLLLiD*LLLi.", "tn")
+
+BUILTIN(__sync_xor_and_fetch, "v.", "t")
+BUILTIN(__sync_xor_and_fetch_1, "ccD*c.", "tn")
+BUILTIN(__sync_xor_and_fetch_2, "ssD*s.", "tn")
+BUILTIN(__sync_xor_and_fetch_4, "iiD*i.", "tn")
+BUILTIN(__sync_xor_and_fetch_8, "LLiLLiD*LLi.", "tn")
+BUILTIN(__sync_xor_and_fetch_16, "LLLiLLLiD*LLLi.", "tn")
+
+BUILTIN(__sync_bool_compare_and_swap, "v.", "t")
+BUILTIN(__sync_bool_compare_and_swap_1, "bcD*cc.", "tn")
+BUILTIN(__sync_bool_compare_and_swap_2, "bsD*ss.", "tn")
+BUILTIN(__sync_bool_compare_and_swap_4, "biD*ii.", "tn")
+BUILTIN(__sync_bool_compare_and_swap_8, "bLLiD*LLiLLi.", "tn")
+BUILTIN(__sync_bool_compare_and_swap_16, "bLLLiD*LLLiLLLi.", "tn")
+
+BUILTIN(__sync_val_compare_and_swap, "v.", "t")
+BUILTIN(__sync_val_compare_and_swap_1, "ccD*cc.", "tn")
+BUILTIN(__sync_val_compare_and_swap_2, "ssD*ss.", "tn")
+BUILTIN(__sync_val_compare_and_swap_4, "iiD*ii.", "tn")
+BUILTIN(__sync_val_compare_and_swap_8, "LLiLLiD*LLiLLi.", "tn")
+BUILTIN(__sync_val_compare_and_swap_16, "LLLiLLLiD*LLLiLLLi.", "tn")
+
+BUILTIN(__sync_lock_test_and_set, "v.", "t")
+BUILTIN(__sync_lock_test_and_set_1, "ccD*c.", "tn")
+BUILTIN(__sync_lock_test_and_set_2, "ssD*s.", "tn")
+BUILTIN(__sync_lock_test_and_set_4, "iiD*i.", "tn")
+BUILTIN(__sync_lock_test_and_set_8, "LLiLLiD*LLi.", "tn")
+BUILTIN(__sync_lock_test_and_set_16, "LLLiLLLiD*LLLi.", "tn")
+
+BUILTIN(__sync_lock_release, "v.", "t")
+BUILTIN(__sync_lock_release_1, "vcD*.", "tn")
+BUILTIN(__sync_lock_release_2, "vsD*.", "tn")
+BUILTIN(__sync_lock_release_4, "viD*.", "tn")
+BUILTIN(__sync_lock_release_8, "vLLiD*.", "tn")
+BUILTIN(__sync_lock_release_16, "vLLLiD*.", "tn")
+
+BUILTIN(__sync_swap, "v.", "t")
+BUILTIN(__sync_swap_1, "ccD*c.", "tn")
+BUILTIN(__sync_swap_2, "ssD*s.", "tn")
+BUILTIN(__sync_swap_4, "iiD*i.", "tn")
+BUILTIN(__sync_swap_8, "LLiLLiD*LLi.", "tn")
+BUILTIN(__sync_swap_16, "LLLiLLLiD*LLLi.", "tn")
 
 BUILTIN(__atomic_load, "v.", "t")
 BUILTIN(__atomic_store, "v.", "t")
@@ -679,13 +680,13 @@ LIBBUILTIN(vfork, "i",            "fj", 
 // it here to avoid having two identical LIBBUILTIN entries.
 #undef setjmp
 LIBBUILTIN(_setjmp, "iJ",         "fj",   "setjmp.h", ALL_LANGUAGES)
-LIBBUILTIN(__sigsetjmp, "iJi",    "fj",   "setjmp.h", ALL_LANGUAGES)
+LIBBUILTIN(__sigsetjmp, "iSJi",   "fj",   "setjmp.h", ALL_LANGUAGES)
 LIBBUILTIN(setjmp, "iJ",          "fj",   "setjmp.h", ALL_LANGUAGES)
-LIBBUILTIN(sigsetjmp, "iJi",      "fj",   "setjmp.h", ALL_LANGUAGES)
+LIBBUILTIN(sigsetjmp, "iSJi",     "fj",   "setjmp.h", ALL_LANGUAGES)
 LIBBUILTIN(setjmp_syscall, "iJ",  "fj",   "setjmp.h", ALL_LANGUAGES)
 LIBBUILTIN(savectx, "iJ",         "fj",   "setjmp.h", ALL_LANGUAGES)
 LIBBUILTIN(qsetjmp, "iJ",         "fj",   "setjmp.h", ALL_LANGUAGES)
-LIBBUILTIN(getcontext, "iJ",      "fj",   "setjmp.h", ALL_LANGUAGES)
+LIBBUILTIN(getcontext, "iK*",     "fj",   "setjmp.h", ALL_LANGUAGES)
 
 LIBBUILTIN(_longjmp, "vJi",       "fr",    "setjmp.h", ALL_LANGUAGES)
 LIBBUILTIN(siglongjmp, "vSJi",    "fr",    "setjmp.h", ALL_LANGUAGES)

Modified: user/attilio/vmcontention/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticGroups.td
==============================================================================
--- user/attilio/vmcontention/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticGroups.td	Sun Nov 20 15:00:45 2011	(r227755)
+++ user/attilio/vmcontention/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticGroups.td	Sun Nov 20 15:06:39 2011	(r227756)
@@ -26,6 +26,7 @@ def : DiagGroup<"attributes">;
 def : DiagGroup<"bad-function-cast">;
 def Availability : DiagGroup<"availability">;
 def BoolConversions : DiagGroup<"bool-conversions">;
+def BuiltinRequiresHeader : DiagGroup<"builtin-requires-header">;
 def CXXCompat: DiagGroup<"c++-compat">;
 def CastAlign : DiagGroup<"cast-align">;
 def : DiagGroup<"cast-qual">;

Modified: user/attilio/vmcontention/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
==============================================================================
--- user/attilio/vmcontention/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td	Sun Nov 20 15:00:45 2011	(r227755)
+++ user/attilio/vmcontention/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td	Sun Nov 20 15:06:39 2011	(r227756)
@@ -254,10 +254,16 @@ def note_please_include_header : Note<
 def note_previous_builtin_declaration : Note<"%0 is a builtin with type %1">;
 def warn_implicit_decl_requires_stdio : Warning<
   "declaration of built-in function '%0' requires inclusion of the header "
-  "<stdio.h>">;
+  "<stdio.h>">,
+  InGroup<BuiltinRequiresHeader>;
 def warn_implicit_decl_requires_setjmp : Warning<
   "declaration of built-in function '%0' requires inclusion of the header "
-  "<setjmp.h>">;
+  "<setjmp.h>">,
+  InGroup<BuiltinRequiresHeader>;
+def warn_implicit_decl_requires_ucontext : Warning<
+  "declaration of built-in function '%0' requires inclusion of the header "
+  "<ucontext.h>">,
+  InGroup<BuiltinRequiresHeader>;
 def warn_redecl_library_builtin : Warning<
   "incompatible redeclaration of library function %0">;
 def err_builtin_definition : Error<"definition of builtin function %0">;

Modified: user/attilio/vmcontention/contrib/llvm/tools/clang/include/clang/Serialization/ASTBitCodes.h
==============================================================================
--- user/attilio/vmcontention/contrib/llvm/tools/clang/include/clang/Serialization/ASTBitCodes.h	Sun Nov 20 15:00:45 2011	(r227755)
+++ user/attilio/vmcontention/contrib/llvm/tools/clang/include/clang/Serialization/ASTBitCodes.h	Sun Nov 20 15:06:39 2011	(r227756)
@@ -677,7 +677,9 @@ namespace clang {
       /// \brief Objective-C "Class" redefinition type
       SPECIAL_TYPE_OBJC_CLASS_REDEFINITION     = 7,
       /// \brief Objective-C "SEL" redefinition type
-      SPECIAL_TYPE_OBJC_SEL_REDEFINITION       = 8
+      SPECIAL_TYPE_OBJC_SEL_REDEFINITION       = 8,
+      /// \brief C ucontext_t typedef type
+      SPECIAL_TYPE_UCONTEXT_T                  = 9
     };
     
     /// \brief The number of special type IDs.

Modified: user/attilio/vmcontention/contrib/llvm/tools/clang/lib/AST/ASTContext.cpp
==============================================================================
--- user/attilio/vmcontention/contrib/llvm/tools/clang/lib/AST/ASTContext.cpp	Sun Nov 20 15:00:45 2011	(r227755)
+++ user/attilio/vmcontention/contrib/llvm/tools/clang/lib/AST/ASTContext.cpp	Sun Nov 20 15:06:39 2011	(r227756)
@@ -227,8 +227,9 @@ ASTContext::ASTContext(LangOptions& LOpt
     ObjCIdDecl(0), ObjCSelDecl(0), ObjCClassDecl(0),
     CFConstantStringTypeDecl(0), ObjCInstanceTypeDecl(0),
     FILEDecl(0), 
-    jmp_bufDecl(0), sigjmp_bufDecl(0), BlockDescriptorType(0), 
-    BlockDescriptorExtendedType(0), cudaConfigureCallDecl(0),
+    jmp_bufDecl(0), sigjmp_bufDecl(0), ucontext_tDecl(0),
+    BlockDescriptorType(0), BlockDescriptorExtendedType(0),
+    cudaConfigureCallDecl(0),
     NullTypeSourceInfo(QualType()),
     SourceMgr(SM), LangOpts(LOpts), 
     AddrSpaceMap(0), Target(t), PrintingPolicy(LOpts),
@@ -6293,6 +6294,15 @@ static QualType DecodeTypeFromStr(const 
       return QualType();
     }
     break;
+  case 'K':
+    assert(HowLong == 0 && !Signed && !Unsigned && "Bad modifiers for 'K'!");
+    Type = Context.getucontext_tType();
+
+    if (Type.isNull()) {
+      Error = ASTContext::GE_Missing_ucontext;
+      return QualType();
+    }
+    break;
   }
 
   // If there are modifiers and if we're allowed to parse them, go for it.

Modified: user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
==============================================================================
--- user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Sun Nov 20 15:00:45 2011	(r227755)
+++ user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Sun Nov 20 15:06:39 2011	(r227756)
@@ -3926,7 +3926,7 @@ void freebsd::Link::ConstructJob(Compila
 
   if (getToolChain().getArchName() == "powerpc") {
     CmdArgs.push_back("-m");
-    CmdArgs.push_back("elf32ppc");
+    CmdArgs.push_back("elf32ppc_fbsd");
   }
 
   if (Output.isFilename()) {

Modified: user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp
==============================================================================
--- user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp	Sun Nov 20 15:00:45 2011	(r227755)
+++ user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp	Sun Nov 20 15:06:39 2011	(r227756)
@@ -803,14 +803,6 @@ Sema::SemaBuiltinAtomicOverloaded(ExprRe
   for (unsigned i = 0; i != NumFixed; ++i) {
     ExprResult Arg = TheCall->getArg(i+1);
 
-    // If the argument is an implicit cast, then there was a promotion due to
-    // "...", just remove it now.
-    if (ImplicitCastExpr *ICE = dyn_cast<ImplicitCastExpr>(Arg.get())) {
-      Arg = ICE->getSubExpr();
-      ICE->setSubExpr(0);
-      TheCall->setArg(i+1, Arg.get());
-    }
-
     // GCC does an implicit conversion to the pointer or integer ValType.  This
     // can fail in some cases (1i -> int**), check for this error case now.
     // Initialize the argument.

Modified: user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp
==============================================================================
--- user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp	Sun Nov 20 15:00:45 2011	(r227755)
+++ user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp	Sun Nov 20 15:06:39 2011	(r227756)
@@ -1305,6 +1305,12 @@ NamedDecl *Sema::LazilyCreateBuiltin(Ide
       Diag(Loc, diag::warn_implicit_decl_requires_setjmp)
         << Context.BuiltinInfo.GetName(BID);
     return 0;
+
+  case ASTContext::GE_Missing_ucontext:
+    if (ForRedeclaration)
+      Diag(Loc, diag::warn_implicit_decl_requires_ucontext)
+        << Context.BuiltinInfo.GetName(BID);
+    return 0;
   }
 
   if (!ForRedeclaration && Context.BuiltinInfo.isPredefinedLibFunction(BID)) {
@@ -3635,6 +3641,8 @@ Sema::ActOnTypedefNameDecl(Scope *S, Dec
         Context.setjmp_bufDecl(NewTD);
       else if (II->isStr("sigjmp_buf"))
         Context.setsigjmp_bufDecl(NewTD);
+      else if (II->isStr("ucontext_t"))
+        Context.setucontext_tDecl(NewTD);
       else if (II->isStr("__builtin_va_list"))
         Context.setBuiltinVaListType(Context.getTypedefType(NewTD));
     }

Modified: user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Serialization/ASTReader.cpp
==============================================================================
--- user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Serialization/ASTReader.cpp	Sun Nov 20 15:00:45 2011	(r227755)
+++ user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Serialization/ASTReader.cpp	Sun Nov 20 15:06:39 2011	(r227756)
@@ -2659,6 +2659,24 @@ void ASTReader::InitializeContext() {  
       if (Context.ObjCSelRedefinitionType.isNull())
         Context.ObjCSelRedefinitionType = GetType(ObjCSelRedef);
     }
+
+    if (unsigned Ucontext_t = SpecialTypes[SPECIAL_TYPE_UCONTEXT_T]) {
+      QualType Ucontext_tType = GetType(Ucontext_t);
+      if (Ucontext_tType.isNull()) {
+        Error("ucontext_t type is NULL");
+        return;
+      }
+
+      if (!Context.ucontext_tDecl) {
+        if (const TypedefType *Typedef = Ucontext_tType->getAs<TypedefType>())
+          Context.setucontext_tDecl(Typedef->getDecl());
+        else {
+          const TagType *Tag = Ucontext_tType->getAs<TagType>();
+          assert(Tag && "Invalid ucontext_t type in AST file");
+          Context.setucontext_tDecl(Tag->getDecl());
+        }
+      }
+    }
   }
   
   ReadPragmaDiagnosticMappings(Context.getDiagnostics());

Modified: user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Serialization/ASTWriter.cpp
==============================================================================
--- user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Serialization/ASTWriter.cpp	Sun Nov 20 15:00:45 2011	(r227755)
+++ user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Serialization/ASTWriter.cpp	Sun Nov 20 15:06:39 2011	(r227756)
@@ -2994,6 +2994,7 @@ void ASTWriter::WriteASTCore(Sema &SemaR
   AddTypeRef(Context.ObjCIdRedefinitionType, SpecialTypes);
   AddTypeRef(Context.ObjCClassRedefinitionType, SpecialTypes);
   AddTypeRef(Context.ObjCSelRedefinitionType, SpecialTypes);
+  AddTypeRef(Context.getucontext_tType(), SpecialTypes);
   
   // Keep writing types and declarations until all types and
   // declarations have been written.

Modified: user/attilio/vmcontention/gnu/usr.bin/binutils/ld/Makefile.powerpc
==============================================================================
--- user/attilio/vmcontention/gnu/usr.bin/binutils/ld/Makefile.powerpc	Sun Nov 20 15:00:45 2011	(r227755)
+++ user/attilio/vmcontention/gnu/usr.bin/binutils/ld/Makefile.powerpc	Sun Nov 20 15:06:39 2011	(r227756)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NATIVE_EMULATION=	elf32ppc
+NATIVE_EMULATION=	elf32ppc_fbsd
 
 SRCS+=		e${NATIVE_EMULATION}.c
 CLEANFILES+=	e${NATIVE_EMULATION}.c

Modified: user/attilio/vmcontention/gnu/usr.bin/binutils/ld/Makefile.powerpc64
==============================================================================
--- user/attilio/vmcontention/gnu/usr.bin/binutils/ld/Makefile.powerpc64	Sun Nov 20 15:00:45 2011	(r227755)
+++ user/attilio/vmcontention/gnu/usr.bin/binutils/ld/Makefile.powerpc64	Sun Nov 20 15:06:39 2011	(r227756)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NATIVE_EMULATION=	elf64ppc
+NATIVE_EMULATION=	elf64ppc_fbsd
 
 SRCS+=		e${NATIVE_EMULATION}.c
 CLEANFILES+=	e${NATIVE_EMULATION}.c
@@ -11,7 +11,7 @@ e${NATIVE_EMULATION}.c: emulparams/${NAT
 	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
 	    ${NATIVE_EMULATION} ""  no ${NATIVE_EMULATION} ${TARGET_TUPLE}
 
-PPC32_EMULATION= elf32ppc
+PPC32_EMULATION= elf32ppc_fbsd
 _ppc32_path=	\"${TOOLS_PREFIX}/usr/lib32\"
 EMS+=		${PPC32_EMULATION}
 .for ext in ${ELF_SCR_EXT}

Modified: user/attilio/vmcontention/include/Makefile
==============================================================================
--- user/attilio/vmcontention/include/Makefile	Sun Nov 20 15:00:45 2011	(r227755)
+++ user/attilio/vmcontention/include/Makefile	Sun Nov 20 15:06:39 2011	(r227756)
@@ -24,7 +24,7 @@ INCS=	a.out.h ar.h assert.h bitstring.h 
 	strings.h sysexits.h tar.h termios.h tgmath.h \
 	time.h timeconv.h timers.h ttyent.h \
 	ulimit.h unistd.h utime.h utmpx.h uuid.h varargs.h vis.h \
-	wchar.h wctype.h wordexp.h
+	wchar.h wctype.h wordexp.h xlocale.h _xlocale_ctype.h
 
 MHDRS=	float.h floatingpoint.h stdarg.h
 

Copied: user/attilio/vmcontention/include/_xlocale_ctype.h (from r227754, head/include/_xlocale_ctype.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/attilio/vmcontention/include/_xlocale_ctype.h	Sun Nov 20 15:06:39 2011	(r227756, copy of r227754, head/include/_xlocale_ctype.h)
@@ -0,0 +1,162 @@
+/*-
+ * Copyright (c) 2011 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by David Chisnall under sponsorship from
+ * the FreeBSD Foundation.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ *
+ * $FreeBSD$
+ */
+#ifndef _XLOCALE_H_
+#error This header should only be included by <xlocale.h>, never directly.
+#endif
+
+#ifndef _XLOCALE_CTYPE_H_
+__BEGIN_DECLS
+unsigned long	___runetype_l(__ct_rune_t, locale_t) __pure;
+__ct_rune_t	___tolower_l(__ct_rune_t, locale_t) __pure;
+__ct_rune_t	___toupper_l(__ct_rune_t, locale_t) __pure;
+_RuneLocale	*__runes_for_locale(locale_t, int*);
+__END_DECLS
+#endif
+
+#ifndef _XLOCALE_INLINE
+#if __GNUC__ && !__GNUC_STDC_INLINE__
+#define _XLOCALE_INLINE extern inline
+#else
+#define _XLOCALE_INLINE inline
+#endif
+#endif
+
+#ifdef XLOCALE_WCTYPES
+static __inline int
+__maskrune_l(__ct_rune_t _c, unsigned long _f, locale_t locale)
+{

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-src-user mailing list