From 06d1b2d208b64b534eff81d8bb51a4abd8c2146d Mon Sep 17 00:00:00 2001
From: Marcel Taeumel <marcel.taeumel@hpi.de>
Date: Tue, 27 Jul 2021 09:53:23 +0200
Subject: [PATCH] Fixes include order for ARM32 builds. Thanks to Bruce O'Neel!

---
 build.linux32ARMv6/squeak.cog.spur/build/mvm       |  2 +-
 .../Cross/plugins/BitBltPlugin/BitBltArmSimd.c     |  4 +++-
 .../Cross/plugins/BitBltPlugin/BitBltDispatch.c    | 14 +++++++-------
 .../Cross/plugins/BitBltPlugin/BitBltGeneric.c     |  3 ++-
 .../Cross/plugins/BitBltPlugin/BitBltInternal.h    |  2 ++
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/build.linux32ARMv6/squeak.cog.spur/build/mvm b/build.linux32ARMv6/squeak.cog.spur/build/mvm
index e1fd0f57bc..7a5cbe4d5d 100755
--- a/build.linux32ARMv6/squeak.cog.spur/build/mvm
+++ b/build.linux32ARMv6/squeak.cog.spur/build/mvm
@@ -2,7 +2,7 @@
 set -e
 # Spur VM with VM profiler and threaded heartbeat
 INSTALLDIR=sqcogspurlinuxhtRPi
-OPT="-m32 -g -O2 -DNDEBUG -DDEBUGVM=0"
+OPT=" -g -O2 -DNDEBUG -DDEBUGVM=0"
 
 if [ $# -ge 1 ]; then
 	INSTALLDIR="$1"; shift
diff --git a/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimd.c b/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimd.c
index 236bcad37f..2d7bc9878d 100644
--- a/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimd.c
+++ b/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimd.c
@@ -23,10 +23,12 @@
  *
  */
 
+/* BEO */
+#include "BitBltInternal.h"
+
 #include <stddef.h>
 #include <stdint.h>
 
-#include "BitBltInternal.h"
 
 enum {
 	HALFTONE_NONE,
diff --git a/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.c b/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.c
index 6065dbab83..a9a64aff3f 100644
--- a/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.c
+++ b/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.c
@@ -23,18 +23,18 @@
  *
  */
 
-#include <stddef.h>
-#include<stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-
 #include "BitBltDispatch.h"
+#include <stdint.h>
 #include "BitBltArm.h"
 #include "BitBltGeneric.h"
 #include "BitBltInternal.h"
 
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <string.h>
+
 /** Define this to enable profiling */
 //#define PROFILING
 
diff --git a/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.c b/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.c
index 762ce7780f..a6ce00fcf3 100644
--- a/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.c
+++ b/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.c
@@ -23,12 +23,13 @@
  *
  */
 
+#include "BitBltInternal.h"
+
 #include <stddef.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
 
-#include "BitBltInternal.h"
 
 
 #define ROR(x,s) (((uint32_t)(x))>>(s)|((uint32_t)(x))<<((32-(s))))
diff --git a/platforms/Cross/plugins/BitBltPlugin/BitBltInternal.h b/platforms/Cross/plugins/BitBltPlugin/BitBltInternal.h
index a653fb64c1..062d37cb5d 100644
--- a/platforms/Cross/plugins/BitBltPlugin/BitBltInternal.h
+++ b/platforms/Cross/plugins/BitBltPlugin/BitBltInternal.h
@@ -27,6 +27,8 @@
 #define BITBLTINTERNAL_H_
 
 #include "BitBltDispatch.h"
+#include <stdint.h>
+#include <stdlib.h>
 
 #define IGNORE(x) (void)(x)
 #define CACHELINE_LEN (32)