dotnet8-stage0: upgrade for diff

2024-01-08 22:00:53 -05:00 · 2024-01-08 22:00:53 -05:00 · 0699a42e68
commit 0699a42e68
parent 776b567f1f
14 changed files with 330 additions and 2792 deletions
--- a/community/dotnet7-stage0/APKBUILD
+++ b/community/dotnet7-stage0/APKBUILD
@ -1,65 +1,60 @@
 # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
 # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>

-pkgname=dotnet7-stage0
-pkgver=7.0.105
-pkgrel=4
+pkgname=dotnet8-stage0
+pkgver=8.0.100
+pkgrel=0

 [ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""

 # Tag of tarball generator.
-_gittag=v$pkgver
+_gittag=v8.0.0

 # Versions of prebuilt artifacts and bootstrap tar
-_artifactsver=7.0.102
-_bootstrapver="7.0.105"
+_artifactsver="8.0.100-rtm.23551.1.centos.8-x64"
+_bootstrapver="8.0.100"
 _bootstraprel=0
-_installerver=${_gittag/v}
-
-# Version of packages that aren't defined in git-info or badly defined
-_iltoolsver=7.0.2-servicing.22607.1
-_aspnetver=7.0.4
+_installerver=8.0.100

 # Patches to be used. String before '_' refers to repo to patch
 # Look for patch notes within each patch for what they fix / where they come from
 # build_* patches applies directly to $builddir
 _patches="
+	build_fix-ga-versions.patch
+	installer_aspire-manifest-version-fix.patch
 	installer_set-crossgen2rid-using-buildarchitecture.patch
-	runtime_76500-mono-musl-support.patch
-	runtime_76500-properly-set-toolchain-for-alpine.patch
 	runtime_82269-mono-thread-coop-undefine-fortify-source.patch
 	runtime_83682-specify-notext-on-linux-musl-x86.patch
-	runtime_84413-support-adding-rids-with-dash-in-base-part.patch
-	runtime_84444-suppress-clang-16-warnings.patch
-	runtime_enable-runtime-marshalling.diff
+	runtime_90251-rename-mono-cmake-host-var.patch
+	runtime_more-clang-16-suppression.patch
 	runtime_remove-usage-of-off64-t.patch
 	"
-_extra_nupkgs="https://globalcdn.nuget.org/packages/stylecop.analyzers.1.2.0-beta.435.nupkg"

 _pkgver_macro=${pkgver%.*}
 _pkgver_prior=1
 _pkgver_name="${_pkgver_macro//[.0]}"
 pkgdesc="The .NET Core stage0 bits for dotnet build"
-# armhf: blocked by https://github.com/dotnet/runtime/issues/77663
 # x86: blocked by https://github.com/dotnet/runtime/issues/83509
-# riscv64: port WIP https://github.com/dotnet/runtime/issues/36748
-# s390x: no diskspace | lack maintainer resources
-arch="x86_64 armv7 aarch64"
+# armhf: blocked by https://github.com/dotnet/runtime/issues/77663
+# riscv64: port WIP https://github.com/dotnet/runtime/issues/84834
+arch="all !x86 !armhf !riscv64"
+_giturl=https://github.com/dotnet/dotnet
 url=https://dotnet.microsoft.com
-_giturl=https://github.com/dotnet/installer
 license="MIT"
-options="!check" # Testsuite in main -build aport
+options="!check net" # Testsuite in main -build aport
 subpackages="
 	dotnet$_pkgver_name-stage0-artifacts:artifacts:noarch
 	dotnet$_pkgver_name-stage0-bootstrap
 	"
 source="
-	https://lab.ilot.io/dotnet/installer/-/releases/$_gittag/downloads/tarball/dotnet-$_gittag.tar.xz
+	dotnet-tarball-$_gittag.tar.gz::https://github.com/dotnet/dotnet/archive/refs/tags/$_gittag.tar.gz
+	dotnet-release-$_gittag.json::https://github.com/dotnet/dotnet/releases/download/$_gittag/release.json
 	dotnet-sdk-$_bootstrapver-linux-musl-x64.noextract::https://dotnetcli.azureedge.net/dotnet/Sdk/$_bootstrapver/dotnet-sdk-$_bootstrapver-linux-musl-x64.tar.gz
 	dotnet-sdk-$_bootstrapver-linux-musl-arm64.noextract::https://dotnetcli.azureedge.net/dotnet/Sdk/$_bootstrapver/dotnet-sdk-$_bootstrapver-linux-musl-arm64.tar.gz
 	dotnet-sdk-$_bootstrapver-linux-musl-arm.noextract::https://dotnetcli.azureedge.net/dotnet/Sdk/$_bootstrapver/dotnet-sdk-$_bootstrapver-linux-musl-arm.tar.gz
+	dotnet-sdk-$_bootstrapver-r$_bootstraprel-linux-musl-s390x.noextract::https://lab.ilot.io/ayakael/dotnet-stage0/-/releases/$_bootstrapver-r$_bootstraprel/downloads/sdk/dotnet-sdk-$_bootstrapver-r$_bootstraprel-linux-musl-s390x.tar.xz
+	dotnet-sdk-$_bootstrapver-r$_bootstraprel-linux-musl-ppc64le.noextract::https://lab.ilot.io/ayakael/dotnet-stage0/-/releases/$_bootstrapver-r$_bootstraprel/downloads/sdk/dotnet-sdk-$_bootstrapver-r$_bootstraprel-linux-musl-ppc64le.tar.xz
 	Private.SourceBuilt.Artifacts.$_artifactsver.noextract::https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.$_artifactsver.tar.gz
-	$_extra_nupkgs
 	$_patches
 	"

@ -124,7 +119,7 @@ case $CTARGET_ARCH in
 	*) _dotnet_target=$CTARGET_ARCH;;
 esac

-builddir="$srcdir"/dotnet-${_gittag/release\/}
+builddir="$srcdir"/dotnet-${_gittag/v}
 _packagesdir="$srcdir"/local-packages
 _libdir="/usr/lib"
 _nugetdir="$srcdir"/nuget
@ -140,62 +135,16 @@ else
 	_logdir="$srcdir"/logs
 fi

-# generates tarball containing all components built by dotnet
-snapshot() {
-	local _pkg="$srcdir"/${builddir##*/}.tar
-	ulimit -n 4096
-	if [ -d "$srcdir" ]; then
-		cd "$srcdir"
-	else
-		mkdir -p "$srcdir" && cd "$srcdir"
-	fi
-	if [ -d "installer" ]; then
-		cd "$srcdir"/installer
-	else
-		git clone $_giturl --branch $_gittag && cd "$srcdir"/installer
-	fi
-
-	sed 's|<Exec Command="tar.*|<Exec Command="tar -cf $(TarballFilePath) -C $(TarballDir)/.. $([MSBuild]::MakeRelative($([System.IO.Path]::GetDirectoryName($(TarballDir))), $(TarballDir)))" />|' -i src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets
-
-	if [ -d "$_libdir/dotnet/bootstrap" ]; then
-		local _cli_root="$(find $_libdir/dotnet/bootstrap/${_pkgver_macro}* -maxdepth 0 -type d | sort -r | head -n 1)"
-	else
-		local _cli_root=""
-	fi
-
-	_InitializeDotNetCli="$_cli_root" DOTNET_INSTALL_DIR="$_cli_root" DotNetBuildFromSource=true ./build.sh \
-		/p:ArcadeBuildTarball=true \
-		/p:TarballDir=$builddir \
-		/p:TarballFilePath=$_pkg
-
-	msg "Compressing ${builddir##*/}.tar to $SRCDEST"
-	xz -T0 -9 -vv -e -c > "$SRCDEST"/${builddir##*/}.tar.xz < "$_pkg"
-
-	cd "$startdir"
-	abuild checksum
-}
-
 prepare() {
 	default_prepare

-	# Parallel restore is broken on mono-based builds since dotnet7
-	# see https://github.com/dotnet/runtime/issues/77364
-	# fixed by https://github.com/dotnet/runtime/pull/79856 on dotnet8
-	# A workaround via runtime_enable-runtime-marshalling.diff
-	case $CARCH in
-		s390x|ppc64le)
-			msg "runtime_enable-runtime-marshalling.diff"
-			patch -p1 -i "$srcdir"/runtime_enable-runtime-marshalling.diff
-			;;
-	esac
+	mkdir -p "$_cli_root"
+	mkdir -p $_packagesdir $_downloaddir $_outputdir $_nugetdir $_logdir

 	# sdk insists on downloading its own dotnet unless ArcadeBuildFromSource
 	# is true, which opens up a can of worms
 	sed 's|ArcadeBuildFromSource=true|Architecture|' -i src/sdk/eng/restore-toolset.sh

-	mkdir -p "$_cli_root"
-	mkdir -p $_packagesdir $_downloaddir $_outputdir $_nugetdir $_logdir
-
 	# links logfiles to pipeline logs for easy pickup in pipelines
 	mkdir -p "$_logdir" "$builddir"/artifacts
 	ln -s "$_logdir" "$builddir"/artifacts/logs
@ -210,24 +159,43 @@ prepare() {

 	tar -xf "$srcdir"/dotnet-sdk-$_pkgver_macro*$_dotnet_arch.noextract -C "$_cli_root" --no-same-owner

-	for i in $_extra_nupkgs; do
-		local filename=${i/::*}
-		local filename=${filename##*/}
-		$_nuget push "$srcdir"/$filename --source="$_packagesdir"
-	done
-
 	# adjusts sdk version and packagedir to expected
 	for i in runtime sdk installer aspnetcore roslyn; do
 		$_nuget add source $_packagesdir --name local --configfile "$builddir"/src/$i/NuGet.config
 		tmp=$(mktemp)
 		jq ".sdk.version = \"$_bootstrapver\"" "$builddir"/src/$i/global.json > $tmp && mv $tmp "$builddir"/src/$i/global.json
 	done
+
+	# extracting PackageVersions.props as some version information is there
+	tar -xzf "$srcdir"/Private.SourceBuilt.Artifacts.*.noextract PackageVersions.props
+
+	# sdk looks for TestCli at wrong place
+	sed '/<TestCliNuGetDirectoryTargetFramework/d' -i "$builddir"/src/sdk/src/Layout/redist/targets/GenerateLayout.targets
+}
+_init() {
+	export _InitializeDotNetCli=$_cli_root
+	export DOTNET_INSTALL_DIR=$_cli_root
+	export PATH="$_cli_root:$PATH"
+	export NUGET_PACKAGES=$_nugetdir
+	export DotNetBuildFromSource=true
+	export DOTNET_CLI_TELEMETRY_OPTOUT=true
+	export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
+	export SHELL=/bin/bash
+	export EXTRA_CPPFLAGS="${CPPFLAGS/--sysroot=$CBUILDROOT}"
+	export EXTRA_CXXFLAGS="${CXXFLAGS/--sysroot=$CBUILDROOT}"
+	export EXTRA_CFLAGS="${CFLAGS/--sysroot=$CBUILDROOT}"
+	export EXTRA_LDFLAGS="$LDFLAGS"
+	unset CXXFLAGS CFLAGS LDFLAGS CPPFLAGS
+
+	ulimit -n 4096
+
+	"$_cli_root"/dotnet build-server shutdown
 }

 _runtime() {
-	"$_cli_root"/dotnet build-server shutdown
+	_init
 	if [ -z "${_runtimever+x}" ]; then
-		local _runtimever=$(grep OutputPackageVersion "$builddir"/git-info/runtime.props | sed -E 's|</?OutputPackageVersion>||g' | tr -d ' ')
+		local _runtimever=$(grep OutputPackageVersion "$builddir"/prereqs/git-info/runtime.props | sed -E 's|</?OutputPackageVersion>||g' | tr -d ' ')
 	fi
 	local _runtimever_ns=$(awk '{if($2 ~ "Name=\"VS.Redist.Common.NetCore.SharedFramework.x64.*\""){print $3}}' "$builddir"/src/installer/eng/Version.Details.xml | awk -F '"' '{print $2}')

@ -243,11 +211,13 @@ _runtime() {
 		/p:NoPgoOptimize=true
 		/p:EnableNgenOptimization=false
 		/p:ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch=none
-		/p:RunApiCompat=false
-		/p:GitCommitHash=$(grep GitCommitHash "$builddir"/git-info/runtime.props | sed -E 's|</?GitCommitHash>||g' | tr -d ' ')
+		/p:_toolsRID=linux-musl-$_dotnet_arch
+		/p:OutputRid=linux-musl-$_dotnet_target
+		/p:GitCommitHash=$(grep GitCommitHash "$builddir"/prereqs/git-info/runtime.props | sed -E 's|</?GitCommitHash>||g' | tr -d ' ')
 		"
 	if [ "$CBUILD" != "$CHOST" ]; then
 		local args="$args -cross"
+		# https://github.com/dotnet/runtime/pull/75597 broke crossbuilding when true
 		local DotNetBuildFromSource=false
 		# x86 build of mono broken, thus do not build mono
 		case $_dotnet_target in
@ -266,35 +236,10 @@ _runtime() {
 	cp artifacts/packages/*/*/dotnet-runtime-*-*.tar.gz $_downloaddir/Runtime/$_runtimever_ns
 }

-_roslyn() {
-	"$_cli_root"/dotnet build-server shutdown
-	if [ -z "${_roslynver+x}" ]; then
-		local _roslynver=$(grep OutputPackageVersion "$builddir"/git-info/roslyn.props | sed -E 's|</?OutputPackageVersion>||g' | tr -d ' ')
-	fi
-	local _roslynver_ns=$(awk '{if($2 == "Name=\"Microsoft.Net.Compilers.Toolset\""){print $3}}' "$builddir"/src/installer/eng/Version.Details.xml | awk -F '"' '{print $2}')
-
-	msg "[$(date)] Building roslyn version $_roslynver"
-	cd "$builddir"/src/roslyn
-
-	local args="
-		-c Release
-		-bl
-		/p:GitCommitHash=$(grep GitCommitHash "$builddir"/git-info/roslyn.props | sed -E 's|</?GitCommitHash>||g' | tr -d ' ')
-		"
-	if [ "$_roslynver" != "${_roslynver##*-}" ]; then
-		local args="$args /p:VersionSuffix=${_roslynver##*-}"
-	fi
-	DotNetBuildFromSource=false ./eng/build.sh --restore $args /p:UseAppHost=false
-	./eng/build.sh --restore --build --pack $args
-	for i in artifacts/packages/*/*/*.nupkg; do
-		$_nuget push $i --source="$_packagesdir"
-	done
-}
-
 _sdk() {
-	"$_cli_root"/dotnet build-server shutdown
+	_init
 	if [ -z "${_sdkver+x}" ]; then
-		local _sdkver=$(grep OutputPackageVersion "$builddir"/git-info/sdk.props | sed -E 's|</?OutputPackageVersion>||g' | tr -d ' ')
+		local _sdkver=$(grep OutputPackageVersion "$builddir"/prereqs/git-info/sdk.props | sed -E 's|</?OutputPackageVersion>||g' | tr -d ' ')
 	fi
 	local _sdkver_ns=$(awk '{if($2 == "Name=\"Microsoft.NET.Sdk\""){print $3}}' "$builddir"/src/installer/eng/Version.Details.xml | awk -F '"' '{print $2}')

@ -305,13 +250,13 @@ _sdk() {
 		-c Release
 		-bl
 		/consoleLoggerParameters:ShowTimestamp
-		/p:GitCommitHash=$(grep GitCommitHash "$builddir"/git-info/sdk.props | sed -E 's|</?GitCommitHash>||g' | tr -d ' ')
+		/p:GitCommitHash=$(grep GitCommitHash "$builddir"/prereqs/git-info/sdk.props | sed -E 's|</?GitCommitHash>||g' | tr -d ' ')
 		/p:Architecture=$_dotnet_target
+		/p:TestCliNuGetDirectoryTargetFramework=netcoreapp3.1
 		"
 	if [ "$_sdkver" != "${_sdkver##*-}" ]; then
 		local args="$args /p:VersionSuffix=${_sdkver##*-}"
 	fi
-
 	./build.sh --pack /p:Projects=$builddir/src/sdk/source-build.slnf $args

 	for i in artifacts/packages/*/*/*.nupkg; do
@ -322,9 +267,9 @@ _sdk() {
 }

 _aspnetcore() {
-	"$_cli_root"/dotnet build-server shutdown
+	_init
 	if [ -z "${_aspnetver+x}" ]; then
-		local _aspnetver=$(grep OutputPackageVersion "$builddir"/git-info/aspnetcore.props | sed -E 's|</?OutputPackageVersion>||g' | tr -d ' ')
+		local _aspnetver=$(grep OutputPackageVersion "$builddir"/prereqs/git-info/aspnetcore.props | sed -E 's|</?OutputPackageVersion>||g' | tr -d ' ')
 	fi
 	local _aspnetver_ns=$(awk '{if($2 == "Name=\"Microsoft.AspNetCore.App.Ref.Internal\""){print $3}}' "$builddir"/src/installer/eng/Version.Details.xml | awk -F '"' '{print $2}')

@ -337,31 +282,34 @@ _aspnetcore() {
 		-arch $_dotnet_target
 		-no-build-nodejs
 		/consoleLoggerParameters:ShowTimestamp
-		/p:BuildOSName=linux-musl
 		/p:BuildNodeJs=false
-		/p:GitCommitHash=$(grep GitCommitHash "$builddir"/git-info/aspnetcore.props | sed -E 's|</?GitCommitHash>||g' | tr -d ' ')
+		/p:BuildOSName=linux-musl
+		/p:GitCommitHash=$(grep GitCommitHash "$builddir"/prereqs/git-info/aspnetcore.props | sed -E 's|</?GitCommitHash>||g' | tr -d ' ')
 		/p:DotNetAssetRootUrl=file://$_downloaddir/
 		/p:EnablePackageValidation=false
 		"
-	# x86 crossgen broken; ppc64le insists on using crossgen
-	case $_dotnet_target in
-		x86|ppc64le) local args="$args /p:DISABLE_CROSSGEN=True";;
-	esac
 	if [ "$_aspnetver" != "${_aspnetver##*-}" ]; then
 		local args="$args /p:VersionSuffix=${_aspnetver##*-}"
 	fi
+
+	# aspnetcore can't find newly created Microsoft.NETCore.App.Runtime.linux-musl-x86 for some reason
+	case $_dotnet_target in
+		riscv64|x86) local args="$args /p:CrossgenOutput=false";;
+	esac
+
 	./eng/build.sh --pack $args

 	for i in artifacts/packages/*/*/*.nupkg; do
 		$_nuget push $i --source="$_packagesdir"
 	done
+
 	mkdir -p "$_downloaddir"/aspnetcore/Runtime/$_aspnetver_ns
-	cp artifacts/installers/*/aspnetcore-runtime-internal-*-linux-musl-$_dotnet_target.tar.gz "$_downloaddir"/aspnetcore/Runtime/$_aspnetver_ns
+	cp artifacts/installers/*/aspnetcore-runtime-*-linux-musl-$_dotnet_target.tar.gz "$_downloaddir"/aspnetcore/Runtime/$_aspnetver_ns
 	cp artifacts/installers/*/aspnetcore_base_runtime.version "$_downloaddir"/aspnetcore/Runtime/$_aspnetver_ns
 }

 _installer() {
-	"$_cli_root"/dotnet build-server shutdown
+	_init
 	msg "[$(date)] Building installer version $_installerver"
 	cd "$builddir"/src/installer

@ -369,23 +317,22 @@ _installer() {
 		-c Release
 		-bl
 		/consoleLoggerParameters:ShowTimestamp
+		/p:EnableSourceLink=false
 		/p:OSName=linux-musl
 		/p:HostOSName=linux-musl
 		/p:Architecture=$_dotnet_target
 		/p:CoreSetupBlobRootUrl=file://$_downloaddir/
 		/p:DotnetToolsetBlobRootUrl=file://$_downloaddir/
-		/p:EnableSourceLink=false
-		/p:GitCommitHash=$(grep GitCommitHash "$builddir"/git-info/installer.props | sed -E 's|</?GitCommitHash>||g' | tr -d ' ')
-		/p:GitCommitCount=$(grep GitCommitCount "$builddir"/git-info/installer.props | sed -E 's|</?GitCommitCount>||g' | tr -d ' ')
+		/p:GitCommitHash=$(grep GitCommitHash "$builddir"/prereqs/git-info/installer.props | sed -E 's|</?GitCommitHash>||g' | tr -d ' ')
+		/p:GitCommitCount=1
 		/p:PublicBaseURL=file://$_downloaddir/
 		"
 	if [ "$_installerver" != "${_installerver##*-}" ]; then
 		local args="$args /p:VersionSuffix=${_installerver##*-}"
 	fi
-
-	# x86 crossgen broken
+	# crossgen broken on x86
 	case $_dotnet_target in
-		x86) local args="$args /p:DISABLE_CROSSGEN=True";;
+		riscv64|x86) local args="$args /p:DISABLE_CROSSGEN=True";;
 	esac

 	./build.sh $args
@ -395,24 +342,7 @@ _installer() {
 }

 build() {
-	export _InitializeDotNetCli=$_cli_root
-	export DOTNET_INSTALL_DIR=$_cli_root
-	export PATH="$_cli_root:$PATH"
-	export NUGET_PACKAGES=$_nugetdir
-	export DotNetBuildFromSource=true
-	export DOTNET_CLI_TELEMETRY_OPTOUT=true
-	export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
-	export SHELL=/bin/bash
-	export EXTRA_CPPFLAGS="${CPPFLAGS/--sysroot=$CBUILDROOT}"
-	export EXTRA_CXXFLAGS="${CXXFLAGS/--sysroot=$CBUILDROOT}"
-	export EXTRA_CFLAGS="${CFLAGS/--sysroot=$CBUILDROOT}"
-	export EXTRA_LDFLAGS="$LDFLAGS"
-	unset CXXFLAGS CFLAGS LDFLAGS CPPFLAGS
-
-	ulimit -n 4096
-
 	_runtime
-	_roslyn
 	_sdk
 	_aspnetcore
 	_installer
@ -430,6 +360,8 @@ bootstrap() {
 	provides="dotnet$_pkgver_name-bootstrap"
 	provider_priority=$_pkgver_prior

+	local _iltoolsver=$(grep \<MicrosoftNETCoreILAsmVersion "$builddir"/PackageVersions.props | sed -E 's|</?MicrosoftNETCoreILAsmVersion>||g' | tr -d ' ')
+
 	install -dm 755 \
 		"$subpkgdir"/$_libdir/dotnet/bootstrap/$pkgver/docs \
 		"$subpkgdir"/$_libdir/dotnet/bootstrap/$pkgver/comp \
@ -461,11 +393,6 @@ bootstrap() {

 	# copies artifacts to artifacts dir for use by future dotnet builds
 	for i in $_nupkgsArray; do install -Dm644 "$_packagesdir"/$i "$subpkgdir"/$_libdir/dotnet/artifacts/$pkgver/ || true; done
-	for i in $_extra_nupkgs; do
-		local filename=${i/::*}
-		local filename=${filename##*/}
-		install -Dm644 "$srcdir"/$filename "$subpkgdir"/$_libdir/dotnet/artifacts/$pkgver/
-	done

 	msg "Changing iltools version to $_iltoolsver"
 	# source-build expects a certain version of ilasm, ildasm and testhost
@ -475,13 +402,14 @@ bootstrap() {
 		local nupath=$(find $nupath || true)
 		local nupkg="${nupath##*/}"
 		local nuname="${nupkg/.nupkg}"
-		if [ -z "${nuname/*rtm*}" ] || [ -z "${nuname/*servicing*}" ]; then
+		if [ -z "${nuname/*rtm*}" ] || [ -z "${nuname/*servicing*}" ] || [ -z "${nuname/*preview*}" ]; then
 			nuname=${nuname%-*}
 		fi
 		local nuname="${nuname%.*.*.*}"
 		local nuver="${nupkg/$nuname.}"
 		local nuver="${nuver/.nupkg}"
 		local nuspec="$nuname.nuspec"
+
 		if [ ! "$nupath" ] || [ "$nupath" = "${nupath/$nuver/$_iltoolsver}" ]; then
 			continue
 		fi
@ -512,24 +440,24 @@ artifacts() {
 	tar --use-compress-program="pigz" \
 		-xf "$srcdir"/Private.SourceBuilt.Artifacts.*.noextract \
 		-C "$subpkgdir"/$_libdir/dotnet/artifacts/$pkgver/ \
-		--no-same-owner \
-		--exclude '*x64*'
+		--no-same-owner
 }

 sha512sums="
-bfc122f316673fe4014e891eb101ecf40efc2ed4ecaff0cbd4bb5c17f547ccaa867ae8af22f41813565630cdb68e2972633703a88478fadde39584f91588589d  dotnet-v7.0.105.tar.xz
-8fb7d1754359e3fda35b7a07e13d2a5e9e723196b980dd922b30919aedaddbedd4d82e28b37471437b69cb93e4b1d136ac701e221924e44d0be6b6ba94dc3654  dotnet-sdk-7.0.105-linux-musl-x64.noextract
-c8120c20939232b53a3cdc607d812d93fadd6dea9466f9454df559f8b7eb334c69fdfd31bc60e4c70b6cf4fc519a25a0439902b04cf5c5bd0c29de020024fbe2  dotnet-sdk-7.0.105-linux-musl-arm64.noextract
-9ffa724ccc02dc3e40afe22f0546a9bdf68b6314cf6da03d9387fb010fe3e5935154a5c06c4a2d588ff4ac77f34120a4ae9bc0237fb24452d78e6698435acf72  dotnet-sdk-7.0.105-linux-musl-arm.noextract
-e5d8f11d5da842309c1e7cf9936eb0cf3cfb56aaa17aeee64fe264b3e6771ee56dd6c405a4c16950b4e4607dab21bc0ec40783f69b0865a6112d7d03b1b57487  Private.SourceBuilt.Artifacts.7.0.102.noextract
-2ede8d9352a51861a5b2550010ff55da8241381a6fa6cc49e025f1c289b230b8c0177e93850de4ea8b6f702c1f2d50d81a9f4d890ca9441c257b614f2a5e05dd  stylecop.analyzers.1.2.0-beta.435.nupkg
+094265462d66d97b51ebfbe5fb06d4a679b97881f1f5a07a87a282a96eeaabfe97ca42061d59aac71dd8861c07f07dda16a72e29ae03167407e51d3fd2767562  dotnet-tarball-v8.0.0.tar.gz
+55f2c56f7fbed4137ebe5e81c7b86d199d7ff91c6e19fbc9a4af8cd5d0f0195273356ead8b80aedfff56a3d704a541a7c2a7395bec3fa5d6585f3afd056b1220  dotnet-release-v8.0.0.json
+a904491cf1fe27603cfc21aa234b2f4da7517929fa9dad0eaa2233d010ef1e890339ca4b8e3c4c0d463f3015d7020a0c37ece97319b061cd92a5fc51cd8a7f4c  dotnet-sdk-8.0.100-linux-musl-x64.noextract
+1d8e54ab8d2b7b83972c1ecd7a23073bf83d39c258e993e54ab91a383ad2aa44276dfc28938f7b162cf79010187005e42a665933dff021ffa5e5d9cfadb5e2b6  dotnet-sdk-8.0.100-linux-musl-arm64.noextract
+a8c08c4eaaa1ade3a1521750c62af92ab8fe91bfdd0f4767f8c0469ebfef091f3a68a443d4566bbfe53c49866d72a104c7aea309cabb36148f9aef9cb950ea64  dotnet-sdk-8.0.100-linux-musl-arm.noextract
+d0bebb6179e679dea5704ca59acb2260a3dde2d22727b8116b57fbcfc3cba7b31581ed785279eec2836e3916608f39fa45a8e26dfa27063928355ccda83b3d09  dotnet-sdk-8.0.100-r0-linux-musl-s390x.noextract
+14fdc6c8225010a6028609ed2b7c942abc770a50167429116ab9d5f0cabfe8038aedb89b7cc984d89c3366351302a86e10c2d5cfccd57399cc42b3c838bc37a0  dotnet-sdk-8.0.100-r0-linux-musl-ppc64le.noextract
+a9933d8de614e914d42cf4953ac60a0a6e83e4276328b838fb369fb3036073fd08d2bcbcee07386f65f802f2f2374e45b44b8f8410396a7d93d20e53646d72f0  Private.SourceBuilt.Artifacts.8.0.100-rtm.23551.1.centos.8-x64.noextract
+48d155f11c4594eeb72b2d80a6e110ab2b093fd2379e9ddcca755072f4a3e64990ef2620709e0b10ea4b979d8909de56d89f970c349c6fee58621a8f6b415a1c  build_fix-ga-versions.patch
+6f23b53b1408dc676434d3ee417b735af033f2717057589e93d26021ca2513d13f40ba7ea3312413f2ed79cda2991538f64b4c835e75f40f5a5e5a0e469c4ec0  installer_aspire-manifest-version-fix.patch
 b6a2dfeccac329546f87f1019c1f2cf07e2f294dd33914449ad08d92269c8713b6fa1e330ef257c24e189023fd0b824df97688b0ba6e578a6d0292b07a72b4c1  installer_set-crossgen2rid-using-buildarchitecture.patch
-43355fdb9531a08a9a141b016c049cc61d779e797f182456f56e5dc3af76fd31643d84d7ad7982080921681d2bbfc7bbaaa64f50c3899b023222eb0d841fbb2a  runtime_76500-mono-musl-support.patch
-24f3fed752922d2ca3c151f21fedf6a257c7c74a155105a1aa09cdc847ba24e496212cb2d8548b134a8901c7da8d78c27fa93579211f7bdeadc598f808fed4a8  runtime_76500-properly-set-toolchain-for-alpine.patch
 d732df247c721c9f677baabdd7f36dbf4b564814ff64164361065bb1c196b767494a1d39f634eadf01a23032c7b3e64102614b7213065c81096bbf3f8022e6a0  runtime_82269-mono-thread-coop-undefine-fortify-source.patch
-2dd195d5275245fe85bea2f75019fd3cbadcef7f5691b44c08db470265c6e7fcb2a50b3276a96df7547af76953623fdc92bd1ad51ccef6738813b78d22327fa3  runtime_83682-specify-notext-on-linux-musl-x86.patch
-2ed962096eb9d8ae61831d224ceb05b8f77f5692f38a3457048d1b4abef705e8e4f676b81bb1a833e338e75ac8dc80b0631b1a45ad9a15c5597740b7320bfbb5  runtime_84413-support-adding-rids-with-dash-in-base-part.patch
-929d5be2e4a213ad726652c24478e45abe1bf1d444c01a8975da007f246cb056916ad4681e541436faa89447e35c5e0a6101ae4ecaecc8083155b04e7138beb8  runtime_84444-suppress-clang-16-warnings.patch
-1f7be536c4826638853f110ee88bbd554be015cc88c6491c1066830789be18ad324f8ed2b1b75ed7aad74457dcafc812730059cb25d36d6344bfae8a517c00c4  runtime_enable-runtime-marshalling.diff
-d972e77df27748a80c9b23eca12f9fbd78be97f9034b79cc5703ba58eb6750171d9a115314300f883620ccbca89c65a99ca7a45d54a421b028b590190b4bed80  runtime_remove-usage-of-off64-t.patch
+c983a1ab7f06ac86691e0fa7a61fcad69a074d984ef4a4116bee43f20be918215963c7ec8ddd7edd70432b29b160ff78288183acc89fda15ce4a75bfdbf99ee3  runtime_83682-specify-notext-on-linux-musl-x86.patch
+3354fa721809f1b94c579408ee78004ff3ca2ba79212c1a0ecc424a9955bb5d5a80c115d4c30dd257526f356ea76f0562db6f83d8dd0b6135f8c689886b3348d  runtime_90251-rename-mono-cmake-host-var.patch
+887112eb2b103eadd6887529ebae7f9a75df2c2cb168e84fd40cc09f9bcd20917d428bbba06968b07b0a463890da82b1b2b1d033a3dd016e6494067464ae6f74  runtime_more-clang-16-suppression.patch
+0c25319125ef5b0ad490b37a643c0c5257c796d5ed24f9ac404f698710b07de790bcbb0b6336d4a50025b94c3bff99b214951bd8f0a79a8d6f543ebaa300740f  runtime_remove-usage-of-off64-t.patch
 "
--- a/community/dotnet7-stage0/README.md
+++ b/community/dotnet7-stage0/README.md
@ -1,17 +1,17 @@
-# dotnet7-stage0
+# dotnet8-stage0

-This is the .NET 7.0 package for Alpine Linux.
+This is the .NET 8.0 package for Alpine Linux.

 Please report any issues [using Gitlab](https://gitlab.alpinelinux.org/alpine/aports/-/issues/new) and tag @ayakael

 # Building info

 ## Generated packages
-* `dotnet7` (empty package to go around `buildrepo` build ordering bug)
-* `dotnet7-stage0-bootstrap` (packages binary bootstrap artifacts)
-* `dotnet7-stage0-artifacts` (packages non-binary bootstrap artifacts)
+* `dotnet8` (empty package to go around `buildrepo` build ordering bug)
+* `dotnet8-stage0-bootstrap` (packages binary bootstrap artifacts)
+* `dotnet8-stage0-artifacts` (packages non-binary bootstrap artifacts)

-## How to build dotnet7 on Alpine
+## How to build dotnet8 on Alpine
 As dotnet is a self-hosting compiler (thus it compiles using itself), it
 requires a bootstrap for the initial build. To solve this problem, this package
 follows the `stage0` proposal outlined [here](https://lists.alpinelinux.org/~alpine/devel/%3C33KG0XO61I4IL.2Z7RTAZ5J3SY6%408pit.net%3E)
@ -22,17 +22,20 @@ builds bootstraps for Alpine on `x86_64`, `aarch64`, and `armv7`. Thus, `stage0`
 has also been designed to be crossbuild aware, allowing bootstrapping to other
 platforms.

-In summary, dotnet7 is built using three different aports.
+In summary, dotnet8 is built using three different aports.

-* `community/dotnet7-stage0`
-Builds minimum components for full build of dotnet7, and packages these in an initial 
-`dotnet7-stage0-bootstrap` package that `dotnet7-build` pulls.
-* `community/dotnet7-build`
-Builds full and packages dotnet7 fully using either stage0 or previoulsy built
-dotnet7 build.
-* `community/dotnet7-runtime`
+* `community/dotnet8-stage0`
+Builds minimum components for full build of dotnet8, and packages these in an initial 
+`dotnet8-stage0-bootstrap` package that `dotnet8-runtime` pulls.
+* `community/dotnet8-runtime`
+Builds full and packages dotnet8 fully using either stage0 or previoulsy built
+dotnet8 build.
+* `community/dotnet8-sdk`
 As abuild does not allow different versions for subpackages, a different aport
-is required to package runtime bits from dotnet7-build.
+is required to package runtime bits from dotnet8-runtime. dotnet8-runtime only
+builds 8.0.1xx feature branch of SDK. Thus, when a new feature branch of sdk is
+released, the updated components are to be built on dotnet8-sdk rather than
+simply repackaging dotnet8-runtime artifacts.

 ## Crossbuilding with `stage0`
 Crossbuilding `stage0` is a three step process:
@ -44,7 +47,7 @@ Crossbuilding `stage0` is a three step process:
   `$HOME/sysroot-$CTARGET_ARCH/etc/apk/repositories`, making sure to add required
   keys. This makes it so that whatever package is not built in step 1 will
   be pulled from package repos
-3. Crossbuild `dotnet7-stage0` via:
+3. Crossbuild `dotnet8-stage0` via:
 ```
 CHOST=$CTARGET_ARCH abuild -r
 ```
@ -53,7 +56,7 @@ CHOST=$CTARGET_ARCH abuild -r

 This package follows [package naming and contents suggested by upstream](https://docs.microsoft.com/en-us/dotnet/core/build/distribution-packaging),
 with two exceptions. It installs dotnet to `/usr/lib/dotnet` (aka `$_libdir`). 
-In addition, the package is named `dotnet7` as opposed to `dotnet-7.0`
+In addition, the package is named `dotnet8` as opposed to `dotnet-8.0`
 to match Alpine Linux naming conventions for packages with many installable versions

 # Contributing
@ -69,7 +72,7 @@ follow.
 2. Checkout the forked repository.

    - `git clone ssh://git@gitlab.alpinelinux.org/$USER/aports`
-    - `cd community/dotnet7-build`
+    - `cd community/dotnet8-runtime`

 3. Make your changes. Don't forget to add a changelog.

@ -81,10 +84,10 @@ follow.

 6. Commit the changes to the git repo in a git branch

-    - `git checkout -b dotnet7/<name>`
+    - `git checkout -b dotnet8/<name>`
    - `git add` any new patches
    - `git remove` any now-unnecessary patches
-    - `git commit -m 'community/dotnet7-build: descriptive description'`
+    - `git commit -m 'community/dotnet8-runtime: descriptive description'`
    - `git push`

 7. Create a merge request with your changes, tagging @ayakael for review.
@ -99,7 +102,7 @@ follow.
 2. Checkout the forked repository.

    - `git clone ssh://git@gitlab.alpinelinux.org/$USER/aports`
-    - `cd community/dotnet7-build`
+    - `cd community/dotnet8-runtime`


 3. Build the new upstream source tarball. Update the versions in the
@ -120,10 +123,10 @@ follow.

 7. Commit the changes to the git repo in a git branch.

-    - `git checkout -b dotnet7/<name>`	
+    - `git checkout -b dotnet8/<name>`	
    - `git add` any new patches
    - `git remove` any now-unnecessary patches
-    - `git commit -m 'community/dotnet7-build: upgrade to <new-version>`
+    - `git commit -m 'community/dotnet8-runtime: upgrade to <new-version>`
    - `git push`

 8. Create a merge request with your changes, tagging @ayakael for review.
--- a/community/dotnet7-stage0/build_fix-ga-versions.patch
+++ b/community/dotnet7-stage0/build_fix-ga-versions.patch
@ -0,0 +1,32 @@
+diff --git a/prereqs/git-info/runtime.props.orig b/prereqs/git-info/runtime.props
+index f9dc4d6..093bd00 100644
+--- a/prereqs/git-info/runtime.props.orig
+++ b/prereqs/git-info/runtime.props
+@@ -3,8 +3,8 @@
+   <PropertyGroup>
+     <GitCommitHash>5535e31a712343a63f5d7d796cd874e563e5ac14</GitCommitHash>
+     <OfficialBuildId>20231031.3</OfficialBuildId>
+-    <OutputPackageVersion>8.0.0-rtm.23531.3</OutputPackageVersion>
+    <OutputPackageVersion>8.0.0</OutputPackageVersion>
+     <PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
+     <IsStable>false</IsStable>
+   </PropertyGroup>
+-</Project>
+\ No newline at end of file
+</Project>
+diff --git a/prereqs/git-info/aspnetcore.props.orig b/prereqs/git-info/aspnetcore.props
+index d1494e8..b83649d 100644
+--- a/prereqs/git-info/aspnetcore.props.orig
+++ b/prereqs/git-info/aspnetcore.props
+@@ -3,8 +3,8 @@
+   <PropertyGroup>
+     <GitCommitHash>3f1acb59718cadf111a0a796681e3d3509bb3381</GitCommitHash>
+     <OfficialBuildId>20231031.12</OfficialBuildId>
+-    <OutputPackageVersion>8.0.0-rtm.23531.12</OutputPackageVersion>
+    <OutputPackageVersion>8.0.0</OutputPackageVersion>
+     <PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
+     <IsStable>false</IsStable>
+   </PropertyGroup>
+-</Project>
+\ No newline at end of file
+</Project>
--- a/community/dotnet7-stage0/installer_aspire-manifest-version-fix.patch
+++ b/community/dotnet7-stage0/installer_aspire-manifest-version-fix.patch
@ -0,0 +1,26 @@
+diff --git a/./src/installer/eng/Version.Details.xml.orig b/./src/installer/eng/Version.Details.xml
+index a1cebfe..3f47a7f 100644
+--- a/./src/installer/eng/Version.Details.xml.orig
+++ b/./src/installer/eng/Version.Details.xml
+@@ -172,7 +172,7 @@
+       <Uri>https://github.com/dotnet/emsdk</Uri>
+       <Sha>2406616d0e3a31d80b326e27c156955bfa41c791</Sha>
+     </Dependency>
+-    <Dependency Name="Microsoft.NET.Sdk.Aspire.Manifest-8.0.100" Version="8.0.0-preview.1.23551.7">
+    <Dependency Name="Microsoft.NET.Sdk.Aspire.Manifest-8.0.100" Version="8.0.0-preview.1.23557.2">
+       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspire</Uri>
+       <Sha>4b00c57d7ccf9a4c7e2aef211ab6bd8af3ee2324</Sha>
+       <SourceBuild RepoName="aspire" ManagedOnly="true" />
+diff --git a/./src/installer/eng/Versions.props.orig b/./src/installer/eng/Versions.props
+index 329ab4e..897263d 100644
+--- a/./src/installer/eng/Versions.props.orig
+++ b/./src/installer/eng/Versions.props
+@@ -238,7 +238,7 @@
+   <!-- Workload manifest package versions -->
+   <PropertyGroup>
+     <AspireFeatureBand>8.0.100</AspireFeatureBand>
+-    <AspireWorkloadManifestVersion>8.0.0-preview.1.23551.7</AspireWorkloadManifestVersion>
+    <AspireWorkloadManifestVersion>8.0.0-preview.1.23557.2</AspireWorkloadManifestVersion>
+     <MauiFeatureBand>8.0.100-rc.2</MauiFeatureBand>
+     <MauiWorkloadManifestVersion>8.0.0-rc.2.9373</MauiWorkloadManifestVersion>
+     <XamarinAndroidWorkloadManifestVersion>34.0.0-rc.2.468</XamarinAndroidWorkloadManifestVersion>
--- a/community/dotnet7-stage0/runtime_76500-mono-musl-support.patch
+++ b/community/dotnet7-stage0/runtime_76500-mono-musl-support.patch
@ -1,325 +0,0 @@
-From 98054ea87ce70247bb09ceafd2ad1a0b36d2fef4 Mon Sep 17 00:00:00 2001
-Patch-Source: https://github.com/dotnet/runtime/pull/76500
-From: Antoine Martin <dev@ayakael.net>
-Date: Sat, 1 Oct 2022 09:21:58 -0400
-Subject: [PATCH] Mono musl support
-
---
- Directory.Build.props                    |  1 +
- eng/common/cross/toolchain.cmake         | 38 +++++++++++++++++++-----
- eng/native/configurecompiler.cmake       |  7 +++++
- eng/native/tryrun.cmake                  |  6 +++-
- src/coreclr/pal/src/CMakeLists.txt       |  5 ++++
- src/coreclr/pal/src/misc/perfjitdump.cpp |  2 +-
- src/coreclr/vm/i386/cgenx86.cpp          |  4 +++
- src/mono/CMakeLists.txt                  | 33 ++++++++++++++++++++
- src/mono/mono.proj                       | 32 +++++++++++++-------
- src/mono/mono/mini/mini-runtime.c        | 29 ++++++++++++++++++
- src/mono/mono/utils/mono-context.h       |  8 +++++
- 11 files changed, 146 insertions(+), 19 deletions(-)
-
-diff --git a/src/runtime/Directory.Build.props b/src/runtime/Directory.Build.props
-index 6f9b97c0a9c..4298a6df1d3 100644
--- a/src/runtime/Directory.Build.props
-+++ b/src/runtime/Directory.Build.props
-@@ -22,7 +22,6 @@
-     <TargetOS Condition="'$(TargetOS)' == ''">$(_hostOS)</TargetOS>
-     <TargetsMobile Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'Browser'">true</TargetsMobile>
-     <TargetsAppleMobile Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator'">true</TargetsAppleMobile>
-    <TargetsLinuxBionic Condition="$(OutputRid.StartsWith('linux-bionic'))">true</TargetsLinuxBionic>
-   </PropertyGroup>
- 
-   <!-- Platform property is required by RepoLayout.props in Arcade SDK. -->
-@@ -154,7 +154,7 @@
-     <_runtimeOS Condition="'$(TargetsMobile)' == 'true'">$(TargetOS.ToLowerInvariant())</_runtimeOS>
- 
-     <_portableOS>linux</_portableOS>
-    <_portableOS Condition="'$(_runtimeOS)' == 'linux-musl'">linux-musl</_portableOS>
-+    <_portableOS Condition="'$(_runtimeOS)' == 'linux-musl' or $(_runtimeOS.StartsWith('alpine'))">linux-musl</_portableOS>
-     <_portableOS Condition="'$(_runtimeOS)' == 'linux-bionic'">linux-bionic</_portableOS>
-     <_portableOS Condition="'$(_hostOS)' == 'OSX'">osx</_portableOS>
-     <_portableOS Condition="'$(_runtimeOS)' == 'win' or '$(TargetOS)' == 'windows'">win</_portableOS>
-@@ -200,6 +199,9 @@
- 
-     <OutputRid Condition="'$(OutputRid)' == ''">$(PackageRID)</OutputRid>
-     <OutputRid Condition="'$(PortableBuild)' == 'true'">$(_portableOS)-$(TargetArchitecture)</OutputRid>
-+
-+    <TargetsLinuxBionic Condition="$(OutputRid.StartsWith('linux-bionic'))">true</TargetsLinuxBionic>
-+    <TargetsLinuxMusl Condition="'$(_portableOS)' == 'linux-musl'">true</TargetsLinuxMusl>
-   </PropertyGroup>
- 
-   <PropertyGroup Label="CalculateTargetOSName" Condition="'$(SkipInferTargetOSName)' != 'true'">
-diff --git a/src/runtime/eng/native/tryrun.cmake b/src/runtime/eng/native/tryrun.cmake
-index 6355b0988f7..056c6606b17 100644
--- a/src/runtime/eng/native/tryrun.cmake
-+++ b/src/runtime/eng/native/tryrun.cmake
-@@ -8,7 +8,11 @@ endmacro()
- 
- if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv7-alpine-linux-musleabihf OR
-    EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv6-alpine-linux-musleabihf OR
-   EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/aarch64-alpine-linux-musl)
-+   EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/aarch64-alpine-linux-musl OR
-+   EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/s390x-alpine-linux-musl OR
-+   EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/ppc64le-alpine-linux-musl OR
-+   EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl OR
-+   EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/riscv64-alpine-linux-musl)
- 
-   set(ALPINE_LINUX 1)
- elseif(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version)
-diff --git a/src/runtime/src/coreclr/pal/src/CMakeLists.txt b/src/runtime/src/coreclr/pal/src/CMakeLists.txt
-index d9726460ccf..c28563f8619 100644
--- a/src/runtime/src/coreclr/pal/src/CMakeLists.txt
-+++ b/src/runtime/src/coreclr/pal/src/CMakeLists.txt
-@@ -315,6 +315,11 @@ if(CLR_CMAKE_TARGET_LINUX)
-     target_link_libraries(coreclrpal ${UNWIND_LIBS})
-   endif(CLR_CMAKE_USE_SYSTEM_LIBUNWIND)
- 
-+  # bundled libunwind requires using libucontext on alpine and x86 and ppc64le
-+  if(CLR_CMAKE_TARGET_ALPINE_LINUX AND (CLR_CMAKE_TARGET_ARCH_I386 OR CLR_CMAKE_TARGET_ARCH_POWERPC64))
-+    target_link_libraries(coreclrpal ucontext)
-+  endif(CLR_CMAKE_TARGET_ALPINE_LINUX AND (CLR_CMAKE_TARGET_ARCH_I386 OR CLR_CMAKE_TARGET_ARCH_POWERPC64))
-+
- endif(CLR_CMAKE_TARGET_LINUX)
- 
- if(CLR_CMAKE_TARGET_NETBSD)
-diff --git a/src/runtime/src/coreclr/pal/src/misc/perfjitdump.cpp b/src/runtime/src/coreclr/pal/src/misc/perfjitdump.cpp
-index 8d7f79ed3f0..043939ad2da 100644
--- a/src/runtime/src/coreclr/pal/src/misc/perfjitdump.cpp
-+++ b/src/runtime/src/coreclr/pal/src/misc/perfjitdump.cpp
-@@ -25,7 +25,7 @@
- #include <sys/uio.h>
- #include <time.h>
- #include <unistd.h>
-#include <linux/limits.h>
-+#include <limits.h>
- 
- #include "../inc/llvm/ELF.h"
- 
-diff --git a/src/runtime/src/coreclr/vm/i386/cgenx86.cpp b/src/runtime/src/coreclr/vm/i386/cgenx86.cpp
-index 811c84a140d..4e958a44b30 100644
--- a/src/runtime/src/coreclr/vm/i386/cgenx86.cpp
-+++ b/src/runtime/src/coreclr/vm/i386/cgenx86.cpp
-@@ -1133,6 +1133,7 @@ extern "C" DWORD __stdcall avx512StateSupport()
- 
- #else // !TARGET_UNIX
- 
-+#if !__has_builtin(__cpuid)
- void __cpuid(int cpuInfo[4], int function_id)
- {
-     // Based on the Clang implementation provided in cpuid.h:
-@@ -1143,7 +1144,9 @@ void __cpuid(int cpuInfo[4], int function_id)
-         : "0"(function_id)
-     );
- }
-+#endif
- 
-+#if !__has_builtin(__cpuidex)
- void __cpuidex(int cpuInfo[4], int function_id, int subFunction_id)
- {
-     // Based on the Clang implementation provided in cpuid.h:
-@@ -1154,6 +1157,7 @@ void __cpuidex(int cpuInfo[4], int function_id, int subFunction_id)
-         : "0"(function_id), "2"(subFunction_id)
-     );
- }
-+#endif
- 
- extern "C" DWORD __stdcall xmmYmmStateSupport()
- {
-diff --git a/src/runtime/src/mono/CMakeLists.txt b/src/runtime/src/mono/CMakeLists.txt
-index cdff32677c0..08a82cd7e83 100644
--- a/src/runtime/src/mono/CMakeLists.txt
-+++ b/src/runtime/src/mono/CMakeLists.txt
-@@ -216,6 +216,35 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-   # Enable the "full RELRO" options (RELRO & BIND_NOW) at link time
-   add_link_options(-Wl,-z,relro)
-   add_link_options(-Wl,-z,now)
-+  # Detect Linux ID
-+  # TODO: Eventually merge with eng/native/configureplatform.cmake
-+  set(LINUX_ID_FILE "/etc/os-release")
-+  if(CMAKE_CROSSCOMPILING)
-+      set(LINUX_ID_FILE "${CMAKE_SYSROOT}${LINUX_ID_FILE}")
-+  endif()
-+
-+  if(EXISTS ${LINUX_ID_FILE})
-+      execute_process(
-+          COMMAND bash -c "source ${LINUX_ID_FILE} && echo \$ID"
-+          OUTPUT_VARIABLE CLR_CMAKE_LINUX_ID
-+          OUTPUT_STRIP_TRAILING_WHITESPACE)
-+
-+      execute_process(
-+          COMMAND bash -c "if strings \"${CMAKE_SYSROOT}/usr/bin/ldd\" 2>&1 | grep -q musl; then echo musl; fi"
-+          OUTPUT_VARIABLE CLR_CMAKE_LINUX_MUSL
-+          OUTPUT_STRIP_TRAILING_WHITESPACE)
-+  endif()
-+
-+  if(DEFINED CLR_CMAKE_LINUX_ID)
-+      if(CLR_CMAKE_LINUX_ID STREQUAL alpine)
-+          set(CLR_CMAKE_HOST_ALPINE_LINUX 1)
-+          set(CLR_CMAKE_HOST_OS ${CLR_CMAKE_LINUX_ID})
-+      endif()
-+
-+      if(CLR_CMAKE_LINUX_MUSL STREQUAL musl)
-+          set(CLR_CMAKE_HOST_LINUX_MUSL 1)
-+      endif()
-+  endif(DEFINED CLR_CMAKE_LINUX_ID)
- elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
-   set(HOST_LINUX 1)
-   add_definitions(-D_GNU_SOURCE -D_REENTRANT)
-@@ -893,6 +922,12 @@ if(HOST_IOS OR HOST_ANDROID OR HOST_MACCAT)
- else()
-   set(DISABLE_DLLMAP 1)
- endif()
-+
-+if(CLR_CMAKE_HOST_ALPINE_LINUX)
-+  # On Alpine Linux, we need to ensure that the reported stack range for the primary thread is
-+  # larger than the initial committed stack size.
-+  add_definitions(-DENSURE_PRIMARY_STACK_SIZE)
-+endif()
- ### End of OS specific checks
- 
- include_directories("${CLR_SRC_NATIVE_DIR}")
-diff --git a/src/runtime/src/mono/mono.proj b/src/runtime/src/mono/mono.proj
-index 59fea4a2f72..5bac7fdf1c6 100644
--- a/src/runtime/src/mono/mono.proj
-+++ b/src/runtime/src/mono/mono.proj
-@@ -554,19 +560,21 @@
-       <MonoToolchainPrebuiltOS Condition="$([MSBuild]::IsOSPlatform('OSX'))">darwin-x86_64</MonoToolchainPrebuiltOS>
-       <MonoToolchainPrebuiltOS Condition="'$(HostOS)' == 'windows'">windows-x86_64</MonoToolchainPrebuiltOS>
-       <_MonoRuntimeFilePath>$(MonoObjDir)out\lib\$(MonoFileName)</_MonoRuntimeFilePath>
-      <_LinuxAbi Condition="'$(TargetsAndroid)' != 'true' and '$(TargetsLinuxBionic)' != 'true'">gnu</_LinuxAbi>
-      <_LinuxAbi Condition="'$(TargetsAndroid)' == 'true' or '$(TargetsLinuxBionic)' == 'true'">android</_LinuxAbi>
-+      <_LinuxAbi Condition="'$(TargetsAndroid)' != 'true' and '$(TargetsLinuxBionic)' != 'true' and '$(TargetsLinuxMusl)' != 'true'">linux-gnu</_LinuxAbi>
-+      <_LinuxAbi Condition="'$(TargetsAndroid)' != 'true' and '$(TargetsLinuxBionic)' != 'true' and '$(TargetsLinuxMusl)' == 'true'">alpine-linux-musl</_LinuxAbi>
-+      <_LinuxAbi Condition="'$(TargetsAndroid)' == 'true' or '$(TargetsLinuxBionic)' == 'true'">linux-android</_LinuxAbi>
-       <_LinuxFloatAbi Condition="'$(TargetsAndroid)' != 'true' and '$(TargetsLinuxBionic)' != 'true'">hf</_LinuxFloatAbi>
-       <_Objcopy>objcopy</_Objcopy>
-      <_Objcopy Condition="'$(Platform)' == 'arm'">arm-linux-$(_LinuxAbi)eabi$(_LinuxFloatAbi)-$(_Objcopy)</_Objcopy>
-      <_Objcopy Condition="'$(Platform)' == 'armv6'">arm-linux-$(_LinuxAbi)eabi$(_LinuxFloatAbi)-$(_Objcopy)</_Objcopy>
-      <_Objcopy Condition="'$(Platform)' == 'arm64'">aarch64-linux-$(_LinuxAbi)-$(_Objcopy)</_Objcopy>
-      <_Objcopy Condition="'$(Platform)' == 'riscv64'">riscv64-linux-$(_LinuxAbi)-$(_Objcopy)</_Objcopy>
-      <_Objcopy Condition="'$(Platform)' == 's390x'">s390x-linux-$(_LinuxAbi)-$(_Objcopy)</_Objcopy>
-      <_Objcopy Condition="'$(Platform)' == 'ppc64le'">powerpc64le-linux-$(_LinuxAbi)-$(_Objcopy)</_Objcopy>
-      <_Objcopy Condition="'$(Platform)' == 'x64'">x86_64-linux-$(_LinuxAbi)-$(_Objcopy)</_Objcopy>
-      <_Objcopy Condition="'$(Platform)' == 'x86'">i686-linux-$(_LinuxAbi)-$(_Objcopy)</_Objcopy>
-+      <_Objcopy Condition="'$(Platform)' == 'arm'">arm-$(_LinuxAbi)eabi$(_LinuxFloatAbi)-$(_Objcopy)</_Objcopy>
-+      <_Objcopy Condition="'$(Platform)' == 'armv6'">arm-$(_LinuxAbi)eabi$(_LinuxFloatAbi)-$(_Objcopy)</_Objcopy>
-+      <_Objcopy Condition="'$(Platform)' == 'arm64'">aarch64-$(_LinuxAbi)-$(_Objcopy)</_Objcopy>
-+      <_Objcopy Condition="'$(Platform)' == 'riscv64'">riscv64-$(_LinuxAbi)-$(_Objcopy)</_Objcopy>
-+      <_Objcopy Condition="'$(Platform)' == 's390x'">s390x-$(_LinuxAbi)-$(_Objcopy)</_Objcopy>
-+      <_Objcopy Condition="'$(Platform)' == 'ppc64le'">powerpc64le-$(_LinuxAbi)-$(_Objcopy)</_Objcopy>
-+      <_Objcopy Condition="'$(Platform)' == 'x64'">x86_64-$(_LinuxAbi)-$(_Objcopy)</_Objcopy>
-+      <_Objcopy Condition="'$(Platform)' == 'x86'">i686-$(_LinuxAbi)-$(_Objcopy)</_Objcopy>
-       <_Objcopy Condition="'$(TargetsAndroid)' == 'true' or '$(TargetsLinuxBionic)' == 'true'">$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/$(MonoToolchainPrebuiltOS)/bin/llvm-objcopy</_Objcopy>
-+      <_Objcopy Condition="'$(TargetsLinuxMusl)' == 'true' and '$(CrossBuild)' != 'true'">objcopy</_Objcopy>
- 
-       <_ObjcopyPrefix Condition="'$(MonoCrossDir)' != '' and '$(Platform)' == 'riscv64'">llvm-objcopy-</_ObjcopyPrefix>
-     </PropertyGroup>
-diff --git a/src/runtime/src/mono/mono/mini/CMakeLists.txt b/src/runtime/src/mono/mono/mini/CMakeLists.txt
-index 30df4bac1f7..8698fd81206 100644
--- a/src/runtime/src/mono/mono/mini/CMakeLists.txt
-+++ b/src/runtime/src/mono/mono/mini/CMakeLists.txt
-@@ -368,6 +368,11 @@ if(NOT DISABLE_SHARED_LIBS)
-   target_sources(monosgen-shared PRIVATE $<TARGET_OBJECTS:eglib_objects>)
-   set_target_properties(monosgen-shared PROPERTIES OUTPUT_NAME ${MONO_SHARED_LIB_NAME})
-   target_link_libraries (monosgen-shared PRIVATE monoapi)
-+  # Alpine Linux implements ucontext in a different library
-+  if(CLR_CMAKE_HOST_ALPINE_LINUX AND TARGET_S390X)
-+    target_link_libraries(monosgen-shared PRIVATE ucontext)
-+  endif(CLR_CMAKE_HOST_ALPINE_LINUX AND TARGET_S390X)
-+
-   target_include_directories (monosgen-shared PRIVATE monoapi)
-   if(TARGET_WIN32)
-     # on Windows the import library for the shared mono library will have the same name as the static library,
-@@ -527,6 +532,10 @@ if(NOT DISABLE_EXECUTABLES)
-     set_target_properties(mono-sgen PROPERTIES OUTPUT_NAME mono-aot-cross)
-   endif()
-   target_link_libraries(mono-sgen PRIVATE monoapi monosgen-static ${OS_LIBS} ${LLVM_LIBS} ${ICU_LIBS} ${Z_LIBS})
-+  # Alpine Linux implements ucontext in a different library
-+  if(CLR_CMAKE_HOST_ALPINE_LINUX AND TARGET_S390X)
-+    target_link_libraries(mono-sgen PRIVATE ucontext)
-+  endif(CLR_CMAKE_HOST_ALPINE_LINUX AND TARGET_S390X)
-   if(NOT DISABLE_COMPONENTS AND STATIC_COMPONENTS AND NOT DISABLE_LINK_STATIC_COMPONENTS)
-     # if components are built statically, link them into runtime.
-     target_sources(mono-sgen PRIVATE "${mono-components-objects}")
-diff --git a/src/runtime/src/mono/mono/mini/mini-runtime.c b/src/runtime/src/mono/mono/mini/mini-runtime.c
-index c481f69adc8..4db6c9a0ae7 100644
--- a/src/runtime/src/mono/mono/mini/mini-runtime.c
-+++ b/src/runtime/src/mono/mono/mini/mini-runtime.c
-@@ -4383,6 +4383,30 @@ mini_llvm_init (void)
- #endif
- }
- 
-+#ifdef ENSURE_PRIMARY_STACK_SIZE
-+/*++ 
-+ Function: 
-+   EnsureStackSize 
-+  
-+ Abstract: 
-+   This fixes a problem on MUSL where the initial stack size reported by the 
-+   pthread_attr_getstack is about 128kB, but this limit is not fixed and 
-+   the stack can grow dynamically. The problem is that it makes the 
-+   functions ReflectionInvocation::[Try]EnsureSufficientExecutionStack 
-+   to fail for real life scenarios like e.g. compilation of corefx. 
-+   Since there is no real fixed limit for the stack, the code below 
-+   ensures moving the stack limit to a value that makes reasonable 
-+   real life scenarios work. 
-+  
-+ --*/
-+static MONO_NO_OPTIMIZATION MONO_NEVER_INLINE void
-+ensure_stack_size (size_t size)
-+{
-+	volatile uint8_t *s = (uint8_t *)g_alloca(size);
-+	*s = 0;
-+}
-+#endif // ENSURE_PRIMARY_STACK_SIZE
-+
- void
- mini_add_profiler_argument (const char *desc)
- {
-@@ -4544,6 +4568,11 @@ mini_init (const char *filename)
- 	mono_w32handle_init ();
- #endif
- 
-+#ifdef ENSURE_PRIMARY_STACK_SIZE 
-+	// TODO: https://github.com/dotnet/runtime/issues/72920
-+	ensure_stack_size (5 * 1024 * 1024);
-+#endif // ENSURE_PRIMARY_STACK_SIZE
-+
- 	mono_thread_info_runtime_init (&ticallbacks);
- 
- 	if (g_hasenv ("MONO_DEBUG")) {
-diff --git a/src/runtime/src/mono/mono/utils/mono-context.h b/src/runtime/src/mono/mono/utils/mono-context.h
-index a1f0fe6f68e..a9db2d336ca 100644
--- a/src/runtime/src/mono/mono/utils/mono-context.h
-+++ b/src/runtime/src/mono/mono/utils/mono-context.h
-@@ -11,6 +11,14 @@
- #ifndef __MONO_MONO_CONTEXT_H__
- #define __MONO_MONO_CONTEXT_H__
- 
-+/* 
-+ * Handle non-gnu libc versions with nothing in features.h 
-+ * We have no idea what they're compatible with, so always fail.
-+ */
-+#ifndef __GLIBC_PREREQ
-+# define __GLIBC_PREREQ(x,y) 0
-+#endif
-+
- #include "mono-compiler.h"
- #include "mono-sigcontext.h"
- #include "mono-machine.h"
-diff --git a/src/runtime/src/native/libs/System.Native/pal_io.c b/src/runtime/src/native/libs/System.Native/pal_io.c
-index 0929a0b49ec..86311e19507 100644
--- a/src/runtime/src/native/libs/System.Native/pal_io.c
-+++ b/src/runtime/src/native/libs/System.Native/pal_io.c
-@@ -1267,7 +1267,7 @@ int32_t SystemNative_CopyFile(intptr_t sourceFd, intptr_t destinationFd, int64_t
-     // Try copying data using a copy-on-write clone. This shares storage between the files.
-     if (sourceLength != 0)
-     {
-        while ((ret = ioctl(outFd, FICLONE, inFd)) < 0 && errno == EINTR);
-+        while ((ret = ioctl(outFd, (int)FICLONE, inFd)) < 0 && errno == EINTR);
-         copied = ret == 0;
-     }
- #endif
-- 
-2.36.3
-
--- a/community/dotnet7-stage0/runtime_76500-properly-set-toolchain-for-alpine.patch
+++ b/community/dotnet7-stage0/runtime_76500-properly-set-toolchain-for-alpine.patch
@ -1,97 +0,0 @@
-From 98054ea87ce70247bb09ceafd2ad1a0b36d2fef4 Mon Sep 17 00:00:00 2001
-Patch-Source: https://github.com/dotnet/arcade/pull/11608
-From: Antoine Martin <dev@ayakael.net>
-Date: Sat, 1 Oct 2022 09:21:58 -0400
-Subject: [PATCH] Mono musl support
-
---
- Directory.Build.props                    |  1 +
- eng/common/cross/toolchain.cmake         | 38 +++++++++++++++++++-----
- eng/native/configurecompiler.cmake       |  7 +++++
- eng/native/tryrun.cmake                  |  6 +++-
- src/coreclr/pal/src/CMakeLists.txt       |  5 ++++
- src/coreclr/pal/src/misc/perfjitdump.cpp |  2 +-
- src/coreclr/vm/i386/cgenx86.cpp          |  4 +++
- src/mono/CMakeLists.txt                  | 33 ++++++++++++++++++++
- src/mono/mono.proj                       | 32 +++++++++++++-------
- src/mono/mono/mini/mini-runtime.c        | 29 ++++++++++++++++++
- src/mono/mono/utils/mono-context.h       |  8 +++++
- 11 files changed, 146 insertions(+), 19 deletions(-)
-
-diff --git a/src/runtime/eng/common/cross/toolchain.cmake b/src/runtime/eng/common/cross/toolchain.cmake
-index 561576be97c..a9db659f869 100644
--- a/src/runtime/eng/common/cross/toolchain.cmake
-+++ b/src/runtime/eng/common/cross/toolchain.cmake
-@@ -60,13 +60,25 @@ elseif(TARGET_ARCH_NAME STREQUAL "armv6")
-   endif()
- elseif(TARGET_ARCH_NAME STREQUAL "ppc64le")
-   set(CMAKE_SYSTEM_PROCESSOR ppc64le)
-  set(TOOLCHAIN "powerpc64le-linux-gnu")
-+  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/powerpc64le-alpine-linux-musl)
-+    set(TOOLCHAIN "powerpc64le-alpine-linux-musl")
-+  else()
-+    set(TOOLCHAIN "powerpc64le-linux-gnu")
-+  endif()
- elseif(TARGET_ARCH_NAME STREQUAL "riscv64")
-   set(CMAKE_SYSTEM_PROCESSOR riscv64)
-  set(TOOLCHAIN "riscv64-linux-gnu")
-+  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/riscv64-alpine-linux-musl)
-+    set(TOOLCHAIN "riscv64-alpine-linux-musl")
-+  else()	
-+    set(TOOLCHAIN "riscv64-linux-gnu")
-+  endif()
- elseif(TARGET_ARCH_NAME STREQUAL "s390x")
-   set(CMAKE_SYSTEM_PROCESSOR s390x)
-  set(TOOLCHAIN "s390x-linux-gnu")
-+  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/s390x-alpine-linux-musl)
-+    set(TOOLCHAIN "s390x-alpine-linux-musl")
-+  else()
-+    set(TOOLCHAIN "s390x-linux-gnu")
-+  endif()
- elseif(TARGET_ARCH_NAME STREQUAL "x64")
-   set(CMAKE_SYSTEM_PROCESSOR x86_64)
-   if(LINUX)
-@@ -83,7 +95,11 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64")
-   endif()
- elseif(TARGET_ARCH_NAME STREQUAL "x86")
-   set(CMAKE_SYSTEM_PROCESSOR i686)
-  set(TOOLCHAIN "i686-linux-gnu")
-+  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
-+    set(TOOLCHAIN "i586-alpine-linux-musl")
-+  else()
-+    set(TOOLCHAIN "i686-linux-gnu")
-+  endif()
-   if(TIZEN)
-     set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0")
-   endif()
-@@ -253,8 +269,12 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
-     add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
-   endif()
- elseif(TARGET_ARCH_NAME STREQUAL "x86")
-  add_toolchain_linker_flag(-m32)
-
-+  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
-+    add_toolchain_linker_flag("--target=${TOOLCHAIN}")
-+    add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}")
-+  else()
-+    add_toolchain_linker_flag(-m32)
-+  endif()
-   if(TIZEN)
-     add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
-     add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
-@@ -291,7 +311,11 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
-     add_compile_options(-mfloat-abi=softfp)
-   endif()
- elseif(TARGET_ARCH_NAME STREQUAL "x86")
-  add_compile_options(-m32)
-+  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
-+    add_compile_options(--target=${TOOLCHAIN})
-+  else()
-+    add_compile_options(-m32)
-+  endif()
-   add_compile_options(-Wno-error=unused-command-line-argument)
- endif()
- 
-- 
-2.36.3
-
--- a/community/dotnet7-stage0/runtime_83682-specify-notext-on-linux-musl-x86.patch
+++ b/community/dotnet7-stage0/runtime_83682-specify-notext-on-linux-musl-x86.patch
@ -7,18 +7,18 @@ Subject: [PATCH] Specify -z notext on linux-musl-x86
 src/coreclr/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

-diff --git a/src/runtime/src/coreclr/CMakeLists.txt.orig b/src/runtime/src/coreclr/CMakeLists.txt
-index 7d1ce8d..5cacc78 100644
--- a/src/runtime/src/coreclr/CMakeLists.txt.orig
+diff --git a/src/runtime/src/coreclr/CMakeLists.txt b/src/runtime/src/coreclr/CMakeLists.txt
+index 67b773bf78787..87d862a541ae6 100644
+--- a/src/runtime/src/coreclr/CMakeLists.txt
 +++ b/src/runtime/src/coreclr/CMakeLists.txt
-@@ -105,6 +105,10 @@ if(CLR_CMAKE_HOST_UNIX)
+@@ -109,6 +109,10 @@ if(CLR_CMAKE_HOST_UNIX)
         endif()
     endif()
 
 +    if(CLR_CMAKE_TARGET_ALPINE_LINUX AND CLR_CMAKE_TARGET_ARCH_I386)
-+        add_linker_flag(-Wl,-z,notext)
+      add_linker_flag(-Wl,-z,notext)
 +    endif()
 +
-     add_subdirectory(pal)
-     add_subdirectory(hosts)
- else()
+     if(NOT CLR_CMAKE_HOST_MACCATALYST AND NOT CLR_CMAKE_HOST_IOS AND NOT CLR_CMAKE_HOST_TVOS)
+       add_subdirectory(pal)
+       add_subdirectory(hosts)
--- a/community/dotnet7-stage0/runtime_84413-support-adding-rids-with-dash-in-base-part.patch
+++ b/community/dotnet7-stage0/runtime_84413-support-adding-rids-with-dash-in-base-part.patch
@ -1,164 +0,0 @@
-From abc761c2c5694e4029fea1a60dc1934951c66e26 Mon Sep 17 00:00:00 2001
-Patch-Source: https://github.com/dotnet/runtime/pull/84413
-From: Tom Deseyn <tom.deseyn@gmail.com>
-Date: Thu, 6 Apr 2023 13:18:11 +0200
-Subject: [PATCH 1/2] Microsoft.NETCore.Platforms: support adding rids with '-'
- in the base part.
-
-Currently when trying to add a rid like 'linux-musl-x64'
-the rid is not understood to be base = 'linux-musl', arch = 'x64'.
-
-Instead the parser considers a potential optional qualifier.
-This causes the rid to be parsed as base = 'linux', arch = 'musl',
-and qualifier = 'x64'.
-
-We know the rids being added won't have a qualifier. If we take
-this into account while parsing, we can parse the rid correctly.
---
- .../Microsoft.NETCore.Platforms/src/RID.cs    | 11 +++-
- .../src/RuntimeGroupCollection.cs             |  2 +-
- .../tests/RidTests.cs                         | 50 +++++++++++++------
- 3 files changed, 47 insertions(+), 16 deletions(-)
-
-diff --git a/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/RID.cs b/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/RID.cs
-index 6457fd29cadf0..b464d5f0f54e3 100644
--- a/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/RID.cs
-+++ b/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/RID.cs
-@@ -56,7 +56,7 @@ private enum RIDPart : int
-             Max = Qualifier
-         }
- 
-        public static RID Parse(string runtimeIdentifier)
-+        public static RID Parse(string runtimeIdentifier, bool noQualifier)
-         {
-             string[] parts = new string[(int)RIDPart.Max + 1];
-             bool omitVersionDelimiter = true;
-@@ -90,6 +90,15 @@ public static RID Parse(string runtimeIdentifier)
-                         // version might be omitted
-                         else if (current == ArchitectureDelimiter)
-                         {
-+                            // The qualifier delimiter and architecture delimiter are the same.
-+                            // When there is no qualifier, there will be one delimiter past the base part
-+                            // for the architecture.
-+                            // So if we see another delimiter later in the string (for the architecture),
-+                            // extend the base part instead of starting the architecture part.
-+                            if (noQualifier && runtimeIdentifier.IndexOf(ArchitectureDelimiter, i + 1) != -1)
-+                            {
-+                                break;
-+                            }
-                             // ensure there's no version later in the string
-                             if (runtimeIdentifier.IndexOf(VersionDelimiter, i) != -1)
-                             {
-diff --git a/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/RuntimeGroupCollection.cs b/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/RuntimeGroupCollection.cs
-index e069508053105..31009a8d28e5e 100644
--- a/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/RuntimeGroupCollection.cs
-+++ b/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/RuntimeGroupCollection.cs
-@@ -34,7 +34,7 @@ public RuntimeGroupCollection(ICollection<RuntimeGroup> runtimeGroups)
-         /// <param name="parent"></param>
-         public void AddRuntimeIdentifier(string runtimeIdentifier, string parent)
-         {
-            RID rid = RID.Parse(runtimeIdentifier);
-+            RID rid = RID.Parse(runtimeIdentifier, noQualifier: true);
- 
-             AddRuntimeIdentifier(rid, parent);
-         }
-diff --git a/src/runtime/src/libraries/Microsoft.NETCore.Platforms/tests/RidTests.cs b/src/runtime/src/libraries/Microsoft.NETCore.Platforms/tests/RidTests.cs
-index 227bcbdd10d4d..8dee0ebeda17a 100644
--- a/src/runtime/src/libraries/Microsoft.NETCore.Platforms/tests/RidTests.cs
-+++ b/src/runtime/src/libraries/Microsoft.NETCore.Platforms/tests/RidTests.cs
-@@ -10,35 +10,57 @@ public class RidTests
-     {
-         public static IEnumerable<object[]> ValidRIDData()
-         {
-            yield return new object[] { "win10-x64", new RID() { BaseRID = "win", OmitVersionDelimiter = true, Version = new RuntimeVersion("10"), Architecture = "x64" } };
-            yield return new object[] { "win10", new RID() { BaseRID = "win", OmitVersionDelimiter = true, Version = new RuntimeVersion("10")} };
-            yield return new object[] { "linux", new RID() { BaseRID = "linux" } };
-            yield return new object[] { "linux-x64", new RID() { BaseRID = "linux", Architecture = "x64" } };
-            yield return new object[] { "linux-x64", new RID() { BaseRID = "linux", Architecture = "x64" } };
-            yield return new object[] { "debian.10-x64", new RID() { BaseRID = "debian", Version = new RuntimeVersion("10"), Architecture = "x64" } };
-            yield return new object[] { "linuxmint.19.2-x64", new RID() { BaseRID = "linuxmint", Version = new RuntimeVersion("19.2"), Architecture = "x64" } };
-            yield return new object[] { "ubuntu.14.04-x64", new RID() { BaseRID = "ubuntu", Version = new RuntimeVersion("14.04"), Architecture = "x64" } };
-            yield return new object[] { "foo-bar.42-arm", new RID() { BaseRID = "foo-bar", Version = new RuntimeVersion("42"), Architecture = "arm" } };
-            yield return new object[] { "foo-bar-arm", new RID() { BaseRID = "foo", Architecture = "bar", Qualifier = "arm" } };  // demonstrates ambiguity, avoid using `-` in base
-            yield return new object[] { "linux-musl-x64", new RID() { BaseRID = "linux", Architecture = "musl", Qualifier = "x64" } };  // yes, we already have ambiguous RIDs
-+            yield return new object[] { "win10-x64", new RID() { BaseRID = "win", OmitVersionDelimiter = true, Version = new RuntimeVersion("10"), Architecture = "x64" }, null };
-+            yield return new object[] { "win10", new RID() { BaseRID = "win", OmitVersionDelimiter = true, Version = new RuntimeVersion("10")}, null };
-+            yield return new object[] { "linux", new RID() { BaseRID = "linux" }, null };
-+            yield return new object[] { "linux-x64", new RID() { BaseRID = "linux", Architecture = "x64" }, null };
-+            yield return new object[] { "linux-x64", new RID() { BaseRID = "linux", Architecture = "x64" }, null };
-+            yield return new object[] { "debian.10-x64", new RID() { BaseRID = "debian", Version = new RuntimeVersion("10"), Architecture = "x64" }, null };
-+            yield return new object[] { "linuxmint.19.2-x64", new RID() { BaseRID = "linuxmint", Version = new RuntimeVersion("19.2"), Architecture = "x64" }, null };
-+            yield return new object[] { "ubuntu.14.04-x64", new RID() { BaseRID = "ubuntu", Version = new RuntimeVersion("14.04"), Architecture = "x64" }, null };
-+            yield return new object[] { "foo-bar.42-arm", new RID() { BaseRID = "foo-bar", Version = new RuntimeVersion("42"), Architecture = "arm" }, null };
-+            yield return new object[] { "foo-bar-arm", new RID() { BaseRID = "foo", Architecture = "bar", Qualifier = "arm" },       // demonstrates ambiguity, avoid using `-` in base
-+                                                       new RID() { BaseRID = "foo-bar", Architecture = "arm" } };
-+            yield return new object[] { "linux-musl-x64", new RID() { BaseRID = "linux", Architecture = "musl", Qualifier = "x64" }, // yes, we already have ambiguous RIDs
-+                                                       new RID() { BaseRID = "linux-musl", Architecture = "x64" } };
-         }
- 
-         [Theory]
-         [MemberData(nameof(ValidRIDData))]
-        internal void ParseCorrectly(string input, RID expected)
-+        internal void ParseCorrectly(string input, RID expected, RID? expectedNoQualifier)
-         {
-            RID actual = RID.Parse(input);
-+            _ = expectedNoQualifier; // unused
-+
-+            RID actual = RID.Parse(input, noQualifier: false);
- 
-             Assert.Equal(expected, actual);
-         }
- 
-         [Theory]
-         [MemberData(nameof(ValidRIDData))]
-        internal void ToStringAsExpected(string expected, RID rid)
-+        internal void ParseCorrectlyNoQualifier(string input, RID expected, RID? expectedNoQualifier)
-+        {
-+            expectedNoQualifier ??= expected;
-+
-+            RID actual = RID.Parse(input, noQualifier: true);
-+
-+            Assert.Equal(expectedNoQualifier, actual);
-+        }
-+
-+        [Theory]
-+        [MemberData(nameof(ValidRIDData))]
-+        internal void ToStringAsExpected(string expected, RID rid, RID? expectedNoQualifierRid)
-         {
-             string actual = rid.ToString();
- 
-             Assert.Equal(expected, actual);
-+
-+            if (expectedNoQualifierRid is not null)
-+            {
-+                actual = expectedNoQualifierRid.ToString();
-+
-+                Assert.Equal(expected, actual);
-+            }
-         }
-     }
- }
-
-From f70da467ca94291039e0ea5b0723cb9db5e090e7 Mon Sep 17 00:00:00 2001
-From: Tom Deseyn <tom.deseyn@gmail.com>
-Date: Thu, 6 Apr 2023 18:14:31 +0200
-Subject: [PATCH 2/2] Update
- src/libraries/Microsoft.NETCore.Platforms/src/RuntimeGroupCollection.cs
-
-Co-authored-by: Eric StJohn <ericstj@microsoft.com>
---
- .../Microsoft.NETCore.Platforms/src/RuntimeGroupCollection.cs    | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/RuntimeGroupCollection.cs b/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/RuntimeGroupCollection.cs
-index 31009a8d28e5e..ec4762d71424c 100644
--- a/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/RuntimeGroupCollection.cs
-+++ b/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/RuntimeGroupCollection.cs
-@@ -34,6 +34,7 @@ public RuntimeGroupCollection(ICollection<RuntimeGroup> runtimeGroups)
-         /// <param name="parent"></param>
-         public void AddRuntimeIdentifier(string runtimeIdentifier, string parent)
-         {
-+            // don't parse qualifier since we don't use them and they are ambiguous with `-` in base RID
-             RID rid = RID.Parse(runtimeIdentifier, noQualifier: true);
- 
-             AddRuntimeIdentifier(rid, parent);
--- a/community/dotnet7-stage0/runtime_84444-suppress-clang-16-warnings.patch
+++ b/community/dotnet7-stage0/runtime_84444-suppress-clang-16-warnings.patch
@ -1,192 +0,0 @@
-From 4b82b0b1173981ea5f2c7baf003a66fad31208c9 Mon Sep 17 00:00:00 2001
-Patch-Source: https://github.com/dotnet/runtime/pull/84443
-From: Antoine Martin <dev@ayakael.net>
-Date: Thu, 6 Apr 2023 16:01:47 -0400
-Subject: [PATCH 1/2] Suppress clang-16 warnings (#81573)
-
---
- eng/common/native/init-compiler.sh                |  2 +-
- eng/native/configurecompiler.cmake                |  9 +++++++++
- src/coreclr/dlls/mscordbi/CMakeLists.txt          |  5 +----
- src/coreclr/dlls/mscordbi/mscordbi.cpp            | 15 +++++++++++++++
- src/native/corehost/apphost/static/CMakeLists.txt |  4 ++--
- ...orts.src => singlefilehost_freebsdexports.src} |  4 ++++
- .../apphost/static/singlefilehost_unixexports.src |  4 ----
- 7 files changed, 32 insertions(+), 11 deletions(-)
- rename src/native/corehost/apphost/static/{singlefilehost_OSXexports.src => singlefilehost_freebsdexports.src} (81%)
-
-diff --git a/src/runtime/eng/common/native/init-compiler.sh b/src/runtime/eng/common/native/init-compiler.sh
-index 41a26d802a93f..f13b74080edf9 100644
--- a/src/runtime/eng/common/native/init-compiler.sh
-+++ b/src/runtime/eng/common/native/init-compiler.sh
-@@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then
-     # Set default versions
-     if [[ -z "$majorVersion" ]]; then
-         # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
-        if [[ "$compiler" == "clang" ]]; then versions=( 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
-+        if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
-         elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi
- 
-         for version in "${versions[@]}"; do
-diff --git a/src/runtime/eng/native/configurecompiler.cmake b/src/runtime/eng/native/configurecompiler.cmake
-index 9090289f50e34..eaf5a867c5f6d 100644
--- a/src/runtime/eng/native/configurecompiler.cmake
-+++ b/src/runtime/eng/native/configurecompiler.cmake
-@@ -447,6 +447,15 @@ if (CLR_CMAKE_HOST_UNIX)
-     add_compile_options(-Wno-incompatible-ms-struct)
- 
-     add_compile_options(-Wno-reserved-identifier)
-+
-+    # clang 16.0 introduced buffer hardening https://discourse.llvm.org/t/rfc-c-buffer-hardening/65734
-+    # which we are not conforming to yet.
-+    add_compile_options(-Wno-unsafe-buffer-usage)
-+
-+    # other clang 16.0 suppressions
-+    add_compile_options(-Wno-single-bit-bitfield-constant-conversion)
-+    add_compile_options(-Wno-cast-function-type-strict)
-+    add_compile_options(-Wno-incompatible-function-pointer-types-strict)
-   else()
-     add_compile_options(-Wno-uninitialized)
-     add_compile_options(-Wno-strict-aliasing)
-diff --git a/src/runtime/src/coreclr/dlls/mscordbi/CMakeLists.txt b/src/runtime/src/coreclr/dlls/mscordbi/CMakeLists.txt
-index c24a90cf70409..95e92034e238f 100644
--- a/src/runtime/src/coreclr/dlls/mscordbi/CMakeLists.txt
-+++ b/src/runtime/src/coreclr/dlls/mscordbi/CMakeLists.txt
-@@ -100,10 +100,7 @@ elseif(CLR_CMAKE_HOST_UNIX)
-         mscordaccore
-     )
- 
-    # COREDBI_LIBRARIES is mentioned twice because ld is one pass linker and will not find symbols
-    # if they are defined after they are used. Having all libs twice makes sure that ld will actually
-    # find all symbols.
-    target_link_libraries(mscordbi ${COREDBI_LIBRARIES} ${COREDBI_LIBRARIES})
-+    target_link_libraries(mscordbi ${COREDBI_LIBRARIES})
- 
-     add_dependencies(mscordbi mscordaccore)
- 
-diff --git a/src/runtime/src/coreclr/dlls/mscordbi/mscordbi.cpp b/src/runtime/src/coreclr/dlls/mscordbi/mscordbi.cpp
-index 891c01e144f5c..109fe6a5b5417 100644
--- a/src/runtime/src/coreclr/dlls/mscordbi/mscordbi.cpp
-+++ b/src/runtime/src/coreclr/dlls/mscordbi/mscordbi.cpp
-@@ -32,3 +32,18 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
- 	// Defer to the main debugging code.
-     return DbgDllMain(hInstance, dwReason, lpReserved);
- }
-+
-+#if defined(HOST_LINUX) && defined(TARGET_LINUX)
-+PALIMPORT HINSTANCE PALAPI DAC_PAL_RegisterModule(IN LPCSTR lpLibFileName);
-+PALIMPORT VOID PALAPI DAC_PAL_UnregisterModule(IN HINSTANCE hInstance);
-+
-+HINSTANCE PALAPI PAL_RegisterModule(IN LPCSTR lpLibFileName)
-+{
-+     return DAC_PAL_RegisterModule(lpLibFileName);
-+}
-+
-+VOID PALAPI PAL_UnregisterModule(IN HINSTANCE hInstance)
-+{
-+    DAC_PAL_UnregisterModule(hInstance);
-+}
-+#endif
-diff --git a/src/runtime/src/native/corehost/apphost/static/CMakeLists.txt b/src/runtime/src/native/corehost/apphost/static/CMakeLists.txt
-index c37885bf5691c..a632d993c0f2a 100644
--- a/src/runtime/src/native/corehost/apphost/static/CMakeLists.txt
-+++ b/src/runtime/src/native/corehost/apphost/static/CMakeLists.txt
-@@ -65,8 +65,8 @@ if(CLR_CMAKE_TARGET_WIN32)
-     add_linker_flag("/DEF:${CMAKE_CURRENT_SOURCE_DIR}/singlefilehost.def")
- 
- else()
-    if(CLR_CMAKE_TARGET_OSX)
-        set(DEF_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/singlefilehost_OSXexports.src)
-+    if(CLR_CMAKE_TARGET_FREEBSD)
-+        set(DEF_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/singlefilehost_freebsdexports.src)
-     else()
-         set(DEF_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/singlefilehost_unixexports.src)
-     endif()
-diff --git a/src/runtime/src/native/corehost/apphost/static/singlefilehost_OSXexports.src b/src/runtime/src/native/corehost/apphost/static/singlefilehost_freebsdexports.src
-similarity index 81%
-rename from src/native/corehost/apphost/static/singlefilehost_OSXexports.src
-rename to src/native/corehost/apphost/static/singlefilehost_freebsdexports.src
-index 18d5697e84580..1f9c517821855 100644
--- a/src/runtime/src/native/corehost/apphost/static/singlefilehost_OSXexports.src
-+++ b/src/runtime/src/native/corehost/apphost/static/singlefilehost_freebsdexports.src
-@@ -9,3 +9,7 @@ g_dacTable
- 
- ; Used by profilers
- MetaDataGetDispenser
-+
-+; FreeBSD needs to reexport these
-+__progname
-+environ 
-diff --git a/src/runtime/src/native/corehost/apphost/static/singlefilehost_unixexports.src b/src/runtime/src/native/corehost/apphost/static/singlefilehost_unixexports.src
-index 1f9c517821855..18d5697e84580 100644
--- a/src/runtime/src/native/corehost/apphost/static/singlefilehost_unixexports.src
-+++ b/src/runtime/src/native/corehost/apphost/static/singlefilehost_unixexports.src
-@@ -9,7 +9,3 @@ g_dacTable
- 
- ; Used by profilers
- MetaDataGetDispenser
-
-; FreeBSD needs to reexport these
-__progname
-environ 
-
-From b5b3114e6866ac0058b5e18da52f92a1738a915b Mon Sep 17 00:00:00 2001
-From: Antoine Martin <dev@ayakael.net>
-Date: Thu, 6 Apr 2023 16:35:18 -0400
-Subject: [PATCH 2/2] Fix DBI loading problem on Linux (#82461)
-
---
- src/coreclr/dlls/mscordbi/CMakeLists.txt | 16 +++++++++++++++-
- src/coreclr/dlls/mscordbi/mscordbi.cpp   | 15 ---------------
- 2 files changed, 15 insertions(+), 16 deletions(-)
-
-diff --git a/src/runtime/src/coreclr/dlls/mscordbi/CMakeLists.txt b/src/runtime/src/coreclr/dlls/mscordbi/CMakeLists.txt
-index 95e92034e238f..c577651141e5c 100644
--- a/src/runtime/src/coreclr/dlls/mscordbi/CMakeLists.txt
-+++ b/src/runtime/src/coreclr/dlls/mscordbi/CMakeLists.txt
-@@ -100,7 +100,21 @@ elseif(CLR_CMAKE_HOST_UNIX)
-         mscordaccore
-     )
- 
-    target_link_libraries(mscordbi ${COREDBI_LIBRARIES})
-+    # Before llvm 16, lld was setting `--undefined-version` by default. The default was
-+    # flipped to `--no-undefined-version` in lld 16, so we will explicitly set it to
-+    # `--undefined-version` for our use-case.
-+    include(CheckLinkerFlag OPTIONAL)
-+    if(COMMAND check_linker_flag)
-+        check_linker_flag(CXX -Wl,--undefined-version LINKER_SUPPORTS_UNDEFINED_VERSION)
-+        if (LINKER_SUPPORTS_UNDEFINED_VERSION)
-+            add_linker_flag(-Wl,--undefined-version)
-+        endif(LINKER_SUPPORTS_UNDEFINED_VERSION)
-+    endif(COMMAND check_linker_flag)
-+
-+    # COREDBI_LIBRARIES is mentioned twice because ld is one pass linker and will not find symbols
-+    # if they are defined after they are used. Having all libs twice makes sure that ld will actually
-+    # find all symbols.
-+    target_link_libraries(mscordbi ${COREDBI_LIBRARIES} ${COREDBI_LIBRARIES})
- 
-     add_dependencies(mscordbi mscordaccore)
- 
-diff --git a/src/runtime/src/coreclr/dlls/mscordbi/mscordbi.cpp b/src/runtime/src/coreclr/dlls/mscordbi/mscordbi.cpp
-index 109fe6a5b5417..891c01e144f5c 100644
--- a/src/runtime/src/coreclr/dlls/mscordbi/mscordbi.cpp
-+++ b/src/runtime/src/coreclr/dlls/mscordbi/mscordbi.cpp
-@@ -32,18 +32,3 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
- 	// Defer to the main debugging code.
-     return DbgDllMain(hInstance, dwReason, lpReserved);
- }
-
-#if defined(HOST_LINUX) && defined(TARGET_LINUX)
-PALIMPORT HINSTANCE PALAPI DAC_PAL_RegisterModule(IN LPCSTR lpLibFileName);
-PALIMPORT VOID PALAPI DAC_PAL_UnregisterModule(IN HINSTANCE hInstance);
-
-HINSTANCE PALAPI PAL_RegisterModule(IN LPCSTR lpLibFileName)
-{
-     return DAC_PAL_RegisterModule(lpLibFileName);
-}
-
-VOID PALAPI PAL_UnregisterModule(IN HINSTANCE hInstance)
-{
-    DAC_PAL_UnregisterModule(hInstance);
-}
-#endif
--- a/community/dotnet7-stage0/runtime_90251-rename-mono-cmake-host-var.patch
+++ b/community/dotnet7-stage0/runtime_90251-rename-mono-cmake-host-var.patch
@ -0,0 +1,80 @@
+From 828269b7e68039f8bc0bdac66e2fd5c58b6d3471 Mon Sep 17 00:00:00 2001
+Patch-Source: https://github.com/dotnet/runtime/pull/90251
+From: Antoine Martin <dev@ayakael.net>
+Date: Wed, 9 Aug 2023 11:36:39 -0400
+Subject: [PATCH 1/1] Rename CMAKE var for mono on libc-musl
+
+---
+ src/mono/CMakeLists.txt           |  6 +++---
+ src/mono/mono/mini/CMakeLists.txt | 12 ++++++------
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/src/runtime/src/coreclr/pgosupport.cmake b/src/runtime/src/coreclr/pgosupport.cmake
+index 719ac14ad99..34a42781ab2 100644
+--- a/src/runtime/src/coreclr/pgosupport.cmake
+++ b/src/runtime/src/coreclr/pgosupport.cmake
+@@ -25,13 +25,13 @@ function(add_pgo TargetName)
+                 target_compile_options(${TargetName} PRIVATE -flto -fprofile-instr-generate)
+                 set_property(TARGET ${TargetName} APPEND_STRING PROPERTY LINK_FLAGS " -flto -fprofile-instr-generate")
+                 if(CMAKE_CROSSCOMPILING AND CMAKE_C_COMPILER_ID MATCHES "Clang")
+-                    if (CLR_CMAKE_HOST_ALPINE_LINUX)
+                    if (CLR_CMAKE_TARGET_LINUX_MUSL)
+                         set_property(TARGET ${TargetName} APPEND_STRING PROPERTY LINK_FLAGS " -resource-dir ${CMAKE_SYSROOT}/usr/lib/clang/${CMAKE_C_COMPILER_VERSION}")
+-                    else(CLR_CMAKE_HOST_ALPINE_LINUX)
+                    else(CLR_CMAKE_TARGET_LINUX_MUSL)
+                         string(REPLACE "." ";" CLANG_VERSION "${CMAKE_C_COMPILER_VERSION}")
+                         list(POP_FRONT CLANG_VERSION CLANG_VERSION_MAJOR)
+                         set_property(TARGET ${TargetName} APPEND_STRING PROPERTY LINK_FLAGS " -resource-dir ${CMAKE_SYSROOT}/usr/lib/llvm-${CLANG_VERSION_MAJOR}/lib/clang/${CMAKE_C_COMPILER_VERSION}")
+-                    endif(CLR_CMAKE_HOST_ALPINE_LINUX)
+                    endif(CLR_CMAKE_TARGET_LINUX_MUSL)
+                 endif(CMAKE_CROSSCOMPILING AND CMAKE_C_COMPILER_ID MATCHES "Clang")
+                 if(NOT LD_LLVM)
+                     set_property(TARGET ${TargetName} APPEND_STRING PROPERTY LINK_FLAGS " -fuse-ld=gold")
+diff --git a/src/runtime/src/mono/CMakeLists.txt b/src/runtime/src/mono/CMakeLists.txt
+index e04d9e9d364..00e54a25d69 100644
+--- a/src/runtime/src/mono/CMakeLists.txt
+++ b/src/runtime/src/mono/CMakeLists.txt
+@@ -943,10 +943,10 @@ else()
+   set(DISABLE_DLLMAP 1)
+ endif()
+ 
+-if(CLR_CMAKE_HOST_ALPINE_LINUX)
+-  # Setting RLIMIT_NOFILE breaks debugging of coreclr on Alpine Linux for some reason
+if(CLR_CMAKE_TARGET_LINUX_MUSL)
+  # Setting RLIMIT_NOFILE breaks debugging of coreclr on musl-libc for some reason
+   add_definitions(-DDONT_SET_RLIMIT_NOFILE)
+-  # On Alpine Linux, we need to ensure that the reported stack range for the primary thread is
+  # On musl-libc, we need to ensure that the reported stack range for the primary thread is
+   # larger than the initial committed stack size.
+   add_definitions(-DENSURE_PRIMARY_STACK_SIZE)
+ endif()
+diff --git a/src/runtime/src/mono/mono/mini/CMakeLists.txt.orig b/src/runtime/src/mono/mono/mini/CMakeLists.txt
+index 5d6ef3d..c3e5414 100644
+--- a/src/runtime/src/mono/mono/mini/CMakeLists.txt.orig
+++ b/src/runtime/src/mono/mono/mini/CMakeLists.txt
+@@ -400,9 +400,9 @@ if(NOT DISABLE_SHARED_LIBS)
+   endif()
+   target_compile_definitions(monosgen-shared PRIVATE -DMONO_DLL_EXPORT)
+   # Alpine Linux implements ucontext in a different library
+-  if(CLR_CMAKE_HOST_ALPINE_LINUX AND TARGET_S390X)
+  if(CLR_CMAKE_TARGET_LINUX_MUSL AND TARGET_S390X)
+     target_link_libraries(monosgen-shared PRIVATE ucontext)
+-  endif(CLR_CMAKE_HOST_ALPINE_LINUX AND TARGET_S390X)
+  endif(CLR_CMAKE_TARGET_LINUX_MUSL AND TARGET_S390X)
+   set_target_properties(monosgen-shared PROPERTIES OUTPUT_NAME ${MONO_SHARED_LIB_NAME})
+   if(MONO_SET_RPATH_ORIGIN)
+     set_target_properties(monosgen-shared PROPERTIES INSTALL_RPATH "$ORIGIN")
+@@ -601,10 +601,10 @@ if(NOT DISABLE_EXECUTABLES)
+     target_link_libraries(mono-sgen PRIVATE icu_shim_objects)
+   endif()
+   target_link_libraries(mono-sgen PRIVATE ${OS_LIBS} ${LLVM_LIBS} ${ICU_LIBS} ${Z_LIBS})
+-  # Alpine Linux implements ucontext in a different library
+-  if(CLR_CMAKE_HOST_ALPINE_LINUX AND TARGET_S390X)
+  # musl-libc implements ucontext in a different library
+  if(CLR_CMAKE_TARGET_LINUX_MUSL AND TARGET_S390X)
+     target_link_libraries(mono-sgen PRIVATE ucontext)
+-  endif(CLR_CMAKE_HOST_ALPINE_LINUX AND TARGET_S390X)
+  endif(CLR_CMAKE_TARGET_LINUX_MUSL AND TARGET_S390X)
+   if(NOT DISABLE_COMPONENTS AND STATIC_COMPONENTS AND NOT DISABLE_LINK_STATIC_COMPONENTS)
+     # if components are built statically, link them into runtime.
+     target_sources(mono-sgen PRIVATE "${mono-components-objects}")
--- a/community/dotnet7-stage0/runtime_91008-handle-enum-return-type-when-inlining.patch
+++ b/community/dotnet7-stage0/runtime_91008-handle-enum-return-type-when-inlining.patch
@ -0,0 +1,30 @@
+From a73b8bacfcc5819926bc05173ab2f7850eb00da3 Mon Sep 17 00:00:00 2001
+Patch-Source: https://github.com/dotnet/runtime/pull/91008
+From: Ulrich Weigand <ulrich.weigand@de.ibm.com>
+Date: Wed, 23 Aug 2023 21:11:37 +0200
+Subject: [PATCH] [mono] Handle enum return type when inlining CreateInstance
+
+Use underlying base type when deciding how to inline a
+CreateInstance invocation in mini_emit_inst_for_method.
+
+Fixes https://github.com/dotnet/runtime/issues/90292
+(Mono abort causing .NET 8 msbuild regression).
+---
+ src/mono/mono/mini/intrinsics.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/runtime/src/mono/mono/mini/intrinsics.c b/src/runtime/src/mono/mono/mini/intrinsics.c
+index b1e5e76723147..ef77b7dc89f2e 100644
+--- a/src/runtime/src/mono/mono/mini/intrinsics.c
+++ b/src/runtime/src/mono/mono/mini/intrinsics.c
+@@ -2079,7 +2079,9 @@ mini_emit_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSign
+ 			MonoType *t = method_context->method_inst->type_argv [0];
+ 			MonoClass *arg0 = mono_class_from_mono_type_internal (t);
+ 			if (m_class_is_valuetype (arg0) && !mono_class_has_default_constructor (arg0, FALSE)) {
+-				if (m_class_is_primitive (arg0)) {
+				if (m_class_is_primitive (arg0) || m_class_is_enumtype (arg0)) {
+					if (m_class_is_enumtype (arg0))
+						t = mono_class_enum_basetype_internal (arg0);
+ 					int dreg = alloc_dreg (cfg, mini_type_to_stack_type (cfg, t));
+ 					mini_emit_init_rvar (cfg, dreg, t);
+ 					ins = cfg->cbb->last_ins;
--- a/community/dotnet7-stage0/runtime_enable-runtime-marshalling.diff
+++ b/community/dotnet7-stage0/runtime_enable-runtime-marshalling.diff
--- a/community/dotnet7-stage0/runtime_more-clang-16-suppression.patch
+++ b/community/dotnet7-stage0/runtime_more-clang-16-suppression.patch
@ -0,0 +1,13 @@
+diff --git a/src/runtime/eng/native/configurecompiler.cmake b/src/runtime/eng/native/configurecompiler.cmake
+index c9a54547c0a..931da2cae5b 100644
+--- a/src/runtime/eng/native/configurecompiler.cmake
+++ b/src/runtime/eng/native/configurecompiler.cmake
+@@ -488,6 +488,8 @@ if (CLR_CMAKE_HOST_UNIX)
+     # other clang 16.0 suppressions
+     add_compile_options(-Wno-single-bit-bitfield-constant-conversion)
+     add_compile_options(-Wno-cast-function-type-strict)
+    add_compile_options(-Wno-incompatible-function-pointer-types-strict)
+    add_compile_options(-Wno-ignored-attributes)
+   else()
+     add_compile_options(-Wno-uninitialized)
+     add_compile_options(-Wno-strict-aliasing)
--- a/community/dotnet7-stage0/runtime_remove-usage-of-off64-t.patch
+++ b/community/dotnet7-stage0/runtime_remove-usage-of-off64-t.patch
@ -1,15 +1,26 @@
-diff --git a/src/runtime/src/coreclr/debug/createdump/crashinfounix.cpp b/src/runtime/src/coreclr/debug/createdump/crashinfounix.cpp
-index 03712c3b684..99d8a457957 100644
--- a/src/runtimr/src/coreclr/debug/createdump/crashinfounix.cpp
+diff --git a/src/runtime/src/coreclr/debug/createdump/crashinfounix.cpp.orig b/src/runtime/src/coreclr/debug/createdump/crashinfounix.cpp
+index 20b2494..165b190 100644
+--- a/src/runtime/src/coreclr/debug/createdump/crashinfounix.cpp.orig
 +++ b/src/runtime/src/coreclr/debug/createdump/crashinfounix.cpp
-@@ -395,7 +395,7 @@ CrashInfo::ReadProcessMemory(void* address, void* buffer, size_t size, size_t* r
+@@ -469,7 +469,7 @@ CrashInfo::ReadProcessMemory(void* address, void* buffer, size_t size, size_t* r
         // performance optimization.
         m_canUseProcVmReadSyscall = false;
-         assert(m_fd != -1);
-        *read = pread64(m_fd, buffer, size, (off64_t)address);
-+        *read = pread(m_fd, buffer, size, (off_t)address);
+         assert(m_fdMem != -1);
+-        *read = pread64(m_fdMem, buffer, size, (off64_t)address);
+        *read = pread(m_fdMem, buffer, size, (off_t)address);
     }
 
     if (*read == (size_t)-1)
-
-
+diff --git a/src/runtime/src/coreclr/debug/createdump/crashinfo.cpp.orig b/src/runtime/src/coreclr/debug/createdump/crashinfo.cpp
+index 5addb79..79655d1 100644
+--- a/src/runtime/src/coreclr/debug/createdump/crashinfo.cpp.orig
+++ b/src/runtime/src/coreclr/debug/createdump/crashinfo.cpp
+@@ -760,7 +760,7 @@ CrashInfo::PageMappedToPhysicalMemory(uint64_t start)
+         }
+ 
+         uint64_t pagemapOffset = (start / PAGE_SIZE) * sizeof(uint64_t);
+-        uint64_t seekResult = lseek64(m_fdPagemap, (off64_t) pagemapOffset, SEEK_SET);
+        uint64_t seekResult = lseek(m_fdPagemap, (off_t) pagemapOffset, SEEK_SET);
+         if (seekResult != pagemapOffset)
+         {
+             int seekErrno = errno;