summaryrefslogtreecommitdiff
path: root/asm/main.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/main.s
parentf910e326a16429f613e3b3814dd98bd69485dcd1 (diff)
make asm compatible with stock gas
Diffstat (limited to 'asm/main.s')
-rw-r--r--asm/main.s8
1 files changed, 8 insertions, 0 deletions
diff --git a/asm/main.s b/asm/main.s
index fe10dafb0..f02f39ed8 100644
--- a/asm/main.s
+++ b/asm/main.s
@@ -1,3 +1,9 @@
+ .include "asm/macros.s"
+
+ .syntax unified
+
+ .text
+
thumb_func_start Main
Main:
push {r4-r7,lr}
@@ -711,3 +717,5 @@ sub_8000964: @ 8000964
bx r0
.pool
thumb_func_end sub_8000964
+
+ .align 2, 0 @ Don't pad with nop.