From 4f01407b5bb29ab330469d5c4e01137cdcfbb630 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Mon, 5 Oct 2015 19:48:12 +0000 Subject: Prepare for merging back to head. --- ObsoleteFiles.inc | 4 ++-- UPDATING | 8 ++++---- sys/sys/param.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 8e4483f33aac..77c3a60eb1a3 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,9 +38,9 @@ # xargs -n1 | sort | uniq -d; # done -# 2015mmdd: new libc++ import +# 20151005: new libc++ import OLD_FILES+=usr/include/c++/__tuple_03 -# 2015mmdd: new clang import which bumps version from 3.6.1 to 3.7.0. +# 20151005: new clang import which bumps version from 3.6.1 to 3.7.0. OLD_FILES+=usr/lib/clang/3.6.1/include/__stddef_max_align_t.h OLD_FILES+=usr/lib/clang/3.6.1/include/__wmmintrin_aes.h OLD_FILES+=usr/lib/clang/3.6.1/include/__wmmintrin_pclmul.h diff --git a/UPDATING b/UPDATING index bd130d2269f8..304f1bae727e 100644 --- a/UPDATING +++ b/UPDATING @@ -31,10 +31,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW: disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) -2015mmdd: - Clang and llvm have been upgraded to 3.7.0. Please see the - 20141231 entry below for information about prerequisites and upgrading, - if you are not already using 3.5.0 or higher. +20151005: + Clang, llvm, lldb, compiler-rt and libc++ have been upgraded to 3.7.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. 20150924: Kernel debug files have been moved to /usr/lib/debug/boot/kernel/, diff --git a/sys/sys/param.h b/sys/sys/param.h index f4673a10b411..67c525f7a348 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 1100079 /* Master, propagated to newvers */ +#define __FreeBSD_version 1100080 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, -- cgit v1.3