diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2019-03-04 19:23:11 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2019-03-04 19:23:11 +0000 |
commit | 1791078b17f2ba4da65ea6571bbea5d9339a7c20 (patch) | |
tree | c963c99be2e84945ae36dd064f564e26d33a0e6e | |
parent | 844fc3e907775eabc1ed4d47c9aa036ab5b261fe (diff) | |
download | src-test-1791078b17f2ba4da65ea6571bbea5d9339a7c20.tar.gz src-test-1791078b17f2ba4da65ea6571bbea5d9339a7c20.zip |
Set tentative merge date, and bump __FreeBSD_version.
Notes
Notes:
svn path=/projects/clang800-import/; revision=344777
-rw-r--r-- | ObsoleteFiles.inc | 4 | ||||
-rw-r--r-- | UPDATING | 2 | ||||
-rw-r--r-- | sys/sys/param.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index ecb3d87da7c78..73a0213dd02dd 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,9 +38,9 @@ # xargs -n1 | sort | uniq -d; # done -# 2019mmdd: new libc++ import which bumps version from 7.0.1 to 8.0.0. +# 20190304: new libc++ import which bumps version from 7.0.1 to 8.0.0. OLD_FILES+=usr/include/c++/v1/experimental/dynarray -# 2019mmdd: new clang import which bumps version from 7.0.1 to 8.0.0. +# 20190304: new clang import which bumps version from 7.0.1 to 8.0.0. OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/allocator_interface.h OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/asan_interface.h OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/common_interface_defs.h diff --git a/UPDATING b/UPDATING index a229edf0dc4ef..c84bbc79f0990 100644 --- a/UPDATING +++ b/UPDATING @@ -31,7 +31,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) -2019mmdd: +20190304: Clang, llvm, lld, lldb, compiler-rt and libc++ have been upgraded to 8.0.0. Please see the 20141231 entry below for information about prerequisites and upgrading, if you are not already using clang 3.5.0 diff --git a/sys/sys/param.h b/sys/sys/param.h index 34f2949bd29c2..62cc482a95e84 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -60,7 +60,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1300013 /* Master, propagated to newvers */ +#define __FreeBSD_version 1300014 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, |