From owner-svn-src-user@FreeBSD.ORG Mon May 27 15:47:19 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 70BC3C1B; Mon, 27 May 2013 15:47:19 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 60533AB1; Mon, 27 May 2013 15:47:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4RFlJsO051525; Mon, 27 May 2013 15:47:19 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4RFlANr051461; Mon, 27 May 2013 15:47:10 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201305271547.r4RFlANr051461@svn.freebsd.org> From: Attilio Rao Date: Mon, 27 May 2013 15:47:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r251027 - in user/attilio/vmcontention: . contrib/jemalloc/include/jemalloc contrib/llvm/lib/Transforms/Vectorize include lib/libc/iconv lib/libc/stdlib/jemalloc lib/libc/sys lib/msun l... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 May 2013 15:47:19 -0000 Author: attilio Date: Mon May 27 15:47:10 2013 New Revision: 251027 URL: http://svnweb.freebsd.org/changeset/base/251027 Log: MFC Added: user/attilio/vmcontention/share/man/man4/aacraid.4 - copied unchanged from r251026, head/share/man/man4/aacraid.4 user/attilio/vmcontention/sys/arm/ti/am335x/am335x_lcd.c - copied unchanged from r251026, head/sys/arm/ti/am335x/am335x_lcd.c user/attilio/vmcontention/sys/arm/ti/am335x/am335x_lcd.h - copied unchanged from r251026, head/sys/arm/ti/am335x/am335x_lcd.h user/attilio/vmcontention/sys/arm/ti/am335x/am335x_lcd_syscons.c - copied unchanged from r251026, head/sys/arm/ti/am335x/am335x_lcd_syscons.c user/attilio/vmcontention/sys/arm/ti/am335x/am335x_pwm.c - copied unchanged from r251026, head/sys/arm/ti/am335x/am335x_pwm.c user/attilio/vmcontention/sys/arm/ti/am335x/am335x_pwm.h - copied unchanged from r251026, head/sys/arm/ti/am335x/am335x_pwm.h user/attilio/vmcontention/sys/arm/ti/am335x/am335x_scm.h - copied unchanged from r251026, head/sys/arm/ti/am335x/am335x_scm.h user/attilio/vmcontention/sys/boot/fdt/dts/am335x-evm.dts - copied unchanged from r251026, head/sys/boot/fdt/dts/am335x-evm.dts user/attilio/vmcontention/sys/dev/aacraid/ - copied from r251026, head/sys/dev/aacraid/ user/attilio/vmcontention/sys/modules/aacraid/ - copied from r251026, head/sys/modules/aacraid/ Modified: user/attilio/vmcontention/Makefile.inc1 user/attilio/vmcontention/ObsoleteFiles.inc user/attilio/vmcontention/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h user/attilio/vmcontention/contrib/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp user/attilio/vmcontention/include/complex.h user/attilio/vmcontention/include/malloc_np.h user/attilio/vmcontention/include/uchar.h user/attilio/vmcontention/lib/libc/iconv/citrus_iconv.c user/attilio/vmcontention/lib/libc/iconv/citrus_iconv_local.h user/attilio/vmcontention/lib/libc/iconv/citrus_mapper_local.h user/attilio/vmcontention/lib/libc/iconv/citrus_stdenc_local.h user/attilio/vmcontention/lib/libc/iconv/iconv.c user/attilio/vmcontention/lib/libc/stdlib/jemalloc/Symbol.map user/attilio/vmcontention/lib/libc/sys/sigreturn.2 user/attilio/vmcontention/lib/msun/Makefile user/attilio/vmcontention/lib/msun/ld128/s_exp2l.c user/attilio/vmcontention/lib/msun/ld80/s_exp2l.c user/attilio/vmcontention/lib/msun/src/e_exp.c user/attilio/vmcontention/lib/msun/src/e_expf.c user/attilio/vmcontention/lib/msun/src/e_log.c user/attilio/vmcontention/lib/msun/src/e_log10.c user/attilio/vmcontention/lib/msun/src/e_log10f.c user/attilio/vmcontention/lib/msun/src/e_log2.c user/attilio/vmcontention/lib/msun/src/e_log2f.c user/attilio/vmcontention/lib/msun/src/e_logf.c user/attilio/vmcontention/lib/msun/src/s_exp2.c user/attilio/vmcontention/lib/msun/src/s_exp2f.c user/attilio/vmcontention/lib/msun/src/s_expm1.c user/attilio/vmcontention/lib/msun/src/s_expm1f.c user/attilio/vmcontention/lib/msun/src/s_fma.c user/attilio/vmcontention/lib/msun/src/s_fmal.c user/attilio/vmcontention/lib/msun/src/s_log1p.c user/attilio/vmcontention/lib/msun/src/s_log1pf.c user/attilio/vmcontention/lib/msun/src/s_nearbyint.c user/attilio/vmcontention/share/man/man4/Makefile user/attilio/vmcontention/share/man/man4/bce.4 user/attilio/vmcontention/share/man/man8/rc.8 user/attilio/vmcontention/share/mk/bsd.lib.mk user/attilio/vmcontention/sys/amd64/conf/GENERIC user/attilio/vmcontention/sys/amd64/conf/NOTES user/attilio/vmcontention/sys/arm/ti/am335x/am335x_prcm.c user/attilio/vmcontention/sys/arm/ti/am335x/files.am335x user/attilio/vmcontention/sys/arm/ti/ti_prcm.h user/attilio/vmcontention/sys/boot/fdt/dts/am335x.dtsi user/attilio/vmcontention/sys/cam/scsi/scsi_da.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c user/attilio/vmcontention/sys/conf/files user/attilio/vmcontention/sys/conf/options user/attilio/vmcontention/sys/dev/ath/if_ath.c user/attilio/vmcontention/sys/dev/ath/if_ath_misc.h user/attilio/vmcontention/sys/dev/ath/if_ath_tx.c user/attilio/vmcontention/sys/dev/ath/if_athvar.h user/attilio/vmcontention/sys/dev/md/md.c user/attilio/vmcontention/sys/dev/nand/nand.h user/attilio/vmcontention/sys/dev/nand/nandbus.c user/attilio/vmcontention/sys/dev/tws/tws.h user/attilio/vmcontention/sys/dev/usb/controller/ehci.c user/attilio/vmcontention/sys/dev/usb/controller/uhci.c user/attilio/vmcontention/sys/dev/usb/usb_device.c user/attilio/vmcontention/sys/dev/usb/usb_hub.c user/attilio/vmcontention/sys/dev/usb/usb_msctest.c user/attilio/vmcontention/sys/i386/conf/GENERIC user/attilio/vmcontention/sys/i386/conf/NOTES user/attilio/vmcontention/sys/ia64/conf/GENERIC user/attilio/vmcontention/sys/kern/kern_alq.c user/attilio/vmcontention/sys/kern/kern_mbuf.c user/attilio/vmcontention/sys/kern/sys_capability.c user/attilio/vmcontention/sys/mips/mips/db_trace.c user/attilio/vmcontention/sys/modules/Makefile user/attilio/vmcontention/sys/net/bpf.c user/attilio/vmcontention/sys/net80211/ieee80211_output.c user/attilio/vmcontention/sys/netinet/sctp_os_bsd.h user/attilio/vmcontention/sys/sys/_types.h user/attilio/vmcontention/tools/regression/lib/libc/locale/test-btowc.c user/attilio/vmcontention/tools/regression/lib/libc/locale/test-iswctype.c user/attilio/vmcontention/tools/regression/lib/libc/locale/test-towctrans.c user/attilio/vmcontention/tools/regression/lib/msun/test-fma.c user/attilio/vmcontention/usr.bin/getent/getent.c user/attilio/vmcontention/usr.bin/iconv/iconv.c user/attilio/vmcontention/usr.bin/mkcsmapper/Makefile user/attilio/vmcontention/usr.bin/mkcsmapper/ldef.h user/attilio/vmcontention/usr.bin/mkcsmapper/lex.l user/attilio/vmcontention/usr.bin/mkcsmapper/yacc.y user/attilio/vmcontention/usr.bin/mkesdb/Makefile user/attilio/vmcontention/usr.bin/mkesdb/ldef.h user/attilio/vmcontention/usr.bin/mkesdb/lex.l user/attilio/vmcontention/usr.bin/mkesdb/yacc.y user/attilio/vmcontention/usr.bin/patch/pch.c user/attilio/vmcontention/usr.sbin/ndp/ndp.8 user/attilio/vmcontention/usr.sbin/rtsold/rtsold.8 Directory Properties: user/attilio/vmcontention/ (props changed) user/attilio/vmcontention/contrib/llvm/ (props changed) user/attilio/vmcontention/lib/libc/ (props changed) user/attilio/vmcontention/share/man/man4/ (props changed) user/attilio/vmcontention/sys/ (props changed) user/attilio/vmcontention/sys/boot/ (props changed) user/attilio/vmcontention/sys/cddl/contrib/opensolaris/ (props changed) user/attilio/vmcontention/sys/conf/ (props changed) user/attilio/vmcontention/usr.sbin/rtsold/ (props changed) Modified: user/attilio/vmcontention/Makefile.inc1 ============================================================================== --- user/attilio/vmcontention/Makefile.inc1 Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/Makefile.inc1 Mon May 27 15:47:10 2013 (r251027) @@ -892,16 +892,11 @@ NO_KERNELOBJ= t KERNCONF=${KERNFAST} .endif .endif -.if !defined(KERNCONF) && defined(KERNEL) -KERNCONF= ${KERNEL} -KERNWARN= -.else .if ${TARGET_ARCH} == "powerpc64" KERNCONF?= GENERIC64 .else KERNCONF?= GENERIC .endif -.endif INSTKERNNAME?= kernel KERNSRCDIR?= ${.CURDIR}/sys @@ -930,12 +925,6 @@ buildkernel: @echo "ERROR: Missing kernel configuration file(s) (${KERNCONF})."; \ false .endif -.if defined(KERNWARN) - @echo "--------------------------------------------------------------" - @echo ">>> WARNING: KERNEL= setting should be changed to KERNCONF=" - @echo "--------------------------------------------------------------" - @sleep 3 -.endif @echo .for _kernel in ${BUILDKERNELS} @echo "--------------------------------------------------------------" @@ -1215,6 +1204,10 @@ _yacc= lib/liby \ usr.bin/yacc .endif +.if ${BOOTSTRAPPING} < 1000014 +_crunch= usr.sbin/crunch +.endif + .if ${BOOTSTRAPPING} < 1000026 _nmtree= lib/libnetbsd \ usr.sbin/nmtree @@ -1293,6 +1286,7 @@ bootstrap-tools: usr.bin/xinstall \ ${_gensnmptree} \ usr.sbin/config \ + ${_crunch} \ ${_nmtree} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool}; \ Modified: user/attilio/vmcontention/ObsoleteFiles.inc ============================================================================== --- user/attilio/vmcontention/ObsoleteFiles.inc Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/ObsoleteFiles.inc Mon May 27 15:47:10 2013 (r251027) @@ -257,7 +257,9 @@ OLD_FILES+=usr/share/man/man1/yyfix.1.gz # 20120505: new clang import installed a redundant internal header OLD_FILES+=usr/include/clang/3.1/stdalign.h # 20120428: MD2 removed from libmd +OLD_LIBS+=lib/libmd.so.5 OLD_FILES+=usr/include/md2.h +OLD_LIBS+=usr/lib32/libmd.so.5 OLD_FILES+=usr/share/man/man3/MD2Data.3.gz OLD_FILES+=usr/share/man/man3/MD2End.3.gz OLD_FILES+=usr/share/man/man3/MD2File.3.gz @@ -824,7 +826,6 @@ OLD_LIBS+=lib/libipx.so.4 OLD_LIBS+=lib/libkiconv.so.3 OLD_LIBS+=lib/libkvm.so.4 OLD_LIBS+=lib/libmd.so.4 -OLD_LIBS+=lib/libmd.so.5 OLD_LIBS+=lib/libncurses.so.7 OLD_LIBS+=lib/libncursesw.so.7 OLD_LIBS+=lib/libnvpair.so.1 Modified: user/attilio/vmcontention/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h ============================================================================== --- user/attilio/vmcontention/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h Mon May 27 15:47:10 2013 (r251027) @@ -68,9 +68,50 @@ extern int __isthreaded; #define isthreaded ((bool)__isthreaded) /* Mangle. */ +#undef je_malloc +#undef je_calloc +#undef je_realloc +#undef je_free +#undef je_posix_memalign +#undef je_malloc_usable_size +#undef je_allocm +#undef je_rallocm +#undef je_sallocm +#undef je_dallocm +#undef je_nallocm +#define je_malloc __malloc +#define je_calloc __calloc +#define je_realloc __realloc +#define je_free __free +#define je_posix_memalign __posix_memalign +#define je_malloc_usable_size __malloc_usable_size +#define je_allocm __allocm +#define je_rallocm __rallocm +#define je_sallocm __sallocm +#define je_dallocm __dallocm +#define je_nallocm __nallocm #define open _open #define read _read #define write _write #define close _close #define pthread_mutex_lock _pthread_mutex_lock #define pthread_mutex_unlock _pthread_mutex_unlock + +#ifdef JEMALLOC_C_ +/* + * Define 'weak' symbols so that an application can have its own versions + * of malloc, calloc, realloc, free, et al. + */ +__weak_reference(__malloc, malloc); +__weak_reference(__calloc, calloc); +__weak_reference(__realloc, realloc); +__weak_reference(__free, free); +__weak_reference(__posix_memalign, posix_memalign); +__weak_reference(__malloc_usable_size, malloc_usable_size); +__weak_reference(__allocm, allocm); +__weak_reference(__rallocm, rallocm); +__weak_reference(__sallocm, sallocm); +__weak_reference(__dallocm, dallocm); +__weak_reference(__nallocm, nallocm); +#endif + Modified: user/attilio/vmcontention/contrib/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp ============================================================================== --- user/attilio/vmcontention/contrib/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/contrib/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp Mon May 27 15:47:10 2013 (r251027) @@ -2169,7 +2169,10 @@ bool LoopVectorizationLegality::canVecto } bool LoopVectorizationLegality::canVectorize() { - assert(TheLoop->getLoopPreheader() && "No preheader!!"); + // We must have a loop in canonical form. Loops with indirectbr in them cannot + // be canonicalized. + if (!TheLoop->getLoopPreheader()) + return false; // We can only vectorize innermost loops. if (TheLoop->getSubLoopsVector().size()) Modified: user/attilio/vmcontention/include/complex.h ============================================================================== --- user/attilio/vmcontention/include/complex.h Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/include/complex.h Mon May 27 15:47:10 2013 (r251027) @@ -46,6 +46,18 @@ _Static_assert(__generic(_Complex_I, flo #define complex _Complex #define I _Complex_I +#if __ISO_C_VISIBLE >= 2011 +#ifdef __clang__ +#define CMPLX(x, y) ((double complex){ x, y }) +#define CMPLXF(x, y) ((float complex){ x, y }) +#define CMPLXL(x, y) ((long double complex){ x, y }) +#elif __GNUC_PREREQ__(4, 7) +#define CMPLX(x, y) __builtin_complex((double)(x), (double)(y)) +#define CMPLXF(x, y) __builtin_complex((float)(x), (float)(y)) +#define CMPLXL(x, y) __builtin_complex((long double)(x), (long double)(y)) +#endif +#endif /* __ISO_C_VISIBLE >= 2011 */ + __BEGIN_DECLS double cabs(double complex); Modified: user/attilio/vmcontention/include/malloc_np.h ============================================================================== --- user/attilio/vmcontention/include/malloc_np.h Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/include/malloc_np.h Mon May 27 15:47:10 2013 (r251027) @@ -61,6 +61,18 @@ int rallocm(void **ptr, size_t *rsize, s int sallocm(const void *ptr, size_t *rsize, int flags) __nonnull(1); int dallocm(void *ptr, int flags) __nonnull(1); int nallocm(size_t *rsize, size_t size, int flags); + +void * __calloc(size_t, size_t) __malloc_like; +void * __malloc(size_t) __malloc_like; +void * __realloc(void *, size_t); +void __free(void *); +int __posix_memalign(void **, size_t, size_t); +size_t __malloc_usable_size(const void *); +int __allocm(void **, size_t *, size_t, int) __nonnull(1); +int __rallocm(void **, size_t *, size_t, size_t, int) __nonnull(1); +int __sallocm(const void *, size_t *, int) __nonnull(1); +int __dallocm(void *, int) __nonnull(1); +int __nallocm(size_t *, size_t, int); __END_DECLS #endif /* _MALLOC_NP_H_ */ Modified: user/attilio/vmcontention/include/uchar.h ============================================================================== --- user/attilio/vmcontention/include/uchar.h Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/include/uchar.h Mon May 27 15:47:10 2013 (r251027) @@ -32,6 +32,16 @@ #include #include +#ifndef _CHAR16_T_DECLARED +typedef __char16_t char16_t; +#define _CHAR16_T_DECLARED +#endif + +#ifndef _CHAR32_T_DECLARED +typedef __char32_t char32_t; +#define _CHAR32_T_DECLARED +#endif + #ifndef _MBSTATE_T_DECLARED typedef __mbstate_t mbstate_t; #define _MBSTATE_T_DECLARED @@ -42,9 +52,6 @@ typedef __size_t size_t; #define _SIZE_T_DECLARED #endif -typedef __char16_t char16_t; -typedef __char32_t char32_t; - __BEGIN_DECLS size_t c16rtomb(char * __restrict, char16_t, mbstate_t * __restrict); size_t c32rtomb(char * __restrict, char32_t, mbstate_t * __restrict); Modified: user/attilio/vmcontention/lib/libc/iconv/citrus_iconv.c ============================================================================== --- user/attilio/vmcontention/lib/libc/iconv/citrus_iconv.c Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/lib/libc/iconv/citrus_iconv.c Mon May 27 15:47:10 2013 (r251027) @@ -258,7 +258,7 @@ int _citrus_iconv_open(struct _citrus_iconv * __restrict * __restrict rcv, const char * __restrict src, const char * __restrict dst) { - struct _citrus_iconv *cv; + struct _citrus_iconv *cv = NULL; struct _citrus_iconv_shared *ci = NULL; char realdst[PATH_MAX], realsrc[PATH_MAX]; char buf[PATH_MAX], path[PATH_MAX]; @@ -301,7 +301,7 @@ _citrus_iconv_open(struct _citrus_iconv ret = (*ci->ci_ops->io_init_context)(*rcv); if (ret) { release_shared(ci); - free(*rcv); + free(cv); return (ret); } return (0); Modified: user/attilio/vmcontention/lib/libc/iconv/citrus_iconv_local.h ============================================================================== --- user/attilio/vmcontention/lib/libc/iconv/citrus_iconv_local.h Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/lib/libc/iconv/citrus_iconv_local.h Mon May 27 15:47:10 2013 (r251027) @@ -57,6 +57,7 @@ static void _citrus_##_m_##_iconv_unini #define _CITRUS_ICONV_DEF_OPS(_m_) \ +extern struct _citrus_iconv_ops _citrus_##_m_##_iconv_ops; \ struct _citrus_iconv_ops _citrus_##_m_##_iconv_ops = { \ /* io_init_shared */ &_citrus_##_m_##_iconv_init_shared, \ /* io_uninit_shared */ &_citrus_##_m_##_iconv_uninit_shared, \ Modified: user/attilio/vmcontention/lib/libc/iconv/citrus_mapper_local.h ============================================================================== --- user/attilio/vmcontention/lib/libc/iconv/citrus_mapper_local.h Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/lib/libc/iconv/citrus_mapper_local.h Mon May 27 15:47:10 2013 (r251027) @@ -52,6 +52,7 @@ static void _citrus_##_m_##_mapper_init (void); #define _CITRUS_MAPPER_DEF_OPS(_m_) \ +extern struct _citrus_mapper_ops _citrus_##_m_##_mapper_ops; \ struct _citrus_mapper_ops _citrus_##_m_##_mapper_ops = { \ /* mo_init */ &_citrus_##_m_##_mapper_init, \ /* mo_uninit */ &_citrus_##_m_##_mapper_uninit, \ Modified: user/attilio/vmcontention/lib/libc/iconv/citrus_stdenc_local.h ============================================================================== --- user/attilio/vmcontention/lib/libc/iconv/citrus_stdenc_local.h Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/lib/libc/iconv/citrus_stdenc_local.h Mon May 27 15:47:10 2013 (r251027) @@ -84,6 +84,7 @@ static int _citrus_##_e_##_stdenc_get_s struct _citrus_stdenc_state_desc * __restrict) #define _CITRUS_STDENC_DEF_OPS(_e_) \ +extern struct _citrus_stdenc_ops _citrus_##_e_##_stdenc_ops; \ struct _citrus_stdenc_ops _citrus_##_e_##_stdenc_ops = { \ /* eo_init */ &_citrus_##_e_##_stdenc_init, \ /* eo_uninit */ &_citrus_##_e_##_stdenc_uninit, \ Modified: user/attilio/vmcontention/lib/libc/iconv/iconv.c ============================================================================== --- user/attilio/vmcontention/lib/libc/iconv/iconv.c Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/lib/libc/iconv/iconv.c Mon May 27 15:47:10 2013 (r251027) @@ -66,37 +66,31 @@ iconv_t _iconv_open(const char *out, c struct _citrus_iconv *prealloc); iconv_t -_iconv_open(const char *out, const char *in, struct _citrus_iconv *prealloc) +_iconv_open(const char *out, const char *in, struct _citrus_iconv *handle) { - struct _citrus_iconv *handle; - char *out_truncated, *p; + const char *out_slashes; + char *out_noslashes; int ret; - handle = prealloc; - /* * Remove anything following a //, as these are options (like * //ignore, //translate, etc) and we just don't handle them. - * This is for compatibilty with software that uses thees + * This is for compatibility with software that uses these * blindly. */ - out_truncated = strdup(out); - if (out_truncated == NULL) { - errno = ENOMEM; - return ((iconv_t)-1); + out_slashes = strstr(out, "//"); + if (out_slashes != NULL) { + out_noslashes = strndup(out, out_slashes - out); + if (out_noslashes == NULL) { + errno = ENOMEM; + return ((iconv_t)-1); + } + ret = _citrus_iconv_open(&handle, in, out_noslashes); + free(out_noslashes); + } else { + ret = _citrus_iconv_open(&handle, in, out); } - p = out_truncated; - while (*p != 0) { - if (p[0] == '/' && p[1] == '/') { - *p = '\0'; - break; - } - p++; - } - - ret = _citrus_iconv_open(&handle, in, out_truncated); - free(out_truncated); if (ret) { errno = ret == ENOENT ? EINVAL : ret; return ((iconv_t)-1); Modified: user/attilio/vmcontention/lib/libc/stdlib/jemalloc/Symbol.map ============================================================================== --- user/attilio/vmcontention/lib/libc/stdlib/jemalloc/Symbol.map Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/lib/libc/stdlib/jemalloc/Symbol.map Mon May 27 15:47:10 2013 (r251027) @@ -26,6 +26,17 @@ FBSD_1.3 { sallocm; dallocm; nallocm; + __malloc; + __calloc; + __realloc; + __free; + __posix_memalign; + __malloc_usable_size; + __allocm; + __rallocm; + __sallocm; + __dallocm; + __nallocm; }; FBSDprivate_1.0 { Modified: user/attilio/vmcontention/lib/libc/sys/sigreturn.2 ============================================================================== --- user/attilio/vmcontention/lib/libc/sys/sigreturn.2 Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/lib/libc/sys/sigreturn.2 Mon May 27 15:47:10 2013 (r251027) @@ -56,10 +56,6 @@ Execution resumes at the specified pc. This system call is used by the trampoline code and .Xr longjmp 3 when returning from a signal to the previously executing program. -.Sh NOTES -This system call is not available in -.Bx 4.2 -hence it should not be used if backward compatibility is needed. .Sh RETURN VALUES If successful, the system call does not return. Otherwise, a value of -1 is returned and Modified: user/attilio/vmcontention/lib/msun/Makefile ============================================================================== --- user/attilio/vmcontention/lib/msun/Makefile Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/lib/msun/Makefile Mon May 27 15:47:10 2013 (r251027) @@ -121,12 +121,6 @@ COMMON_SRCS:= ${COMMON_SRCS:N${i:R}.c} .endfor .endif -# Some files need certain gcc built-in functions to be disabled, since gcc's -# model of the functions bogusly assumes -fno-trapping-math. -XRINT_CFLAGS= -fno-builtin-rint -fno-builtin-rintf -fno-builtin-rintl -CFLAGS+= ${XRINT_CFLAGS} -XRINT_CFLAGS:= ${.IMPSRC:M*/s_nearbyint.c:C/^.+$/${XRINT_CFLAGS}/:C/^$//} - SRCS= ${COMMON_SRCS} ${ARCH_SRCS} INCS+= fenv.h math.h Modified: user/attilio/vmcontention/lib/msun/ld128/s_exp2l.c ============================================================================== --- user/attilio/vmcontention/lib/msun/ld128/s_exp2l.c Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/lib/msun/ld128/s_exp2l.c Mon May 27 15:47:10 2013 (r251027) @@ -39,14 +39,11 @@ __FBSDID("$FreeBSD$"); #define BIAS (LDBL_MAX_EXP - 1) #define EXPMASK (BIAS + LDBL_MAX_EXP) -#if 0 /* XXX Prevent gcc from erroneously constant folding this. */ -static const long double twom10000 = 0x1p-10000L; -#else -static volatile long double twom10000 = 0x1p-10000L; -#endif +static volatile long double + huge = 0x1p10000L, + twom10000 = 0x1p-10000L; static const long double - huge = 0x1p10000L, P1 = 0x1.62e42fefa39ef35793c7673007e6p-1L, P2 = 0x1.ebfbdff82c58ea86f16b06ec9736p-3L, P3 = 0x1.c6b08d704a0bf8b33a762bad3459p-5L, Modified: user/attilio/vmcontention/lib/msun/ld80/s_exp2l.c ============================================================================== --- user/attilio/vmcontention/lib/msun/ld80/s_exp2l.c Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/lib/msun/ld80/s_exp2l.c Mon May 27 15:47:10 2013 (r251027) @@ -43,12 +43,9 @@ __FBSDID("$FreeBSD$"); #define BIAS (LDBL_MAX_EXP - 1) #define EXPMASK (BIAS + LDBL_MAX_EXP) -static const long double huge = 0x1p10000L; -#if 0 /* XXX Prevent gcc from erroneously constant folding this. */ -static const long double twom10000 = 0x1p-10000L; -#else -static volatile long double twom10000 = 0x1p-10000L; -#endif +static volatile long double + huge = 0x1p10000L, + twom10000 = 0x1p-10000L; static const double redux = 0x1.8p63 / TBLSIZE, Modified: user/attilio/vmcontention/lib/msun/src/e_exp.c ============================================================================== --- user/attilio/vmcontention/lib/msun/src/e_exp.c Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/lib/msun/src/e_exp.c Mon May 27 15:47:10 2013 (r251027) @@ -84,7 +84,6 @@ __FBSDID("$FreeBSD$"); static const double one = 1.0, halF[2] = {0.5,-0.5,}, -huge = 1.0e+300, o_threshold= 7.09782712893383973096e+02, /* 0x40862E42, 0xFEFA39EF */ u_threshold= -7.45133219101941108420e+02, /* 0xc0874910, 0xD52D3051 */ ln2HI[2] ={ 6.93147180369123816490e-01, /* 0x3fe62e42, 0xfee00000 */ @@ -99,6 +98,7 @@ P4 = -1.65339022054652515390e-06, /* 0 P5 = 4.13813679705723846039e-08; /* 0x3E663769, 0x72BEA4D0 */ static volatile double +huge = 1.0e+300, twom1000= 9.33263618503218878990e-302; /* 2**-1000=0x01700000,0*/ double Modified: user/attilio/vmcontention/lib/msun/src/e_expf.c ============================================================================== --- user/attilio/vmcontention/lib/msun/src/e_expf.c Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/lib/msun/src/e_expf.c Mon May 27 15:47:10 2013 (r251027) @@ -24,7 +24,6 @@ __FBSDID("$FreeBSD$"); static const float one = 1.0, halF[2] = {0.5,-0.5,}, -huge = 1.0e+30, o_threshold= 8.8721679688e+01, /* 0x42b17180 */ u_threshold= -1.0397208405e+02, /* 0xc2cff1b5 */ ln2HI[2] ={ 6.9314575195e-01, /* 0x3f317200 */ @@ -39,7 +38,9 @@ invln2 = 1.4426950216e+00, /* 0x3fb8a P1 = 1.6666625440e-1, /* 0xaaaa8f.0p-26 */ P2 = -2.7667332906e-3; /* -0xb55215.0p-32 */ -static volatile float twom100 = 7.8886090522e-31; /* 2**-100=0x0d800000 */ +static volatile float +huge = 1.0e+30, +twom100 = 7.8886090522e-31; /* 2**-100=0x0d800000 */ float __ieee754_expf(float x) Modified: user/attilio/vmcontention/lib/msun/src/e_log.c ============================================================================== --- user/attilio/vmcontention/lib/msun/src/e_log.c Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/lib/msun/src/e_log.c Mon May 27 15:47:10 2013 (r251027) @@ -81,6 +81,7 @@ Lg6 = 1.531383769920937332e-01, /* 3FC3 Lg7 = 1.479819860511658591e-01; /* 3FC2F112 DF3E5244 */ static const double zero = 0.0; +static volatile double vzero = 0.0; double __ieee754_log(double x) @@ -94,7 +95,7 @@ __ieee754_log(double x) k=0; if (hx < 0x00100000) { /* x < 2**-1022 */ if (((hx&0x7fffffff)|lx)==0) - return -two54/zero; /* log(+-0)=-inf */ + return -two54/vzero; /* log(+-0)=-inf */ if (hx<0) return (x-x)/zero; /* log(-#) = NaN */ k -= 54; x *= two54; /* subnormal number, scale up x */ GET_HIGH_WORD(hx,x); Modified: user/attilio/vmcontention/lib/msun/src/e_log10.c ============================================================================== --- user/attilio/vmcontention/lib/msun/src/e_log10.c Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/lib/msun/src/e_log10.c Mon May 27 15:47:10 2013 (r251027) @@ -34,6 +34,7 @@ log10_2hi = 3.01029995663611771306e-01 log10_2lo = 3.69423907715893078616e-13; /* 0x3D59FEF3, 0x11F12B36 */ static const double zero = 0.0; +static volatile double vzero = 0.0; double __ieee754_log10(double x) @@ -47,7 +48,7 @@ __ieee754_log10(double x) k=0; if (hx < 0x00100000) { /* x < 2**-1022 */ if (((hx&0x7fffffff)|lx)==0) - return -two54/zero; /* log(+-0)=-inf */ + return -two54/vzero; /* log(+-0)=-inf */ if (hx<0) return (x-x)/zero; /* log(-#) = NaN */ k -= 54; x *= two54; /* subnormal number, scale up x */ GET_HIGH_WORD(hx,x); Modified: user/attilio/vmcontention/lib/msun/src/e_log10f.c ============================================================================== --- user/attilio/vmcontention/lib/msun/src/e_log10f.c Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/lib/msun/src/e_log10f.c Mon May 27 15:47:10 2013 (r251027) @@ -28,6 +28,7 @@ log10_2hi = 3.0102920532e-01, /* 0x3e9 log10_2lo = 7.9034151668e-07; /* 0x355427db */ static const float zero = 0.0; +static volatile float vzero = 0.0; float __ieee754_log10f(float x) @@ -40,7 +41,7 @@ __ieee754_log10f(float x) k=0; if (hx < 0x00800000) { /* x < 2**-126 */ if ((hx&0x7fffffff)==0) - return -two25/zero; /* log(+-0)=-inf */ + return -two25/vzero; /* log(+-0)=-inf */ if (hx<0) return (x-x)/zero; /* log(-#) = NaN */ k -= 25; x *= two25; /* subnormal number, scale up x */ GET_FLOAT_WORD(hx,x); Modified: user/attilio/vmcontention/lib/msun/src/e_log2.c ============================================================================== --- user/attilio/vmcontention/lib/msun/src/e_log2.c Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/lib/msun/src/e_log2.c Mon May 27 15:47:10 2013 (r251027) @@ -34,6 +34,7 @@ ivln2hi = 1.44269504072144627571e+00 ivln2lo = 1.67517131648865118353e-10; /* 0x3de705fc, 0x2eefa200 */ static const double zero = 0.0; +static volatile double vzero = 0.0; double __ieee754_log2(double x) @@ -47,7 +48,7 @@ __ieee754_log2(double x) k=0; if (hx < 0x00100000) { /* x < 2**-1022 */ if (((hx&0x7fffffff)|lx)==0) - return -two54/zero; /* log(+-0)=-inf */ + return -two54/vzero; /* log(+-0)=-inf */ if (hx<0) return (x-x)/zero; /* log(-#) = NaN */ k -= 54; x *= two54; /* subnormal number, scale up x */ GET_HIGH_WORD(hx,x); Modified: user/attilio/vmcontention/lib/msun/src/e_log2f.c ============================================================================== --- user/attilio/vmcontention/lib/msun/src/e_log2f.c Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/lib/msun/src/e_log2f.c Mon May 27 15:47:10 2013 (r251027) @@ -26,6 +26,7 @@ ivln2hi = 1.4428710938e+00, /* 0x3fb ivln2lo = -1.7605285393e-04; /* 0xb9389ad4 */ static const float zero = 0.0; +static volatile float vzero = 0.0; float __ieee754_log2f(float x) @@ -38,7 +39,7 @@ __ieee754_log2f(float x) k=0; if (hx < 0x00800000) { /* x < 2**-126 */ if ((hx&0x7fffffff)==0) - return -two25/zero; /* log(+-0)=-inf */ + return -two25/vzero; /* log(+-0)=-inf */ if (hx<0) return (x-x)/zero; /* log(-#) = NaN */ k -= 25; x *= two25; /* subnormal number, scale up x */ GET_FLOAT_WORD(hx,x); Modified: user/attilio/vmcontention/lib/msun/src/e_logf.c ============================================================================== --- user/attilio/vmcontention/lib/msun/src/e_logf.c Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/lib/msun/src/e_logf.c Mon May 27 15:47:10 2013 (r251027) @@ -30,6 +30,7 @@ Lg3 = 0x91e9ee.0p-25, /* 0.28498786 Lg4 = 0xf89e26.0p-26; /* 0.24279078841 */ static const float zero = 0.0; +static volatile float vzero = 0.0; float __ieee754_logf(float x) @@ -42,7 +43,7 @@ __ieee754_logf(float x) k=0; if (ix < 0x00800000) { /* x < 2**-126 */ if ((ix&0x7fffffff)==0) - return -two25/zero; /* log(+-0)=-inf */ + return -two25/vzero; /* log(+-0)=-inf */ if (ix<0) return (x-x)/zero; /* log(-#) = NaN */ k -= 25; x *= two25; /* subnormal number, scale up x */ GET_FLOAT_WORD(ix,x); Modified: user/attilio/vmcontention/lib/msun/src/s_exp2.c ============================================================================== --- user/attilio/vmcontention/lib/msun/src/s_exp2.c Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/lib/msun/src/s_exp2.c Mon May 27 15:47:10 2013 (r251027) @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #define TBLSIZE (1 << TBLBITS) static const double - huge = 0x1p1000, redux = 0x1.8p52 / TBLSIZE, P1 = 0x1.62e42fefa39efp-1, P2 = 0x1.ebfbdff82c575p-3, @@ -44,7 +43,9 @@ static const double P4 = 0x1.3b2ab88f70400p-7, P5 = 0x1.5d88003875c74p-10; -static volatile double twom1000 = 0x1p-1000; +static volatile double + huge = 0x1p1000, + twom1000 = 0x1p-1000; static const double tbl[TBLSIZE * 2] = { /* exp2(z + eps) eps */ Modified: user/attilio/vmcontention/lib/msun/src/s_exp2f.c ============================================================================== --- user/attilio/vmcontention/lib/msun/src/s_exp2f.c Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/lib/msun/src/s_exp2f.c Mon May 27 15:47:10 2013 (r251027) @@ -36,14 +36,15 @@ __FBSDID("$FreeBSD$"); #define TBLSIZE (1 << TBLBITS) static const float - huge = 0x1p100f, redux = 0x1.8p23f / TBLSIZE, P1 = 0x1.62e430p-1f, P2 = 0x1.ebfbe0p-3f, P3 = 0x1.c6b348p-5f, P4 = 0x1.3b2c9cp-7f; -static volatile float twom100 = 0x1p-100f; +static volatile float + huge = 0x1p100f, + twom100 = 0x1p-100f; static const double exp2ft[TBLSIZE] = { 0x1.6a09e667f3bcdp-1, Modified: user/attilio/vmcontention/lib/msun/src/s_expm1.c ============================================================================== --- user/attilio/vmcontention/lib/msun/src/s_expm1.c Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/lib/msun/src/s_expm1.c Mon May 27 15:47:10 2013 (r251027) @@ -115,7 +115,6 @@ __FBSDID("$FreeBSD$"); static const double one = 1.0, -huge = 1.0e+300, tiny = 1.0e-300, o_threshold = 7.09782712893383973096e+02,/* 0x40862E42, 0xFEFA39EF */ ln2_hi = 6.93147180369123816490e-01,/* 0x3fe62e42, 0xfee00000 */ @@ -128,6 +127,8 @@ Q3 = -7.93650757867487942473e-05, /* B Q4 = 4.00821782732936239552e-06, /* 3ED0CFCA 86E65239 */ Q5 = -2.01099218183624371326e-07; /* BE8AFDB7 6E09C32D */ +static volatile double huge = 1.0e+300; + double expm1(double x) { Modified: user/attilio/vmcontention/lib/msun/src/s_expm1f.c ============================================================================== --- user/attilio/vmcontention/lib/msun/src/s_expm1f.c Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/lib/msun/src/s_expm1f.c Mon May 27 15:47:10 2013 (r251027) @@ -23,7 +23,6 @@ __FBSDID("$FreeBSD$"); static const float one = 1.0, -huge = 1.0e+30, tiny = 1.0e-30, o_threshold = 8.8721679688e+01,/* 0x42b17180 */ ln2_hi = 6.9313812256e-01,/* 0x3f317180 */ @@ -37,6 +36,8 @@ invln2 = 1.4426950216e+00,/* 0x3fb8aa3b Q1 = -3.3333212137e-2, /* -0x888868.0p-28 */ Q2 = 1.5807170421e-3; /* 0xcf3010.0p-33 */ +static volatile float huge = 1.0e+30; + float expm1f(float x) { Modified: user/attilio/vmcontention/lib/msun/src/s_fma.c ============================================================================== --- user/attilio/vmcontention/lib/msun/src/s_fma.c Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/lib/msun/src/s_fma.c Mon May 27 15:47:10 2013 (r251027) @@ -238,6 +238,8 @@ fma(double x, double y, double z) zs = copysign(DBL_MIN, zs); fesetround(FE_TONEAREST); + /* work around clang bug 8100 */ + volatile double vxs = xs; /* * Basic approach for round-to-nearest: @@ -247,7 +249,7 @@ fma(double x, double y, double z) * adj = xy.lo + r.lo (inexact; low bit is sticky) * result = r.hi + adj (correctly rounded) */ - xy = dd_mul(xs, ys); + xy = dd_mul(vxs, ys); r = dd_add(xy.hi, zs); spread = ex + ey; @@ -268,7 +270,9 @@ fma(double x, double y, double z) * rounding modes. */ fesetround(oround); - adj = r.lo + xy.lo; + /* work around clang bug 8100 */ + volatile double vrlo = r.lo; + adj = vrlo + xy.lo; return (ldexp(r.hi + adj, spread)); } Modified: user/attilio/vmcontention/lib/msun/src/s_fmal.c ============================================================================== --- user/attilio/vmcontention/lib/msun/src/s_fmal.c Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/lib/msun/src/s_fmal.c Mon May 27 15:47:10 2013 (r251027) @@ -226,6 +226,8 @@ fmal(long double x, long double y, long zs = copysignl(LDBL_MIN, zs); fesetround(FE_TONEAREST); + /* work around clang bug 8100 */ + volatile long double vxs = xs; /* * Basic approach for round-to-nearest: @@ -235,7 +237,7 @@ fmal(long double x, long double y, long * adj = xy.lo + r.lo (inexact; low bit is sticky) * result = r.hi + adj (correctly rounded) */ - xy = dd_mul(xs, ys); + xy = dd_mul(vxs, ys); r = dd_add(xy.hi, zs); spread = ex + ey; @@ -256,7 +258,9 @@ fmal(long double x, long double y, long * rounding modes. */ fesetround(oround); - adj = r.lo + xy.lo; + /* work around clang bug 8100 */ + volatile long double vrlo = r.lo; + adj = vrlo + xy.lo; return (ldexpl(r.hi + adj, spread)); } Modified: user/attilio/vmcontention/lib/msun/src/s_log1p.c ============================================================================== --- user/attilio/vmcontention/lib/msun/src/s_log1p.c Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/lib/msun/src/s_log1p.c Mon May 27 15:47:10 2013 (r251027) @@ -96,6 +96,7 @@ Lp6 = 1.531383769920937332e-01, /* 3FC3 Lp7 = 1.479819860511658591e-01; /* 3FC2F112 DF3E5244 */ static const double zero = 0.0; +static volatile double vzero = 0.0; double log1p(double x) @@ -109,7 +110,7 @@ log1p(double x) k = 1; if (hx < 0x3FDA827A) { /* 1+x < sqrt(2)+ */ if(ax>=0x3ff00000) { /* x <= -1.0 */ - if(x==-1.0) return -two54/zero; /* log1p(-1)=+inf */ + if(x==-1.0) return -two54/vzero; /* log1p(-1)=+inf */ else return (x-x)/(x-x); /* log1p(x<-1)=NaN */ } if(ax<0x3e200000) { /* |x| < 2**-29 */ Modified: user/attilio/vmcontention/lib/msun/src/s_log1pf.c ============================================================================== --- user/attilio/vmcontention/lib/msun/src/s_log1pf.c Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/lib/msun/src/s_log1pf.c Mon May 27 15:47:10 2013 (r251027) @@ -34,6 +34,7 @@ Lp6 = 1.5313838422e-01, /* 3E1CD04F */ Lp7 = 1.4798198640e-01; /* 3E178897 */ static const float zero = 0.0; +static volatile float vzero = 0.0; float log1pf(float x) @@ -47,7 +48,7 @@ log1pf(float x) k = 1; if (hx < 0x3ed413d0) { /* 1+x < sqrt(2)+ */ if(ax>=0x3f800000) { /* x <= -1.0 */ - if(x==(float)-1.0) return -two25/zero; /* log1p(-1)=+inf */ + if(x==(float)-1.0) return -two25/vzero; /* log1p(-1)=+inf */ else return (x-x)/(x-x); /* log1p(x<-1)=NaN */ } if(ax<0x38000000) { /* |x| < 2**-15 */ Modified: user/attilio/vmcontention/lib/msun/src/s_nearbyint.c ============================================================================== --- user/attilio/vmcontention/lib/msun/src/s_nearbyint.c Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/lib/msun/src/s_nearbyint.c Mon May 27 15:47:10 2013 (r251027) @@ -36,12 +36,16 @@ __FBSDID("$FreeBSD$"); * instead of feclearexcept()/feupdateenv() to restore the environment * because the only exception defined for rint() is overflow, and * rounding can't overflow as long as emax >= p. + * + * The volatile keyword is needed below because clang incorrectly assumes + * that rint won't raise any floating-point exceptions. Declaring ret volatile + * is sufficient to trick the compiler into doing the right thing. */ #define DECL(type, fn, rint) \ type \ fn(type x) \ { \ - type ret; \ + volatile type ret; \ fenv_t env; \ \ fegetenv(&env); \ Modified: user/attilio/vmcontention/share/man/man4/Makefile ============================================================================== --- user/attilio/vmcontention/share/man/man4/Makefile Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/share/man/man4/Makefile Mon May 27 15:47:10 2013 (r251027) @@ -4,6 +4,7 @@ .include MAN= aac.4 \ + aacraid.4 \ acpi.4 \ ${_acpi_asus.4} \ ${_acpi_asus_wmi.4} \ Copied: user/attilio/vmcontention/share/man/man4/aacraid.4 (from r251026, head/share/man/man4/aacraid.4) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/share/man/man4/aacraid.4 Mon May 27 15:47:10 2013 (r251027, copy of r251026, head/share/man/man4/aacraid.4) @@ -0,0 +1,139 @@ +.\" Copyright (c) 2013 Achim Leubner +.\" All rights reserved. +.\" +.\" 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$ +.Dd April 09, 2013 +.Dt AACRAID 4 +.Os +.Sh NAME +.Nm aacraid +.Nd Adaptec AACRAID Controller driver +.Sh SYNOPSIS +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd device pci +.Cd device aacraid +.Pp +To compile in debugging code: +.Cd options AACRAID_DEBUG=N +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +aacraid_load="YES" +.Ed +.Sh DESCRIPTION +The +.Nm +driver provides support for the Adaptec by PMC RAID controllers, +including Series 6/7/8 and upcoming families. +.Pp +The RAID containers are handled via the +.Nm aacraidp0 +bus. +The physical buses are represented by the +.Nm aacraidp? +devices (beginning with aacraidp1). These devices enable the +SCSI pass-thru interface and allows devices connected +to the card such as CD-ROMs to be available via the CAM +.Xr scsi 4 +subsystem. +Note that not all cards allow this interface to be enabled. +.Pp +The +.Pa /dev/aacraid? +device nodes provide access to the management interface of the controller. +One node exists per installed card. +If the kernel is compiled with the +.Dv COMPAT_LINUX +option, or the +.Pa aacraid_linux.ko +and +.Pa linux.ko +modules are loaded, the +Linux-compatible +.Xr ioctl 2 +interface for the management device will be enabled and will allow +Linux-based management applications to control the card. +.Sh HARDWARE +Controllers supported by the +.Nm +driver include: +.Pp +.Bl -bullet -compact +.It +Adaptec ASR-6405(T|E) +.It +Adaptec ASR-6445 +.It +Adaptec ASR-6805(T|E|Q|TQ) +.It +Adaptec ASR-7085 +.It +Adaptec ASR-7805(Q) +.It +Adaptec ASR-70165 +.It +Adaptec ASR-71605(E|Q) +.It +Adaptec ASR-71685 +.It +Adaptec ASR-72405 +.It +Adaptec Series 8 cards +.El +.Sh FILES +.Bl -tag -width /boot/kernel/aacraid.ko -compact +.It Pa /dev/aacraid? +aacraid management interface +.El +.Sh DIAGNOSTICS +Compiling with +.Dv AACRAID_DEBUG +set to a number between 0 and 3 +will enable increasingly verbose debug messages. +.Pp +The adapter can send status and alert messages asynchronously +to the driver. +These messages are printed on the system console, +and are also queued for retrieval by a management application. +.Sh SEE ALSO +.Xr kld 4 , +.Xr linux 4 , +.Xr scsi 4 , +.Xr kldload 8 +.Sh AUTHORS +.An Achim Leubner +.Aq achim@FreeBSD.org +.An Ed Maste +.Aq emaste@FreeBSD.org +.An Scott Long +.Aq scottl@FreeBSD.org +.Sh BUGS +.Pp +The controller is not actually paused on suspend/resume. Modified: user/attilio/vmcontention/share/man/man4/bce.4 ============================================================================== --- user/attilio/vmcontention/share/man/man4/bce.4 Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/share/man/man4/bce.4 Mon May 27 15:47:10 2013 (r251027) @@ -212,7 +212,7 @@ Enable/Disable strict RX frame size chec .It Va hw.bce.hdr_split Enable/Disable frame header/payload splitting (default 1). .It Va hw.bce.rx_pages -Set the number of memory pages assigned to recieve packets by the driver. +Set the number of memory pages assigned to receive packets by the driver. Due to alignment issues, this value can only be of the set 1, 2, 4 or 8 (default 2). .It Va hw.bce.tx_pages Modified: user/attilio/vmcontention/share/man/man8/rc.8 ============================================================================== --- user/attilio/vmcontention/share/man/man8/rc.8 Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/share/man/man8/rc.8 Mon May 27 15:47:10 2013 (r251027) @@ -124,7 +124,9 @@ Load the configuration files. Determine if booting in a jail, and add .Dq Li nojail -to the list of KEYWORDS to skip in +(no jails allowed) or +.Dq Li nojailvnet +(only allow vnet-enabled jails) to the list of KEYWORDS to skip in .Xr rcorder 8 . .It Invoke Modified: user/attilio/vmcontention/share/mk/bsd.lib.mk ============================================================================== --- user/attilio/vmcontention/share/mk/bsd.lib.mk Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/share/mk/bsd.lib.mk Mon May 27 15:47:10 2013 (r251027) @@ -294,16 +294,21 @@ _libinstall: .if defined(SHLIB_LINK) # ${_SHLIBDIRPREFIX} and ${_LDSCRIPTROOT} are both needed when cross-building # and when building 32 bits library shims. ${_SHLIBDIRPREFIX} is the directory -# prefix where shared objects will be installed. ${_LDSCRIPTROOT} is the -# directory prefix that will be used in generated ld(1) scripts. They cannot -# be coalesced because of the way ld(1) handles the sysroot prefix (used in the -# cross-toolchain): -# - 64 bits libs are located under sysroot, so ${_LDSCRIPTROOT} must be empty. +# prefix where shared objects will be installed by the install target. +# +# ${_LDSCRIPTROOT} is the directory prefix that will be used when generating +# ld(1) scripts. The crosstools' ld is configured to lookup libraries in an +# alternative directory which is called "sysroot", so during buildworld binaries +# won't be linked against the running system libraries but against the ones of +# the current source tree. ${_LDSCRIPTROOT} behavior is twisted because of +# the location where we store them: +# - 64 bits libs are located under sysroot, so ${_LDSCRIPTROOT} must be empty +# because ld(1) will manage to find them from sysroot; # - 32 bits shims are not, so ${_LDSCRIPTROOT} is used to specify their full -# path. Note that ld(1) scripts are generated both during buildworld and -# installworld; in the later case ${_LDSCRIPTROOT} must be obviously empty. -# On the other hand, the use of ${_SHLIBDIRPREFIX} is more consistent since it -# does not involve the logic of a tool we do not own. +# path, outside of sysroot. +# Note that ld(1) scripts are generated both during buildworld and +# installworld; in the later case ${_LDSCRIPTROOT} must be obviously empty +# because on the target system, libraries are meant to be looked up from /. .if defined(SHLIB_LDSCRIPT) && !empty(SHLIB_LDSCRIPT) && exists(${.CURDIR}/${SHLIB_LDSCRIPT}) sed -e 's,@@SHLIB@@,${_LDSCRIPTROOT}${SHLIBDIR}/${SHLIB_NAME},g' \ -e 's,@@LIBDIR@@,${_LDSCRIPTROOT}${LIBDIR},g' \ Modified: user/attilio/vmcontention/sys/amd64/conf/GENERIC ============================================================================== --- user/attilio/vmcontention/sys/amd64/conf/GENERIC Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/sys/amd64/conf/GENERIC Mon May 27 15:47:10 2013 (r251027) @@ -158,6 +158,7 @@ device tws # LSI 3ware 9750 SATA+SAS 6 # RAID controllers device aac # Adaptec FSA RAID device aacp # SCSI passthrough for aac (requires CAM) +device aacraid # Adaptec by PMC RAID device ida # Compaq Smart RAID device mfi # LSI MegaRAID SAS device mlx # Mylex DAC960 family Modified: user/attilio/vmcontention/sys/amd64/conf/NOTES ============================================================================== --- user/attilio/vmcontention/sys/amd64/conf/NOTES Mon May 27 13:51:57 2013 (r251026) +++ user/attilio/vmcontention/sys/amd64/conf/NOTES Mon May 27 15:47:10 2013 (r251027) @@ -406,6 +406,10 @@ device aac device aacp # SCSI Passthrough interface (optional, CAM required) # +# Adaptec by PMC RAID controllers, Series 6/7/8 and upcoming families +device aacraid # Container interface, CAM required + +# # Highpoint RocketRAID 27xx. device hpt27xx Copied: user/attilio/vmcontention/sys/arm/ti/am335x/am335x_lcd.c (from r251026, head/sys/arm/ti/am335x/am335x_lcd.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/sys/arm/ti/am335x/am335x_lcd.c Mon May 27 15:47:10 2013 (r251027, copy of r251026, head/sys/arm/ti/am335x/am335x_lcd.c) @@ -0,0 +1,667 @@ +/*- + * Copyright 2013 Oleksandr Tymoshenko + * All rights reserved. + * + * 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. + * *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***