Skip to content

Commit 8b36518

Browse files
digitalinfinitydigitalinfinity
committed
Merge remote-tracking branch 'origin/master' into linux
2 parents 7f73459 + 03722d9 commit 8b36518

146 files changed

Lines changed: 15828 additions & 11545 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Build/Common.Build.props‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99

1010
<PreprocessorDefinitions Condition="'$(RuntimeLib)'=='static_library'">%(PreprocessorDefinitions);USE_STATIC_RUNTIMELIB</PreprocessorDefinitions>
1111

12+
<!-- Add any preprocessor definitions passed using msbuild environment -->
13+
<PreprocessorDefinitions Condition="'$(AdditionalPreprocessorDefinitions)'!=''">%(PreprocessorDefinitions);$(AdditionalPreprocessorDefinitions)</PreprocessorDefinitions>
14+
1215
<!-- /W4 -->
1316
<WarningLevel>Level4</WarningLevel>
1417
<!-- /WX -->

‎Build/scripts/pgo/pre_pgi.cmd‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ set POGO_TYPE=PGI
4646
REM Temporary fix around pgo bug, todo:: check if still necessary once toolset is updated
4747
set _LINK_=/cgthreads:1
4848

49-
goto:eof
49+
goto:checkpass
5050

5151
:usage
5252
echo Invalid/missing arguments
@@ -57,3 +57,6 @@ goto:eof
5757
echo - binary_path: output path of your binaries
5858

5959
exit /b 1
60+
61+
:checkpass
62+
exit /b 0

‎bin/ChakraCore/ChakraCoreDllFunc.cpp‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
#endif
1313
#include "JsrtContext.h"
1414
#include "TestHooks.h"
15+
#ifdef VTUNE_PROFILING
16+
#include "Base/VTuneChakraProfile.h"
17+
#endif
1518

1619
extern HANDLE g_hInstance;
1720
#ifdef _WIN32
@@ -56,6 +59,9 @@ static BOOL AttachProcess(HANDLE hmod)
5659
#ifdef ENABLE_JS_ETW
5760
EtwTrace::Register();
5861
#endif
62+
#ifdef VTUNE_PROFILING
63+
VTuneChakraProfile::Register();
64+
#endif
5965
ValueType::Initialize();
6066
ThreadContext::GlobalInitialize();
6167

@@ -158,6 +164,9 @@ EXTERN_C BOOL WINAPI DllMain(HINSTANCE hmod, DWORD dwReason, PVOID pvReserved)
158164
// Do this before DetachProcess() so that we won't have ETW rundown callbacks while destroying threadContexts.
159165
EtwTrace::UnRegister();
160166
#endif
167+
#ifdef VTUNE_PROFILING
168+
VTuneChakraProfile::UnRegister();
169+
#endif
161170

162171
// don't do anything if we are in forceful shutdown
163172
// try to clean up handles in graceful shutdown

0 commit comments

Comments
 (0)