diff options
author | Andreas Schwab <schwab@suse.de> | 2020-01-09 12:49:38 +0100 |
---|---|---|
committer | Anup Patel <anup@brainfault.org> | 2020-01-10 09:30:27 +0530 |
commit | 6ffe1bed09be1cb2db8755b30c0258849184400b (patch) | |
tree | b8ae22adece62c49f4cce1fde68901a5ed060135 /firmware/fw_jump.S | |
parent | f95dd39ab6ed9711aabc56968582aa44130a9f89 (diff) |
firmware: Fix placement of .align directives
Move the .align directives after switching the section. We want to align
the start of the current section, not the end of the previous section.
This also obsoletes the misguided workaround of disabling relaxation.
Signed-off-by: Andreas Schwab <schwab@suse.de>
Reviewed-by: Anup Patel <anup.patel@wdc.com>
Diffstat (limited to 'firmware/fw_jump.S')
-rw-r--r-- | firmware/fw_jump.S | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/firmware/fw_jump.S b/firmware/fw_jump.S index e0a3b53..afbcec0 100644 --- a/firmware/fw_jump.S +++ b/firmware/fw_jump.S @@ -9,8 +9,8 @@ #include "fw_base.S" - .align 3 .section .entry, "ax", %progbits + .align 3 .global fw_boot_hart /* * This function is called very early even before @@ -22,8 +22,8 @@ fw_boot_hart: li a0, -1 ret - .align 3 .section .entry, "ax", %progbits + .align 3 .global fw_save_info /* * We can only use a0, a1, a2, a3, and a4 registers here. @@ -34,8 +34,8 @@ fw_boot_hart: fw_save_info: ret - .align 3 .section .entry, "ax", %progbits + .align 3 .global fw_prev_arg1 /* * We can only use a0, a1, and a2 registers here. @@ -47,8 +47,8 @@ fw_prev_arg1: add a0, zero, zero ret - .align 3 .section .entry, "ax", %progbits + .align 3 .global fw_next_arg1 /* * We can only use a0, a1, and a2 registers here. @@ -64,8 +64,8 @@ fw_next_arg1: #endif ret - .align 3 .section .entry, "ax", %progbits + .align 3 .global fw_next_addr /* * We can only use a0, a1, and a2 registers here. @@ -76,8 +76,8 @@ fw_next_addr: REG_L a0, (a0) ret - .align 3 .section .entry, "ax", %progbits + .align 3 .global fw_next_mode /* * We can only use a0, a1, and a2 registers here. @@ -87,8 +87,8 @@ fw_next_mode: li a0, PRV_S ret - .align 3 .section .entry, "ax", %progbits + .align 3 .global fw_options /* * We can only use a0, a1, and a2 registers here. @@ -103,7 +103,7 @@ fw_options: #error "Must define FW_JUMP_ADDR" #endif - .align 3 .section .entry, "ax", %progbits + .align 3 _jump_addr: RISCV_PTR FW_JUMP_ADDR |