summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Sullivan <briansul@microsoft.com>2016-12-07 16:12:57 -0800
committerGitHub <noreply@github.com>2016-12-07 16:12:57 -0800
commit79f22fd6b8a0c4f884421a63cfa9054ced1b2cfd (patch)
treef0a4a9609be6f696f75e886afea636dfa8b40c96
parent64c2ad17351ac5bc0bb042216bfcbf1c5136d7cf (diff)
parent1e7a3ece5f580834921703438e8b68724d681c78 (diff)
downloadcoreclr-79f22fd6b8a0c4f884421a63cfa9054ced1b2cfd.tar.gz
coreclr-79f22fd6b8a0c4f884421a63cfa9054ced1b2cfd.tar.bz2
coreclr-79f22fd6b8a0c4f884421a63cfa9054ced1b2cfd.zip
Merge pull request #8509 from dotnet-bot/from-tfs
Merge changes from TFS
-rw-r--r--src/jit/dll/jit.nativeproj6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/jit/dll/jit.nativeproj b/src/jit/dll/jit.nativeproj
index 97981e7eff..7505f5e8ef 100644
--- a/src/jit/dll/jit.nativeproj
+++ b/src/jit/dll/jit.nativeproj
@@ -37,9 +37,9 @@
<!-- Profile-guided optimization -->
- <PogoOptimize Condition="('$(BuildArchitecture)' == 'arm')">false</PogoOptimize>
- <PogoInstrument Condition="('$(BuildArchitecture)' == 'arm') and ('$(_BuildType)' == 'ret') and ('$(BuildProjectName)' == '')">true</PogoInstrument>
- <PogoUpdate Condition="('$(BuildArchitecture)' == 'arm') and ('$(_BuildType)' == 'ret') and ('$(BuildProjectName)' == '')">true</PogoUpdate>
+ <PogoOptimize Condition="('$(BuildArchitecture)' == 'amd64' or '$(BuildArchitecture)' == 'arm')">false</PogoOptimize>
+ <PogoInstrument Condition="('$(BuildArchitecture)' == 'amd64' or '$(BuildArchitecture)' == 'arm') and ('$(_BuildType)' == 'ret') and ('$(BuildProjectName)' == '')">true</PogoInstrument>
+ <PogoUpdate Condition="('$(BuildArchitecture)' == 'amd64' or '$(BuildArchitecture)' == 'arm') and ('$(_BuildType)' == 'ret') and ('$(BuildProjectName)' == '')">true</PogoUpdate>
<Win32DllLibs Condition="'$(PogoInstrument)' == 'true' and '$(BuildArchitecture)' == 'amd64'">$(Win32DllLibs);$(CrtLibPath)\pgort.lib</Win32DllLibs>
<Win32DllLibs Condition="'$(PogoInstrument)' == 'true' and '$(BuildArchitecture)' == 'arm'">$(Win32DllLibs);$(CrtLibPath)\pgort.lib;$(SdkLibPath)\ntdll.lib</Win32DllLibs>
<OptimizationDataRelativeDir>$(_BuildArch)\CLR\Base</OptimizationDataRelativeDir>