From fa2297f6b7adb78a7d286c174d16a123a5295683 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 16 Feb 2014 01:32:25 +0100
Subject: SCUMM: Manually specify function alignment in ARM assembly.

---
 engines/scumm/gfxARM.s           | 2 ++
 engines/scumm/proc3ARM.s         | 1 +
 engines/scumm/smush/codec47ARM.s | 1 +
 3 files changed, 4 insertions(+)

diff --git a/engines/scumm/gfxARM.s b/engines/scumm/gfxARM.s
index 9238888831..5cfe8ba0a4 100644
--- a/engines/scumm/gfxARM.s
+++ b/engines/scumm/gfxARM.s
@@ -41,6 +41,7 @@
 	@ In addition, we assume that text, src and dst are all word (4 byte)
 	@ aligned. This is the same assumption that the old 'inline' version
 	@ made.
+	.align 2
 _asmDrawStripToScreen:
 	@ r0 = height
 	@ r1 = width
@@ -118,6 +119,7 @@ end:
 	@ In addition, we assume that src and dst are both word (4 byte)
 	@ aligned. This is the same assumption that the old 'inline' version
 	@ made.
+	.align 2
 _asmCopy8Col:
 	@ r0 = dst
 	@ r1 = dstPitch
diff --git a/engines/scumm/proc3ARM.s b/engines/scumm/proc3ARM.s
index 75dd4b4a7f..4346f66331 100644
--- a/engines/scumm/proc3ARM.s
+++ b/engines/scumm/proc3ARM.s
@@ -71,6 +71,7 @@
 	@ <> = _palette
 	@ <> = _numstrips
 	@ <> = _scaleIndexY
+	.align 2
 _ClassicProc3RendererShadowARM:
 	@ shadow20 = false
 	@ shadowed = true
diff --git a/engines/scumm/smush/codec47ARM.s b/engines/scumm/smush/codec47ARM.s
index a91f932558..53e9143f39 100644
--- a/engines/scumm/smush/codec47ARM.s
+++ b/engines/scumm/smush/codec47ARM.s
@@ -28,6 +28,7 @@
 
 	.global	_ARM_Smush_decode2
 
+	.align 2
 _ARM_Smush_decode2:
 	@ r0 = dst
 	@ r1 = src
-- 
cgit v1.2.3