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.

Sign up for GitHub

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

Jump to bottom

Fix ARM64-based CPU detection logic; take #3. #5683

Merged
merged 1 commit into from
Feb 28, 2019
Merged

Fix ARM64-based CPU detection logic; take #3. #5683

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/ObjCRuntime/Runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ unsafe static void Initialize (InitializationOptions* options)
#if !XAMMAC_SYSTEM_MONO
UseAutoreleasePoolInThreadPool = true;
#endif
IsARM64CallingConvention = GetIsARM64CallingConvention (); // Can only be done after Runtime.Arch is set (i.e. InitializePlatform has been called).

objc_exception_mode = options->MarshalObjectiveCExceptionMode;
managed_exception_mode = options->MarshalManagedExceptionMode;
Expand Down Expand Up @@ -1739,7 +1740,7 @@ public string Description {
[DllImport (Constants.libSystemLibrary)]
static unsafe extern NXArchInfo* NXGetLocalArchInfo ();

public readonly static bool IsARM64CallingConvention = GetIsARM64CallingConvention ();
public static bool IsARM64CallingConvention;

[BindingImpl (BindingImplOptions.Optimizable)]
static bool GetIsARM64CallingConvention ()
Expand Down