Fix build break on Linux ARM (#4320)

10 files changed, 11 insertions, 10 deletions

diff --git a/src/Native/Runtime/arm/AllocFast.S b/src/Native/Runtime/arm/AllocFast.S
index 3f76d4dc8..4eaabac52 100644
--- a/src/Native/Runtime/arm/AllocFast.S
+++ b/src/Native/Runtime/arm/AllocFast.S
@@ -5,8 +5,8 @@
 .syntax unified
 .thumb
 
-#include <unixasmmacros.inc>
 #include <AsmOffsets.inc>         // generated by the build from AsmOffsets.cpp
+#include <unixasmmacros.inc>
 
 // Allocate non-array, non-finalizable object. If the allocation doesn't fit into the current thread's
 // allocation context then automatically fallback to the slow allocation path.
diff --git a/src/Native/Runtime/arm/CallDescrWorker.S b/src/Native/Runtime/arm/CallDescrWorker.S
index 3c1e81ad1..dd4524297 100644
--- a/src/Native/Runtime/arm/CallDescrWorker.S
+++ b/src/Native/Runtime/arm/CallDescrWorker.S
@@ -5,8 +5,8 @@
 .syntax unified
 .thumb
 
-#include <unixasmmacros.inc>
 #include <AsmOffsets.inc>         // generated by the build from AsmOffsets.cpp
+#include <unixasmmacros.inc>
 
 // TODO: Implement Arm support
 
diff --git a/src/Native/Runtime/arm/CallingConventionConverterHelpers.S b/src/Native/Runtime/arm/CallingConventionConverterHelpers.S
index c42d6d1f7..ddb2cf33d 100644
--- a/src/Native/Runtime/arm/CallingConventionConverterHelpers.S
+++ b/src/Native/Runtime/arm/CallingConventionConverterHelpers.S
@@ -6,8 +6,8 @@
 .syntax unified
 .thumb
 
-#include <unixasmmacros.inc>
 #include <AsmOffsets.inc>         // generated by the build from AsmOffsets.cpp
+#include <unixasmmacros.inc>
 
 //
 // void CallingConventionConverter_ReturnVoidReturnThunk()
diff --git a/src/Native/Runtime/arm/ExceptionHandling.S b/src/Native/Runtime/arm/ExceptionHandling.S
index b3bfd3ae7..2732282e8 100644
--- a/src/Native/Runtime/arm/ExceptionHandling.S
+++ b/src/Native/Runtime/arm/ExceptionHandling.S
@@ -5,8 +5,8 @@
 .syntax unified
 .thumb
 
-#include <unixasmmacros.inc>
 #include <AsmOffsets.inc>         // generated by the build from AsmOffsets.cpp
+#include <unixasmmacros.inc>
 
 #define STACKSIZEOF_ExInfo ((SIZEOF__ExInfo + 7)&(~7))
 
diff --git a/src/Native/Runtime/arm/Interlocked.S b/src/Native/Runtime/arm/Interlocked.S
index bb964dca0..5698e8a78 100644
--- a/src/Native/Runtime/arm/Interlocked.S
+++ b/src/Native/Runtime/arm/Interlocked.S
@@ -5,8 +5,8 @@
 .syntax unified
 .thumb
 
-#include <unixasmmacros.inc>
 #include <AsmOffsets.inc>         // generated by the build from AsmOffsets.cpp
+#include <unixasmmacros.inc>
 
 // WARNING: Code in EHHelpers.cpp makes assumptions about this helper, in particular:
 // - Function "InWriteBarrierHelper" assumes an AV due to passed in null pointer will happen at RhpLockCmpXchg32AVLocation
diff --git a/src/Native/Runtime/arm/InteropThunksHelpers.S b/src/Native/Runtime/arm/InteropThunksHelpers.S
index 69336f445..ac8da0b10 100644
--- a/src/Native/Runtime/arm/InteropThunksHelpers.S
+++ b/src/Native/Runtime/arm/InteropThunksHelpers.S
@@ -5,8 +5,9 @@
 .syntax unified
 .thumb
 
-#include <unixasmmacros.inc>
 #include <AsmOffsets.inc>         // generated by the build from AsmOffsets.cpp
+#include <unixasmmacros.inc>
+
 #define POINTER_SIZE 4
 
 //
diff --git a/src/Native/Runtime/arm/PInvoke.S b/src/Native/Runtime/arm/PInvoke.S
index 487bf6dde..b6516063f 100644
--- a/src/Native/Runtime/arm/PInvoke.S
+++ b/src/Native/Runtime/arm/PInvoke.S
@@ -2,8 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#include <unixasmmacros.inc>
 #include <AsmOffsets.inc>
+#include <unixasmmacros.inc>
 
 .syntax unified
 .thumb
diff --git a/src/Native/Runtime/arm/StubDispatch.S b/src/Native/Runtime/arm/StubDispatch.S
index d6293dc80..26ca007a7 100644
--- a/src/Native/Runtime/arm/StubDispatch.S
+++ b/src/Native/Runtime/arm/StubDispatch.S
@@ -5,8 +5,8 @@
 .syntax unified
 .thumb
 
-#include <unixasmmacros.inc>
 #include <AsmOffsets.inc>         // generated by the build from AsmOffsets.cpp
+#include <unixasmmacros.inc>
 
 #ifdef FEATURE_CACHED_INTERFACE_DISPATCH
 
diff --git a/src/Native/Runtime/arm/UniversalTransition.S b/src/Native/Runtime/arm/UniversalTransition.S
index 2fab91382..0ec4ece13 100644
--- a/src/Native/Runtime/arm/UniversalTransition.S
+++ b/src/Native/Runtime/arm/UniversalTransition.S
@@ -5,8 +5,8 @@
 .syntax unified
 .thumb
 
-#include <unixasmmacros.inc>
 #include <AsmOffsets.inc>         // generated by the build from AsmOffsets.cpp
+#include <unixasmmacros.inc>
 
 #ifdef FEATURE_DYNAMIC_CODE
 
diff --git a/src/Native/Runtime/arm/WriteBarriers.S b/src/Native/Runtime/arm/WriteBarriers.S
index 9c18c3681..06684beae 100644
--- a/src/Native/Runtime/arm/WriteBarriers.S
+++ b/src/Native/Runtime/arm/WriteBarriers.S
@@ -5,8 +5,8 @@
 .syntax unified
 .thumb
 
-#include <unixasmmacros.inc>
 #include <AsmOffsets.inc>         // generated by the build from AsmOffsets.cpp
+#include <unixasmmacros.inc>
 
 #ifdef WRITE_BARRIER_CHECK