Skip to content

Commit 48155eb

Browse files
Tropix126max-niederman
authored andcommitted
move .code_signature section into .text
1 parent 651a267 commit 48155eb

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

compiler/rustc_target/src/spec/targets/armv7a_vex_v5_linker_script.ld

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,15 @@ It's currently unclear why subtracting anything is necessary, but it fixes memor
1818
__heap_end = __user_ram_end - __stack_length - 0x100;
1919

2020
SECTIONS {
21-
.code_signature __user_ram_start : {
22-
__code_signature_start = .;
21+
.text : {
22+
__text_start = .;
2323
KEEP(*(.code_signature))
24-
. = __code_signature_start + 0x20;
25-
} > USER_RAM = 0
26-
27-
.text __user_ram_start + 0x20 : {
28-
*(.text.boot)
24+
. = __text_start + 0x20;
25+
*(.boot)
2926
*(.text .text.*)
30-
} > USER_RAM
27+
} > USER_RAM = 0
3128

32-
.rodata : {
33-
*(.rodata .rodata.*)
29+
.rodata1 : {
3430
*(.rodata1 .rodata1.*)
3531
} > USER_RAM
3632

@@ -59,4 +55,4 @@ SECTIONS {
5955
/DISCARD/ : {
6056
*(.ARM.exidx)
6157
}
62-
}
58+
}

library/std/src/sys/pal/vexos/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use crate::{arch::asm, ptr::{self, addr_of_mut}};
2626

2727
#[cfg(not(test))]
2828
#[no_mangle]
29-
#[link_section = ".text.boot"]
29+
#[link_section = ".boot"]
3030
pub unsafe extern "C" fn _start() -> ! {
3131
extern "C" {
3232
static mut __bss_start: u8;

0 commit comments

Comments
 (0)