Update aosp/master LLVM for rebase to r222494.

Change-Id: Ic787f5e0124df789bd26f3f24680f45e678eef2d

5 files changed, 90 insertions, 8 deletions

diff --git a/tools/msbuild/CMakeLists.txt b/tools/msbuild/CMakeLists.txt
index b7be71d..4f471e5 100644
--- a/tools/msbuild/CMakeLists.txt
+++ b/tools/msbuild/CMakeLists.txt
@@ -10,6 +10,8 @@ if (WIN32)
     set(prop_file_v110_xp "Microsoft.Cpp.${platform}.LLVM-vs2012_xp.props")
     set(prop_file_v120 "toolset-vs2013.props")
     set(prop_file_v120_xp "toolset-vs2013_xp.props")
+    set(prop_file_v140 "toolset-vs2014.props")
+    set(prop_file_v140_xp "toolset-vs2014_xp.props")
 
     if (platform STREQUAL "Win32")
       set(mflag "m32")
@@ -29,6 +31,11 @@ if (WIN32)
     configure_file(${prop_file_in} ${platform}/${prop_file_v120})
     set(VS_VERSION "v120_xp")
     configure_file(${prop_file_in} ${platform}/${prop_file_v120_xp})
+    set(VS_VERSION "v140")
+    set(MSC_VERSION "1900")
+    configure_file(${prop_file_in} ${platform}/${prop_file_v140})
+    set(VS_VERSION "v140_xp")
+    configure_file(${prop_file_in} ${platform}/${prop_file_v140_xp})
     set(VS_VERSION)
     set(MSC_VERSION)
     set(mflag)
@@ -38,12 +45,16 @@ if (WIN32)
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${platform}/${prop_file_v110_xp}" DESTINATION tools/msbuild/${platform})
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${platform}/${prop_file_v120}" DESTINATION tools/msbuild/${platform})
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${platform}/${prop_file_v120_xp}" DESTINATION tools/msbuild/${platform})
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${platform}/${prop_file_v140}" DESTINATION tools/msbuild/${platform})
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${platform}/${prop_file_v140_xp}" DESTINATION tools/msbuild/${platform})
 
     install(FILES "Microsoft.Cpp.Win32.LLVM-vs2010.targets" DESTINATION "tools/msbuild/${platform}" RENAME "Microsoft.Cpp.${platform}.LLVM-vs2010.targets")
     install(FILES "Microsoft.Cpp.Win32.LLVM-vs2012.targets" DESTINATION "tools/msbuild/${platform}" RENAME "Microsoft.Cpp.${platform}.LLVM-vs2012.targets")
     install(FILES "Microsoft.Cpp.Win32.LLVM-vs2012_xp.targets" DESTINATION "tools/msbuild/${platform}" RENAME "Microsoft.Cpp.${platform}.LLVM-vs2012_xp.targets")
     install(FILES "toolset-vs2013.targets" DESTINATION "tools/msbuild/${platform}")
     install(FILES "toolset-vs2013_xp.targets" DESTINATION "tools/msbuild/${platform}")
+    install(FILES "toolset-vs2014.targets" DESTINATION "tools/msbuild/${platform}")
+    install(FILES "toolset-vs2014_xp.targets" DESTINATION "tools/msbuild/${platform}")
   endforeach()
 
   set(LIB_PATH_VERSION)
diff --git a/tools/msbuild/install.bat b/tools/msbuild/install.bat
index 9880fb2..6e321e3 100644
--- a/tools/msbuild/install.bat
+++ b/tools/msbuild/install.bat
@@ -6,13 +6,15 @@ set SUCCESS=0
 REM Change to the directory of this batch file.

 cd /d %~dp0

 

+REM Loop over the two platforms in awkward batch file fashion.

 set PLATFORM=None

-:START

-IF %PLATFORM% == x64 GOTO LOOPEND

+:PLATFORMLOOPHEAD

+IF %PLATFORM% == x64 GOTO PLATFORMLOOPEND

 IF %PLATFORM% == Win32 SET PLATFORM=x64

 IF %PLATFORM% == None SET PLATFORM=Win32

 

 REM Search for the MSBuild toolsets directory.

+

 SET D="%ProgramFiles%\MSBuild\Microsoft.Cpp\v4.0\Platforms\%PLATFORM%\PlatformToolsets"

 IF EXIST %D% GOTO FOUND_V100

 SET D="%ProgramFiles(x86)%\MSBuild\Microsoft.Cpp\v4.0\Platforms\%PLATFORM%\PlatformToolsets"

