-
Notifications
You must be signed in to change notification settings - Fork 137
Update 2.1 to March Release #1517
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
44574e7
march 2.1 changes
adaggarwal 51a575e
prebuilt-baseline-update
adaggarwal 820d3c4
update cli
adaggarwal 6c1c835
corefx Patch: add: disable atomic operation for implicit strong memor…
adaggarwal 2bac6f2
rework corefx patch to determine clang version and then apply the dis…
adaggarwal 55c746c
wip
adaggarwal 33c73d1
coreclr-patch: Handle glibc sysctl deprecation for fedora>30
adaggarwal File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 2.2.0-preview1-03415-02 | ||
| 2.1.0-rc1-03131-06 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20200116-02/final/index.json | ||
| https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20200219-01/final/index.json |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
patches/coreclr/0001-glibc-sysctl-deprecation-handling.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| From f2a4abfda4f2dea0d1bece590222b304b6242cf3 Mon Sep 17 00:00:00 2001 | ||
| From: adaggarwal <aditya.aggarwal@microsoft.com> | ||
| Date: Fri, 6 Mar 2020 18:25:45 +0000 | ||
| Subject: [PATCH] glibc sysctl deprecation handling | ||
|
|
||
| --- | ||
| src/pal/src/misc/sysinfo.cpp | 7 +++++-- | ||
| 1 file changed, 5 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/src/pal/src/misc/sysinfo.cpp b/src/pal/src/misc/sysinfo.cpp | ||
| index 495cc8bb94..0afb14a73a 100644 | ||
| --- a/src/pal/src/misc/sysinfo.cpp | ||
| +++ b/src/pal/src/misc/sysinfo.cpp | ||
| @@ -26,9 +26,12 @@ Revision History: | ||
| #include <errno.h> | ||
| #include <unistd.h> | ||
| #include <sys/types.h> | ||
| -#if HAVE_SYSCTL | ||
| + | ||
| +#if HAVE_SYSCONF | ||
| +// <unistd.h> already included | ||
| +#elif HAVE_SYSCTL | ||
| #include <sys/sysctl.h> | ||
| -#elif !HAVE_SYSCONF | ||
| +#else | ||
| #error Either sysctl or sysconf is required for GetSystemInfo. | ||
| #endif | ||
|
|
||
| -- | ||
| 2.21.0 | ||
|
|
||
26 changes: 26 additions & 0 deletions
26
patches/corefx/0001-disable-atomic-operation-strong-memory-warning.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| From be37d2123ac401604846b0306664e83b5c147db1 Mon Sep 17 00:00:00 2001 | ||
| From: adaggarwal <aditya.aggarwal@microsoft.com> | ||
| Date: Thu, 5 Mar 2020 19:41:55 +0000 | ||
| Subject: [PATCH] disable atomic operation strong memory warning | ||
|
|
||
| --- | ||
| src/Native/Unix/CMakeLists.txt | 3 +++ | ||
| 1 file changed, 3 insertions(+) | ||
|
|
||
| diff --git a/src/Native/Unix/CMakeLists.txt b/src/Native/Unix/CMakeLists.txt | ||
| index 7d804a1e54..bb980df3eb 100644 | ||
| --- a/src/Native/Unix/CMakeLists.txt | ||
| +++ b/src/Native/Unix/CMakeLists.txt | ||
| @@ -29,6 +29,9 @@ add_compile_options(-Werror) | ||
| if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5) | ||
| add_compile_options(-Wno-unreachable-code) | ||
| endif () | ||
| +if(CMAKE_C_COMPILER_VERSION VERSION_GREATER 7) | ||
| + add_compile_options(-Wno-atomic-implicit-seq-cst) | ||
| +endif() | ||
|
|
||
| if (CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL amd64) | ||
| add_definitions(-DBIT64=1) | ||
| -- | ||
| 2.21.0 | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule cli
updated
3 files
| +2 −2 | build/DependencyVersions.props | |
| +1 −1 | build/Version.props | |
| +11 −0 | build/publish/PublishNupkgToBlobFeed.targets |
Submodule corefx
updated
23 files
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 2.2.2-servicing-27317-07 | ||
| 2.1.8-servicing-27317-03 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.