diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2015-08-05 10:45:17 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2015-08-05 10:45:17 -0700 |
| commit | c32d22b11658f006b19b3094984edefeedf03215 (patch) | |
| tree | 7ed600850c076cc9f0bd20a79a0390579fb20b3c | |
| parent | 9bfa6286073dd3c4db5e66ab575727690863f23c (diff) | |
| parent | 00453a1e5707e8e56d595ede07a43f2cc6012dec (diff) | |
| download | coreclr-c32d22b11658f006b19b3094984edefeedf03215.tar.gz coreclr-c32d22b11658f006b19b3094984edefeedf03215.tar.bz2 coreclr-c32d22b11658f006b19b3094984edefeedf03215.zip | |
Merge pull request #1349 from dotnet-bot/from-tfs
Merge changes from TFS
| -rw-r--r-- | dirs.proj | 5 | ||||
| -rw-r--r-- | src/dirs.proj | 6 | ||||
| -rw-r--r-- | src/vm/ceemain.cpp | 16 |
3 files changed, 13 insertions, 14 deletions
@@ -4,7 +4,7 @@ <ItemDefinitionGroup> <ProjectFile> - <ProductGroups>VS;FX</ProductGroups> + <ProductGroups>FX;PK</ProductGroups> </ProjectFile> </ItemDefinitionGroup> @@ -13,11 +13,14 @@ <BuildInPhase1>true</BuildInPhase1> <BuildInPhase2>true</BuildInPhase2> <BuildSysBinaries>true</BuildSysBinaries> + <!-- for now only binplace the xplat bits during official builds --> + <GetAllXPlatBinaries Condition="'$(GetAllXPlatBinaries)' == '' and '$(OfficialBuild)' != ''">true</GetAllXPlatBinaries> </PropertyGroup> <!-- Build in all phases --> <ItemGroup> <ProjectFile Include="src\dirs.proj" Condition="'$(BuildSysBuildOnlyForARM64)' == 'true'" /> + <ProjectFile Include="xplat\GetAllXPlatBinaries.proj" Condition="'$(GetAllXPlatBinaries)' == 'true' and '$(FeatureCoreclr)' == 'true' and '$(TargetArch)' == 'amd64'" /> </ItemGroup> <!--Import the targets--> diff --git a/src/dirs.proj b/src/dirs.proj index ded6fb4267..1572fccf96 100644 --- a/src/dirs.proj +++ b/src/dirs.proj @@ -31,7 +31,7 @@ <ProjectFile Include="md\dirs.proj" /> <ProjectFile Include="classlibnative\dirs.proj" /> <ProjectFile Include="strongname\dirs.proj" > - <ProductGroups>VS;FX</ProductGroups> + <ProductGroups>FX</ProductGroups> </ProjectFile> <ProjectFile Include="zap\dirs.proj" /> <ProjectFile Include="gcdump\lib\gcdump.nativeproj" /> @@ -53,7 +53,7 @@ <ProjectFile Include="tools\dirs.proj" /> <ProjectFile Include="toolbox\dirs.proj" > - <ProductGroups>VS;FX</ProductGroups> + <ProductGroups>FX</ProductGroups> </ProjectFile> <ProjectFile Include="misc\misc.proj" /> </ItemGroup> @@ -70,7 +70,7 @@ <ProjectFile Include="bcl\mscorlib.csproj" /> <ProjectFile Include="managedlibraries\dirs.proj" /> <ProjectFile Include="config\config.nativeproj" > - <ProductGroups>VS;FX</ProductGroups> + <ProductGroups>FX</ProductGroups> </ProjectFile> <ProjectFile Include="usagelog\usagelog.nativeproj" /> <ProjectFile Include="lhdwshim\dirs.proj" /> diff --git a/src/vm/ceemain.cpp b/src/vm/ceemain.cpp index 4055635e65..07c037fa41 100644 --- a/src/vm/ceemain.cpp +++ b/src/vm/ceemain.cpp @@ -256,6 +256,11 @@ #include "perfmap.h" #endif +#ifndef FEATURE_PAL +// Included for referencing __security_cookie +#include "process.h" +#endif // !FEATURE_PAL + #ifdef FEATURE_IPCMAN static HRESULT InitializeIPCManager(void); static void PublishIPCManager(void); @@ -683,15 +688,6 @@ DWORD __stdcall BBSweepStartFunction(LPVOID lpArgs) //----------------------------------------------------------------------------- -#ifndef FEATURE_PAL -// Defined by CRT -extern "C" -{ - extern DWORD_PTR __security_cookie; - extern void __fastcall __security_check_cookie(DWORD_PTR cookie); -} -#endif // !FEATURE_PAL - void InitGSCookie() { CONTRACTL @@ -717,7 +713,7 @@ void InitGSCookie() PAGE_EXECUTE_WRITECOPY|PAGE_WRITECOMBINE)) == 0)); // Forces VC cookie to be initialized. - void (__fastcall *pf)(DWORD_PTR cookie) = &__security_check_cookie; + void * pf = &__security_check_cookie; pf = NULL; GSCookie val = (GSCookie)(__security_cookie ^ GetTickCount()); |