Expose LLVM version string via macro in llvm-config.h, and modify Go bindings

to make use of it.

llvm-svn: 222307

diff --git a/llvm/autoconf/configure.ac b/llvm/autoconf/configure.ac
index 31d462b..ca6d710 100644 (file)
--- a/llvm/autoconf/configure.ac
+++ b/llvm/autoconf/configure.ac
@@ -42,6 +42,7 @@ LLVM_VERSION_SUFFIX=svn
 AC_DEFINE_UNQUOTED([LLVM_VERSION_MAJOR], $LLVM_VERSION_MAJOR, [Major version of the LLVM API])
 AC_DEFINE_UNQUOTED([LLVM_VERSION_MINOR], $LLVM_VERSION_MINOR, [Minor version of the LLVM API])
 AC_DEFINE_UNQUOTED([LLVM_VERSION_PATCH], $LLVM_VERSION_PATCH, [Patch version of the LLVM API])
+AC_DEFINE_UNQUOTED([LLVM_VERSION_STRING], "$PACKAGE_VERSION", [LLVM version string])
 
 AC_SUBST([LLVM_VERSION_MAJOR])
 AC_SUBST([LLVM_VERSION_MINOR])

diff --git a/llvm/bindings/go/build.sh b/llvm/bindings/go/build.sh
index 3f0be00..3177852 100755 (executable)
--- a/llvm/bindings/go/build.sh
+++ b/llvm/bindings/go/build.sh
@@ -26,6 +26,3 @@ else
 fi
 
 $llvm_go print-config > $gollvmdir/llvm_config.go
-
-llvm_version="$($llvm_config --version)"
-printf "package llvm\n\nconst Version = \"%s\"\n" "$llvm_version" > $gollvmdir/version.go

diff --git a/llvm/bindings/go/llvm/version.go b/llvm/bindings/go/llvm/version.go
index 5938583..d0623be 100644 (file)
--- a/llvm/bindings/go/llvm/version.go
+++ b/llvm/bindings/go/llvm/version.go
@@ -1,3 +1,21 @@
+//===- version.go - LLVM version info -------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines LLVM version information.
+//
+//===----------------------------------------------------------------------===//
+
 package llvm
 
-const Version = "3.6.0svn"
+/*
+#include "llvm/Config/llvm-config.h"
+*/
+import "C"
+
+const Version = C.LLVM_VERSION_STRING

diff --git a/llvm/configure b/llvm/configure
index 597d119..4bfc2e5 100755 (executable)
--- a/llvm/configure
+++ b/llvm/configure
@@ -1941,6 +1941,11 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+cat >>confdefs.h <<_ACEOF
+#define LLVM_VERSION_STRING "$PACKAGE_VERSION"
+_ACEOF
+
+
 
 
 

diff --git a/llvm/include/llvm/Config/config.h.in b/llvm/include/llvm/Config/config.h.in
index beed118..8fcf145 100644 (file)
--- a/llvm/include/llvm/Config/config.h.in
+++ b/llvm/include/llvm/Config/config.h.in
@@ -543,6 +543,9 @@
 /* Patch version of the LLVM API */
 #undef LLVM_VERSION_PATCH
 
+/* LLVM version string */
+#undef LLVM_VERSION_STRING
+
 /* The shared library extension */
 #undef LTDL_SHLIB_EXT
 

diff --git a/llvm/include/llvm/Config/llvm-config.h.cmake b/llvm/include/llvm/Config/llvm-config.h.cmake
index 5811164..77201e6 100644 (file)
--- a/llvm/include/llvm/Config/llvm-config.h.cmake
+++ b/llvm/include/llvm/Config/llvm-config.h.cmake
@@ -92,6 +92,9 @@
 /* Minor version of the LLVM API */
 #cmakedefine LLVM_VERSION_MINOR ${LLVM_VERSION_MINOR}
 
+/* LLVM version string */
+#define LLVM_VERSION_STRING "${PACKAGE_VERSION}"
+
 /* Define if we link Polly to the tools */
 #cmakedefine LINK_POLLY_INTO_TOOLS
 

diff --git a/llvm/include/llvm/Config/llvm-config.h.in b/llvm/include/llvm/Config/llvm-config.h.in
index 5656240..2d6add7 100644 (file)
--- a/llvm/include/llvm/Config/llvm-config.h.in
+++ b/llvm/include/llvm/Config/llvm-config.h.in
@@ -92,4 +92,7 @@
 /* Minor version of the LLVM API */
 #undef LLVM_VERSION_MINOR
 
+/* LLVM version string */
+#undef LLVM_VERSION_STRING
+
 #endif