@@ -30,13 +32,24 @@ IF EXIST %D% GOTO FOUND_V120
 SET D="%ProgramFiles(x86)%\MSBuild\Microsoft.Cpp\v4.0\V120\Platforms\%PLATFORM%\PlatformToolsets"

 IF EXIST %D% GOTO FOUND_V120

 

-:LOOPEND

+:TRY_V140

+SET D="%ProgramFiles%\MSBuild\Microsoft.Cpp\v4.0\V140\Platforms\%PLATFORM%\PlatformToolsets"

+IF EXIST %D% GOTO FOUND_V140

+SET D="%ProgramFiles(x86)%\MSBuild\Microsoft.Cpp\v4.0\V140\Platforms\%PLATFORM%\PlatformToolsets"

+IF EXIST %D% GOTO FOUND_V140

+

+:TRY_V150

+

+GOTO PLATFORMLOOPHEAD

+

+:PLATFORMLOOPEND

 IF %SUCCESS% == 1 goto DONE

 echo Failed to find MSBuild toolsets directory.

 goto FAILED

 

 

 :FOUND_V100

+REM Routine for installing v100 toolchain.

 IF NOT EXIST %D%\LLVM-vs2010 mkdir %D%\LLVM-vs2010

 IF NOT %ERRORLEVEL% == 0 GOTO FAILED

 copy %PLATFORM%\Microsoft.Cpp.%PLATFORM%.LLVM-vs2010.props %D%\LLVM-vs2010

@@ -47,6 +60,7 @@ set SUCCESS=1
 GOTO TRY_V110

 

 :FOUND_V110

+REM Routine for installing v110 toolchain.

 IF NOT EXIST %D%\LLVM-vs2012 mkdir %D%\LLVM-vs2012

 IF NOT %ERRORLEVEL% == 0 GOTO FAILED

 copy %PLATFORM%\Microsoft.Cpp.%PLATFORM%.LLVM-vs2012.props %D%\LLVM-vs2012

@@ -63,6 +77,7 @@ set SUCCESS=1
 GOTO TRY_V120

 

 :FOUND_V120

+REM Routine for installing v120 toolchain.

 IF NOT EXIST %D%\LLVM-vs2013 mkdir %D%\LLVM-vs2013

 IF NOT %ERRORLEVEL% == 0 GOTO FAILED

 copy %PLATFORM%\toolset-vs2013.props %D%\LLVM-vs2013\toolset.props

@@ -76,7 +91,24 @@ IF NOT %ERRORLEVEL% == 0 GOTO FAILED
 copy %PLATFORM%\toolset-vs2013_xp.targets %D%\LLVM-vs2013_xp\toolset.targets

 IF NOT %ERRORLEVEL% == 0 GOTO FAILED

 set SUCCESS=1

-GOTO START

+GOTO TRY_V140

+

+:FOUND_V140

+REM Routine for installing v140 toolchain.

+IF NOT EXIST %D%\LLVM-vs2014 mkdir %D%\LLVM-vs2014

+IF NOT %ERRORLEVEL% == 0 GOTO FAILED

+copy %PLATFORM%\toolset-vs2014.props %D%\LLVM-vs2014\toolset.props

+IF NOT %ERRORLEVEL% == 0 GOTO FAILED

+copy %PLATFORM%\toolset-vs2014.targets %D%\LLVM-vs2014\toolset.targets

+IF NOT %ERRORLEVEL% == 0 GOTO FAILED

+IF NOT EXIST %D%\LLVM-vs2014_xp mkdir %D%\LLVM-vs2014_xp

+IF NOT %ERRORLEVEL% == 0 GOTO FAILED

+copy %PLATFORM%\toolset-vs2014_xp.props %D%\LLVM-vs2014_xp\toolset.props

+IF NOT %ERRORLEVEL% == 0 GOTO FAILED

+copy %PLATFORM%\toolset-vs2014_xp.targets %D%\LLVM-vs2014_xp\toolset.targets

+IF NOT %ERRORLEVEL% == 0 GOTO FAILED

+set SUCCESS=1

+GOTO TRY_V150

 

 

 :DONE

diff --git a/tools/msbuild/toolset-vs2014.targets b/tools/msbuild/toolset-vs2014.targets
new file mode 100644
index 0000000..05b59a2
--- /dev/null
+++ b/tools/msbuild/toolset-vs2014.targets
@@ -0,0 +1,3 @@
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <Import Project="$(VCTargetsPath)\Microsoft.CppCommon.targets" />

