diff options
author | Hans Wennborg <hans@hanshq.net> | 2014-07-28 22:10:52 +0000 |
---|---|---|
committer | Hans Wennborg <hans@hanshq.net> | 2014-07-28 22:10:52 +0000 |
commit | 0b783fc554d60729e19485891b5a7743fd609635 (patch) | |
tree | 476b75009399e4b105ea3b383b1e82164ba4cb0a | |
parent | 8a865f3b90eaace2a37da96e3ef3cc36cb6f29fc (diff) |
Update LLVM version: 3.5 => 3.6
We branched 3.5, it's now time to work on 3.6.
This is Sylvestre's patch from [1] plus regenerated configure
file by me, and minus the release notes reset, which Sean
pointed out [2] should happen later.
1. http://reviews.llvm.org/D4660
2. http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20140721/111137.html
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@214131 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | autoconf/configure.ac | 2 | ||||
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | docs/conf.py | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b9fca2a386..c492e408fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,7 @@ set(CMAKE_MODULE_PATH ) set(LLVM_VERSION_MAJOR 3) -set(LLVM_VERSION_MINOR 5) +set(LLVM_VERSION_MINOR 6) set(LLVM_VERSION_PATCH 0) if (NOT PACKAGE_VERSION) diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 96ca6c1f5e..837213a75d 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -35,7 +35,7 @@ dnl address for reporting bugs. AC_INIT([LLVM],[3.5.0svn],[http://llvm.org/bugs/]) LLVM_VERSION_MAJOR=3 -LLVM_VERSION_MINOR=5 +LLVM_VERSION_MINOR=6 LLVM_VERSION_PATCH=0 LLVM_VERSION_SUFFIX=svn @@ -1924,7 +1924,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu LLVM_VERSION_MAJOR=3 -LLVM_VERSION_MINOR=5 +LLVM_VERSION_MINOR=6 LLVM_VERSION_PATCH=0 LLVM_VERSION_SUFFIX=svn diff --git a/docs/conf.py b/docs/conf.py index 17d21f3142..659c3e07fb 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -47,9 +47,9 @@ copyright = u'2003-2014, LLVM Project' # built documents. # # The short X.Y version. -version = '3.4' +version = '3.6' # The full version, including alpha/beta/rc tags. -release = '3.4' +release = '3.6' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. |