summaryrefslogtreecommitdiff
path: root/asm/macros/function.inc
diff options
context:
space:
mode:
authorMartmists <martmists@gmail.com>2020-04-22 13:57:09 +0200
committerMartmists <martmists@gmail.com>2020-04-22 13:57:09 +0200
commit9b3107c478c9f39c17ef4171c9c5330adcb1385a (patch)
treee63d60215b5ba9405d7aeb3322873d26c5f03cc1 /asm/macros/function.inc
parentdcdf58739922de3b3bbc828f46e36b83f53c52a0 (diff)
parent5ee605688aaea7fe6b4573dc2ce5ce24cd671855 (diff)
Merge branch 'master' into os_lib
Diffstat (limited to 'asm/macros/function.inc')
-rw-r--r--asm/macros/function.inc9
1 files changed, 2 insertions, 7 deletions
diff --git a/asm/macros/function.inc b/asm/macros/function.inc
index 67fb373a..6b9e5f40 100644
--- a/asm/macros/function.inc
+++ b/asm/macros/function.inc
@@ -1,8 +1,7 @@
.macro arm_func_start name
- .align 2, 0
+ .balign 4, 0
.global \name
.arm
- .type \name, function
.endm
.macro arm_func_end name
@@ -10,18 +9,14 @@
.endm
.macro thumb_func_start name
- .align 2, 0
+ .balign 4, 0
.global \name
.thumb
- .thumb_func
- .type \name, function
.endm
.macro non_word_aligned_thumb_func_start name
.global \name
.thumb
- .thumb_func
- .type \name, function
.endm
.macro thumb_func_end name