浏览代码

Merge #23

23: Fix _start_trap alignment r=dvc94ch a=Disasm

Based on this proposal: https://github.com/rust-embedded/riscv-rt/pull/22#issuecomment-466307711

Co-authored-by: Vadim Kaushan <admin@disasm.info>
bors[bot] 6 年之前
父节点
当前提交
cd42df7e2e
共有 4 个文件被更改,包括 1 次插入1 次删除
  1. 0 1
      riscv-rt/asm.S
  2. 二进制
      riscv-rt/bin/riscv32imac-unknown-none-elf.a
  3. 二进制
      riscv-rt/bin/riscv32imc-unknown-none-elf.a
  4. 1 0
      riscv-rt/link.x

+ 0 - 1
riscv-rt/asm.S

@@ -36,7 +36,6 @@ _start:
     restores caller saved registers and then returns.
 */
 .section .trap, "ax"
-.align 4
 .global _start_trap
 
 _start_trap:

二进制
riscv-rt/bin/riscv32imac-unknown-none-elf.a


二进制
riscv-rt/bin/riscv32imc-unknown-none-elf.a


+ 1 - 0
riscv-rt/link.x

@@ -15,6 +15,7 @@ SECTIONS
     /* point of the program. */
     KEEP(*(.init));
     KEEP(*(.init.rust));
+    . = ALIGN(4);
     KEEP(*(.trap));
     KEEP(*(.trap.rust));