diff options
Diffstat (limited to 'share')
-rw-r--r-- | share/examples/mdoc/example.4 | 8 | ||||
-rw-r--r-- | share/man/man4/da.4 | 31 | ||||
-rw-r--r-- | share/man/man5/devfs.conf.5 | 6 | ||||
-rw-r--r-- | share/man/man5/src.conf.5 | 9 | ||||
-rw-r--r-- | share/man/man9/Makefile | 5 | ||||
-rw-r--r-- | share/man/man9/mbuf.9 | 2 | ||||
-rw-r--r-- | share/mk/atf.test.mk | 84 | ||||
-rw-r--r-- | share/mk/bsd.cpu.mk | 21 | ||||
-rw-r--r-- | share/mk/bsd.own.mk | 1 | ||||
-rw-r--r-- | share/timedef/zh_CN.GB18030.src | 26 | ||||
-rw-r--r-- | share/timedef/zh_CN.GB2312.src | 26 | ||||
-rw-r--r-- | share/timedef/zh_CN.UTF-8.src | 26 | ||||
-rw-r--r-- | share/timedef/zh_CN.eucCN.src | 26 | ||||
-rw-r--r-- | share/timedef/zh_TW.Big5.src | 26 | ||||
-rw-r--r-- | share/timedef/zh_TW.UTF-8.src | 26 | ||||
-rw-r--r-- | share/zoneinfo/Makefile | 2 |
16 files changed, 129 insertions, 196 deletions
diff --git a/share/examples/mdoc/example.4 b/share/examples/mdoc/example.4 index c39e486..7185715 100644 --- a/share/examples/mdoc/example.4 +++ b/share/examples/mdoc/example.4 @@ -26,15 +26,14 @@ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. -.Dd April 1, 2006 +.Dd July 31, 2015 .Dt EXAMPLE 4 i386 .Os .Sh NAME .Nm example .Nd "example device driver manual page" .Sh SYNOPSIS -To compile the -driver into the kernel, +To compile the driver into the kernel, place the following lines in the kernel configuration file: .Bd -ragged -offset indent @@ -42,8 +41,7 @@ kernel configuration file: .Cd "options EXAMPLE_DEBUG" .Ed .Pp -Alternatively, to load the -driver as a +Alternatively, to load the driver as a module at boot time, place the following line in .Xr loader.conf 5 : .Bd -literal -offset indent diff --git a/share/man/man4/da.4 b/share/man/man4/da.4 index 7d6f83b..0fabedd 100644 --- a/share/man/man4/da.4 +++ b/share/man/man4/da.4 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 22, 2014 +.Dd October 11, 2015 .Dt DA 4 .Os .Sh NAME @@ -133,8 +133,7 @@ variables and .Xr loader 8 tunables: .Bl -tag -width 12 -.It kern.cam.da.retry_count -.Pp +.It Va kern.cam.da.retry_count This variable determines how many times the .Nm driver will retry a READ or WRITE command. @@ -143,8 +142,7 @@ the .Nm driver dump routine. This value currently defaults to 4. -.It kern.cam.da.default_timeout -.Pp +.It Va kern.cam.da.default_timeout This variable determines how long the .Nm driver will wait before timing out an outstanding command. @@ -152,20 +150,31 @@ The units for this value are seconds, and the default is currently 60 seconds. .It Va kern.cam.sort_io_queue .It Va kern.cam.da. Ns Ar X Ns Va .sort_io_queue -.Pp These variables determine whether request queue should be sorted trying to optimize head seeks. Set to 1 to enable sorting, 0 to disable, -1 to leave it as-is. The default is sorting enabled for HDDs and disabled for SSDs. -.It kern.cam.da.%d.minimum_cmd_size -.Pp +.It Va kern.cam.da. Ns Ar X Ns Va .delete_method +This variable specifies method to handle BIO_DELETE requests: +.Bl -tag +.It ATA_TRIM +ATA TRIM via ATA COMMAND PASS THROUGH command, +.It UNMAP +UNMAP command, +.It WS16 +WRITE SAME(16) command with UNMAP flag, +.It WS10 +WRITE SAME(10) command with UNMAP flag, +.It ZERO +WRITE SAME(10) command without UNMAP flag, +.It DISABLE +disable BIO_DELETE support. +.El +.It Va kern.cam.da. Ns Ar X Ns Va .minimum_cmd_size This variable determines what the minimum READ/WRITE CDB size is for a given .Nm unit. -(The %d above denotes the unit number of the -.Nm -driver instance, e.g.\& 1, 2, 4, 8, etc.) Valid minimum command size values are 6, 10, 12 and 16 bytes. The default is 6 bytes. .Pp diff --git a/share/man/man5/devfs.conf.5 b/share/man/man5/devfs.conf.5 index 8e53735..01fb7fa 100644 --- a/share/man/man5/devfs.conf.5 +++ b/share/man/man5/devfs.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 17, 2005 +.Dd November 1, 2015 .Dt DEVFS.CONF 5 .Os .Sh NAME @@ -109,9 +109,9 @@ link cd0 cdrom .Pp Similarly, to link .Pa /dev/cdrom -to the first ATAPI CD-ROM device, the following action may be used: +to the first SCSI CD-ROM device, the following action may be used: .Bd -literal -offset indent -link acd0 cdrom +link cd0 cdrom .Ed .Pp To set the owner of a device, the diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 4b20bb4..61a7c44 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. -.\" from FreeBSD: stable/10/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des +.\" from FreeBSD: stable/10/tools/build/options/makeman 288396 2015-09-29 21:45:23Z bdrewery .\" $FreeBSD$ -.Dd April 23, 2015 +.Dd October 25, 2015 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1063,11 +1063,6 @@ Set to disable symbol versioning when building shared libraries. Set to not build .Xr syscons 4 support files such as keyboard maps, fonts, and screen output maps. -.It Va WITHOUT_SYSINSTALL -.\" from FreeBSD: stable/10/tools/build/options/WITHOUT_SYSINSTALL 183242 2008-09-21 22:02:26Z sam -Set to not build -.Xr sysinstall 8 -and related programs. .It Va WITHOUT_TALK .\" from FreeBSD: stable/10/tools/build/options/WITHOUT_TALK 278710 2015-02-13 21:19:54Z ngie Set to not build or install diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index a3c8009..69bf839 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -898,12 +898,7 @@ MLINKS+=\ mbuf.9 m_dup.9 \ mbuf.9 m_dup_pkthdr.9 \ mbuf.9 MEXTADD.9 \ - mbuf.9 MEXT_ADD_REF.9 \ - mbuf.9 MEXTFREE.9 \ - mbuf.9 MEXT_IS_REF.9 \ - mbuf.9 MEXT_REM_REF.9 \ mbuf.9 m_fixhdr.9 \ - mbuf.9 MFREE.9 \ mbuf.9 m_free.9 \ mbuf.9 m_freem.9 \ mbuf.9 MGET.9 \ diff --git a/share/man/man9/mbuf.9 b/share/man/man9/mbuf.9 index fd2dddc..2ff875c 100644 --- a/share/man/man9/mbuf.9 +++ b/share/man/man9/mbuf.9 @@ -51,8 +51,6 @@ .Fa "short flags" .Fa "int type" .Fc -.Fn MEXTFREE "struct mbuf *mbuf" -.Fn MFREE "struct mbuf *mbuf" "struct mbuf *successor" .\" .Ss Mbuf utility macros .Fn mtod "struct mbuf *mbuf" "type" diff --git a/share/mk/atf.test.mk b/share/mk/atf.test.mk index 7a3ddd9..1f3bc18 100644 --- a/share/mk/atf.test.mk +++ b/share/mk/atf.test.mk @@ -22,28 +22,10 @@ ATF_TESTS_C?= ATF_TESTS_CXX?= ATF_TESTS_SH?= -# Whether to allow using the deprecated ATF tools or not. -# -# If 'yes', this file will generate Atffiles when requested and will also -# support using the deprecated atf-run tool to execute the tests. -ALLOW_DEPRECATED_ATF_TOOLS?= no - -# Knob to control the handling of the Atffile for this Makefile. -# -# If 'yes', an Atffile exists in the source tree and is installed into -# TESTSDIR. -# -# If 'auto', an Atffile is automatically generated based on the list of test -# programs built by the Makefile and is installed into TESTSDIR. This is the -# default and is sufficient in the majority of the cases. -# -# If 'no', no Atffile is installed. -ATFFILE?= auto - # Path to the prefix of the installed ATF tools, if any. # # If atf-run and atf-report are installed from ports, we automatically define a -# realtest target below to run the tests using these tools. The tools are +# realregress target below to run the tests using these tools. The tools are # searched for in the hierarchy specified by this variable. ATF_PREFIX?= /usr/local @@ -115,67 +97,3 @@ ${_T}: ${ATF_TESTS_SH_SRC_${_T}} mv ${.TARGET}.tmp ${.TARGET} .endfor .endif - -.if ${ALLOW_DEPRECATED_ATF_TOOLS} != "no" - -.if ${ATFFILE:tl} != "no" -FILES+= Atffile -FILESDIR_Atffile= ${TESTSDIR} - -.if ${ATFFILE:tl} == "auto" -CLEANFILES+= Atffile Atffile.tmp - -Atffile: Makefile - @{ echo 'Content-Type: application/X-atf-atffile; version="1"'; \ - echo; \ - echo '# Automatically generated by atf-test.mk.'; \ - echo; \ - echo 'prop: test-suite = "'${TESTSUITE}'"'; \ - echo; \ - for tp in ${ATF_TESTS_C} ${ATF_TESTS_CXX} ${ATF_TESTS_SH} \ - ${TESTS_SUBDIRS}; \ - do \ - echo "tp: $${tp}"; \ - done; } >Atffile.tmp - @mv Atffile.tmp Atffile -.endif -.endif - -ATF_REPORT?= ${ATF_PREFIX}/bin/atf-report -ATF_RUN?= ${ATF_PREFIX}/bin/atf-run -.if exists(${ATF_RUN}) && exists(${ATF_REPORT}) -# Definition of the "make test" target and supporting variables. -# -# This target, by necessity, can only work for native builds (i.e. a freeBSD -# host building a release for the same system). The target runs ATF, which is -# not in the toolchain, and the tests execute code built for the target host. -# -# Due to the dependencies of the binaries built by the source tree and how they -# are used by tests, it is highly possible for a execution of "make test" to -# report bogus results unless the new binaries are put in place. -_TESTS_FIFO= ${.OBJDIR}/atf-run.fifo -_TESTS_LOG= ${.OBJDIR}/atf-run.log -CLEANFILES+= ${_TESTS_FIFO} ${_TESTS_LOG} -realtest: .PHONY - @set -e; \ - if [ -z "${TESTSDIR}" ]; then \ - echo "*** No TESTSDIR defined; nothing to do."; \ - exit 0; \ - fi; \ - cd ${DESTDIR}${TESTSDIR}; \ - rm -f ${_TESTS_FIFO}; \ - mkfifo ${_TESTS_FIFO}; \ - tee ${_TESTS_LOG} < ${_TESTS_FIFO} | ${TESTS_ENV} ${ATF_REPORT} & \ - set +e; \ - ${TESTS_ENV} ${ATF_RUN} >> ${_TESTS_FIFO}; \ - result=$${?}; \ - wait; \ - rm -f ${_TESTS_FIFO}; \ - echo; \ - echo "*** The verbatim output of atf-run has been saved to ${_TESTS_LOG}"; \ - echo "***"; \ - echo "*** WARNING: atf-run is deprecated; please install kyua instead"; \ - exit $${result} -.endif - -.endif diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index 5453bd4..f0da4ae 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -267,6 +267,27 @@ _CPUCFLAGS += -mfloat-abi=softfp CFLAGS += ${_CPUCFLAGS} .endif +# +# Prohibit the compiler from emitting SIMD instructions. +# These flags are added to CFLAGS in areas where the extra context-switch +# cost outweighs the advantages of SIMD instructions. +# +# gcc: +# Setting -mno-mmx implies -mno-3dnow +# Setting -mno-sse implies -mno-sse2, -mno-sse3, -mno-ssse3 and -mfpmath=387 +# +# clang: +# Setting -mno-mmx implies -mno-3dnow and -mno-3dnowa +# Setting -mno-sse implies -mno-sse2, -mno-sse3, -mno-ssse3, -mno-sse41 and +# -mno-sse42 +# (-mfpmath= is not supported) +# +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" +CFLAGS_NO_SIMD.clang= -mno-avx +CFLAGS_NO_SIMD= -mno-mmx -mno-sse +.endif +CFLAGS_NO_SIMD += ${CFLAGS_NO_SIMD.${COMPILER_TYPE}} + # Add in any architecture-specific CFLAGS. # These come from make.conf or the command line or the environment. CFLAGS += ${CFLAGS.${MACHINE_ARCH}} diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index b06b1d4..4792bad 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -369,7 +369,6 @@ __DEFAULT_YES_OPTIONS = \ SVNLITE \ SYMVER \ SYSCONS \ - SYSINSTALL \ TALK \ TCSH \ TCP_WRAPPERS \ diff --git a/share/timedef/zh_CN.GB18030.src b/share/timedef/zh_CN.GB18030.src index 3000022..4290be7 100644 --- a/share/timedef/zh_CN.GB18030.src +++ b/share/timedef/zh_CN.GB18030.src @@ -5,18 +5,18 @@ # # Short month names # - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 -10 -11 -12 + 1Ô + 2Ô + 3Ô + 4Ô + 5Ô + 6Ô + 7Ô + 8Ô + 9Ô +10Ô +11Ô +12Ô # # Long month names (as in a date) # @@ -75,7 +75,7 @@ # # date_fmt # -%YÄê%bÔÂ%eÈÕ %A %X %Z +%YÄê%_mÔÂ%eÈÕ %A %X %Z # # Long month names (without case ending) # diff --git a/share/timedef/zh_CN.GB2312.src b/share/timedef/zh_CN.GB2312.src index 3000022..4290be7 100644 --- a/share/timedef/zh_CN.GB2312.src +++ b/share/timedef/zh_CN.GB2312.src @@ -5,18 +5,18 @@ # # Short month names # - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 -10 -11 -12 + 1Ô + 2Ô + 3Ô + 4Ô + 5Ô + 6Ô + 7Ô + 8Ô + 9Ô +10Ô +11Ô +12Ô # # Long month names (as in a date) # @@ -75,7 +75,7 @@ # # date_fmt # -%YÄê%bÔÂ%eÈÕ %A %X %Z +%YÄê%_mÔÂ%eÈÕ %A %X %Z # # Long month names (without case ending) # diff --git a/share/timedef/zh_CN.UTF-8.src b/share/timedef/zh_CN.UTF-8.src index 6b1d023..9f742dd 100644 --- a/share/timedef/zh_CN.UTF-8.src +++ b/share/timedef/zh_CN.UTF-8.src @@ -5,18 +5,18 @@ # # Short month names # - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 -10 -11 -12 + 1月 + 2月 + 3月 + 4月 + 5月 + 6月 + 7月 + 8月 + 9月 +10月 +11月 +12月 # # Long month names (as in a date) # @@ -75,7 +75,7 @@ # # date_fmt # -%Yå¹´%b月%eæ—¥ %A %X %Z +%Yå¹´%_m月%eæ—¥ %A %X %Z # # Long month names (without case ending) # diff --git a/share/timedef/zh_CN.eucCN.src b/share/timedef/zh_CN.eucCN.src index 3000022..4290be7 100644 --- a/share/timedef/zh_CN.eucCN.src +++ b/share/timedef/zh_CN.eucCN.src @@ -5,18 +5,18 @@ # # Short month names # - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 -10 -11 -12 + 1Ô + 2Ô + 3Ô + 4Ô + 5Ô + 6Ô + 7Ô + 8Ô + 9Ô +10Ô +11Ô +12Ô # # Long month names (as in a date) # @@ -75,7 +75,7 @@ # # date_fmt # -%YÄê%bÔÂ%eÈÕ %A %X %Z +%YÄê%_mÔÂ%eÈÕ %A %X %Z # # Long month names (without case ending) # diff --git a/share/timedef/zh_TW.Big5.src b/share/timedef/zh_TW.Big5.src index dee99ae..b3aa142 100644 --- a/share/timedef/zh_TW.Big5.src +++ b/share/timedef/zh_TW.Big5.src @@ -4,18 +4,18 @@ # WARNING: empty lines are essential too # # Short month names - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 -10 -11 -12 + 1¤ë + 2¤ë + 3¤ë + 4¤ë + 5¤ë + 6¤ë + 7¤ë + 8¤ë + 9¤ë +10¤ë +11¤ë +12¤ë # # Long month names (as in a date) # @@ -74,7 +74,7 @@ # # date_fmt # -%Y¦~%b¤ë%e¤é %A %X %Z +%Y¦~%_m¤ë%e¤é %A %X %Z # # Long month names (without case ending) # diff --git a/share/timedef/zh_TW.UTF-8.src b/share/timedef/zh_TW.UTF-8.src index 22b6892..85cc20f 100644 --- a/share/timedef/zh_TW.UTF-8.src +++ b/share/timedef/zh_TW.UTF-8.src @@ -4,18 +4,18 @@ # WARNING: empty lines are essential too # # Short month names - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 -10 -11 -12 + 1月 + 2月 + 3月 + 4月 + 5月 + 6月 + 7月 + 8月 + 9月 +10月 +11月 +12月 # # Long month names (as in a date) # @@ -74,7 +74,7 @@ # # date_fmt # -%Yå¹´%b月%eæ—¥ %A %X %Z +%Yå¹´%_m月%eæ—¥ %A %X %Z # # Long month names (without case ending) # diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile index bcf1570..7f022c8 100644 --- a/share/zoneinfo/Makefile +++ b/share/zoneinfo/Makefile @@ -79,7 +79,7 @@ zoneinfo: yearistype ${TDATA} beforeinstall: cd ${TZBUILDDIR} && \ - find * -type f -print -exec ${INSTALL} \ + find -s * -type f -print -exec ${INSTALL} \ -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ \{} ${DESTDIR}/usr/share/zoneinfo/\{} \; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ |