summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.inc12
-rw-r--r--gnu/usr.bin/groff/tmac/mdoc.local.in5
-rw-r--r--lib/clang/llvm.build.mk2
-rw-r--r--sys/conf/newvers.sh4
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
OpenPOWER on IntegriCloud