summaryrefslogtreecommitdiff
path: root/asm/malloc.s
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-09-02 23:11:29 -0700
committerYamaArashi <shadow962@live.com>2016-09-02 23:11:29 -0700
commita05857f889631dd6e722f952475fb96382cdf999 (patch)
tree3e7b52a566406ba22a442e62d2b7fbdf99926e5c /asm/malloc.s
parentf910e326a16429f613e3b3814dd98bd69485dcd1 (diff)
make asm compatible with stock gas
Diffstat (limited to 'asm/malloc.s')
-rw-r--r--asm/malloc.s8
1 files changed, 8 insertions, 0 deletions
diff --git a/asm/malloc.s b/asm/malloc.s
index d9cb84e8e..529b654c7 100644
--- a/asm/malloc.s
+++ b/asm/malloc.s
@@ -1,3 +1,9 @@
+ .include "asm/macros.s"
+
+ .syntax unified
+
+ .text
+
thumb_func_start PutMemBlockHeader
@ void PutMemBlockHeader(void *block, struct MemBlock *prev, struct MemBlock *next, u32 size)
PutMemBlockHeader: @ 8000988
@@ -329,3 +335,5 @@ _08000BB2:
pop {r1}
bx r1
thumb_func_end CheckHeap
+
+ .align 2, 0 @ Don't pad with nop.