summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Stellard <thomas.stellard@amd.com>2013-09-12 03:18:17 +0000
committerTom Stellard <thomas.stellard@amd.com>2013-09-12 03:18:17 +0000
commitaf15d2d3cb7134a3160da1ffafbf8ad03e3f5233 (patch)
tree8829384723b0a27f5acbe503f1de8a5d75cfac3b
parent3001340c236a0f3f74c5527cd24c7d78aec26286 (diff)
downloadllvm-af15d2d3cb7134a3160da1ffafbf8ad03e3f5233.tar.gz
Bump version to 3.3.1
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_33@190580 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--CMakeLists.txt4
-rw-r--r--autoconf/configure.ac3
-rwxr-xr-xconfigure25
-rw-r--r--include/llvm/Config/config.h.in3
4 files changed, 23 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fffdf9b87be6..2e80bc64cceb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,8 +12,9 @@ set(CMAKE_MODULE_PATH
set(LLVM_VERSION_MAJOR 3)
set(LLVM_VERSION_MINOR 3)
+set(LLVM_VERSION_PATCH 1)
-set(PACKAGE_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}svn")
+set(PACKAGE_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}")
option(LLVM_USE_FOLDERS "Enable solution folders in Visual Studio. Disable for Express versions." ON)
if ( LLVM_USE_FOLDERS )
@@ -487,6 +488,7 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/
set(CPACK_PACKAGE_VENDOR "LLVM")
set(CPACK_PACKAGE_VERSION_MAJOR ${LLVM_VERSION_MAJOR})
set(CPACK_PACKAGE_VERSION_MINOR ${LLVM_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${LLVM_VERSION_PATCH})
add_version_info_from_vcs(CPACK_PACKAGE_VERSION_PATCH)
include(CPack)
diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index a5caac971b48..ec17c6b4cb51 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -31,9 +31,10 @@ dnl===
dnl===-----------------------------------------------------------------------===
dnl Initialize autoconf and define the package name, version number and
dnl address for reporting bugs.
-AC_INIT([LLVM],[3.3],[http://llvm.org/bugs/])
+AC_INIT([LLVM],[3.3.1],[http://llvm.org/bugs/])
AC_DEFINE([LLVM_VERSION_MAJOR], [3], [Major version of the LLVM API])
AC_DEFINE([LLVM_VERSION_MINOR], [3], [Minor version of the LLVM API])
+AC_DEFINE([LLVM_VERSION_PATCH], [1], [Minor version of the LLVM API])
dnl Provide a copyright substitution and ensure the copyright notice is included
dnl in the output of --version option of the generated configure script.
diff --git a/configure b/configure
index decbc409d836..7fe4105ccc89 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for LLVM 3.3.
+# Generated by GNU Autoconf 2.60 for LLVM 3.3.1.
#
# Report bugs to <http://llvm.org/bugs/>.
#
@@ -561,8 +561,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='LLVM'
PACKAGE_TARNAME='llvm'
-PACKAGE_VERSION='3.3'
-PACKAGE_STRING='LLVM 3.3'
+PACKAGE_VERSION='3.3.1'
+PACKAGE_STRING='LLVM 3.3.1'
PACKAGE_BUGREPORT='http://llvm.org/bugs/'
ac_unique_file="lib/IR/Module.cpp"
@@ -1331,7 +1331,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures LLVM 3.3 to adapt to many kinds of systems.
+\`configure' configures LLVM 3.3.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1397,7 +1397,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of LLVM 3.3:";;
+ short | recursive ) echo "Configuration of LLVM 3.3.1:";;
esac
cat <<\_ACEOF
@@ -1559,7 +1559,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-LLVM configure 3.3
+LLVM configure 3.3.1
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1575,7 +1575,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by LLVM $as_me 3.3, which was
+It was created by LLVM $as_me 3.3.1, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -1939,6 +1939,11 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
+cat >>confdefs.h <<\_ACEOF
+#define LLVM_VERSION_PATCH 1
+_ACEOF
+
+
LLVM_COPYRIGHT="Copyright (c) 2003-2013 University of Illinois at Urbana-Champaign."
@@ -10535,7 +10540,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10538 "configure"
+#line 10543 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -23036,7 +23041,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by LLVM $as_me 3.3, which was
+This file was extended by LLVM $as_me 3.3.1, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23089,7 +23094,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-LLVM config.status 3.3
+LLVM config.status 3.3.1
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/include/llvm/Config/config.h.in b/include/llvm/Config/config.h.in
index 950e66f27503..6b80b56733b9 100644
--- a/include/llvm/Config/config.h.in
+++ b/include/llvm/Config/config.h.in
@@ -677,6 +677,9 @@
/* Minor version of the LLVM API */
#undef LLVM_VERSION_MINOR
+/* Minor version of the LLVM API */
+#undef LLVM_VERSION_PATCH
+
/* Define if the OS needs help to load dependent libraries for dlopen(). */
#undef LTDL_DLOPEN_DEPLIBS