summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiyoung Yun <jy910.yun@samsung.com>2017-06-15 18:03:42 +0900
committerJiyoung Yun <jy910.yun@samsung.com>2017-06-15 18:03:42 +0900
commit1b0a538f540a15579c5891c07f8741e86d65a190 (patch)
tree1b8a6ffb3d3dfeb61a570879f462c82a278a6123
parent08934ce010f73576c95fb2518e1fa2b8adeace04 (diff)
downloadcoreclr-submit/tizen/20170615.122113.tar.gz
coreclr-submit/tizen/20170615.122113.tar.bz2
coreclr-submit/tizen/20170615.122113.zip
Change-Id: I16a40361afc9f6aedef1c6748d5ba293aa7b0e97
-rw-r--r--packaging/Add-Tizen-RuntimeID-case.patch15
-rw-r--r--packaging/Add-project.assets.json-files.patch (renamed from packaging/Add-project.lock.json-files.patch)415
-rw-r--r--packaging/Change-O3-build-in-clang3.8.patch6
-rw-r--r--packaging/Enable_build_with_FEATURE_DBGIPC.patch45
-rw-r--r--packaging/Fix-build-breakage-on-high-processsor-machines-12114.patch55
-rw-r--r--packaging/coreclr.spec14
-rw-r--r--packaging/downloaded_files.tar.gzbin188483470 -> 2347863958 bytes
7 files changed, 292 insertions, 258 deletions
diff --git a/packaging/Add-Tizen-RuntimeID-case.patch b/packaging/Add-Tizen-RuntimeID-case.patch
index 091d55fd38..ebc6f75d41 100644
--- a/packaging/Add-Tizen-RuntimeID-case.patch
+++ b/packaging/Add-Tizen-RuntimeID-case.patch
@@ -1,19 +1,18 @@
-From a512a1f58a98a5611178e356ae217af1ffb11d72 Mon Sep 17 00:00:00 2001
+From 22e3b17ce2c06db68071dc37d48431a1efd4489e Mon Sep 17 00:00:00 2001
From: Jiyoung Yun <jy910.yun@samsung.com>
-Date: Tue, 14 Feb 2017 17:57:48 +0900
+Date: Wed, 14 Jun 2017 16:36:56 +0900
Subject: [PATCH] Add Tizen RuntimeID case
-Change-Id: I4d689e31f64143c3d0e2dac74b09aefc9d40de60
-Signed-off-by: Jiyoung Yun <jy910.yun@samsung.com>
+Change-Id: I8c52d2993dd1414ede6ff1e40e949af58bca9d40
---
build.sh | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/build.sh b/build.sh
-index ae5e436..6da18d9 100755
+index 55b4ba3..802ecab 100755
--- a/build.sh
+++ b/build.sh
-@@ -358,12 +358,19 @@ isMSBuildOnNETCoreSupported()
+@@ -407,12 +407,19 @@ isMSBuildOnNETCoreSupported()
"alpine.3.4.3-x64")
__isMSBuildOnNETCoreSupported=1
;;
@@ -33,7 +32,7 @@ index ae5e436..6da18d9 100755
fi
}
-@@ -419,12 +426,18 @@ build_CoreLib()
+@@ -468,12 +475,18 @@ build_CoreLib()
# The cross build generates a crossgen with the target architecture.
if [ $__CrossBuild != 1 ]; then
# The architecture of host pc must be same architecture with target.
@@ -48,7 +47,7 @@ index ae5e436..6da18d9 100755
elif [[ ( "$__HostArch" == "arm64" ) && ( "$__BuildArch" == "arm" ) ]]; then
build_CoreLib_ni
+ elif [[ ( "$__HostArch" == "arm" ) && ( "$__BuildArch" == "armel" ) ]]; then
-+ build_CoreLib_ni
++ exit 0
else
exit 1
fi
diff --git a/packaging/Add-project.lock.json-files.patch b/packaging/Add-project.assets.json-files.patch
index fbd0727936..20289f88c3 100644
--- a/packaging/Add-project.lock.json-files.patch
+++ b/packaging/Add-project.assets.json-files.patch
@@ -1,26 +1,25 @@
-From a5fc08c9c3e223d54e959c6fb2393ccd289ff571 Mon Sep 17 00:00:00 2001
+From 840a0d38d475f448598afd6aa2e0de42fd450cbc Mon Sep 17 00:00:00 2001
From: Jiyoung Yun <jy910.yun@samsung.com>
-Date: Thu, 27 Apr 2017 16:51:53 +0900
-Subject: [PATCH] Add project.lock.json files
+Date: Tue, 13 Jun 2017 18:43:19 +0900
+Subject: [PATCH] Add project.assets.json files
---
- src/.nuget/init/project.lock.json | 40 +
- src/ToolBox/SOS/NETCore/project.lock.json | 1925 +++++++++++++++++++++++++++++
- 2 files changed, 1965 insertions(+)
- create mode 100755 src/.nuget/init/project.lock.json
- create mode 100755 src/ToolBox/SOS/NETCore/project.lock.json
+ src/.nuget/init/project.assets.json | 72 +
+ src/ToolBox/SOS/NETCore/project.assets.json | 1918 +++++++++++++++++++++++++++
+ 2 files changed, 1990 insertions(+)
+ create mode 100644 src/.nuget/init/project.assets.json
+ create mode 100644 src/ToolBox/SOS/NETCore/project.assets.json
-diff --git a/src/.nuget/init/project.lock.json b/src/.nuget/init/project.lock.json
-new file mode 100755
-index 0000000..d70dc13
+diff --git a/src/.nuget/init/project.assets.json b/src/.nuget/init/project.assets.json
+new file mode 100644
+index 0000000..92622ad
--- /dev/null
-+++ b/src/.nuget/init/project.lock.json
-@@ -0,0 +1,40 @@
++++ b/src/.nuget/init/project.assets.json
+@@ -0,0 +1,72 @@
+{
-+ "locked": false,
+ "version": 2,
+ "targets": {
-+ "DNXCore,Version=v5.0": {
++ ".NETCoreApp,Version=v1.0": {
+ "Microsoft.NETCore.Platforms/1.0.2-beta-24224-02": {
+ "type": "package",
+ "compile": {
@@ -36,39 +35,71 @@ index 0000000..d70dc13
+ "Microsoft.NETCore.Platforms/1.0.2-beta-24224-02": {
+ "sha512": "2iueL6ciB4i0waip9Y87I+bU9ObLCbucAcHfVBea2CsOeXljU5stmrqi48hgjHN/0v3Y2QAj7/6yWcjsmxpQTQ==",
+ "type": "package",
-+ "path": "Microsoft.NETCore.Platforms/1.0.2-beta-24224-02",
++ "path": "microsoft.netcore.platforms/1.0.2-beta-24224-02",
+ "files": [
-+ "Microsoft.NETCore.Platforms.1.0.2-beta-24224-02.nupkg.sha512",
-+ "Microsoft.NETCore.Platforms.nuspec",
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/netstandard1.0/_._",
++ "microsoft.netcore.platforms.1.0.2-beta-24224-02.nupkg.sha512",
++ "microsoft.netcore.platforms.nuspec",
+ "runtime.json"
+ ]
+ }
+ },
+ "projectFileDependencyGroups": {
-+ "": [
++ ".NETCoreApp,Version=v1.0": [
+ "Microsoft.NETCore.Platforms >= 1.0.2-beta-24224-02"
-+ ],
-+ "DNXCore,Version=v5.0": []
++ ]
++ },
++ "packageFolders": {
++ "/home/jyoung/git/dotnet/coreclr-2.0.0.11992/packages": {},
++ "/home/jyoung/.dotnet/NuGetFallbackFolder": {}
+ },
-+ "tools": {},
-+ "projectFileToolGroups": {}
++ "project": {
++ "version": "2.0.0",
++ "restore": {
++ "projectUniqueName": "/home/jyoung/git/dotnet/coreclr-2.0.0.11992/src/.nuget/init/init.csproj",
++ "projectName": "init",
++ "projectPath": "/home/jyoung/git/dotnet/coreclr-2.0.0.11992/src/.nuget/init/init.csproj",
++ "packagesPath": "/home/jyoung/git/dotnet/coreclr-2.0.0.11992/packages",
++ "outputPath": "/home/jyoung/git/dotnet/coreclr-2.0.0.11992/src/.nuget/init",
++ "projectStyle": "PackageReference",
++ "originalTargetFrameworks": [
++ "netcoreapp1.0"
++ ],
++ "frameworks": {
++ "netcoreapp1.0": {
++ "projectReferences": {}
++ }
++ }
++ },
++ "frameworks": {
++ "netcoreapp1.0": {
++ "dependencies": {
++ "Microsoft.NETCore.Platforms": {
++ "target": "Package",
++ "version": "1.0.2-beta-24224-02"
++ }
++ },
++ "imports": [
++ "portable-net45+win8"
++ ]
++ }
++ }
++ }
+}
\ No newline at end of file
-diff --git a/src/ToolBox/SOS/NETCore/project.lock.json b/src/ToolBox/SOS/NETCore/project.lock.json
-new file mode 100755
-index 0000000..e5b570e
+diff --git a/src/ToolBox/SOS/NETCore/project.assets.json b/src/ToolBox/SOS/NETCore/project.assets.json
+new file mode 100644
+index 0000000..f500312
--- /dev/null
-+++ b/src/ToolBox/SOS/NETCore/project.lock.json
-@@ -0,0 +1,1925 @@
++++ b/src/ToolBox/SOS/NETCore/project.assets.json
+@@ -0,0 +1,1918 @@
+{
-+ "locked": false,
+ "version": 2,
+ "targets": {
-+ ".NETCoreApp,Version=v1.0": {
-+ "Microsoft.NETCore.Platforms/1.0.1": {
++ ".NETCoreApp,Version=v4.0": {
++ "Microsoft.NETCore.Platforms/1.0.2-beta-24224-02": {
+ "type": "package",
+ "compile": {
+ "lib/netstandard1.0/_._": {}
@@ -137,9 +168,6 @@ index 0000000..e5b570e
+ },
+ "compile": {
+ "ref/netstandard1.3/System.Collections.dll": {}
-+ },
-+ "runtime": {
-+ "lib/portable-net45+win8+wp8+wpa81/_._": {}
+ }
+ },
+ "System.Collections.Immutable/1.3.0": {
@@ -170,9 +198,6 @@ index 0000000..e5b570e
+ },
+ "compile": {
+ "ref/netstandard1.3/System.Diagnostics.Debug.dll": {}
-+ },
-+ "runtime": {
-+ "lib/portable-net45+win8+wp8+wpa81/_._": {}
+ }
+ },
+ "System.Diagnostics.Tracing/4.3.0": {
@@ -184,9 +209,6 @@ index 0000000..e5b570e
+ },
+ "compile": {
+ "ref/netstandard1.5/_._": {}
-+ },
-+ "runtime": {
-+ "lib/portable-net45+win8+wpa81/_._": {}
+ }
+ },
+ "System.Globalization/4.3.0": {
@@ -198,9 +220,6 @@ index 0000000..e5b570e
+ },
+ "compile": {
+ "ref/netstandard1.3/System.Globalization.dll": {}
-+ },
-+ "runtime": {
-+ "lib/portable-net45+win8+wp8+wpa81/_._": {}
+ }
+ },
+ "System.IO/4.3.0": {
@@ -214,9 +233,6 @@ index 0000000..e5b570e
+ },
+ "compile": {
+ "ref/netstandard1.5/System.IO.dll": {}
-+ },
-+ "runtime": {
-+ "lib/portable-net45+win8+wp8+wpa81/_._": {}
+ }
+ },
+ "System.IO.Compression/4.3.0": {
@@ -241,9 +257,6 @@ index 0000000..e5b570e
+ "compile": {
+ "ref/netstandard1.3/System.IO.Compression.dll": {}
+ },
-+ "runtime": {
-+ "lib/portable-net45+win8+wpa81/_._": {}
-+ },
+ "runtimeTargets": {
+ "runtimes/unix/lib/netstandard1.3/System.IO.Compression.dll": {
+ "assetType": "runtime",
@@ -310,9 +323,6 @@ index 0000000..e5b570e
+ },
+ "compile": {
+ "ref/netstandard1.5/System.Reflection.dll": {}
-+ },
-+ "runtime": {
-+ "lib/portable-net45+win8+wp8+wpa81/_._": {}
+ }
+ },
+ "System.Reflection.Extensions/4.3.0": {
@@ -325,9 +335,6 @@ index 0000000..e5b570e
+ },
+ "compile": {
+ "ref/netstandard1.0/System.Reflection.Extensions.dll": {}
-+ },
-+ "runtime": {
-+ "lib/portable-net45+win8+wp8+wpa81/_._": {}
+ }
+ },
+ "System.Reflection.Metadata/1.4.1": {
@@ -366,9 +373,6 @@ index 0000000..e5b570e
+ },
+ "compile": {
+ "ref/netstandard1.0/System.Reflection.Primitives.dll": {}
-+ },
-+ "runtime": {
-+ "lib/portable-net45+win8+wp8+wpa81/_._": {}
+ }
+ },
+ "System.Resources.ResourceManager/4.3.0": {
@@ -382,9 +386,6 @@ index 0000000..e5b570e
+ },
+ "compile": {
+ "ref/netstandard1.0/System.Resources.ResourceManager.dll": {}
-+ },
-+ "runtime": {
-+ "lib/portable-net45+win8+wp8+wpa81/_._": {}
+ }
+ },
+ "System.Runtime/4.3.0": {
@@ -395,9 +396,6 @@ index 0000000..e5b570e
+ },
+ "compile": {
+ "ref/netstandard1.5/System.Runtime.dll": {}
-+ },
-+ "runtime": {
-+ "lib/portable-net45+win8+wp80+wpa81/_._": {}
+ }
+ },
+ "System.Runtime.Extensions/4.3.0": {
@@ -409,9 +407,6 @@ index 0000000..e5b570e
+ },
+ "compile": {
+ "ref/netstandard1.5/System.Runtime.Extensions.dll": {}
-+ },
-+ "runtime": {
-+ "lib/portable-net45+win8+wp8+wpa81/_._": {}
+ }
+ },
+ "System.Runtime.Handles/4.3.0": {
@@ -437,9 +432,6 @@ index 0000000..e5b570e
+ },
+ "compile": {
+ "ref/netstandard1.5/System.Runtime.InteropServices.dll": {}
-+ },
-+ "runtime": {
-+ "lib/portable-net45+win8+wpa81/_._": {}
+ }
+ },
+ "System.Text.Encoding/4.3.0": {
@@ -451,9 +443,6 @@ index 0000000..e5b570e
+ },
+ "compile": {
+ "ref/netstandard1.3/System.Text.Encoding.dll": {}
-+ },
-+ "runtime": {
-+ "lib/portable-net45+win8+wp8+wpa81/_._": {}
+ }
+ },
+ "System.Text.Encoding.Extensions/4.3.0": {
@@ -466,9 +455,6 @@ index 0000000..e5b570e
+ },
+ "compile": {
+ "ref/netstandard1.3/System.Text.Encoding.Extensions.dll": {}
-+ },
-+ "runtime": {
-+ "lib/portable-net45+win8+wp8+wpa81/_._": {}
+ }
+ },
+ "System.Threading/4.3.0": {
@@ -493,84 +479,79 @@ index 0000000..e5b570e
+ },
+ "compile": {
+ "ref/netstandard1.3/System.Threading.Tasks.dll": {}
-+ },
-+ "runtime": {
-+ "lib/portable-net45+win8+wp8+wpa81/_._": {}
+ }
+ }
+ }
+ },
+ "libraries": {
-+ "Microsoft.NETCore.Platforms/1.0.1": {
-+ "sha512": "2G6OjjJzwBfNOO8myRV/nFrbTw5iA+DEm0N+qUqhrOmaVtn4pC77h38I1jsXGw5VH55+dPfQsqHD0We9sCl9FQ==",
++ "Microsoft.NETCore.Platforms/1.0.2-beta-24224-02": {
++ "sha512": "2iueL6ciB4i0waip9Y87I+bU9ObLCbucAcHfVBea2CsOeXljU5stmrqi48hgjHN/0v3Y2QAj7/6yWcjsmxpQTQ==",
+ "type": "package",
-+ "path": "Microsoft.NETCore.Platforms/1.0.1",
++ "path": "microsoft.netcore.platforms/1.0.2-beta-24224-02",
+ "files": [
-+ "Microsoft.NETCore.Platforms.1.0.1.nupkg.sha512",
-+ "Microsoft.NETCore.Platforms.nuspec",
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/netstandard1.0/_._",
++ "microsoft.netcore.platforms.1.0.2-beta-24224-02.nupkg.sha512",
++ "microsoft.netcore.platforms.nuspec",
+ "runtime.json"
+ ]
+ },
+ "Microsoft.NETCore.Targets/1.1.0": {
+ "sha512": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==",
+ "type": "package",
-+ "path": "Microsoft.NETCore.Targets/1.1.0",
++ "path": "microsoft.netcore.targets/1.1.0",
+ "files": [
-+ "Microsoft.NETCore.Targets.1.1.0.nupkg.sha512",
-+ "Microsoft.NETCore.Targets.nuspec",
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/netstandard1.0/_._",
++ "microsoft.netcore.targets.1.1.0.nupkg.sha512",
++ "microsoft.netcore.targets.nuspec",
+ "runtime.json"
+ ]
+ },
+ "runtime.native.System/4.3.0": {
+ "sha512": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==",
+ "type": "package",
-+ "path": "runtime.native.System/4.3.0",
++ "path": "runtime.native.system/4.3.0",
+ "files": [
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/netstandard1.0/_._",
-+ "runtime.native.System.4.3.0.nupkg.sha512",
-+ "runtime.native.System.nuspec"
++ "runtime.native.system.4.3.0.nupkg.sha512",
++ "runtime.native.system.nuspec"
+ ]
+ },
+ "runtime.native.System.IO.Compression/4.3.0": {
+ "sha512": "INBPonS5QPEgn7naufQFXJEp3zX6L4bwHgJ/ZH78aBTpeNfQMtf7C6VrAFhlq2xxWBveIOWyFzQjJ8XzHMhdOQ==",
+ "type": "package",
-+ "path": "runtime.native.System.IO.Compression/4.3.0",
++ "path": "runtime.native.system.io.compression/4.3.0",
+ "files": [
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/netstandard1.0/_._",
-+ "runtime.native.System.IO.Compression.4.3.0.nupkg.sha512",
-+ "runtime.native.System.IO.Compression.nuspec"
++ "runtime.native.system.io.compression.4.3.0.nupkg.sha512",
++ "runtime.native.system.io.compression.nuspec"
+ ]
+ },
+ "System.Buffers/4.3.0": {
+ "sha512": "ratu44uTIHgeBeI0dE8DWvmXVBSo4u7ozRZZHOMmK/JPpYyo0dAfgSiHlpiObMQ5lEtEyIXA40sKRYg5J6A8uQ==",
+ "type": "package",
-+ "path": "System.Buffers/4.3.0",
++ "path": "system.buffers/4.3.0",
+ "files": [
-+ "System.Buffers.4.3.0.nupkg.sha512",
-+ "System.Buffers.nuspec",
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/netstandard1.1/.xml",
-+ "lib/netstandard1.1/System.Buffers.dll"
++ "lib/netstandard1.1/System.Buffers.dll",
++ "system.buffers.4.3.0.nupkg.sha512",
++ "system.buffers.nuspec"
+ ]
+ },
+ "System.Collections/4.3.0": {
+ "sha512": "3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==",
+ "type": "package",
-+ "path": "System.Collections/4.3.0",
++ "path": "system.collections/4.3.0",
+ "files": [
-+ "System.Collections.4.3.0.nupkg.sha512",
-+ "System.Collections.nuspec",
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/MonoAndroid10/_._",
@@ -627,31 +608,31 @@ index 0000000..e5b570e
+ "ref/xamarinios10/_._",
+ "ref/xamarinmac20/_._",
+ "ref/xamarintvos10/_._",
-+ "ref/xamarinwatchos10/_._"
++ "ref/xamarinwatchos10/_._",
++ "system.collections.4.3.0.nupkg.sha512",
++ "system.collections.nuspec"
+ ]
+ },
+ "System.Collections.Immutable/1.3.0": {
+ "sha512": "zukBRPUuNxwy9m4TGWLxKAnoiMc9+B+8VXeXVyPiBPvOd7yLgAlZ1DlsRWJjMx4VsvhhF2+6q6kO2GRbPja6hA==",
+ "type": "package",
-+ "path": "System.Collections.Immutable/1.3.0",
++ "path": "system.collections.immutable/1.3.0",
+ "files": [
-+ "System.Collections.Immutable.1.3.0.nupkg.sha512",
-+ "System.Collections.Immutable.nuspec",
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/netstandard1.0/System.Collections.Immutable.dll",
+ "lib/netstandard1.0/System.Collections.Immutable.xml",
+ "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll",
-+ "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.xml"
++ "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.xml",
++ "system.collections.immutable.1.3.0.nupkg.sha512",
++ "system.collections.immutable.nuspec"
+ ]
+ },
+ "System.Diagnostics.Debug/4.3.0": {
+ "sha512": "ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==",
+ "type": "package",
-+ "path": "System.Diagnostics.Debug/4.3.0",
++ "path": "system.diagnostics.debug/4.3.0",
+ "files": [
-+ "System.Diagnostics.Debug.4.3.0.nupkg.sha512",
-+ "System.Diagnostics.Debug.nuspec",
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/MonoAndroid10/_._",
@@ -708,16 +689,16 @@ index 0000000..e5b570e
+ "ref/xamarinios10/_._",
+ "ref/xamarinmac20/_._",
+ "ref/xamarintvos10/_._",
-+ "ref/xamarinwatchos10/_._"
++ "ref/xamarinwatchos10/_._",
++ "system.diagnostics.debug.4.3.0.nupkg.sha512",
++ "system.diagnostics.debug.nuspec"
+ ]
+ },
+ "System.Diagnostics.Tracing/4.3.0": {
+ "sha512": "rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==",
+ "type": "package",
-+ "path": "System.Diagnostics.Tracing/4.3.0",
++ "path": "system.diagnostics.tracing/4.3.0",
+ "files": [
-+ "System.Diagnostics.Tracing.4.3.0.nupkg.sha512",
-+ "System.Diagnostics.Tracing.nuspec",
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/MonoAndroid10/_._",
@@ -796,16 +777,16 @@ index 0000000..e5b570e
+ "ref/xamarinios10/_._",
+ "ref/xamarinmac20/_._",
+ "ref/xamarintvos10/_._",
-+ "ref/xamarinwatchos10/_._"
++ "ref/xamarinwatchos10/_._",
++ "system.diagnostics.tracing.4.3.0.nupkg.sha512",
++ "system.diagnostics.tracing.nuspec"
+ ]
+ },
+ "System.Globalization/4.3.0": {
+ "sha512": "kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==",
+ "type": "package",
-+ "path": "System.Globalization/4.3.0",
++ "path": "system.globalization/4.3.0",
+ "files": [
-+ "System.Globalization.4.3.0.nupkg.sha512",
-+ "System.Globalization.nuspec",
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/MonoAndroid10/_._",
@@ -862,16 +843,16 @@ index 0000000..e5b570e
+ "ref/xamarinios10/_._",
+ "ref/xamarinmac20/_._",
+ "ref/xamarintvos10/_._",
-+ "ref/xamarinwatchos10/_._"
++ "ref/xamarinwatchos10/_._",
++ "system.globalization.4.3.0.nupkg.sha512",
++ "system.globalization.nuspec"
+ ]
+ },
+ "System.IO/4.3.0": {
+ "sha512": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==",
+ "type": "package",
-+ "path": "System.IO/4.3.0",
++ "path": "system.io/4.3.0",
+ "files": [
-+ "System.IO.4.3.0.nupkg.sha512",
-+ "System.IO.nuspec",
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/MonoAndroid10/_._",
@@ -941,16 +922,16 @@ index 0000000..e5b570e
+ "ref/xamarinios10/_._",
+ "ref/xamarinmac20/_._",
+ "ref/xamarintvos10/_._",
-+ "ref/xamarinwatchos10/_._"
++ "ref/xamarinwatchos10/_._",
++ "system.io.4.3.0.nupkg.sha512",
++ "system.io.nuspec"
+ ]
+ },
+ "System.IO.Compression/4.3.0": {
+ "sha512": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==",
+ "type": "package",
-+ "path": "System.IO.Compression/4.3.0",
++ "path": "system.io.compression/4.3.0",
+ "files": [
-+ "System.IO.Compression.4.3.0.nupkg.sha512",
-+ "System.IO.Compression.nuspec",
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/MonoAndroid10/_._",
@@ -1010,16 +991,16 @@ index 0000000..e5b570e
+ "ref/xamarinwatchos10/_._",
+ "runtimes/unix/lib/netstandard1.3/System.IO.Compression.dll",
+ "runtimes/win/lib/net46/System.IO.Compression.dll",
-+ "runtimes/win/lib/netstandard1.3/System.IO.Compression.dll"
++ "runtimes/win/lib/netstandard1.3/System.IO.Compression.dll",
++ "system.io.compression.4.3.0.nupkg.sha512",
++ "system.io.compression.nuspec"
+ ]
+ },
+ "System.IO.FileSystem/4.0.1": {
+ "sha512": "IBErlVq5jOggAD69bg1t0pJcHaDbJbWNUZTPI96fkYWzwYbN6D9wRHMULLDd9dHsl7C2YsxXL31LMfPI1SWt8w==",
+ "type": "package",
-+ "path": "System.IO.FileSystem/4.0.1",
++ "path": "system.io.filesystem/4.0.1",
+ "files": [
-+ "System.IO.FileSystem.4.0.1.nupkg.sha512",
-+ "System.IO.FileSystem.nuspec",
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/MonoAndroid10/_._",
@@ -1046,16 +1027,16 @@ index 0000000..e5b570e
+ "ref/xamarinios10/_._",
+ "ref/xamarinmac20/_._",
+ "ref/xamarintvos10/_._",
-+ "ref/xamarinwatchos10/_._"
++ "ref/xamarinwatchos10/_._",
++ "system.io.filesystem.4.0.1.nupkg.sha512",
++ "system.io.filesystem.nuspec"
+ ]
+ },
+ "System.IO.FileSystem.Primitives/4.0.1": {
+ "sha512": "kWkKD203JJKxJeE74p8aF8y4Qc9r9WQx4C0cHzHPrY3fv/L/IhWnyCHaFJ3H1QPOH6A93whlQ2vG5nHlBDvzWQ==",
+ "type": "package",
-+ "path": "System.IO.FileSystem.Primitives/4.0.1",
++ "path": "system.io.filesystem.primitives/4.0.1",
+ "files": [
-+ "System.IO.FileSystem.Primitives.4.0.1.nupkg.sha512",
-+ "System.IO.FileSystem.Primitives.nuspec",
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/MonoAndroid10/_._",
@@ -1083,16 +1064,16 @@ index 0000000..e5b570e
+ "ref/xamarinios10/_._",
+ "ref/xamarinmac20/_._",
+ "ref/xamarintvos10/_._",
-+ "ref/xamarinwatchos10/_._"
++ "ref/xamarinwatchos10/_._",
++ "system.io.filesystem.primitives.4.0.1.nupkg.sha512",
++ "system.io.filesystem.primitives.nuspec"
+ ]
+ },
+ "System.Linq/4.3.0": {
+ "sha512": "5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==",
+ "type": "package",
-+ "path": "System.Linq/4.3.0",
++ "path": "system.linq/4.3.0",
+ "files": [
-+ "System.Linq.4.3.0.nupkg.sha512",
-+ "System.Linq.nuspec",
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/MonoAndroid10/_._",
@@ -1153,16 +1134,16 @@ index 0000000..e5b570e
+ "ref/xamarinios10/_._",
+ "ref/xamarinmac20/_._",
+ "ref/xamarintvos10/_._",
-+ "ref/xamarinwatchos10/_._"
++ "ref/xamarinwatchos10/_._",
++ "system.linq.4.3.0.nupkg.sha512",
++ "system.linq.nuspec"
+ ]
+ },
+ "System.Reflection/4.3.0": {
+ "sha512": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==",
+ "type": "package",
-+ "path": "System.Reflection/4.3.0",
++ "path": "system.reflection/4.3.0",
+ "files": [
-+ "System.Reflection.4.3.0.nupkg.sha512",
-+ "System.Reflection.nuspec",
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/MonoAndroid10/_._",
@@ -1232,16 +1213,16 @@ index 0000000..e5b570e
+ "ref/xamarinios10/_._",
+ "ref/xamarinmac20/_._",
+ "ref/xamarintvos10/_._",
-+ "ref/xamarinwatchos10/_._"
++ "ref/xamarinwatchos10/_._",
++ "system.reflection.4.3.0.nupkg.sha512",
++ "system.reflection.nuspec"
+ ]
+ },
+ "System.Reflection.Extensions/4.3.0": {
+ "sha512": "rJkrJD3kBI5B712aRu4DpSIiHRtr6QlfZSQsb0hYHrDCZORXCFjQfoipo2LaMUHoT9i1B7j7MnfaEKWDFmFQNQ==",
+ "type": "package",
-+ "path": "System.Reflection.Extensions/4.3.0",
++ "path": "system.reflection.extensions/4.3.0",
+ "files": [
-+ "System.Reflection.Extensions.4.3.0.nupkg.sha512",
-+ "System.Reflection.Extensions.nuspec",
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/MonoAndroid10/_._",
@@ -1287,31 +1268,31 @@ index 0000000..e5b570e
+ "ref/xamarinios10/_._",
+ "ref/xamarinmac20/_._",
+ "ref/xamarintvos10/_._",
-+ "ref/xamarinwatchos10/_._"
++ "ref/xamarinwatchos10/_._",
++ "system.reflection.extensions.4.3.0.nupkg.sha512",
++ "system.reflection.extensions.nuspec"
+ ]
+ },
+ "System.Reflection.Metadata/1.4.1": {
+ "sha512": "tc2ZyJgweHCLci5oQGuhQn9TD0Ii9DReXkHtZm3aAGp8xe40rpRjiTbMXOtZU+fr0BOQ46goE9+qIqRGjR9wGg==",
+ "type": "package",
-+ "path": "System.Reflection.Metadata/1.4.1",
++ "path": "system.reflection.metadata/1.4.1",
+ "files": [
-+ "System.Reflection.Metadata.1.4.1.nupkg.sha512",
-+ "System.Reflection.Metadata.nuspec",
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/netstandard1.1/System.Reflection.Metadata.dll",
+ "lib/netstandard1.1/System.Reflection.Metadata.xml",
+ "lib/portable-net45+win8/System.Reflection.Metadata.dll",
-+ "lib/portable-net45+win8/System.Reflection.Metadata.xml"
++ "lib/portable-net45+win8/System.Reflection.Metadata.xml",
++ "system.reflection.metadata.1.4.1.nupkg.sha512",
++ "system.reflection.metadata.nuspec"
+ ]
+ },
+ "System.Reflection.Primitives/4.3.0": {
+ "sha512": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==",
+ "type": "package",
-+ "path": "System.Reflection.Primitives/4.3.0",
++ "path": "system.reflection.primitives/4.3.0",
+ "files": [
-+ "System.Reflection.Primitives.4.3.0.nupkg.sha512",
-+ "System.Reflection.Primitives.nuspec",
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/MonoAndroid10/_._",
@@ -1357,16 +1338,16 @@ index 0000000..e5b570e
+ "ref/xamarinios10/_._",
+ "ref/xamarinmac20/_._",
+ "ref/xamarintvos10/_._",
-+ "ref/xamarinwatchos10/_._"
++ "ref/xamarinwatchos10/_._",
++ "system.reflection.primitives.4.3.0.nupkg.sha512",
++ "system.reflection.primitives.nuspec"
+ ]
+ },
+ "System.Resources.ResourceManager/4.3.0": {
+ "sha512": "/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==",
+ "type": "package",
-+ "path": "System.Resources.ResourceManager/4.3.0",
++ "path": "system.resources.resourcemanager/4.3.0",
+ "files": [
-+ "System.Resources.ResourceManager.4.3.0.nupkg.sha512",
-+ "System.Resources.ResourceManager.nuspec",
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/MonoAndroid10/_._",
@@ -1412,16 +1393,16 @@ index 0000000..e5b570e
+ "ref/xamarinios10/_._",
+ "ref/xamarinmac20/_._",
+ "ref/xamarintvos10/_._",
-+ "ref/xamarinwatchos10/_._"
++ "ref/xamarinwatchos10/_._",
++ "system.resources.resourcemanager.4.3.0.nupkg.sha512",
++ "system.resources.resourcemanager.nuspec"
+ ]
+ },
+ "System.Runtime/4.3.0": {
+ "sha512": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==",
+ "type": "package",
-+ "path": "System.Runtime/4.3.0",
++ "path": "system.runtime/4.3.0",
+ "files": [
-+ "System.Runtime.4.3.0.nupkg.sha512",
-+ "System.Runtime.nuspec",
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/MonoAndroid10/_._",
@@ -1502,16 +1483,16 @@ index 0000000..e5b570e
+ "ref/xamarinios10/_._",
+ "ref/xamarinmac20/_._",
+ "ref/xamarintvos10/_._",
-+ "ref/xamarinwatchos10/_._"
++ "ref/xamarinwatchos10/_._",
++ "system.runtime.4.3.0.nupkg.sha512",
++ "system.runtime.nuspec"
+ ]
+ },
+ "System.Runtime.Extensions/4.3.0": {
+ "sha512": "guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==",
+ "type": "package",
-+ "path": "System.Runtime.Extensions/4.3.0",
++ "path": "system.runtime.extensions/4.3.0",
+ "files": [
-+ "System.Runtime.Extensions.4.3.0.nupkg.sha512",
-+ "System.Runtime.Extensions.nuspec",
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/MonoAndroid10/_._",
@@ -1581,16 +1562,16 @@ index 0000000..e5b570e
+ "ref/xamarinios10/_._",
+ "ref/xamarinmac20/_._",
+ "ref/xamarintvos10/_._",
-+ "ref/xamarinwatchos10/_._"
++ "ref/xamarinwatchos10/_._",
++ "system.runtime.extensions.4.3.0.nupkg.sha512",
++ "system.runtime.extensions.nuspec"
+ ]
+ },
+ "System.Runtime.Handles/4.3.0": {
+ "sha512": "OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==",
+ "type": "package",
-+ "path": "System.Runtime.Handles/4.3.0",
++ "path": "system.runtime.handles/4.3.0",
+ "files": [
-+ "System.Runtime.Handles.4.3.0.nupkg.sha512",
-+ "System.Runtime.Handles.nuspec",
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/MonoAndroid10/_._",
@@ -1617,16 +1598,16 @@ index 0000000..e5b570e
+ "ref/xamarinios10/_._",
+ "ref/xamarinmac20/_._",
+ "ref/xamarintvos10/_._",
-+ "ref/xamarinwatchos10/_._"
++ "ref/xamarinwatchos10/_._",
++ "system.runtime.handles.4.3.0.nupkg.sha512",
++ "system.runtime.handles.nuspec"
+ ]
+ },
+ "System.Runtime.InteropServices/4.1.0": {
+ "sha512": "16eu3kjHS633yYdkjwShDHZLRNMKVi/s0bY8ODiqJ2RfMhDMAwxZaUaWVnZ2P71kr/or+X9o/xFWtNqz8ivieQ==",
+ "type": "package",
-+ "path": "System.Runtime.InteropServices/4.1.0",
++ "path": "system.runtime.interopservices/4.1.0",
+ "files": [
-+ "System.Runtime.InteropServices.4.1.0.nupkg.sha512",
-+ "System.Runtime.InteropServices.nuspec",
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/MonoAndroid10/_._",
@@ -1705,16 +1686,16 @@ index 0000000..e5b570e
+ "ref/xamarinios10/_._",
+ "ref/xamarinmac20/_._",
+ "ref/xamarintvos10/_._",
-+ "ref/xamarinwatchos10/_._"
++ "ref/xamarinwatchos10/_._",
++ "system.runtime.interopservices.4.1.0.nupkg.sha512",
++ "system.runtime.interopservices.nuspec"
+ ]
+ },
+ "System.Text.Encoding/4.3.0": {
+ "sha512": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==",
+ "type": "package",
-+ "path": "System.Text.Encoding/4.3.0",
++ "path": "system.text.encoding/4.3.0",
+ "files": [
-+ "System.Text.Encoding.4.3.0.nupkg.sha512",
-+ "System.Text.Encoding.nuspec",
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/MonoAndroid10/_._",
@@ -1771,16 +1752,16 @@ index 0000000..e5b570e
+ "ref/xamarinios10/_._",
+ "ref/xamarinmac20/_._",
+ "ref/xamarintvos10/_._",
-+ "ref/xamarinwatchos10/_._"
++ "ref/xamarinwatchos10/_._",
++ "system.text.encoding.4.3.0.nupkg.sha512",
++ "system.text.encoding.nuspec"
+ ]
+ },
+ "System.Text.Encoding.Extensions/4.3.0": {
+ "sha512": "YVMK0Bt/A43RmwizJoZ22ei2nmrhobgeiYwFzC4YAN+nue8RF6djXDMog0UCn+brerQoYVyaS+ghy9P/MUVcmw==",
+ "type": "package",
-+ "path": "System.Text.Encoding.Extensions/4.3.0",
++ "path": "system.text.encoding.extensions/4.3.0",
+ "files": [
-+ "System.Text.Encoding.Extensions.4.3.0.nupkg.sha512",
-+ "System.Text.Encoding.Extensions.nuspec",
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/MonoAndroid10/_._",
@@ -1837,16 +1818,16 @@ index 0000000..e5b570e
+ "ref/xamarinios10/_._",
+ "ref/xamarinmac20/_._",
+ "ref/xamarintvos10/_._",
-+ "ref/xamarinwatchos10/_._"
++ "ref/xamarinwatchos10/_._",
++ "system.text.encoding.extensions.4.3.0.nupkg.sha512",
++ "system.text.encoding.extensions.nuspec"
+ ]
+ },
+ "System.Threading/4.3.0": {
+ "sha512": "VkUS0kOBcUf3Wwm0TSbrevDDZ6BlM+b/HRiapRFWjM5O0NS0LviG0glKmFK+hhPDd1XFeSdU1GmlLhb2CoVpIw==",
+ "type": "package",
-+ "path": "System.Threading/4.3.0",
++ "path": "system.threading/4.3.0",
+ "files": [
-+ "System.Threading.4.3.0.nupkg.sha512",
-+ "System.Threading.nuspec",
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/MonoAndroid10/_._",
@@ -1906,16 +1887,16 @@ index 0000000..e5b570e
+ "ref/xamarinmac20/_._",
+ "ref/xamarintvos10/_._",
+ "ref/xamarinwatchos10/_._",
-+ "runtimes/aot/lib/netcore50/System.Threading.dll"
++ "runtimes/aot/lib/netcore50/System.Threading.dll",
++ "system.threading.4.3.0.nupkg.sha512",
++ "system.threading.nuspec"
+ ]
+ },
+ "System.Threading.Tasks/4.3.0": {
+ "sha512": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==",
+ "type": "package",
-+ "path": "System.Threading.Tasks/4.3.0",
++ "path": "system.threading.tasks/4.3.0",
+ "files": [
-+ "System.Threading.Tasks.4.3.0.nupkg.sha512",
-+ "System.Threading.Tasks.nuspec",
+ "ThirdPartyNotices.txt",
+ "dotnet_library_license.txt",
+ "lib/MonoAndroid10/_._",
@@ -1972,21 +1953,65 @@ index 0000000..e5b570e
+ "ref/xamarinios10/_._",
+ "ref/xamarinmac20/_._",
+ "ref/xamarintvos10/_._",
-+ "ref/xamarinwatchos10/_._"
++ "ref/xamarinwatchos10/_._",
++ "system.threading.tasks.4.3.0.nupkg.sha512",
++ "system.threading.tasks.nuspec"
+ ]
+ }
+ },
+ "projectFileDependencyGroups": {
-+ "": [
-+ "Microsoft.NETCore.Platforms >= 1.0.1",
++ ".NETCoreApp,Version=v4.0": [
++ "Microsoft.NETCore.Platforms >= 1.0.2-beta-24224-02",
+ "System.IO.FileSystem >= 4.0.1",
+ "System.Reflection.Metadata >= 1.4.1",
+ "System.Runtime.InteropServices >= 4.1.0"
-+ ],
-+ ".NETCoreApp,Version=v1.0": []
++ ]
++ },
++ "packageFolders": {
++ "/home/jyoung/git/dotnet/coreclr-2.0.0.11992/packages": {},
++ "/home/jyoung/.dotnet/NuGetFallbackFolder": {}
+ },
-+ "tools": {},
-+ "projectFileToolGroups": {}
++ "project": {
++ "version": "2.0.0",
++ "restore": {
++ "projectUniqueName": "/home/jyoung/git/dotnet/coreclr-2.0.0.11992/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj",
++ "projectName": "SOS.NETCore",
++ "projectPath": "/home/jyoung/git/dotnet/coreclr-2.0.0.11992/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj",
++ "packagesPath": "/home/jyoung/git/dotnet/coreclr-2.0.0.11992/packages",
++ "outputPath": "/home/jyoung/git/dotnet/coreclr-2.0.0.11992/src/ToolBox/SOS/NETCore",
++ "projectStyle": "PackageReference",
++ "skipContentFileWrite": true,
++ "originalTargetFrameworks": [
++ ".NETCoreApp,Version=v4.0"
++ ],
++ "frameworks": {
++ "netcoreapp4.0": {
++ "projectReferences": {}
++ }
++ }
++ },
++ "dependencies": {
++ "Microsoft.NETCore.Platforms": {
++ "target": "Package",
++ "version": "1.0.2-beta-24224-02"
++ },
++ "System.IO.FileSystem": {
++ "target": "Package",
++ "version": "4.0.1"
++ },
++ "System.Runtime.InteropServices": {
++ "target": "Package",
++ "version": "4.1.0"
++ },
++ "System.Reflection.Metadata": {
++ "target": "Package",
++ "version": "1.4.1"
++ }
++ },
++ "frameworks": {
++ "netcoreapp4.0": {}
++ }
++ }
+}
\ No newline at end of file
--
diff --git a/packaging/Change-O3-build-in-clang3.8.patch b/packaging/Change-O3-build-in-clang3.8.patch
index 703121a72d..1d174fb31d 100644
--- a/packaging/Change-O3-build-in-clang3.8.patch
+++ b/packaging/Change-O3-build-in-clang3.8.patch
@@ -1,4 +1,4 @@
-From e0909aac25fe2a5a02e2396457f2f8b0c07adf8e Mon Sep 17 00:00:00 2001
+From 836eb83226a2db9e4a98cbe2c743521566c75de2 Mon Sep 17 00:00:00 2001
From: Jiyoung Yun <jy910.yun@samsung.com>
Date: Thu, 20 Apr 2017 11:18:59 +0900
Subject: [PATCH] Change O3 build in clang3.8
@@ -9,13 +9,13 @@ Change-Id: Ibc02c4d4e340d66347514459e37c01cb69fc6a52
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/pal/tools/gen-buildsys-clang.sh b/src/pal/tools/gen-buildsys-clang.sh
-index 762a199..eebb8d6 100755
+index 9441877..7385f15 100755
--- a/src/pal/tools/gen-buildsys-clang.sh
+++ b/src/pal/tools/gen-buildsys-clang.sh
@@ -156,9 +156,9 @@ if [ "$build_arch" == "armel" ]; then
fi
- clang_version=$(echo $CC | awk -F- '{ print $NF }')
+ clang_version=$( $CC --version | head -1 | sed 's/[^0-9]*\([0-9]*\.[0-9]*\).*/\1/' )
-# Use O1 option when the clang version is smaller than 3.9
+# Use O1 option when the clang version is smaller than 3.8
# Otherwise use O3 option in release build
diff --git a/packaging/Enable_build_with_FEATURE_DBGIPC.patch b/packaging/Enable_build_with_FEATURE_DBGIPC.patch
deleted file mode 100644
index ae468780a0..0000000000
--- a/packaging/Enable_build_with_FEATURE_DBGIPC.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 524f53e95807f856aa099ccf4f4a950e0fb9d5dc Mon Sep 17 00:00:00 2001
-From: Jonghyun Park <parjong@gmail.com>
-Date: Thu, 27 Apr 2017 13:45:39 +0900
-Subject: [PATCH] [ARM/Linux] Enable build with FEATURE_DBGIPC=0
-
----
- src/debug/di/cordb.cpp | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/src/debug/di/cordb.cpp b/src/debug/di/cordb.cpp
-index e6ed44d..8fb67cf 100644
---- a/src/debug/di/cordb.cpp
-+++ b/src/debug/di/cordb.cpp
-@@ -20,6 +20,13 @@
- #include "dbgtransportmanager.h"
- #endif // FEATURE_DBGIPC_TRANSPORT_DI
-
-+#if defined(PLATFORM_UNIX) || defined(__ANDROID__)
-+// _aligned_malloc and _aligned_free are unavailable on POSIX and Android
-+#define HAVE_ALIGNED_MALLOC 0
-+#else
-+#define HAVE_ALIGNED_MALLOC 1
-+#endif
-+
- //********** Globals. *********************************************************
- #ifndef FEATURE_PAL
- HINSTANCE g_hInst; // Instance handle to this piece of code.
-@@ -499,7 +506,7 @@ DbiGetThreadContext(HANDLE hThread,
- DT_CONTEXT *lpContext)
- {
- // if we aren't local debugging this isn't going to work
--#if !defined(_ARM_) || defined(FEATURE_DBGIPC_TRANSPORT_DI) || defined(__ANDROID__)
-+#if !defined(_ARM_) || defined(FEATURE_DBGIPC_TRANSPORT_DI) || !HAVE_ALIGNED_MALLOC
- _ASSERTE(!"Can't use local GetThreadContext remotely, this needed to go to datatarget");
- return FALSE;
- #else
-@@ -538,7 +545,7 @@ BOOL
- DbiSetThreadContext(HANDLE hThread,
- const DT_CONTEXT *lpContext)
- {
--#if !defined(_ARM_) || defined(FEATURE_DBGIPC_TRANSPORT_DI) || defined(__ANDROID__)
-+#if !defined(_ARM_) || defined(FEATURE_DBGIPC_TRANSPORT_DI) || !HAVE_ALIGNED_MALLOC
- _ASSERTE(!"Can't use local GetThreadContext remotely, this needed to go to datatarget");
- return FALSE;
- #else
diff --git a/packaging/Fix-build-breakage-on-high-processsor-machines-12114.patch b/packaging/Fix-build-breakage-on-high-processsor-machines-12114.patch
new file mode 100644
index 0000000000..47b7f7c86f
--- /dev/null
+++ b/packaging/Fix-build-breakage-on-high-processsor-machines-12114.patch
@@ -0,0 +1,55 @@
+From f14cffc86b49cb803a6ed8e5a864f8c0c7b87f33 Mon Sep 17 00:00:00 2001
+From: Omair Majid <omair.majid@gmail.com>
+Date: Wed, 7 Jun 2017 00:19:48 -0400
+Subject: [PATCH] Fix build breakage on high-processsor machines (#12114)
+
+The build calls `make -j $NumProc`. This breaks on machines with a high
+number of procesors (such as 25).
+
+To reproduce this on any machine, edit build.sh and change
+
+ buildTool install -j $NumProc
+
+to
+
+ buildTool install -j 100
+
+The error trace looks like this:
+
+ In file included from coreclr/bin/obj/Linux.x64.Debug/Generated/eventpipe/dotnetruntime.cpp:12:
+ In file included from coreclr/src/vm/common.h:306:
+ In file included from coreclr/src/vm/eepolicy.h:15:
+ In file included from coreclr/src/vm/vars.hpp:70:
+ In file included from coreclr/src/vm/eeprofinterfaces.h:19:
+ In file included from coreclr/src/inc/profilepriv.h:128:
+ In file included from coreclr/src/inc/profilepriv.inl:18:
+ In file included from coreclr/src/vm/eetoprofinterfaceimpl.h:23:
+ coreclr/src/inc/eventtracebase.h:306:10: fatal error: 'clretwallmain.h' file not found
+
+It turns out that the eventpipe code has a dependency on
+clretwallmain.h. src/CMakeLists.txt points out that clretwallmain.h is a
+generated file. But there's no actual dependency between the eventpipe
+target and the header file(s).
+
+Fix that by fixing the generator script to insert an explicit dependency
+between 'eventpipe' module and 'GeneratedEventingFiles' module.
+---
+ src/scripts/genEventPipe.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/scripts/genEventPipe.py b/src/scripts/genEventPipe.py
+index a00511d..4c802ac 100644
+--- a/src/scripts/genEventPipe.py
++++ b/src/scripts/genEventPipe.py
+@@ -262,6 +262,8 @@ def generateEventPipeCmakeFile(etwmanifest, eventpipe_directory):
+ topCmake.write(' "eventpipehelpers.cpp"\n')
+ topCmake.write(""" )
+
++ add_dependencies(eventpipe GeneratedEventingFiles)
++
+ # Install the static eventpipe library
+ install(TARGETS eventpipe DESTINATION lib)
+ """)
+--
+1.9.1
+
diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec
index 07aea25496..226893a216 100644
--- a/packaging/coreclr.spec
+++ b/packaging/coreclr.spec
@@ -9,10 +9,10 @@
%define dotnet_version 2.0.0
# git rev-parse --verify HEAD
-%define CORECLR_GIT_HASH 8b1595b74c943b33fa794e63e440e6f4c9679478
+%define CORECLR_GIT_HASH 9679ded412d1421f3d54ee3082e8b5f900217a4a
Name: coreclr
-Version: 2.0.0.11599
+Version: 2.0.0.11992
Release: 0
Summary: Microsoft .NET Runtime, Coreclr
Group: Development/Languages
@@ -24,10 +24,10 @@ Source1001: %{name}.manifest
Source1002: libicu.tar.gz
Source1003: dep_libs.tar.gz
# Gbp-Ignore-Patches: 0 1 2 3
-Patch0: Add-project.lock.json-files.patch
+Patch0: Add-project.assets.json-files.patch
Patch1: Add-Tizen-RuntimeID-case.patch
Patch2: Change-O3-build-in-clang3.8.patch
-Patch3: Enable_build_with_FEATURE_DBGIPC.patch
+Patch3: Fix-build-breakage-on-high-processsor-machines-12114.patch
ExcludeArch: aarch64
@@ -235,15 +235,15 @@ export PAL_DBG_CHANNELS=""
# No build native and mscorlib.
%else
# Build native only.
-./build.sh %{_barch} %{_buildtype} clang3.8 skipmscorlib skipgenerateversion skipnuget %{testopt} stripSymbols cmakeargs -DFEATURE_GDBJIT=TRUE cmakeargs -DFEATURE_DBGIPC=0
+./build.sh %{_barch} %{_buildtype} clang3.8 skipmscorlib skipgenerateversion skipnuget %{testopt} cmakeargs -DFEATURE_GDBJIT=TRUE cmakeargs -DFEATURE_DBGIPC=0
%endif
%else
%if 0%{skipnative}
# Build mscorlib only.
-./build.sh %{_barch} %{_buildtype} -skiprestore skipnative skipnuget %{testopt}
+./build.sh %{_barch} %{_buildtype} -skiprestore skipnative skipnuget %{testopt} -- /p:RestorePackages=false
%else
# Build native and mscorlib.
-./build.sh %{_barch} %{_buildtype} clang3.8 skipgenerateversion -skiprestore skipnuget %{testopt} stripSymbols cmakeargs -DFEATURE_GDBJIT=TRUE cmakeargs -DFEATURE_DBGIPC=0
+./build.sh %{_barch} %{_buildtype} clang3.8 skipgenerateversion skipnuget %{testopt} cmakeargs -DFEATURE_GDBJIT=TRUE cmakeargs -DFEATURE_DBGIPC=0 cmakeargs -DFEATURE_NI_BIND_FALLBACK=false -- /p:RestorePackages=false
%endif
%endif
diff --git a/packaging/downloaded_files.tar.gz b/packaging/downloaded_files.tar.gz
index bc0839a37a..ee1101af99 100644
--- a/packaging/downloaded_files.tar.gz
+++ b/packaging/downloaded_files.tar.gz
Binary files differ