Merge remote-tracking branch 'upstream/master' into from-tfs
authorMatt Ellis <matell@microsoft.com>
Sun, 21 Aug 2016 01:29:38 +0000 (18:29 -0700)
committerMatt Ellis <matell@microsoft.com>
Sun, 21 Aug 2016 01:29:38 +0000 (18:29 -0700)
Commit migrated from https://github.com/dotnet/coreclr/commit/0d25412997731f0738dc6d81f7d92fa260ce10f0

1  2 
src/coreclr/src/mscorlib/model.xml
src/coreclr/tests/issues.targets
src/coreclr/tests/x86_legacy_backend_issues.targets

Simple merge
Simple merge
      <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitall\waitallex8a\*">
        <Issue>3832</Issue>
      </ExcludeList>
 +    <ExcludeList Include="$(XunitTestBinBase)\JIT\superpmi\superpmicollect\superpmicollect.cmd">
 +         <Issue>6830</Issue>
 +    </ExcludeList>
+     <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\tailcall_v4\smallFrame\smallFrame.cmd">
+       <Issue>tail. call pop ret is only supported on amd64</Issue>
+     </ExcludeList>
    </ItemGroup>
    
    <!-- Tests that need to be triaged for vararg usage as that is not supported -->