[llvm-commits] [dragonegg] r149134 - in /dragonegg/trunk: Makefile src/Backend.cpp

[Duncan Sands]

Author: baldrick
Date: Fri Jan 27 12:21:09 2012
New Revision: 149134

URL: http://llvm.org/viewvc/llvm-project?rev=149134&view=rev
Log:
Store the LLVM version rather than the dragonegg svn revision
in object files.  That's because the svn revision isn't always
available (eg: when not using svn).

Modified:
    dragonegg/trunk/Makefile
    dragonegg/trunk/src/Backend.cpp

Modified: dragonegg/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/Makefile?rev=149134&r1=149133&r2=149134&view=diff
==============================================================================
--- dragonegg/trunk/Makefile (original)
+++ dragonegg/trunk/Makefile Fri Jan 27 12:21:09 2012
@@ -42,8 +42,7 @@
 GCC_MICRO=$(word 3, $(subst ., ,$(GCC_VERSION)))
 TARGET_TRIPLE:=$(shell $(GCC) -dumpmachine)
 
-# NOTE: replace with an informative string when doing a release.
-REVISION:=$(shell svnversion -n $(TOP_DIR))
+LLVM_VERSION:=$(shell $(LLVM_CONFIG) --version)
 
 PLUGIN=dragonegg.so
 PLUGIN_OBJECTS=Backend.o Cache.o Constants.o Convert.o Debug.o DefaultABI.o \
@@ -59,7 +58,7 @@
 
 CPP_OPTIONS+=$(CPPFLAGS) $(shell $(LLVM_CONFIG) --cppflags) \
 	     -MD -MP \
-	     -DIN_GCC -DREVISION=\"$(REVISION)\" \
+	     -DIN_GCC -DLLVM_VERSION=\"$(LLVM_VERSION)\" \
 	     -DGCC_MAJOR=$(GCC_MAJOR) -DGCC_MINOR=$(GCC_MINOR) \
 	     -DGCC_MICRO=$(GCC_MICRO) \
 	     -I$(INCLUDE_DIR) -I$(GCC_PLUGIN_DIR)/include

Modified: dragonegg/trunk/src/Backend.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/Backend.cpp?rev=149134&r1=149133&r2=149134&view=diff
==============================================================================
--- dragonegg/trunk/src/Backend.cpp (original)
+++ dragonegg/trunk/src/Backend.cpp Fri Jan 27 12:21:09 2012
@@ -481,7 +481,7 @@
     IdentString += pkg_version;
     IdentString += version_string;
     IdentString += " LLVM: ";
-    IdentString += REVISION;
+    IdentString += LLVM_VERSION;
     IdentString += "\"";
     TheModule->setModuleInlineAsm(IdentString);
   }
@@ -2019,7 +2019,7 @@
 /// llvm_plugin_info - Information about this plugin.  Users can access this
 /// using "gcc --help -v".
 static struct plugin_info llvm_plugin_info = {
-  REVISION,	// version
+  LLVM_VERSION,	// version
   // TODO provide something useful here
   NULL		// help
 };