From 44574e796cb79b1802794a8d05c9a875188f4983 Mon Sep 17 00:00:00 2001 From: adaggarwal Date: Wed, 26 Feb 2020 17:51:42 +0000 Subject: [PATCH 1/7] march 2.1 changes --- BuildToolsVersion.txt | 2 +- ProdConFeed.txt | 2 +- dependencies.props | 4 ++-- repos/core-setup.proj | 2 +- repos/coreclr.proj | 2 +- repos/corefx.proj | 2 +- src/core-setup | 2 +- src/coreclr | 2 +- src/corefx | 2 +- tools-local/ILAsmVersion.txt | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt index e9b930e1ba..61c9aa8a61 100644 --- a/BuildToolsVersion.txt +++ b/BuildToolsVersion.txt @@ -1 +1 @@ -2.2.0-preview1-03415-02 +2.1.0-rc1-03131-06 diff --git a/ProdConFeed.txt b/ProdConFeed.txt index fa2345cbbc..95d01a6717 100644 --- a/ProdConFeed.txt +++ b/ProdConFeed.txt @@ -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 diff --git a/dependencies.props b/dependencies.props index 9d308dafe8..3b8ed7ed69 100644 --- a/dependencies.props +++ b/dependencies.props @@ -22,8 +22,8 @@ the product as version strings to be used by the SDK to fetch extra content. --> - 2.1.16 - 2.1.16 + 2.1.17 + 2.1.17 2.2.0 diff --git a/repos/core-setup.proj b/repos/core-setup.proj index c27e720088..e752fc1ab2 100644 --- a/repos/core-setup.proj +++ b/repos/core-setup.proj @@ -21,7 +21,7 @@ $(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) $(ArmEnvironmentVariables) $(BuildCommand) - 20190418-01 + 20200219-03 $(SourceBuiltPackagesPath) diff --git a/repos/coreclr.proj b/repos/coreclr.proj index 267fafe19e..a90302b636 100644 --- a/repos/coreclr.proj +++ b/repos/coreclr.proj @@ -18,7 +18,7 @@ $(ArmEnvironmentVariables) $(BuildCommand) $(ProjectDirectory)/clean$(ShellExtension) - 20190417-04 + 20200219-01 diff --git a/repos/corefx.proj b/repos/corefx.proj index c57508ceef..64a6cacd3e 100644 --- a/repos/corefx.proj +++ b/repos/corefx.proj @@ -24,7 +24,7 @@ $(ProjectDirectory)/bin/packages/$(Configuration) $(ProjectDirectory)/clean$(ShellExtension) - 20190417-02 + 20200219-01 diff --git a/src/core-setup b/src/core-setup index 5f979c18c1..7b9e4ef7c1 160000 --- a/src/core-setup +++ b/src/core-setup @@ -1 +1 @@ -Subproject commit 5f979c18c12f4903b171ca8cefccceeb03b22c32 +Subproject commit 7b9e4ef7c114f04a1baf0143fad29c984364a5f5 diff --git a/src/coreclr b/src/coreclr index 813d5a06aa..07242eedaa 160000 --- a/src/coreclr +++ b/src/coreclr @@ -1 +1 @@ -Subproject commit 813d5a06aa20c5da77b0d6b36c4e16f87a50d7b0 +Subproject commit 07242eedaaab9b6ef09d5070a11c5b72ca166fbc diff --git a/src/corefx b/src/corefx index 7a9e727fa3..7601f4f622 160000 --- a/src/corefx +++ b/src/corefx @@ -1 +1 @@ -Subproject commit 7a9e727fa3961bb55a02e471bb0bc9f9e82df4d9 +Subproject commit 7601f4f6225089ffb291dc7d58293c7bbf5c5d4f diff --git a/tools-local/ILAsmVersion.txt b/tools-local/ILAsmVersion.txt index 48ed895af2..6332f2e102 100644 --- a/tools-local/ILAsmVersion.txt +++ b/tools-local/ILAsmVersion.txt @@ -1 +1 @@ -2.2.2-servicing-27317-07 +2.1.8-servicing-27317-03 From 51a575eef44fda6318d1cf7d01821ec58fa9c053 Mon Sep 17 00:00:00 2001 From: adaggarwal Date: Wed, 26 Feb 2020 21:18:47 +0000 Subject: [PATCH 2/7] prebuilt-baseline-update --- tools-local/prebuilt-baseline-online.xml | 27 ++++++++++++------------ 1 file changed, 14 insertions(+), 13 deletions(-) mode change 100755 => 100644 tools-local/prebuilt-baseline-online.xml diff --git a/tools-local/prebuilt-baseline-online.xml b/tools-local/prebuilt-baseline-online.xml old mode 100755 new mode 100644 index 9ec60a90cd..56dc9282da --- a/tools-local/prebuilt-baseline-online.xml +++ b/tools-local/prebuilt-baseline-online.xml @@ -86,7 +86,7 @@ - + @@ -95,9 +95,9 @@ - - - + + + @@ -140,13 +140,13 @@ - - + + - + @@ -155,11 +155,12 @@ + - + @@ -279,10 +280,10 @@ - - - - + + + + @@ -448,7 +449,7 @@ - + From 820d3c4e97c52862e8901d4cb4c1648af18f2d4a Mon Sep 17 00:00:00 2001 From: Aditya Aggarwal Date: Mon, 2 Mar 2020 15:07:59 -0600 Subject: [PATCH 3/7] update cli --- src/cli | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cli b/src/cli index b33df27d25..537cfb9a5c 160000 --- a/src/cli +++ b/src/cli @@ -1 +1 @@ -Subproject commit b33df27d250772dadd4fda805ff65a3eb38a2b78 +Subproject commit 537cfb9a5c520aa2ff4ffd4d2b9f45d16f4a6b7b From 6c1c835befd6a6c42283bdfde47d5b04c220a019 Mon Sep 17 00:00:00 2001 From: adaggarwal Date: Thu, 5 Mar 2020 17:54:33 +0000 Subject: [PATCH 4/7] corefx Patch: add: disable atomic operation for implicit strong memory barriers --- ...licit-strong-memory-barriers-warning.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 patches/corefx/0001-disable-implicit-strong-memory-barriers-warning.patch diff --git a/patches/corefx/0001-disable-implicit-strong-memory-barriers-warning.patch b/patches/corefx/0001-disable-implicit-strong-memory-barriers-warning.patch new file mode 100644 index 0000000000..c24fe3a4d9 --- /dev/null +++ b/patches/corefx/0001-disable-implicit-strong-memory-barriers-warning.patch @@ -0,0 +1,24 @@ +From 3ad581497c6533d9c3d083c7d0333e74315811d0 Mon Sep 17 00:00:00 2001 +From: adaggarwal +Date: Thu, 5 Mar 2020 17:51:26 +0000 +Subject: [PATCH] disable-implicit-strong-memory-barriers-warning + +--- + src/Native/Unix/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Native/Unix/CMakeLists.txt b/src/Native/Unix/CMakeLists.txt +index 7d804a1..91827c7 100644 +--- a/src/Native/Unix/CMakeLists.txt ++++ b/src/Native/Unix/CMakeLists.txt +@@ -21,6 +21,7 @@ add_compile_options(-Wno-typedef-redefinition) + add_compile_options(-Wno-unused-local-typedef) + add_compile_options(-Wno-c99-extensions) + add_compile_options(-Wno-c11-extensions) ++add_compile_options(-Wno-atomic-implicit-seq-cst) + add_compile_options(-fPIC) + add_compile_options(-I${CMAKE_CURRENT_SOURCE_DIR}/Common) + add_compile_options(-I${CMAKE_CURRENT_BINARY_DIR}/Common) +-- +1.8.3.1 + From 2bac6f2850db36eb6e3c016591c205abff655f54 Mon Sep 17 00:00:00 2001 From: adaggarwal Date: Thu, 5 Mar 2020 19:51:21 +0000 Subject: [PATCH 5/7] rework corefx patch to determine clang version and then apply the disablement --- ...omic-operation-strong-memory-warning.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 patches/corefx/0001-disable-atomic-operation-strong-memory-warning.patch diff --git a/patches/corefx/0001-disable-atomic-operation-strong-memory-warning.patch b/patches/corefx/0001-disable-atomic-operation-strong-memory-warning.patch new file mode 100644 index 0000000000..35e0487436 --- /dev/null +++ b/patches/corefx/0001-disable-atomic-operation-strong-memory-warning.patch @@ -0,0 +1,26 @@ +From be37d2123ac401604846b0306664e83b5c147db1 Mon Sep 17 00:00:00 2001 +From: adaggarwal +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_EQUAL 8) ++ 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 + From 55c746c2e3272a301eed2d099dd05f02486c7569 Mon Sep 17 00:00:00 2001 From: adaggarwal Date: Thu, 5 Mar 2020 20:55:48 +0000 Subject: [PATCH 6/7] wip --- ...omic-operation-strong-memory-warning.patch | 2 +- ...licit-strong-memory-barriers-warning.patch | 24 ------------------- 2 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 patches/corefx/0001-disable-implicit-strong-memory-barriers-warning.patch diff --git a/patches/corefx/0001-disable-atomic-operation-strong-memory-warning.patch b/patches/corefx/0001-disable-atomic-operation-strong-memory-warning.patch index 35e0487436..4afa5fd3a2 100644 --- a/patches/corefx/0001-disable-atomic-operation-strong-memory-warning.patch +++ b/patches/corefx/0001-disable-atomic-operation-strong-memory-warning.patch @@ -15,7 +15,7 @@ index 7d804a1e54..bb980df3eb 100644 if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5) add_compile_options(-Wno-unreachable-code) endif () -+if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 8) ++if(CMAKE_C_COMPILER_VERSION VERSION_GREATER 7) + add_compile_options(-Wno-atomic-implicit-seq-cst) +endif() diff --git a/patches/corefx/0001-disable-implicit-strong-memory-barriers-warning.patch b/patches/corefx/0001-disable-implicit-strong-memory-barriers-warning.patch deleted file mode 100644 index c24fe3a4d9..0000000000 --- a/patches/corefx/0001-disable-implicit-strong-memory-barriers-warning.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 3ad581497c6533d9c3d083c7d0333e74315811d0 Mon Sep 17 00:00:00 2001 -From: adaggarwal -Date: Thu, 5 Mar 2020 17:51:26 +0000 -Subject: [PATCH] disable-implicit-strong-memory-barriers-warning - ---- - src/Native/Unix/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Native/Unix/CMakeLists.txt b/src/Native/Unix/CMakeLists.txt -index 7d804a1..91827c7 100644 ---- a/src/Native/Unix/CMakeLists.txt -+++ b/src/Native/Unix/CMakeLists.txt -@@ -21,6 +21,7 @@ add_compile_options(-Wno-typedef-redefinition) - add_compile_options(-Wno-unused-local-typedef) - add_compile_options(-Wno-c99-extensions) - add_compile_options(-Wno-c11-extensions) -+add_compile_options(-Wno-atomic-implicit-seq-cst) - add_compile_options(-fPIC) - add_compile_options(-I${CMAKE_CURRENT_SOURCE_DIR}/Common) - add_compile_options(-I${CMAKE_CURRENT_BINARY_DIR}/Common) --- -1.8.3.1 - From 33c73d1395ee245d969bd4fe29286ff6891cc47b Mon Sep 17 00:00:00 2001 From: adaggarwal Date: Fri, 6 Mar 2020 18:28:28 +0000 Subject: [PATCH 7/7] coreclr-patch: Handle glibc sysctl deprecation for fedora>30 --- ...01-glibc-sysctl-deprecation-handling.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 patches/coreclr/0001-glibc-sysctl-deprecation-handling.patch diff --git a/patches/coreclr/0001-glibc-sysctl-deprecation-handling.patch b/patches/coreclr/0001-glibc-sysctl-deprecation-handling.patch new file mode 100644 index 0000000000..7ceedba0b6 --- /dev/null +++ b/patches/coreclr/0001-glibc-sysctl-deprecation-handling.patch @@ -0,0 +1,31 @@ +From f2a4abfda4f2dea0d1bece590222b304b6242cf3 Mon Sep 17 00:00:00 2001 +From: adaggarwal +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 + #include + #include +-#if HAVE_SYSCTL ++ ++#if HAVE_SYSCONF ++// already included ++#elif HAVE_SYSCTL + #include +-#elif !HAVE_SYSCONF ++#else + #error Either sysctl or sysconf is required for GetSystemInfo. + #endif + +-- +2.21.0 +