diff options
| author | Johannes Schickel | 2014-03-09 16:04:13 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2014-03-09 16:04:13 +0100 |
| commit | 9ba4a3f0a92a69d580b8a1d76a05ef2d4a8cc189 (patch) | |
| tree | 5b241fe05aabeabf338446cd8f5399867333187c /engines | |
| parent | 3c76acf4451bdfcc15a940b32a1e86b517f43f46 (diff) | |
| parent | 948d4feb234b7f9fa8b4951921c593cabf7dafea (diff) | |
| download | scummvm-rg350-9ba4a3f0a92a69d580b8a1d76a05ef2d4a8cc189.tar.gz scummvm-rg350-9ba4a3f0a92a69d580b8a1d76a05ef2d4a8cc189.tar.bz2 scummvm-rg350-9ba4a3f0a92a69d580b8a1d76a05ef2d4a8cc189.zip | |
Merge pull request #444 from lordhoto/iphone-clang-3.3
IPHONE: Support clang based toolchain
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/gfxARM.s | 2 | ||||
| -rw-r--r-- | engines/scumm/proc3ARM.s | 1 | ||||
| -rw-r--r-- | engines/scumm/smush/codec47ARM.s | 1 |
3 files changed, 4 insertions, 0 deletions
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 |