diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-09-06 09:16:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-06 09:16:17 +0100 |
| commit | e524d78f9fc904b0e831855145320384e9656a46 (patch) | |
| tree | 0946cb9acdbaf2db58ab4fe2053c92aa71d08355 | |
| parent | 942ee0d8cf936387c5e7891237e5fb0d58d7d250 (diff) | |
| parent | fed18b3aec0f575752eeca0ca8c24d7dd16dac78 (diff) | |
Merge pull request #1076 from masahir0y/asm_macro
asm_macros: set the default assembly code alignment to 4 byte
| -rw-r--r-- | include/common/asm_macros_common.S | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/include/common/asm_macros_common.S b/include/common/asm_macros_common.S index dbc9e2d3..6a02e18e 100644 --- a/include/common/asm_macros_common.S +++ b/include/common/asm_macros_common.S @@ -12,11 +12,12 @@ * to enable elimination of unused code during linking. It also adds * basic debug information to enable call stack printing most of the * time. The optional _align parameter can be used to force a - * non-standard alignment (indicated in powers of 2). Do *not* try to - * use a raw .align directive. Since func switches to a new section, - * this would not have the desired effect. + * non-standard alignment (indicated in powers of 2). The default is + * _align=2 because both Aarch32 and Aarch64 instructions must be + * word aligned. Do *not* try to use a raw .align directive. Since func + * switches to a new section, this would not have the desired effect. */ - .macro func _name, _align=-1 + .macro func _name, _align=2 /* * Add Call Frame Information entry in the .debug_frame section for * debugger consumption. This enables callstack printing in debuggers. @@ -36,9 +37,7 @@ * .debug_frame */ .cfi_startproc - .if (\_align) != -1 - .align \_align - .endif + .align \_align \_name: .endm |