Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 31 Jul 2017 22:19:39 +0000 (UTC)
From:      Marius Strobl <marius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r321825 - in stable/10: . gnu/usr.bin/groff/tmac lib/clang sys/conf
Message-ID:  <201707312219.v6VMJdAl069073@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marius
Date: Mon Jul 31 22:19:39 2017
New Revision: 321825
URL: https://svnweb.freebsd.org/changeset/base/321825

Log:
  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)

Modified:
  stable/10/Makefile.inc1
  stable/10/gnu/usr.bin/groff/tmac/mdoc.local.in
  stable/10/lib/clang/clang.build.mk
  stable/10/sys/conf/newvers.sh

Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1	Mon Jul 31 22:00:27 2017	(r321824)
+++ stable/10/Makefile.inc1	Mon Jul 31 22:19:39 2017	(r321825)
@@ -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

Modified: stable/10/gnu/usr.bin/groff/tmac/mdoc.local.in
==============================================================================
--- stable/10/gnu/usr.bin/groff/tmac/mdoc.local.in	Mon Jul 31 22:00:27 2017	(r321824)
+++ stable/10/gnu/usr.bin/groff/tmac/mdoc.local.in	Mon Jul 31 22:19:39 2017	(r321825)
@@ -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

Modified: stable/10/lib/clang/clang.build.mk
==============================================================================
--- stable/10/lib/clang/clang.build.mk	Mon Jul 31 22:00:27 2017	(r321824)
+++ stable/10/lib/clang/clang.build.mk	Mon Jul 31 22:19:39 2017	(r321825)
@@ -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}\"

Modified: stable/10/sys/conf/newvers.sh
==============================================================================
--- stable/10/sys/conf/newvers.sh	Mon Jul 31 22:00:27 2017	(r321824)
+++ stable/10/sys/conf/newvers.sh	Mon Jul 31 22:19:39 2017	(r321825)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707312219.v6VMJdAl069073>