diff options
| author | Paul Robinson <paul_robinson@playstation.sony.com> | 2014-12-10 23:49:03 +0000 |
|---|---|---|
| committer | Paul Robinson <paul_robinson@playstation.sony.com> | 2014-12-10 23:49:03 +0000 |
| commit | af6b86ca98695c166a1044be9434bba9615d0d7f (patch) | |
| tree | 12d3ed19ba973b6a7b4af7ffcbb9fbf58bec5975 | |
| parent | 2ac7e4b3ee461335cc6c13a85c89b9eaf7f4e1af (diff) | |
| download | bcm5719-llvm-af6b86ca98695c166a1044be9434bba9615d0d7f.tar.gz bcm5719-llvm-af6b86ca98695c166a1044be9434bba9615d0d7f.zip | |
Revert r223578, perf data collection depends on the old symbol name.
llvm-svn: 223987
| -rw-r--r-- | clang/lib/Basic/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | clang/lib/Basic/Makefile | 10 | ||||
| -rw-r--r-- | clang/lib/Basic/Version.cpp | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/clang/lib/Basic/CMakeLists.txt b/clang/lib/Basic/CMakeLists.txt index d15fc23429a..50a06d9e7a4 100644 --- a/clang/lib/Basic/CMakeLists.txt +++ b/clang/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/clang/lib/Basic/Makefile b/clang/lib/Basic/Makefile index 1fd70bd27aa..fe2c5156227 100644 --- a/clang/lib/Basic/Makefile +++ b/clang/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/clang/lib/Basic/Version.cpp b/clang/lib/Basic/Version.cpp index 6bea9705f82..c2b7753d412 100644 --- a/clang/lib/Basic/Version.cpp +++ b/clang/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 |
