diff options
| author | gjb <gjb@FreeBSD.org> | 2017-05-19 00:00:38 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2017-05-19 00:00:38 +0000 |
| commit | 36e493fadc47cf70ed3ceef4004b3e22425681fd (patch) | |
| tree | ff07dadddbf21a0ce8f18d504288ef81c4e04f13 | |
| parent | b763b254d60837797c4bc2eef59a68983305c143 (diff) | |
| download | FreeBSD-src-36e493fadc47cf70ed3ceef4004b3e22425681fd.zip FreeBSD-src-36e493fadc47cf70ed3ceef4004b3e22425681fd.tar.gz | |
Update stable/11 from 11.0-STABLE to 11.1-PRERELEASE, marking the
official start of the code slush.
Set the default mdoc(7) version to 11.1, and update the clang(1)
TARGET_TRIPLE to reflect 11.1. While here, add missing FreeBSD
major versions to mdoc(7).
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation
| -rw-r--r-- | Makefile.inc1 | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/groff/tmac/mdoc.local.in | 5 | ||||
| -rw-r--r-- | lib/clang/llvm.build.mk | 2 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 4 |
4 files changed, 8 insertions, 5 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 4995c24..554c8d2 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -596,7 +596,7 @@ XCXXFLAGS+= -isystem ${WORLDTMP}/usr/include/c++/v1 -std=c++11 \ .endif .else TARGET_ABI?= unknown -TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 +TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.1 XCFLAGS+= -target ${TARGET_TRIPLE} .endif XCFLAGS+= --sysroot=${WORLDTMP} diff --git a/gnu/usr.bin/groff/tmac/mdoc.local.in b/gnu/usr.bin/groff/tmac/mdoc.local.in index 046b16b..af9efa1 100644 --- a/gnu/usr.bin/groff/tmac/mdoc.local.in +++ b/gnu/usr.bin/groff/tmac/mdoc.local.in @@ -50,7 +50,7 @@ .ds doc-str-Lb-libstdthreads C11 Threads Library (libstdthreads, \-lstdthreads) . .\" Default .Os value -.ds doc-default-operating-system FreeBSD\~11.0 +.ds doc-default-operating-system FreeBSD\~11.1 . .\" FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-2.2.9 2.2.9 @@ -62,7 +62,10 @@ .ds doc-operating-system-FreeBSD-9.3 9.3 .ds doc-operating-system-FreeBSD-10.0 10.0 .ds doc-operating-system-FreeBSD-10.1 10.1 +.ds doc-operating-system-FreeBSD-10.2 10.2 +.ds doc-operating-system-FreeBSD-10.3 10.3 .ds doc-operating-system-FreeBSD-11.0 11.0 +.ds doc-operating-system-FreeBSD-11.1 11.1 . .\" Definitions for other *BSDs not (yet) in doc-common .ds doc-operating-system-NetBSD-7.0 7.0 diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk index a1f845c..4b4a839c 100644 --- a/lib/clang/llvm.build.mk +++ b/lib/clang/llvm.build.mk @@ -31,7 +31,7 @@ TARGET_ABI= gnueabi .else TARGET_ABI= unknown .endif -OS_VERSION= freebsd11.0 +OS_VERSION= freebsd11.1 TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-${TARGET_ABI}-${OS_VERSION} BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-unknown-${OS_VERSION} diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index fa05d7d..41bc615 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -43,8 +43,8 @@ # included if the tree is modified. TYPE="FreeBSD" -REVISION="11.0" -BRANCH="STABLE" +REVISION="11.1" +BRANCH="PRERELEASE" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi |
