Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Port fixes for CoreCLR 1.0.0 RTM #6611

Merged
merged 5 commits into from
Aug 7, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dir.props
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@

<!-- Packaging properties -->
<PropertyGroup>
<PreReleaseLabel>rc3</PreReleaseLabel>
<PreReleaseLabel>servicing</PreReleaseLabel>
<PackageDescriptionFile>$(SourceDir).nuget/descriptions.json</PackageDescriptionFile>
<PackageLicenseFile>$(SourceDir).nuget/dotnet_library_license.txt</PackageLicenseFile>
<PackageThirdPartyNoticesFile>$(SourceDir).nuget/ThirdPartyNotices.txt</PackageThirdPartyNoticesFile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<SkipValidatePackage>true</SkipValidatePackage>
<PackagePlatforms>x64;x86;arm</PackagePlatforms>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>debian.8-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>fedora.23-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>opensuse.13.2-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>osx.10.10-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>rhel.7-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>ubuntu.14.04-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>ubuntu.16.04-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<MinOSForArch>win7</MinOSForArch>
<MinOSForArch Condition="$(PackagePlatform.StartsWith('arm'))">win8</MinOSForArch>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<SkipValidatePackage>true</SkipValidatePackage>
<PackagePlatforms>x64;x86;arm</PackagePlatforms>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>debian.8-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>fedora.23-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>opensuse.13.2-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>osx.10.10-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>rhel.7-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>ubuntu.14.04-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>ubuntu.16.04-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<MinOSForArch>win7</MinOSForArch>
<MinOSForArch Condition="$(PackagePlatform.StartsWith('arm'))">win8</MinOSForArch>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<SkipValidatePackage>true</SkipValidatePackage>
<PackagePlatforms>x64;x86;arm</PackagePlatforms>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>debian.8-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>fedora.23-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>opensuse.13.2-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>osx.10.10-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>rhel.7-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>ubuntu.14.04-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>ubuntu.16.04-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<MinOSForArch>win7</MinOSForArch>
<MinOSForArch Condition="$(PackagePlatform.StartsWith('arm'))">win8</MinOSForArch>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<SkipValidatePackage>true</SkipValidatePackage>
<PackagePlatforms>x64;x86;arm</PackagePlatforms>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>debian.8-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>fedora.23-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>opensuse.13.2-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>osx.10.10-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>rhel.7-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>ubuntu.14.04-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<PackageTargetRuntime>ubuntu.16.04-$(PackagePlatform)</PackageTargetRuntime>
<!-- only build for x64 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<MinOSForArch>win7</MinOSForArch>
<MinOSForArch Condition="$(PackagePlatform.StartsWith('arm'))">win8</MinOSForArch>
Expand Down
32 changes: 28 additions & 4 deletions src/jit/ee_il_dll.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
#if !defined(PLATFORM_UNIX)
#include <io.h> // For _dup, _setmode
#include <fcntl.h> // For _O_TEXT
#include <errno.h> // For EINVAL
#endif

/*****************************************************************************/
Expand Down Expand Up @@ -72,10 +73,33 @@ void __stdcall jitStartup(ICorJitHost* jitHost)
#else
if (jitstdout == nullptr)
{
int jitstdoutFd = _dup(_fileno(procstdout()));
_setmode(jitstdoutFd, _O_TEXT);
jitstdout = _fdopen(jitstdoutFd, "w");
assert(jitstdout != nullptr);
int stdoutFd = _fileno(procstdout());
// Check fileno error output(s) -1 may overlap with errno result
// but is included for completness.
// We want to detect the case where the initial handle is null
// or bogus and avoid making further calls.
if ((stdoutFd != -1) && (stdoutFd != -2) && (errno != EINVAL))
{
int jitstdoutFd = _dup(_fileno(procstdout()));
// Check the error status returned by dup.
if (jitstdoutFd != -1)
{
_setmode(jitstdoutFd, _O_TEXT);
jitstdout = _fdopen(jitstdoutFd, "w");
assert(jitstdout != nullptr);

// Prevent the FILE* from buffering its output in order to avoid calls to
// `fflush()` throughout the code.
setvbuf(jitstdout, nullptr, _IONBF, 0);
}
}
}

// If jitstdout is still null, fallback to whatever procstdout() was
// initially set to.
if (jitstdout == nullptr)
{
jitstdout = procstdout();
}
#endif

Expand Down
6 changes: 3 additions & 3 deletions src/pal/src/exception/signal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -464,10 +464,10 @@ static void inject_activation_handler(int code, siginfo_t *siginfo, void *contex
if (g_safeActivationCheckFunction(CONTEXTGetPC(&winContext), /* checkingCurrentThread */ TRUE))
{
g_activationFunction(&winContext);
}

// Activation function may have modified the context, so update it.
CONTEXTToNativeContext(&winContext, ucontext);
// Activation function may have modified the context, so update it.
CONTEXTToNativeContext(&winContext, ucontext);
}
}
else if (g_previous_activation.sa_sigaction != NULL)
{
Expand Down
Loading