import dotnet3.1-3.1.417-1.el8
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
parent
1ff1878e9c
commit
68420deebe
|
|
@ -1 +1 @@
|
|||
6d8a2bb600af2f73f425857174dbca974fc9c48f SOURCES/dotnet-v3.1.416-SDK.tar.gz
|
||||
009b2cd68b4b75b90eff1b157fae7aedc6c0a08b SOURCES/dotnet-v3.1.417-SDK.tar.gz
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
SOURCES/dotnet-v3.1.416-SDK.tar.gz
|
||||
SOURCES/dotnet-v3.1.417-SDK.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,83 +0,0 @@
|
|||
From 9a2857177a8a2a388298ad5674f6e5edd1e5b853 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Vorlicek <jan.vorlicek@volny.cz>
|
||||
Date: Tue, 4 Jan 2022 23:51:52 +0100
|
||||
Subject: [PATCH] Fix build with Clang 13 (#63314)
|
||||
|
||||
* Fix clang 13 induced runtime issues (#62170)
|
||||
|
||||
The clang 13 optimizer started to assume that "this" pointer is always
|
||||
properly aligned. That lead to elimination of some code that was actually
|
||||
needed.
|
||||
It also takes pointer aliasing rules more strictly in one place in jit.
|
||||
That caused the optimizer to falsely assume that a callee with an argument
|
||||
passed by reference is not modifying that argument and used a stale
|
||||
copy of the original value at the caller site.
|
||||
|
||||
This change fixes both of the issues. With this fix, runtime compiled
|
||||
using clang 13 seems to be fully functional.
|
||||
|
||||
* Fix build with clang 13 (#60328)
|
||||
---
|
||||
src/inc/corhlpr.h | 8 ++++----
|
||||
src/jit/bitsetasshortlong.h | 4 ++--
|
||||
2 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/inc/corhlpr.h b/src/inc/corhlpr.h
|
||||
index 5b263a5382..c512069fca 100644
|
||||
--- a/src/inc/corhlpr.h
|
||||
+++ b/src/inc/corhlpr.h
|
||||
@@ -335,7 +335,7 @@ struct COR_ILMETHOD_SECT
|
||||
const COR_ILMETHOD_SECT* Next() const
|
||||
{
|
||||
if (!More()) return(0);
|
||||
- return ((COR_ILMETHOD_SECT*)(((BYTE *)this) + DataSize()))->Align();
|
||||
+ return ((COR_ILMETHOD_SECT*)Align(((BYTE *)this) + DataSize()));
|
||||
}
|
||||
|
||||
const BYTE* Data() const
|
||||
@@ -373,9 +373,9 @@ struct COR_ILMETHOD_SECT
|
||||
return((AsSmall()->Kind & CorILMethod_Sect_FatFormat) != 0);
|
||||
}
|
||||
|
||||
- const COR_ILMETHOD_SECT* Align() const
|
||||
+ static const void* Align(const void* p)
|
||||
{
|
||||
- return((COR_ILMETHOD_SECT*) ((((UINT_PTR) this) + 3) & ~3));
|
||||
+ return((void*) ((((UINT_PTR) p) + 3) & ~3));
|
||||
}
|
||||
|
||||
protected:
|
||||
@@ -578,7 +578,7 @@ typedef struct tagCOR_ILMETHOD_FAT : IMAGE_COR_ILMETHOD_FAT
|
||||
|
||||
const COR_ILMETHOD_SECT* GetSect() const {
|
||||
if (!More()) return (0);
|
||||
- return(((COR_ILMETHOD_SECT*) (GetCode() + GetCodeSize()))->Align());
|
||||
+ return(((COR_ILMETHOD_SECT*) COR_ILMETHOD_SECT::Align(GetCode() + GetCodeSize())));
|
||||
}
|
||||
} COR_ILMETHOD_FAT;
|
||||
|
||||
diff --git a/src/jit/bitsetasshortlong.h b/src/jit/bitsetasshortlong.h
|
||||
index 17e0e3a69c..0c40283ce5 100644
|
||||
--- a/src/jit/bitsetasshortlong.h
|
||||
+++ b/src/jit/bitsetasshortlong.h
|
||||
@@ -346,7 +346,7 @@ public:
|
||||
{
|
||||
if (IsShort(env))
|
||||
{
|
||||
- (size_t&)out = (size_t)out & ((size_t)gen | (size_t)in);
|
||||
+ out = (BitSetShortLongRep)((size_t)out & ((size_t)gen | (size_t)in));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -362,7 +362,7 @@ public:
|
||||
{
|
||||
if (IsShort(env))
|
||||
{
|
||||
- (size_t&)in = (size_t)use | ((size_t)out & ~(size_t)def);
|
||||
+ in = (BitSetShortLongRep)((size_t)use | ((size_t)out & ~(size_t)def));
|
||||
}
|
||||
else
|
||||
{
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
|
@ -25,10 +25,10 @@
|
|||
%endif
|
||||
%global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g')
|
||||
|
||||
%global host_version 3.1.22
|
||||
%global runtime_version 3.1.22
|
||||
%global host_version 3.1.23
|
||||
%global runtime_version 3.1.23
|
||||
%global aspnetcore_runtime_version %{runtime_version}
|
||||
%global sdk_version 3.1.416
|
||||
%global sdk_version 3.1.417
|
||||
%global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
|
||||
|
||||
%global host_rpm_version %{host_version}
|
||||
|
|
@ -61,7 +61,7 @@
|
|||
|
||||
Name: dotnet3.1
|
||||
Version: %{sdk_rpm_version}
|
||||
Release: 4%{?dist}
|
||||
Release: 1%{?dist}
|
||||
Summary: .NET Core CLI tools and runtime
|
||||
License: MIT and ASL 2.0 and BSD
|
||||
URL: https://github.com/dotnet/
|
||||
|
|
@ -79,9 +79,8 @@ Patch100: corefx-optflags-support.patch
|
|||
Patch103: corefx-39633-cgroupv2-mountpoints.patch
|
||||
|
||||
Patch200: coreclr-27048-sysctl-deprecation.patch
|
||||
Patch201: coreclr-clang13.patch
|
||||
# Already applied at tarball build time
|
||||
#Patch202: coreclr-libunwind-fno-common.patch
|
||||
#Patch201: coreclr-libunwind-fno-common.patch
|
||||
|
||||
Patch300: core-setup-do-not-strip.patch
|
||||
Patch301: core-setup-no-werror.patch
|
||||
|
|
@ -194,6 +193,8 @@ Requires: dotnet-hostfxr-3.1%{?_isa} >= %{host_rpm_version}-%{release}
|
|||
# libicu is dlopen()ed
|
||||
Requires: libicu
|
||||
|
||||
# See src/corefx.*/src/Native/AnyOS/brotli-version.txt
|
||||
Provides: bundled(libbrotli) = 1.0.9
|
||||
%if %{use_bundled_libunwind}
|
||||
Provides: bundled(libunwind) = 1.3
|
||||
%endif
|
||||
|
|
@ -341,30 +342,29 @@ ln -s %{_libdir}/dotnet/reference-packages/Private.SourceBuild.ReferencePackages
|
|||
%endif
|
||||
|
||||
# Fix bad hardcoded path in build
|
||||
sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/core-setup.*/src/corehost/common/pal.unix.cpp
|
||||
sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/dotnet-core-setup.*/src/corehost/common/pal.unix.cpp
|
||||
|
||||
# Disable warnings
|
||||
sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.common.props
|
||||
|
||||
%patch1 -p1
|
||||
|
||||
pushd src/corefx.*
|
||||
pushd src/dotnet-corefx.*
|
||||
%patch100 -p1
|
||||
%patch103 -p1
|
||||
popd
|
||||
|
||||
pushd src/coreclr.*
|
||||
pushd src/dotnet-coreclr.*
|
||||
%patch200 -p1
|
||||
%patch201 -p1
|
||||
#%%patch202 -p1
|
||||
#%%patch201 -p1
|
||||
popd
|
||||
|
||||
pushd src/core-setup.*
|
||||
pushd src/dotnet-core-setup.*
|
||||
%patch300 -p1
|
||||
%patch301 -p1
|
||||
popd
|
||||
|
||||
pushd src/cli.*
|
||||
pushd src/dotnet-cli.*
|
||||
%patch500 -p1
|
||||
popd
|
||||
|
||||
|
|
@ -444,11 +444,11 @@ chmod 0755 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{run
|
|||
# Provided by dotnet-host from another SRPM
|
||||
#install -dm 0755 %%{buildroot}/%%{_datadir}/bash-completion/completions
|
||||
# dynamic completion needs the file to be named the same as the base command
|
||||
#install src/cli.*/scripts/register-completions.bash %%{buildroot}/%%{_datadir}/bash-completion/completions/dotnet
|
||||
#install src/dotnet-cli.*/scripts/register-completions.bash %%{buildroot}/%%{_datadir}/bash-completion/completions/dotnet
|
||||
|
||||
# TODO: the zsh completion script needs to be ported to use #compdef
|
||||
#install -dm 755 %%{buildroot}/%%{_datadir}/zsh/site-functions
|
||||
#install src/cli/scripts/register-completions.zsh %%{buildroot}/%%{_datadir}/zsh/site-functions/_dotnet
|
||||
#install src/dotnet-cli/scripts/register-completions.zsh %%{buildroot}/%%{_datadir}/zsh/site-functions/_dotnet
|
||||
|
||||
# Provided by dotnet-host from another SRPM
|
||||
#install -dm 0755 %%{buildroot}%%{_bindir}
|
||||
|
|
@ -511,6 +511,10 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
|
|||
%{_libdir}/dotnet/source-built-artifacts
|
||||
|
||||
%changelog
|
||||
* Mon Mar 28 2022 Omair Majid <omajid@redhat.com> - 3.1.417-1
|
||||
- Update to .NET SDK 3.1.417 and Runtime 3.1.23
|
||||
- Resolves: RHBZ#2060566
|
||||
|
||||
* Tue Jan 25 2022 Omair Majid <omajid@redhat.com> - 3.1.416-4
|
||||
- Update to .NET SDK 3.1.416 and Runtime 3.1.22
|
||||
- Resolves: RHBZ#2011820
|
||||
|
|
|
|||
Loading…
Reference in New Issue