Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-12-09 23:48:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
llvm-svn: 223987
This commit is contained in:
Paul Robinson 2014-12-10 23:49:03 +00:00
parent 2ac7e4b3ee
commit af6b86ca98
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/Basic/CMakeLists.txt
View File

@ -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}")

10
clang/lib/Basic/Makefile
View File

@ -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

10
clang/lib/Basic/Version.cpp
View File

@ -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