Skip to content

Commit 3a84578

Browse files
committed
loader: fix build with gcc-ld
With Rust 1.65.0, we may be forced to use gdb's linker due to bug that appeared in llvm-15: rust-lang/rust#103949 Signed-off-by: Sean Cross <[email protected]>
1 parent d74673a commit 3a84578

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

loader/link.x

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
MEMORY
22
{
3-
RAM : ORIGIN = 0x40000000, LENGTH = 16M
43
FLASH : ORIGIN = 0x20501000, LENGTH = 188k
54
FONTS : ORIGIN = 0x20530000, LENGTH = 4352k
6-
MEMLCD: ORIGIN = 0xB0000000, LENGTH = 32k
5+
RAM : ORIGIN = 0x40000000, LENGTH = 16M
6+
MEMLCD : ORIGIN = 0xB0000000, LENGTH = 32k
77
}
88
/*
99
Fonts go from 0x2053_0000 to 0x2097_0000
@@ -51,7 +51,7 @@ SECTIONS
5151
.text.dummy (NOLOAD) :
5252
{
5353
/* This section is intended to make _stext address work */
54-
. = _stext;
54+
. = ABSOLUTE(_stext);
5555
} > REGION_TEXT
5656

5757
.text _stext :
@@ -91,7 +91,7 @@ SECTIONS
9191
_edata = .;
9292
} > REGION_DATA AT > REGION_RODATA
9393

94-
.fonts ALIGN(65536) : SUBALIGN(65536)
94+
.fonts : ALIGN(65536)
9595
{
9696
KEEP(*(.fontdata));
9797
} > FONTS

0 commit comments

Comments
 (0)