diff options
| author | Steve MacLean <stmaclea@microsoft.com> | 2019-04-11 20:28:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-11 20:28:25 -0400 |
| commit | cfffad26af69d0393fe5615cf40114f50e31f4d5 (patch) | |
| tree | b59b8d44916f3410799744f46b908a41627001ca | |
| parent | 759e3777aad6e711c6c6171ee738df9f38e877a0 (diff) | |
| download | coreclr-cfffad26af69d0393fe5615cf40114f50e31f4d5.tar.gz coreclr-cfffad26af69d0393fe5615cf40114f50e31f4d5.tar.bz2 coreclr-cfffad26af69d0393fe5615cf40114f50e31f4d5.zip | |
Fix 23740 (#23906)
Adjust AssemblyLoadContextBaseObject packing for
windows arm.
| -rw-r--r-- | src/vm/object.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/vm/object.h b/src/vm/object.h index cc0810fc98..b9b7b3ae2e 100644 --- a/src/vm/object.h +++ b/src/vm/object.h @@ -1613,9 +1613,9 @@ NOINLINE AssemblyBaseObject* GetRuntimeAssemblyHelper(LPVOID __me, DomainAssembl // AssemblyLoadContextBaseObject // This class is the base class for AssemblyLoadContext // -#if (defined(_TARGET_X86_) || defined(_TARGET_ARM_)) && !defined(FEATURE_PAL) +#if defined(_TARGET_X86_) && !defined(FEATURE_PAL) #include "pshpack4.h" -#endif // (defined(_TARGET_X86_) || defined(_TARGET_ARM_)) && !defined(FEATURE_PAL) +#endif // defined(_TARGET_X86_) && !defined(FEATURE_PAL) class AssemblyLoadContextBaseObject : public Object { friend class MscorlibBinder; @@ -1653,9 +1653,9 @@ class AssemblyLoadContextBaseObject : public Object public: INT_PTR GetNativeAssemblyLoadContext() { LIMITED_METHOD_CONTRACT; return _nativeAssemblyLoadContext; } }; -#if (defined(_TARGET_X86_) || defined(_TARGET_ARM_)) && !defined(FEATURE_PAL) +#if defined(_TARGET_X86_) && !defined(FEATURE_PAL) #include "poppack.h" -#endif // (defined(_TARGET_X86_) || defined(_TARGET_ARM_)) && !defined(FEATURE_PAL) +#endif // defined(_TARGET_X86_) && !defined(FEATURE_PAL) // AssemblyNameBaseObject // This class is the base class for assembly names |