Skip to content

Commit

Permalink
loader: fix build with gcc-ld
Browse files Browse the repository at this point in the history
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 <sean@xobs.io>
  • Loading branch information
xobs committed Nov 4, 2022
1 parent d74673a commit 3a84578
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions loader/link.x
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
MEMORY
{
RAM : ORIGIN = 0x40000000, LENGTH = 16M
FLASH : ORIGIN = 0x20501000, LENGTH = 188k
FONTS : ORIGIN = 0x20530000, LENGTH = 4352k
MEMLCD: ORIGIN = 0xB0000000, LENGTH = 32k
RAM : ORIGIN = 0x40000000, LENGTH = 16M
MEMLCD : ORIGIN = 0xB0000000, LENGTH = 32k
}
/*
Fonts go from 0x2053_0000 to 0x2097_0000
Expand Down Expand Up @@ -51,7 +51,7 @@ SECTIONS
.text.dummy (NOLOAD) :
{
/* This section is intended to make _stext address work */
. = _stext;
. = ABSOLUTE(_stext);
} > REGION_TEXT

.text _stext :
Expand Down Expand Up @@ -91,7 +91,7 @@ SECTIONS
_edata = .;
} > REGION_DATA AT > REGION_RODATA

.fonts ALIGN(65536) : SUBALIGN(65536)
.fonts : ALIGN(65536)
{
KEEP(*(.fontdata));
} > FONTS
Expand Down

0 comments on commit 3a84578

Please sign in to comment.