From 91609cf57581dfd5b60bc480f881918aea40fcb6 Mon Sep 17 00:00:00 2001
From: marius <marius@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Mon, 31 Jul 2017 22:19:39 +0000
Subject: [PATCH] Update stable/10 from 10.3-STABLE to 10.4-PRERELEASE as part
 of the 10.4 release cycle, also belatedly marking the official start of the
 code slush.

Set the default mdoc(7) version to 10.4, and update the clang(1)
TARGET_TRIPLE to reflect 10.4. While at it, add missing FreeBSD
major versions to mdoc(7).

Approved by:	re (implicit)


git-svn-id: svn://svn.freebsd.org/base/stable/10@321825 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 Makefile.inc1                        | 2 +-
 gnu/usr.bin/groff/tmac/mdoc.local.in | 4 +++-
 lib/clang/clang.build.mk             | 4 ++--
 sys/conf/newvers.sh                  | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index d79f6688f..885aaba46 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -359,7 +359,7 @@ TARGET_ABI=	gnueabi
 .else
 TARGET_ABI=	unknown
 .endif
-TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.0
+TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.4
 XFLAGS+=	-target ${TARGET_TRIPLE}
 .endif
 .endif
diff --git a/gnu/usr.bin/groff/tmac/mdoc.local.in b/gnu/usr.bin/groff/tmac/mdoc.local.in
index 6d9928aaf..a9fe153d0 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\~10.3
+.ds doc-default-operating-system FreeBSD\~10.4
 .
 .\" FreeBSD releases not found in doc-common
 .ds doc-operating-system-FreeBSD-7.4    7.4
@@ -63,7 +63,9 @@
 .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-10.4   10.4
 .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/clang.build.mk b/lib/clang/clang.build.mk
index 6a23820aa..db43fac3b 100644
--- a/lib/clang/clang.build.mk
+++ b/lib/clang/clang.build.mk
@@ -27,8 +27,8 @@ TARGET_ABI=	gnueabi
 TARGET_ABI=	unknown
 .endif
 
-TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.3
-BUILD_TRIPLE?=	${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd10.3
+TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.4
+BUILD_TRIPLE?=	${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd10.4
 CFLAGS+=	-DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \
 		-DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" \
 		-DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\"
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index e903fac71..2e040bd45 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -31,8 +31,8 @@
 # $FreeBSD$
 
 TYPE="FreeBSD"
-REVISION="10.3"
-BRANCH="STABLE"
+REVISION="10.4"
+BRANCH="PRERELEASE"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi
-- 
2.42.0