From 5b41a5b675f736ef42d70e3e1f8cb49480d2a068 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 26 Nov 2016 01:13:53 +0000 Subject: [PATCH] Update build glue for llvm/clang 3.9.1. --- etc/mtree/BSD.debug.dist | 2 +- etc/mtree/BSD.usr.dist | 2 +- lib/clang/headers/Makefile | 2 +- lib/clang/include/clang/Basic/Version.inc | 6 +++--- lib/clang/include/clang/Config/config.h | 2 +- lib/clang/include/llvm/Config/config.h | 8 ++++---- lib/clang/include/llvm/Config/llvm-config.h | 4 ++-- lib/libclang_rt/Makefile.inc | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist index fe076893158f..4ca8413103a8 100644 --- a/etc/mtree/BSD.debug.dist +++ b/etc/mtree/BSD.debug.dist @@ -29,7 +29,7 @@ .. lib clang - 3.9.0 + 3.9.1 lib freebsd .. diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index feaed8ee6d10..70d652e02818 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -19,7 +19,7 @@ aout .. clang - 3.9.0 + 3.9.1 include sanitizer .. diff --git a/lib/clang/headers/Makefile b/lib/clang/headers/Makefile index 100a27793487..9f234d2d2d82 100644 --- a/lib/clang/headers/Makefile +++ b/lib/clang/headers/Makefile @@ -4,7 +4,7 @@ .PATH: ${CLANG_SRCS}/lib/Headers -INCSDIR= ${LIBDIR}/clang/3.9.0/include +INCSDIR= ${LIBDIR}/clang/3.9.1/include GENINCS+= arm_neon.h diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc index 6456171b9ae1..f4fc27fa5d23 100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@ -1,10 +1,10 @@ /* $FreeBSD$ */ -#define CLANG_VERSION 3.9.0 +#define CLANG_VERSION 3.9.1 #define CLANG_VERSION_MAJOR 3 #define CLANG_VERSION_MINOR 9 -#define CLANG_VERSION_PATCHLEVEL 0 +#define CLANG_VERSION_PATCHLEVEL 1 #define CLANG_VENDOR "FreeBSD " -#define SVN_REVISION "280324" +#define SVN_REVISION "287912" diff --git a/lib/clang/include/clang/Config/config.h b/lib/clang/include/clang/Config/config.h index c4656807d945..76c17ab8c870 100644 --- a/lib/clang/include/clang/Config/config.h +++ b/lib/clang/include/clang/Config/config.h @@ -34,7 +34,7 @@ /* #undef CLANG_HAVE_LIBXML */ /* The LLVM product name and version */ -#define BACKEND_PACKAGE_STRING "LLVM 3.9.0" +#define BACKEND_PACKAGE_STRING "LLVM 3.9.1" /* Linker version detected at compile time. */ /* #undef HOST_LINK_VERSION */ diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h index 1861a5c14398..63efb266ea9f 100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@ -508,10 +508,10 @@ #define LLVM_VERSION_MINOR 9 /* Patch version of the LLVM API */ -#define LLVM_VERSION_PATCH 0 +#define LLVM_VERSION_PATCH 1 /* LLVM version string */ -#define LLVM_VERSION_STRING "3.9.0" +#define LLVM_VERSION_STRING "3.9.1" /* LLVM version information */ /* #undef LLVM_VERSION_INFO */ @@ -546,13 +546,13 @@ #define PACKAGE_NAME "LLVM" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "LLVM 3.9.0" +#define PACKAGE_STRING "LLVM 3.9.1" /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME /* Define to the version of this package. */ -#define PACKAGE_VERSION "3.9.0" +#define PACKAGE_VERSION "3.9.1" /* Define to the vendor of this package. */ /* #undef PACKAGE_VENDOR */ diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h index 060ea2025683..c54e34500b26 100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@ -98,10 +98,10 @@ #define LLVM_VERSION_MINOR 9 /* Patch version of the LLVM API */ -#define LLVM_VERSION_PATCH 0 +#define LLVM_VERSION_PATCH 1 /* LLVM version string */ -#define LLVM_VERSION_STRING "3.9.0" +#define LLVM_VERSION_STRING "3.9.1" /* Define if we link Polly to the tools */ /* #undef LINK_POLLY_INTO_TOOLS */ diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc index 56a6a01ee46a..47cd21b5cf79 100644 --- a/lib/libclang_rt/Makefile.inc +++ b/lib/libclang_rt/Makefile.inc @@ -7,7 +7,7 @@ CRTSRC= ${SRCTOP}/contrib/compiler-rt .PATH: ${CRTSRC}/lib -CLANGDIR= /usr/lib/clang/3.9.0 +CLANGDIR= /usr/lib/clang/3.9.1 LIBDIR= ${CLANGDIR}/lib/freebsd NO_PIC=