Skip to content

Commit 3d72466

Browse files
author
Jianchun Xu
committed
Merge remote-tracking branch 'master' into swb
2 parents 6b58450 + 060539a commit 3d72466

File tree

544 files changed

+652979
-12255
lines changed

Some content is hidden

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

544 files changed

+652979
-12255
lines changed

‎.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
*.vspscc
2929
*.wrn
3030

31+
# Visual Studio Extensions
32+
*.vadbg
33+
3134
# Build Artifacts
3235
build_*.err
3336
build_*.log
@@ -87,3 +90,5 @@ pal/src/config.h
8790
# Generated by other tools
8891
*.orig
8992
deps/
93+
94+
.DS_Store

‎Build/CMakeFeatureDetect.cmake

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
#-------------------------------------------------------------------------------------------------------
2+
# Copyright (C) Microsoft. All rights reserved.
3+
# Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
4+
#-------------------------------------------------------------------------------------------------------
5+
6+
include(CheckCXXSourceCompiles)
7+
include(CheckCXXSourceRuns)
8+
9+
if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
10+
# by default this is disabled for osx
11+
# enable temporarily
12+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
13+
-Werror"
14+
)
15+
endif()
16+
17+
check_cxx_source_runs("
18+
#include <stdlib.h>
19+
#include <stdio.h>
20+
21+
__attribute__((disable_tail_calls))
22+
int inc(int a) { return a + 1; }
23+
24+
int main(int argc, char **argv) {
25+
printf(\"%d\", inc(argc + 1));
26+
exit(0);
27+
}" CLANG_HAS_DISABLE_TAIL_CALLS_CFG)
28+
29+
if(CLANG_HAS_DISABLE_TAIL_CALLS_CFG STREQUAL 1)
30+
add_definitions(-DCLANG_HAS_DISABLE_TAIL_CALLS=1)
31+
set(CXX_DO_NOT_OPTIMIZE_SIBLING_CALLS "")
32+
else()
33+
set(CXX_DO_NOT_OPTIMIZE_SIBLING_CALLS "-fno-optimize-sibling-calls")
34+
endif()
35+
36+
if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
37+
# by default this is disabled for osx
38+
# disable back
39+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
40+
-Wno-error"
41+
)
42+
endif()

‎Build/Chakra.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<RuntimeLibrary Condition="'$(Configuration)'=='Debug' AND '$(RuntimeLib)'=='static_library'">MultiThreadedDebug</RuntimeLibrary>
4040
<AdditionalIncludeDirectories>
4141
$(ChakraCoreRootDirectory)\lib\common\placeholder;
42+
$(IntDir)..\CoreManifests\
4243
%(AdditionalIncludeDirectories)
4344
</AdditionalIncludeDirectories>
4445

‎Build/Chakra.Core.sln

Lines changed: 81 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ChakraCore", "..\bin\Chakra
88
{1876E800-AD77-48C4-A2F7-E5265F24AC38} = {1876E800-AD77-48C4-A2F7-E5265F24AC38}
99
{5643D42A-C38D-4D82-9662-58470B3AC9F7} = {5643D42A-C38D-4D82-9662-58470B3AC9F7}
1010
{FD8EEC40-4141-448A-BF4B-1589FBE4F60D} = {FD8EEC40-4141-448A-BF4B-1589FBE4F60D}
11+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
1112
{6979EC58-7A28-465C-A694-F3323A1F5401} = {6979EC58-7A28-465C-A694-F3323A1F5401}
1213
{F6FAD160-5A4B-476A-93AC-33E0B3A18C0C} = {F6FAD160-5A4B-476A-93AC-33E0B3A18C0C}
1314
{18CF279F-188D-4655-B03D-74F65388E7D1} = {18CF279F-188D-4655-B03D-74F65388E7D1}
@@ -27,46 +28,83 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ChakraCore", "..\bin\Chakra
2728
EndProject
2829
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{D8216B93-BD6E-4293-8D98-79CEF7CF66BC}"
2930
EndProject
30-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Codex", "..\lib\Common\Codex\Chakra.Common.Codex.vcxproj", "{1876E800-AD77-48C4-A2F7-E5265F24AC38}"
31+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Codex", "..\lib\common\codex\Chakra.Common.Codex.vcxproj", "{1876E800-AD77-48C4-A2F7-E5265F24AC38}"
3132
EndProject
3233
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Runtime.ByteCode", "..\lib\Runtime\ByteCode\Chakra.Runtime.ByteCode.vcxproj", "{706083F7-6AA4-4558-A153-6352EF9110F5}"
34+
ProjectSection(ProjectDependencies) = postProject
35+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
36+
EndProjectSection
3337
EndProject
3438
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Runtime.Debug", "..\lib\Runtime\Debug\Chakra.Runtime.Debug.vcxproj", "{8C61E4E7-F0D6-420D-A352-3E6E50D406DD}"
39+
ProjectSection(ProjectDependencies) = postProject
40+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
41+
EndProjectSection
3542
EndProject
3643
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Runtime.Language", "..\lib\Runtime\Language\Chakra.Runtime.Language.vcxproj", "{706083F7-6AA4-4558-A153-6352EF9110F8}"
44+
ProjectSection(ProjectDependencies) = postProject
45+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
46+
EndProjectSection
3747
EndProject
3848
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Runtime.Library", "..\lib\Runtime\Library\Chakra.Runtime.Library.vcxproj", "{706083F7-6AA4-4558-A153-6352EF9110F7}"
49+
ProjectSection(ProjectDependencies) = postProject
50+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
51+
EndProjectSection
3952
EndProject
4053
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Runtime.Types", "..\lib\Runtime\Types\Chakra.Runtime.Types.vcxproj", "{706083F7-6AA4-4558-A153-6352EF9110F6}"
54+
ProjectSection(ProjectDependencies) = postProject
55+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
56+
EndProjectSection
4157
EndProject
42-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Common", "..\lib\Common\Common\Chakra.Common.Common.vcxproj", "{BB4153FF-AC3E-4734-B562-CC23812DF31B}"
58+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Common", "..\lib\common\common\Chakra.Common.Common.vcxproj", "{BB4153FF-AC3E-4734-B562-CC23812DF31B}"
59+
ProjectSection(ProjectDependencies) = postProject
60+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
61+
EndProjectSection
4362
EndProject
4463
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Runtime", "Runtime", "{DDF436E7-0A8E-41AA-82B3-902B5D2D0809}"
4564
EndProject
4665
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{546172B2-F084-4363-BE35-06010663D319}"
4766
EndProject
48-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Core", "..\lib\Common\Core\Chakra.Common.Core.vcxproj", "{CC4153FF-AC3E-4734-B562-CC23812DF31B}"
67+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Core", "..\lib\common\core\Chakra.Common.Core.vcxproj", "{CC4153FF-AC3E-4734-B562-CC23812DF31B}"
68+
ProjectSection(ProjectDependencies) = postProject
69+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
70+
EndProjectSection
4971
EndProject
50-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.DataStructures", "..\lib\Common\DataStructures\Chakra.Common.DataStructures.vcxproj", "{5643D42A-C38D-4D82-9662-58470B3AC9F7}"
72+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.DataStructures", "..\lib\common\DataStructures\Chakra.Common.DataStructures.vcxproj", "{5643D42A-C38D-4D82-9662-58470B3AC9F7}"
5173
EndProject
52-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Exceptions", "..\lib\Common\Exceptions\Chakra.Common.Exceptions.vcxproj", "{FD8EEC40-4141-448A-BF4B-1589FBE4F60D}"
74+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Exceptions", "..\lib\common\Exceptions\Chakra.Common.Exceptions.vcxproj", "{FD8EEC40-4141-448A-BF4B-1589FBE4F60D}"
5375
EndProject
54-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Memory", "..\lib\Common\Memory\Chakra.Common.Memory.vcxproj", "{BB4153FF-AC3E-4734-B562-FF23812DF31B}"
76+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Memory", "..\lib\common\Memory\Chakra.Common.Memory.vcxproj", "{BB4153FF-AC3E-4734-B562-FF23812DF31B}"
77+
ProjectSection(ProjectDependencies) = postProject
78+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
79+
EndProjectSection
5580
EndProject
5681
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Backend", "..\lib\Backend\Chakra.Backend.vcxproj", "{18CF279F-188D-4655-B03D-74F65388E7D1}"
82+
ProjectSection(ProjectDependencies) = postProject
83+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
84+
EndProjectSection
5785
EndProject
5886
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Parser", "..\lib\Parser\Chakra.Parser.vcxproj", "{F6FAD160-5A4B-476A-93AC-33E0B3A18C0C}"
87+
ProjectSection(ProjectDependencies) = postProject
88+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
89+
EndProjectSection
5990
EndProject
60-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Jsrt", "..\lib\Jsrt\Chakra.Jsrt.vcxproj", "{706083F7-6AA4-4558-A153-6352EF9220F5}"
91+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Jsrt", "..\lib\jsrt\Chakra.Jsrt.vcxproj", "{706083F7-6AA4-4558-A153-6352EF9220F5}"
6192
ProjectSection(ProjectDependencies) = postProject
93+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
6294
{0DB5ECBC-9385-4A65-BE2C-4EF7C65CB719} = {0DB5ECBC-9385-4A65-BE2C-4EF7C65CB719}
6395
EndProjectSection
6496
EndProject
65-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Jsrt.Core", "..\lib\Jsrt\Core\Chakra.Jsrt.Core.vcxproj", "{706083F7-6AA4-4558-A153-6352EF9220EE}"
97+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Jsrt.Core", "..\lib\jsrt\core\Chakra.Jsrt.Core.vcxproj", "{706083F7-6AA4-4558-A153-6352EF9220EE}"
98+
ProjectSection(ProjectDependencies) = postProject
99+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
100+
EndProjectSection
66101
EndProject
67102
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Runtime.Math", "..\lib\Runtime\Math\Chakra.Runtime.Math.vcxproj", "{ABC904AD-9415-46F8-AA23-E33193F81F7C}"
103+
ProjectSection(ProjectDependencies) = postProject
104+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
105+
EndProjectSection
68106
EndProject
69-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Util", "..\lib\Common\Util\Chakra.Common.Util.vcxproj", "{6979EC58-7A28-465C-A694-F3323A1F5401}"
107+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Util", "..\lib\common\util\Chakra.Common.Util.vcxproj", "{6979EC58-7A28-465C-A694-F3323A1F5401}"
70108
EndProject
71109
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{158C8616-750C-4E0E-BD3D-5721D3C555E6}"
72110
EndProject
@@ -81,11 +119,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ch", "..\bin\ch\ch.vcxproj"
81119
EndProject
82120
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rl", "..\bin\rl\rl.vcxproj", "{80A70F57-0F89-458F-AFD3-CE2159EB9BB1}"
83121
EndProject
84-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Runtime.Base", "..\lib\Runtime\Base\Chakra.Runtime.Base.vcxproj", "{706083F7-6AA4-4558-A153-6352EF9110EE}"
122+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Runtime.Base", "..\lib\Runtime\base\Chakra.Runtime.Base.vcxproj", "{706083F7-6AA4-4558-A153-6352EF9110EE}"
123+
ProjectSection(ProjectDependencies) = postProject
124+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
125+
EndProjectSection
85126
EndProject
86127
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.WasmReader", "..\lib\WasmReader\Chakra.WasmReader.vcxproj", "{53D52B0B-86D9-4D31-AD09-0D6B3C063ADD}"
87128
EndProject
88129
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GCStress", "..\bin\GCStress\GCStress.vcxproj", "{73CE5C59-E0BA-413D-A73C-3EECE067891B}"
130+
ProjectSection(ProjectDependencies) = postProject
131+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
132+
EndProjectSection
89133
EndProject
90134
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Runtime.PlatformAgnostic", "..\lib\Runtime\PlatformAgnostic\Chakra.Runtime.PlatformAgnostic.vcxproj", "{129AC184-877C-441F-AC49-A692CE700E62}"
91135
EndProject
@@ -94,9 +138,16 @@ EndProject
94138
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.JITIDL", "..\lib\JITIDL\Chakra.JITIDL.vcxproj", "{0DB5ECBC-9385-4A65-BE2C-4EF7C65CB719}"
95139
EndProject
96140
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.JITServer", "..\lib\JITServer\Chakra.JITServer.vcxproj", "{31024620-7B97-4EC7-96E8-E7B296A17DF4}"
141+
ProjectSection(ProjectDependencies) = postProject
142+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
143+
EndProjectSection
97144
EndProject
98145
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NativeTests", "..\bin\NativeTests\NativeTests.vcxproj", "{EDEB02E2-F389-4CBF-AE7D-3041A934F86B}"
99146
EndProject
147+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Manifests", "Manifests", "{984BE359-87F7-4BD7-A823-AD8A59739801}"
148+
EndProject
149+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CoreManifests", "..\manifests\CoreManifests.vcxproj", "{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}"
150+
EndProject
100151
Global
101152
GlobalSection(SolutionConfigurationPlatforms) = preSolution
102153
Debug|ARM = Debug|ARM
@@ -614,6 +665,24 @@ Global
614665
{EDEB02E2-F389-4CBF-AE7D-3041A934F86B}.Test|x64.Build.0 = Test|x64
615666
{EDEB02E2-F389-4CBF-AE7D-3041A934F86B}.Test|x86.ActiveCfg = Test|Win32
616667
{EDEB02E2-F389-4CBF-AE7D-3041A934F86B}.Test|x86.Build.0 = Test|Win32
668+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}.Debug|ARM.ActiveCfg = Debug|ARM
669+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}.Debug|ARM.Build.0 = Debug|ARM
670+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}.Debug|x64.ActiveCfg = Debug|x64
671+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}.Debug|x64.Build.0 = Debug|x64
672+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}.Debug|x86.ActiveCfg = Debug|Win32
673+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}.Debug|x86.Build.0 = Debug|Win32
674+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}.Release|ARM.ActiveCfg = Release|ARM
675+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}.Release|ARM.Build.0 = Release|ARM
676+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}.Release|x64.ActiveCfg = Release|x64
677+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}.Release|x64.Build.0 = Release|x64
678+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}.Release|x86.ActiveCfg = Release|Win32
679+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}.Release|x86.Build.0 = Release|Win32
680+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}.Test|ARM.ActiveCfg = Test|ARM
681+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}.Test|ARM.Build.0 = Test|ARM
682+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}.Test|x64.ActiveCfg = Test|x64
683+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}.Test|x64.Build.0 = Test|x64
684+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}.Test|x86.ActiveCfg = Test|Win32
685+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}.Test|x86.Build.0 = Test|Win32
617686
EndGlobalSection
618687
GlobalSection(SolutionProperties) = preSolution
619688
HideSolutionNode = FALSE
@@ -652,5 +721,7 @@ Global
652721
{0DB5ECBC-9385-4A65-BE2C-4EF7C65CB719} = {D8216B93-BD6E-4293-8D98-79CEF7CF66BC}
653722
{31024620-7B97-4EC7-96E8-E7B296A17DF4} = {D8216B93-BD6E-4293-8D98-79CEF7CF66BC}
654723
{EDEB02E2-F389-4CBF-AE7D-3041A934F86B} = {D3BA0BFC-4757-4B73-994F-3556950884A1}
724+
{984BE359-87F7-4BD7-A823-AD8A59739801} = {158C8616-750C-4E0E-BD3D-5721D3C555E6}
725+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {984BE359-87F7-4BD7-A823-AD8A59739801}
655726
EndGlobalSection
656727
EndGlobal

