Revert r223578, perf data collection depends on the old symbol name.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@223987 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Basic/CMakeLists.txt b/lib/Basic/CMakeLists.txt
index d15fc23429ab836d3a41dd78548bb1448ce76c15..50a06d9e7a4212c94396ec09303df44b430a9ef6 100644 (file)
--- a/lib/Basic/CMakeLists.txt
+++ b/lib/Basic/CMakeLists.txt
@@ -38,7 +38,7 @@ if(DEFINED llvm_vc AND DEFINED clang_vc)
     ${CMAKE_COMMAND} "-DFIRST_SOURCE_DIR=${LLVM_MAIN_SRC_DIR}"
                      "-DFIRST_NAME=LLVM"
                      "-DSECOND_SOURCE_DIR=${CLANG_SOURCE_DIR}"
-                     "-DSECOND_NAME=CLANG"
+                     "-DSECOND_NAME=SVN"
                      "-DHEADER_FILE=${version_inc}"
                      -P "${get_svn_script}")
 

diff --git a/lib/Basic/Makefile b/lib/Basic/Makefile
index 1fd70bd27aa2dc3414eb06fc267ede7b8a015097..fe2c515622751c023d0b7bf869491a4b47690dcc 100644 (file)
--- a/lib/Basic/Makefile
+++ b/lib/Basic/Makefile
@@ -16,10 +16,10 @@ LIBRARYNAME := clangBasic
 
 include $(CLANG_LEVEL)/Makefile
 
-CLANG_REVISION := $(strip \
+SVN_REVISION := $(strip \
         $(shell $(LLVM_SRC_ROOT)/utils/GetSourceVersion $(PROJ_SRC_DIR)/../..))
 
-CLANG_REPOSITORY := $(strip \
+SVN_REPOSITORY := $(strip \
         $(shell $(LLVM_SRC_ROOT)/utils/GetRepositoryPath $(PROJ_SRC_DIR)/../..))
 
 LLVM_REVISION := $(strip \
@@ -29,12 +29,12 @@ LLVM_REPOSITORY := $(strip \
         $(shell $(LLVM_SRC_ROOT)/utils/GetRepositoryPath $(LLVM_SRC_ROOT)))
 
 CPP.Defines += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include \
-         -DCLANG_REVISION='"$(CLANG_REVISION)"' -DCLANG_REPOSITORY='"$(CLANG_REPOSITORY)"' \
+         -DSVN_REVISION='"$(SVN_REVISION)"' -DSVN_REPOSITORY='"$(SVN_REPOSITORY)"' \
          -DLLVM_REVISION='"$(LLVM_REVISION)"' -DLLVM_REPOSITORY='"$(LLVM_REPOSITORY)"'
 
 $(ObjDir)/.ver-svn .ver: $(ObjDir)/.dir
-       @if [ '$(CLANG_REVISION) $(LLVM_REVISION)' != '$(shell cat $(ObjDir)/.ver-svn 2>/dev/null)' ]; then\
-               echo '$(CLANG_REVISION) $(LLVM_REVISION)' > $(ObjDir)/.ver-svn;                    \
+       @if [ '$(SVN_REVISION) $(LLVM_REVISION)' != '$(shell cat $(ObjDir)/.ver-svn 2>/dev/null)' ]; then\
+               echo '$(SVN_REVISION) $(LLVM_REVISION)' > $(ObjDir)/.ver-svn;                    \
        fi
 $(ObjDir)/.ver-svn: .ver
 $(ObjDir)/Version.o: $(ObjDir)/.ver-svn

diff --git a/lib/Basic/Version.cpp b/lib/Basic/Version.cpp
index 6bea9705f824ea0b2882c8c3d00e7f65f289e469..c2b7753d41288ac94587f3cb35a1f8c9c3f1c984 100644 (file)
--- a/lib/Basic/Version.cpp
+++ b/lib/Basic/Version.cpp
@@ -28,13 +28,13 @@ std::string getClangRepositoryPath() {
 #if defined(CLANG_REPOSITORY_STRING)
   return CLANG_REPOSITORY_STRING;
 #else
-#ifdef CLANG_REPOSITORY
-  StringRef URL(CLANG_REPOSITORY);
+#ifdef SVN_REPOSITORY
+  StringRef URL(SVN_REPOSITORY);
 #else
   StringRef URL("");
 #endif
 
-  // If the CLANG_REPOSITORY is empty, try to use the SVN keyword. This helps us
+  // If the SVN_REPOSITORY is empty, try to use the SVN keyword. This helps us
   // pick up a tag in an SVN export, for example.
   StringRef SVNRepository("$URL$");
   if (URL.empty()) {
@@ -72,8 +72,8 @@ std::string getLLVMRepositoryPath() {
 }
 
 std::string getClangRevision() {
-#ifdef CLANG_REVISION
-  return CLANG_REVISION;
+#ifdef SVN_REVISION
+  return SVN_REVISION;
 #else
   return "";
 #endif