Skip to content

Commit 2ce267a

Browse files
committed
Remove eh_frmae from linker file
1 parent 275facc commit 2ce267a

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

riscv-rt/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
77

88
## [Unreleased]
99

10+
### Changed
11+
12+
- `link.x.in`: remove references to `eh_frame`
13+
1014
## [v0.13.0] - 2024-10-19
1115

1216
### Added

riscv-rt/link.x.in

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,6 @@ SECTIONS
169169
{
170170
KEEP(*(.got .got.*));
171171
}
172-
173-
.eh_frame (INFO) : { KEEP(*(.eh_frame)) }
174-
.eh_frame_hdr (INFO) : { *(.eh_frame_hdr) }
175172
}
176173

177174
/* Do not exceed this mark in the error messages above | */
@@ -187,9 +184,6 @@ ERROR(riscv-rt): the start of the REGION_DATA must be ${ARCH_WIDTH}-byte aligned
187184
ASSERT(ORIGIN(REGION_HEAP) % 4 == 0, "
188185
ERROR(riscv-rt): the start of the REGION_HEAP must be 4-byte aligned");
189186

190-
ASSERT(ORIGIN(REGION_TEXT) % 4 == 0, "
191-
ERROR(riscv-rt): the start of the REGION_TEXT must be 4-byte aligned");
192-
193187
ASSERT(ORIGIN(REGION_STACK) % 4 == 0, "
194188
ERROR(riscv-rt): the start of the REGION_STACK must be 4-byte aligned");
195189

@@ -216,11 +210,11 @@ ASSERT(SIZEOF(.stack) > (_max_hart_id + 1) * _hart_stack_size, "
216210
ERROR(riscv-rt): .stack section is too small for allocating stacks for all the harts.
217211
Consider changing `_max_hart_id` or `_hart_stack_size`.");
218212

213+
/* # Other checks */
219214
ASSERT(SIZEOF(.got) == 0, "
220-
.got section detected in the input files. Dynamic relocations are not
221-
supported. If you are linking to C code compiled using the `gcc` crate
222-
then modify your build script to compile the C code _without_ the
223-
-fPIC flag. See the documentation of the `gcc::Config.fpic` method for
224-
details.");
215+
ERROR(riscv-rt): .got section detected in the input files. Dynamic relocations are not
216+
supported. If you are linking to C code compiled using the `cc` crate then modify your
217+
build script to compile the C code _without_ the -fPIC flag. See the documentation of
218+
the `cc::Build.pic` method for details.");
225219

226220
/* Do not exceed this mark in the error messages above | */

0 commit comments

Comments
 (0)