From 464d42b828a6bebfefcf5ca0b32bcc116a28ae4f Mon Sep 17 00:00:00 2001 From: dim Date: Wed, 1 Mar 2017 21:58:26 +0000 Subject: [PATCH] Bump __FreeBSD_version, and set tentative merge date. --- ObsoleteFiles.inc | 4 ++-- UPDATING | 2 +- sys/sys/param.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 2633ead1f0b4..32f96ef2ee40 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,10 +38,10 @@ # xargs -n1 | sort | uniq -d; # done -# 2017mmdd: new libc++ import which bumps version from 3.9.1 to 4.0.0. +# 20170302: new libc++ import which bumps version from 3.9.1 to 4.0.0. OLD_FILES+=usr/include/c++/v1/__undef___deallocate OLD_FILES+=usr/include/c++/v1/tr1/__undef___deallocate -# 2017mmdd: new clang import which bumps version from 3.9.1 to 4.0.0. +# 20170302: new clang import which bumps version from 3.9.1 to 4.0.0. OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/allocator_interface.h OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/asan_interface.h OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/common_interface_defs.h diff --git a/UPDATING b/UPDATING index 76befc2844f7..a460c5ffc3cd 100644 --- a/UPDATING +++ b/UPDATING @@ -51,7 +51,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: ****************************** SPECIAL WARNING: ****************************** -2017mmdd: +20170302: Clang, llvm, lldb, compiler-rt and libc++ have been upgraded to 4.0.0. Please see the 20141231 entry below for information about prerequisites and upgrading, if you are not already using clang 3.5.0 or higher. diff --git a/sys/sys/param.h b/sys/sys/param.h index 031c006b27c5..00eda63d9457 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1200022 /* Master, propagated to newvers */ +#define __FreeBSD_version 1200023 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, -- 2.41.0