diff options
| author | Moritz Angermann <moritz.angermann@gmail.com> | 2020-11-25 09:32:00 +0800 |
|---|---|---|
| committer | Moritz Angermann <moritz.angermann@gmail.com> | 2020-11-25 10:38:45 +0800 |
| commit | a3e195ae70c569e1a140e22175220d28d8be35c0 (patch) | |
| tree | 89a2e2a85c9f41a75eb18cd3d46928813524799a /rts/linker/Elf.c | |
| parent | d4483f7b81dc7bd3d246fc22728a1ec86570e6e8 (diff) | |
| download | haskell-wip/backport/9.0/T18857.tar.gz | |
CmmToLlvm: Declare signature for memcmpwip/backport/9.0/T18857
Otherwise `opt` fails with:
error: use of undefined value '@memcmp$def'
Diffstat (limited to 'rts/linker/Elf.c')
| -rw-r--r-- | rts/linker/Elf.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/rts/linker/Elf.c b/rts/linker/Elf.c index 3c0ace3a4b..0a02fb452a 100644 --- a/rts/linker/Elf.c +++ b/rts/linker/Elf.c @@ -780,7 +780,12 @@ ocGetNames_ELF ( ObjectCode* oc ) else if (!oc->imageMapped || size < getPageSize() / 3) { bool executable = kind == SECTIONKIND_CODE_OR_RODATA; m32_allocator *allocator = executable ? oc->rx_m32 : oc->rw_m32; - start = m32_alloc(allocator, size, 8); + // align on 16 bytes. The reason being that llvm will emit see + // paddq statements for x86_64 under optimisation and load from + // RODATA sections. Specifically .rodata.cst16. However we don't + // handle the cst part in any way what so ever, so 16 seems + // better than 8. + start = m32_alloc(allocator, size, 16); if (start == NULL) goto fail; memcpy(start, oc->image + offset, size); alloc = SECTION_M32; @@ -915,7 +920,7 @@ ocGetNames_ELF ( ObjectCode* oc ) symbol->addr = (SymbolAddr*)( (intptr_t) oc->sections[secno].start + (intptr_t) symbol->elf_sym->st_value); - + ASSERT(symbol->addr != 0x0); if (ELF_ST_BIND(symbol->elf_sym->st_info) == STB_LOCAL) { isLocal = true; isWeak = false; @@ -1842,6 +1847,7 @@ ocResolve_ELF ( ObjectCode* oc ) #endif ASSERT(symbol->elf_sym->st_name == 0); ASSERT(symbol->elf_sym->st_value == 0); + ASSERT(0x0 != oc->sections[ secno ].start); symbol->addr = oc->sections[ secno ].start; } } @@ -1915,6 +1921,7 @@ int ocRunInit_ELF( ObjectCode *oc ) init_start = (init_t*)init_startC; init_end = (init_t*)(init_startC + shdr[i].sh_size); for (init = init_start; init < init_end; init++) { + ASSERT(0x0 != *init); (*init)(argc, argv, envv); } } |