Date: Fri, 20 Nov 2015 16:18:27 +0000 (UTC) From: Andrew Turner <andrew@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r291103 - in head/sys: conf modules Message-ID: <201511201618.tAKGIRov037496@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andrew Date: Fri Nov 20 16:18:27 2015 New Revision: 291103 URL: https://svnweb.freebsd.org/changeset/base/291103 Log: DTrace is known to work on armv6, enable building it as a module. Reviewed by: imp Sponsored by: ABT Systems Ltd Differential Revision: https://reviews.freebsd.org/D4221 Modified: head/sys/conf/kern.opts.mk head/sys/modules/Makefile Modified: head/sys/conf/kern.opts.mk ============================================================================== --- head/sys/conf/kern.opts.mk Fri Nov 20 16:12:22 2015 (r291102) +++ head/sys/conf/kern.opts.mk Fri Nov 20 16:18:27 2015 (r291103) @@ -59,7 +59,10 @@ __DEFAULT_NO_OPTIONS = \ # Things that don't work based on the CPU .if ${MACHINE_CPUARCH} == "arm" -BROKEN_OPTIONS+= CDDL ZFS +BROKEN_OPTIONS+= ZFS +. if ${MACHINE_ARCH:Marmv6*} == "" +BROKEN_OPTIONS+= CDDL +. endif .endif .if ${MACHINE_CPUARCH} == "mips" Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Fri Nov 20 16:12:22 2015 (r291102) +++ head/sys/modules/Makefile Fri Nov 20 16:18:27 2015 (r291103) @@ -403,7 +403,8 @@ _autofs= autofs .endif .if ${MK_CDDL} != "no" || defined(ALL_MODULES) -.if ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" && \ +.if (${MACHINE_CPUARCH} != "arm" || ${MACHINE_ARCH:Marmv6*} == "") && \ + ${MACHINE_CPUARCH} != "mips" && \ ${MACHINE_CPUARCH} != "sparc64" SUBDIR+= dtrace .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511201618.tAKGIRov037496>