summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Wennborg <hans@hanshq.net>2017-07-19 12:19:01 +0000
committerHans Wennborg <hans@hanshq.net>2017-07-19 12:19:01 +0000
commit8fd3ba977465e2f6e267d036e6adf8855d5b0734 (patch)
tree6479ee3f6665891ba76a9c23dd0919cd3b44e33f
parent287f684c18b74faebd913cc9d11eb3e0feab5198 (diff)
downloadbcm5719-llvm-8fd3ba977465e2f6e267d036e6adf8855d5b0734.tar.gz
bcm5719-llvm-8fd3ba977465e2f6e267d036e6adf8855d5b0734.zip
Update trunk version to 6.0.0svn
llvm-svn: 308442
-rw-r--r--llvm/CMakeLists.txt2
-rw-r--r--llvm/docs/conf.py4
-rwxr-xr-xllvm/utils/release/build_llvm_package.bat4
3 files changed, 5 insertions, 5 deletions
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
index 61ecfdf970d..b0572f9adfa 100644
--- a/llvm/CMakeLists.txt
+++ b/llvm/CMakeLists.txt
@@ -20,7 +20,7 @@ if(POLICY CMP0057)
endif()
if(NOT DEFINED LLVM_VERSION_MAJOR)
- set(LLVM_VERSION_MAJOR 5)
+ set(LLVM_VERSION_MAJOR 6)
endif()
if(NOT DEFINED LLVM_VERSION_MINOR)
set(LLVM_VERSION_MINOR 0)
diff --git a/llvm/docs/conf.py b/llvm/docs/conf.py
index e7c18da48eb..92eb9813ecf 100644
--- a/llvm/docs/conf.py
+++ b/llvm/docs/conf.py
@@ -48,9 +48,9 @@ copyright = u'2003-%d, LLVM Project' % date.today().year
# built documents.
#
# The short version.
-version = '5'
+version = '6'
# The full version, including alpha/beta/rc tags.
-release = '5'
+release = '6'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/llvm/utils/release/build_llvm_package.bat b/llvm/utils/release/build_llvm_package.bat
index 79871781211..ef9b21ce923 100755
--- a/llvm/utils/release/build_llvm_package.bat
+++ b/llvm/utils/release/build_llvm_package.bat
@@ -26,8 +26,8 @@ set python64_dir=C:\Users\%USER%\AppData\Local\Programs\Python\Python35
set revision=%1
set branch=trunk
-set package_version=5.0.0-r%revision%
-set clang_format_vs_version=5.0.0.%revision%
+set package_version=6.0.0-r%revision%
+set clang_format_vs_version=6.0.0.%revision%
set build_dir=llvm_package_%revision%
echo Branch: %branch%
OpenPOWER on IntegriCloud