Update prebuilt Clang to match Android kernel.
Bug: 132428451
Change-Id: I8f6e2cb23f381fc0c02ddea99b867e58e925e5be
diff --git a/linux-x64/clang/lib64/cmake/llvm/VersionFromVCS.cmake b/linux-x64/clang/lib64/cmake/llvm/VersionFromVCS.cmake
index 552fe77..56331a3 100644
--- a/linux-x64/clang/lib64/cmake/llvm/VersionFromVCS.cmake
+++ b/linux-x64/clang/lib64/cmake/llvm/VersionFromVCS.cmake
@@ -3,90 +3,92 @@
# existence of certain subdirectories under SOURCE_DIR (if provided as an
# extra argument, otherwise uses CMAKE_CURRENT_SOURCE_DIR).
-function(add_version_info_from_vcs VERS)
- SET(SOURCE_DIR ${ARGV1})
- if("${SOURCE_DIR}" STREQUAL "")
- SET(SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+function(get_source_info_svn path revision repository)
+ # If svn is a bat file, find_program(Subversion) doesn't find it.
+ # Explicitly search for that here; Subversion_SVN_EXECUTABLE will override
+ # the find_program call in FindSubversion.cmake.
+ find_program(Subversion_SVN_EXECUTABLE NAMES svn svn.bat)
+ find_package(Subversion)
+
+ # Subversion module does not work with symlinks, see PR8437.
+ get_filename_component(realpath ${path} REALPATH)
+ if(Subversion_FOUND)
+ subversion_wc_info(${realpath} Project)
+ if(Project_WC_REVISION)
+ set(${revision} ${Project_WC_REVISION} PARENT_SCOPE)
+ endif()
+ if(Project_WC_URL)
+ set(${repository} ${Project_WC_URL} PARENT_SCOPE)
+ endif()
endif()
- string(REPLACE "svn" "" result "${${VERS}}")
- if( EXISTS "${SOURCE_DIR}/.svn" )
- set(result "${result}svn")
- # FindSubversion does not work with symlinks. See PR 8437
- if( NOT IS_SYMLINK "${SOURCE_DIR}" )
- find_package(Subversion)
- endif()
- if( Subversion_FOUND )
- subversion_wc_info( ${SOURCE_DIR} Project )
- if( Project_WC_REVISION )
- set(SVN_REVISION ${Project_WC_REVISION} PARENT_SCOPE)
- set(result "${result}-r${Project_WC_REVISION}")
- endif()
- if( Project_WC_URL )
- set(LLVM_REPOSITORY ${Project_WC_URL} PARENT_SCOPE)
- endif()
- endif()
- else()
- find_program(git_executable NAMES git git.exe git.cmd)
+endfunction()
- if( git_executable )
- # Run from a subdirectory to force git to print an absoute path.
- execute_process(COMMAND ${git_executable} rev-parse --git-dir
- WORKING_DIRECTORY ${SOURCE_DIR}/cmake
- RESULT_VARIABLE git_result
- OUTPUT_VARIABLE git_dir
- ERROR_QUIET)
- if(git_result EQUAL 0)
- # Try to get a ref-id
- string(STRIP "${git_dir}" git_dir)
- set(result "${result}git")
- if( EXISTS ${git_dir}/svn )
- # Get the repository URL
- execute_process(COMMAND
- ${git_executable} svn info
- WORKING_DIRECTORY ${SOURCE_DIR}
- TIMEOUT 5
- RESULT_VARIABLE git_result
- OUTPUT_VARIABLE git_output
- ERROR_QUIET)
- if( git_result EQUAL 0 )
- string(REGEX MATCH "URL: ([^ \n]*)" svn_url ${git_output})
- if(svn_url)
- set(LLVM_REPOSITORY ${CMAKE_MATCH_1} PARENT_SCOPE)
- endif()
- endif()
-
- # Get the svn revision number for this git commit if one exists.
- execute_process(COMMAND ${git_executable} svn find-rev HEAD
- WORKING_DIRECTORY ${SOURCE_DIR}
- TIMEOUT 5
- RESULT_VARIABLE git_result
- OUTPUT_VARIABLE git_head_svn_rev_number
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- if( git_result EQUAL 0 AND git_output)
- set(SVN_REVISION ${git_head_svn_rev_number} PARENT_SCOPE)
- set(git_svn_rev "-svn-${git_head_svn_rev_number}")
- else()
- set(git_svn_rev "")
- endif()
- endif()
-
- # Get the git ref id
- execute_process(COMMAND
- ${git_executable} rev-parse --short HEAD
- WORKING_DIRECTORY ${SOURCE_DIR}
- TIMEOUT 5
+function(get_source_info_git path revision repository)
+ find_package(Git)
+ if(GIT_FOUND)
+ execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --git-dir
+ WORKING_DIRECTORY ${path}
+ RESULT_VARIABLE git_result
+ OUTPUT_VARIABLE git_output
+ ERROR_QUIET)
+ if(git_result EQUAL 0)
+ string(STRIP "${git_output}" git_output)
+ get_filename_component(git_dir ${git_output} ABSOLUTE BASE_DIR ${path})
+ if(EXISTS "${git_dir}/svn/refs")
+ execute_process(COMMAND ${GIT_EXECUTABLE} svn info
+ WORKING_DIRECTORY ${path}
RESULT_VARIABLE git_result
- OUTPUT_VARIABLE git_ref_id
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-
- if( git_result EQUAL 0 )
- set(GIT_COMMIT ${git_ref_id} PARENT_SCOPE)
- set(result "${result}${git_svn_rev}-${git_ref_id}")
+ OUTPUT_VARIABLE git_output)
+ if(git_result EQUAL 0)
+ string(REGEX REPLACE "^(.*\n)?Revision: ([^\n]+).*"
+ "\\2" git_svn_rev "${git_output}")
+ set(${revision} ${git_svn_rev} PARENT_SCOPE)
+ string(REGEX REPLACE "^(.*\n)?URL: ([^\n]+).*"
+ "\\2" git_url "${git_output}")
+ set(${repository} ${git_url} PARENT_SCOPE)
+ endif()
+ else()
+ execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
+ WORKING_DIRECTORY ${path}
+ RESULT_VARIABLE git_result
+ OUTPUT_VARIABLE git_output)
+ if(git_result EQUAL 0)
+ string(STRIP "${git_output}" git_output)
+ set(${revision} ${git_output} PARENT_SCOPE)
+ endif()
+ execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref --symbolic-full-name @{upstream}
+ WORKING_DIRECTORY ${path}
+ RESULT_VARIABLE git_result
+ OUTPUT_VARIABLE git_output
+ ERROR_QUIET)
+ if(git_result EQUAL 0)
+ string(REPLACE "/" ";" branch ${git_output})
+ list(GET branch 0 remote)
else()
- set(result "${result}${git_svn_rev}")
+ set(remote "origin")
+ endif()
+ execute_process(COMMAND ${GIT_EXECUTABLE} remote get-url ${remote}
+ WORKING_DIRECTORY ${path}
+ RESULT_VARIABLE git_result
+ OUTPUT_VARIABLE git_output
+ ERROR_QUIET)
+ if(git_result EQUAL 0)
+ string(STRIP "${git_output}" git_output)
+ set(${repository} ${git_output} PARENT_SCOPE)
+ else()
+ set(${repository} ${path} PARENT_SCOPE)
endif()
endif()
endif()
endif()
- set(${VERS} ${result} PARENT_SCOPE)
-endfunction(add_version_info_from_vcs)
+endfunction()
+
+function(get_source_info path revision repository)
+ if(EXISTS "${path}/.svn")
+ get_source_info_svn("${path}" revision_info repository_info)
+ else()
+ get_source_info_git("${path}" revision_info repository_info)
+ endif()
+ set(${repository} "${repository_info}" PARENT_SCOPE)
+ set(${revision} "${revision_info}" PARENT_SCOPE)
+endfunction()