- Switch releng/12.0 from RC3 to RELEASE.upstream/12.0.0release/12.0.0

- Add the anticipated 12.0-RELEASE date to UPDATING.
- Set a static __FreeBSD_version.
- This one goes to 12.

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation

3 files changed, 5 insertions, 2 deletions

diff --git a/UPDATING b/UPDATING
index bc66eff745f4..bd37b24c2078 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,9 @@ from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to
 the tip of head, and then rebuild without this option. The bootstrap process
 from older version of current across the gcc/clang cutover is a bit fragile.
 
+20181211:
+	12.0-RELEASE.
+
 20181115:
 	The set of CTM commands (ctm, ctm_smail, ctm_rmail, ctm_dequeue)
 	has been converted to a port (misc/ctm) and will be removed from
diff --git a/lib/csu/common/crtbrand.c b/lib/csu/common/crtbrand.c
index c407de435b96..e22c347fe1d3 100644
--- a/lib/csu/common/crtbrand.c
+++ b/lib/csu/common/crtbrand.c
@@ -65,5 +65,5 @@ static const struct {
 	.descsz = sizeof(int32_t),
 	.type = NT_FREEBSD_ABI_TAG,
 	.name = NOTE_FREEBSD_VENDOR,
-	.desc = __FreeBSD_version
+	.desc = 1200086
 };
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index b6e93a4b2737..67d073945130 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -46,7 +46,7 @@
 
 TYPE="FreeBSD"
 REVISION="12.0"
-BRANCH="RC3"
+BRANCH="RELEASE"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi