summaryrefslogtreecommitdiff
path: root/rts/linker
diff options
context:
space:
mode:
authorMoritz Angermann <moritz.angermann@gmail.com>2021-03-25 21:02:23 +0800
committerMarge Bot <ben+marge-bot@smart-cactus.org>2021-03-29 17:25:49 -0400
commitdf08d54841bfee99fe5f9bed9bbab5e4bd512a70 (patch)
tree7309821d25fa8d2ee141caa8348fdff091df9d99 /rts/linker
parent4bbd1445e193bc314073e83820caa393567fcd25 (diff)
downloadhaskell-df08d54841bfee99fe5f9bed9bbab5e4bd512a70.tar.gz
[armv7] arm32 needs symbols!
Diffstat (limited to 'rts/linker')
-rw-r--r--rts/linker/Elf.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/rts/linker/Elf.c b/rts/linker/Elf.c
index 8037d52b7c..d34b6e6e50 100644
--- a/rts/linker/Elf.c
+++ b/rts/linker/Elf.c
@@ -713,12 +713,13 @@ ocGetNames_ELF ( ObjectCode* oc )
#if defined(NEED_GOT) || RTS_LINKER_USE_MMAP
if (USE_CONTIGUOUS_MMAP || RtsFlags.MiscFlags.linkerAlwaysPic) {
/* The space for bss sections is already preallocated */
- ASSERT(oc->bssBegin != NULL);
+ CHECK(oc->bssBegin != NULL);
alloc = SECTION_NOMEM;
+ CHECK(oc->image != 0x0);
start =
oc->image + roundUpToAlign(oc->bssBegin - oc->image, align);
oc->bssBegin = (char*)start + size;
- ASSERT(oc->bssBegin <= oc->bssEnd);
+ CHECK(oc->bssBegin <= oc->bssEnd);
} else {
/* Use mmapForLinker to allocate .bss, otherwise the malloced
* address might be out of range for sections that are mmaped.
@@ -733,6 +734,7 @@ ocGetNames_ELF ( ObjectCode* oc )
mapped_offset = 0;
mapped_size = roundUpToPage(size);
}
+ CHECK(start != 0x0);
#else
alloc = SECTION_MALLOC;
start = stgCallocBytes(1, size, "ocGetNames_ELF(BSS)");