‎Build/MicroBuildv2.Build.ProjectConfiguration.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
1313
<PropertyGroup>
14-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
14+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see https://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
1515
</PropertyGroup>
1616
<Error Text="$([System.String]::Format('$(ErrorText)', '$(MicroBuildV2Props)'))"
1717
Condition="'$(VSO_MICROBUILD_V2)'=='True' AND !Exists('$(MicroBuildV2Props)')" />

‎CMakeLists.txt

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ if(STATIC_LIBRARY)
172172
endif()
173173

174174
if(CLR_CMAKE_PLATFORM_XPLAT)
175+
add_definitions(-DFEATURE_PAL)
175176
add_definitions(-DPLATFORM_UNIX=1)
176177

177178
if(CLR_CMAKE_PLATFORM_LINUX)
@@ -238,15 +239,13 @@ if(CLR_CMAKE_PLATFORM_XPLAT)
238239
# -Wno-return-type # switch unreachable code
239240
# -Wno-switch # switch values not handled
240241

241-
# xplat-todo for release build
242-
# -fno-inline.... -> -mno-omit.... are needed for more accurate stack inf.
243-
# Release Builds: Not sure if this has to be as strict as the debug/test?
242+
include(Build/CMakeFeatureDetect.cmake)
243+
244244
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
245-
-fdelayed-template-parsing\
246-
-fno-omit-frame-pointer\
247-
-fno-optimize-sibling-calls\
248-
-mno-omit-leaf-frame-pointer" # this is for compat reasons. i.e. It is a noop with gcc
249-
)
245+
${CXX_DO_NOT_OPTIMIZE_SIBLING_CALLS} \
246+
-fno-omit-frame-pointer \
247+
-fdelayed-template-parsing"
248+
)
250249