+</Project>

diff --git a/tools/msbuild/toolset-vs2014_xp.targets b/tools/msbuild/toolset-vs2014_xp.targets
new file mode 100644
index 0000000..eec4f18
--- /dev/null
+++ b/tools/msbuild/toolset-vs2014_xp.targets
@@ -0,0 +1,21 @@
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <!-- Force TargetFrameworkVersion to v4.0 to support XP-->

+  <PropertyGroup>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

+    <BeforeClCompileTargets>NoSupportCodeAnalysisXP;$(BeforeClCompileTargets)</BeforeClCompileTargets>

+  </PropertyGroup>

+

+  <Import Project="$(VCTargetsPath)\Microsoft.CppCommon.targets" />

+

+  <Target Name="NoSupportCodeAnalysisXP" Condition="'$(ErrorNoSupportCodeAnalysisXP)' != 'false'">

+    <VCMessage Condition="'$(DesignTimeBuild)' != 'true' and '@(ClCompile->AnyHaveMetadataValue('EnablePREfast', 'true'))'=='true'" Code="MSB8026" Type="Error"/>

+  </Target>

+

+  <PropertyGroup>

+    <PrepareForBuildDependsOn>CheckWindowsSDK71A;$(PrepareForBuildDependsOn)</PrepareForBuildDependsOn>

+  </PropertyGroup>

+

+  <Target Name="CheckWindowsSDK71A">

+    <VCMessage Code="MSB8003" Type="Warning" Arguments="WindowsSdkDir_71A" Condition="'$(WindowsSdkDir_71A)'=='' and '$(UseEnv)' != 'true'" />

+  </Target>

+</Project>

diff --git a/tools/msbuild/uninstall.bat b/tools/msbuild/uninstall.bat
index b0bc943..c1afae2 100644
--- a/tools/msbuild/uninstall.bat
+++ b/tools/msbuild/uninstall.bat
@@ -6,8 +6,8 @@ REM CD to the directory of this batch file.
 cd /d %~dp0

 

 set PLATFORM=None

-:START

-IF %PLATFORM% == x64 GOTO END

+:LOOPHEAD

+IF %PLATFORM% == x64 GOTO LOOPEND

 IF %PLATFORM% == Win32 SET PLATFORM=x64

 IF %PLATFORM% == None SET PLATFORM=Win32

 

@@ -51,8 +51,23 @@ IF EXIST %D%\LLVM-vs2013_xp del %D%\LLVM-vs2013_xp\toolset.props
 IF EXIST %D%\LLVM-vs2013_xp del %D%\LLVM-vs2013_xp\toolset.targets

 IF EXIST %D%\LLVM-vs2013_xp rmdir %D%\LLVM-vs2013_xp

 

+SET D="%ProgramFiles%\MSBuild\Microsoft.Cpp\v4.0\V140\Platforms\%PLATFORM%\PlatformToolsets"

+IF EXIST %D%\LLVM-vs2014 del %D%\LLVM-vs2014\toolset.props

+IF EXIST %D%\LLVM-vs2014 del %D%\LLVM-vs2014\toolset.targets

+IF EXIST %D%\LLVM-vs2014 rmdir %D%\LLVM-vs2014

+IF EXIST %D%\LLVM-vs2014_xp del %D%\LLVM-vs2014_xp\toolset.props

+IF EXIST %D%\LLVM-vs2014_xp del %D%\LLVM-vs2014_xp\toolset.targets

+IF EXIST %D%\LLVM-vs2014_xp rmdir %D%\LLVM-vs2014_xp

+SET D="%ProgramFiles(x86)%\MSBuild\Microsoft.Cpp\v4.0\V140\Platforms\%PLATFORM%\PlatformToolsets"

+IF EXIST %D%\LLVM-vs2014 del %D%\LLVM-vs2014\toolset.props

+IF EXIST %D%\LLVM-vs2014 del %D%\LLVM-vs2014\toolset.targets

+IF EXIST %D%\LLVM-vs2014 rmdir %D%\LLVM-vs2014

+IF EXIST %D%\LLVM-vs2014_xp del %D%\LLVM-vs2014_xp\toolset.props

+IF EXIST %D%\LLVM-vs2014_xp del %D%\LLVM-vs2014_xp\toolset.targets

+IF EXIST %D%\LLVM-vs2014_xp rmdir %D%\LLVM-vs2014_xp

 

-GOTO START

 

-:END

+GOTO LOOPHEAD

+

+:LOOPEND

 echo Done!