Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[dotnet/tools] Don't disable compact unwind info. Fixes #16546. #16623

Merged
merged 1 commit into from
Nov 8, 2022
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
5 changes: 0 additions & 5 deletions dotnet/targets/Xamarin.Shared.Sdk.targets
Original file line number Diff line number Diff line change
Expand Up @@ -1156,11 +1156,6 @@
<_LinkNativeExecutableInputs Include="@(_XamarinMainLibraries)" />
<_LinkNativeExecutableInputs Include="@(_FileNativeReference)" />
</ItemGroup>

<ItemGroup Condition="'$(_XamarinRuntime)' == 'MonoVM' And $([MSBuild]::VersionGreaterThanOrEquals('$(_XcodeVersion)','14.0'))">
<_MainLinkerFlags Include="-Wl,-no_compact_unwind" />
<_MainLinkerFlags Include="-Wl,-keep_dwarf_unwind" />
</ItemGroup>
</Target>

<!-- Any .dylibs we link with might have an incorrect identity (see https://github.com/xamarin/xamarin-macios/issues/13999),
Expand Down
7 changes: 0 additions & 7 deletions tools/common/CompilerFlags.cs
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,6 @@ public void LinkWithMono ()
}
AddOtherFlag ("-lz");
AddOtherFlag ("-liconv");

if (Driver.XcodeVersion.Major >= 14 && Application.BitCodeMode == BitCodeMode.None) {
// This solves a warning:
// ld: warning: could not create compact unwind for _BrotliBuildHistogramsWithContext: registers 27 not saved contiguously in frame
AddOtherFlag ("-Wl,-no_compact_unwind");
AddOtherFlag ("-Wl,-keep_dwarf_unwind");
}
}

public void LinkWithXamarin ()
Expand Down