Skip to content

Commit b668cd5

Browse files
committed
tweak error messages
1 parent 351b06c commit b668cd5

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

cortex-m-rt/link.x.in

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -153,29 +153,30 @@ __sheap = __edata;
153153

154154
/* # Sanity checks */
155155

156-
/* Do not exceed this mark in the error messages below | */
157-
ASSERT(__reset_vector == ORIGIN(FLASH) + 0x8,
158-
"The reset vector is missing. This is a cortex-m-rt bug.
159-
Please file a bug report at:
160-
https://github.com/japaric/cortex-m-rt/issues");
156+
/* Do not exceed this mark in the error messages below | */
157+
ASSERT(__reset_vector == ORIGIN(FLASH) + 0x8, "
158+
cortex-m-rt: The reset vector is missing. This is a bug in cortex-m-rt. Please file a bug
159+
report at: https://github.com/japaric/cortex-m-rt/issues");
161160

162161
ASSERT(__eexceptions - ORIGIN(FLASH) == 0x40, "
163-
The exception handlers are missing. This is a cortex-m-rt bug.
164-
Please file a bug report at:
165-
https://github.com/japaric/cortex-m-rt/issues");
162+
cortex-m-rt: The exception handlers are missing. This is a bug in cortex-m-rt. Please file
163+
a bug report at: https://github.com/japaric/cortex-m-rt/issues");
166164

167165
ASSERT(__einterrupts - __eexceptions > 0, "
168-
The interrupt handlers are missing. If you are not linking to a device
169-
crate then you supply the interrupt handlers yourself. Check the
170-
documentation.");
166+
cortex-m-rt: The interrupt handlers are missing. Possible fixes, from most likely to less
167+
likely:
168+
- Link to a device crate
169+
- Disable the 'device' feature of cortex-m-rt to build a generic application (a dependency
170+
may be enabling it)
171+
- Supply the interrupt handlers yourself. Check the documentation for details.");
171172

172173
ASSERT(__einterrupts <= _stext, "
173-
The '.text' section can't be placed inside '.vector_table' section.
174-
Set '_stext' to an address greater than '__einterrupts' (cf. `nm`)");
174+
cortex-m-rt: The '.text' section can't be placed inside the '.vector_table' section. Set
175+
'_stext' to an address greater than '__einterrupts' (cf. `nm` output)");
175176

176177
ASSERT(_stext < ORIGIN(FLASH) + LENGTH(FLASH), "
177-
The '.text' section must be placed inside the FLASH memory
178-
Set '_stext' to an address smaller than 'ORIGIN(FLASH) + LENGTH(FLASH)");
178+
cortex-m-rt The '.text' section must be placed inside the FLASH memory.Set '_stext' to an
179+
address smaller than 'ORIGIN(FLASH) + LENGTH(FLASH)");
179180

180181
/* This has been temporarily omitted because it's not supported by LLD */
181182
/* ASSERT(__sbss % 4 == 0 && __ebss % 4 == 0, " */
@@ -188,9 +189,8 @@ Set '_stext' to an address smaller than 'ORIGIN(FLASH) + LENGTH(FLASH)");
188189
/* __sidata is not 4-byte aligned. This is a cortex-m-rt bug."); */
189190

190191
ASSERT(__sgot == __egot, "
191-
.got section detected in the input object files. Dynamic relocations
192-
are not supported. If you are linking to C code compiled using the
193-
`cc` crate then modify your build script to compile the C code
194-
_without_ the -fPIC flag. See the documentation of the
192+
.got section detected in the input object files. Dynamic relocations are not supported.
193+
If you are linking to C code compiled using the `cc` crate then modify your build script
194+
to compile the C code _without_ the -fPIC flag. See the documentation of the
195195
`cc::Build.pic` method for details.");
196-
/* Do not exceed this mark in the error messages above | */
196+
/* Do not exceed this mark in the error messages above | */

0 commit comments

Comments
 (0)