251250
# CXX / CC COMPILER FLAGS
252251
add_compile_options(
@@ -285,9 +284,7 @@ elseif(CMAKE_BUILD_TYPE STREQUAL Test)
285284
endif(CMAKE_BUILD_TYPE STREQUAL Debug)
286285

287286
if(NOT CMAKE_BUILD_TYPE STREQUAL Debug)
288-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
289-
-O3"
290-
)
287+
add_compile_options(-O3)
291288
endif(NOT CMAKE_BUILD_TYPE STREQUAL Debug)
292289

293290
if(IS_64BIT_BUILD)
@@ -297,10 +294,6 @@ if(IS_64BIT_BUILD)
297294
)
298295
endif(IS_64BIT_BUILD)
299296

300-
if(CLR_CMAKE_PLATFORM_XPLAT)
301-
add_definitions(-DFEATURE_PAL)
302-
endif(CLR_CMAKE_PLATFORM_XPLAT)
303-
304297
if(NO_JIT_SH)
305298
unset(NO_JIT_SH CACHE) # don't cache
306299
unset(BuildJIT CACHE) # also clear it just in case

‎bin/ChakraCore/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ target_include_directories (
2020
# pthread: For threading
2121
# stdc++/gcc_s: C++ runtime code
2222
# dl: For shared library loading related functions
23-
# icuuc: For the ICU (xplat-todo: Make this optional)
2423
#
2524
if(CMAKE_SYSTEM_NAME STREQUAL Linux)
2625
set(LINKER_START_GROUP

‎bin/ChakraCore/ChakraCore.def

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ JsTTDRawBufferCopySyncIndirect
3838
JsTTDRawBufferModifySyncIndirect
3939
JsTTDRawBufferAsyncModificationRegister
4040
JsTTDRawBufferAsyncModifyComplete
41+
JsTTDCheckAndAssertIfTTDRunning
4142
JsTTDGetSnapTimeTopLevelEventMove
43+
JsTTDGetSnapShotBoundInterval
44+
JsTTDGetPreviousSnapshotInterval
4245
JsTTDPreExecuteSnapShotInterval
4346
JsTTDMoveToTopLevelEvent
4447
JsTTDReplayExecution

‎bin/ChakraCore/ChakraCore.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
#include "jserr.rc2"
1515

1616
#ifdef ENABLE_JS_ETW
17-
#include "Microsoft-Scripting-chakraEvents.rc"
17+
#include "Microsoft-Scripting-chakra-InstrumentationEvents.rc"
1818
#endif
1919

‎bin/ChakraCore/ChakraCore.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
<AdditionalIncludeDirectories>
7878
$(ChakraCoreRootDirectory)lib\common;
7979
$(ChakraParserIntDir);
80+
$(IntDir)..\CoreManifests\;
8081
%(AdditionalIncludeDirectories)
8182
</AdditionalIncludeDirectories>
8283
</ResourceCompile>

‎bin/ChakraCore/ChakraCoreDllFunc.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
#ifdef VTUNE_PROFILING
1616
#include "Base/VTuneChakraProfile.h"
1717
#endif
18+
#ifdef ENABLE_JS_ETW
19+
#include "Base/EtwTrace.h"
20+
#endif
1821

1922
#ifdef __APPLE__
2023
// dummy usage of JSRT to force export JSRT on dylib

‎bin/GCStress/GCStress.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
$(ChakraCommonMemoryLib);
3131
$(ChakraRuntimePlatformAgnostic);
3232
$(ChakraCommonLinkDependencies);
33+
Advapi32.lib;
3334
%(AdditionalDependencies)</AdditionalDependencies>
3435
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
3536
<SubSystem>Console</SubSystem>

0 commit comments

Comments
 (0)