diff options
| author | Moritz Angermann <moritz.angermann@gmail.com> | 2020-04-21 11:44:07 +0800 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-04-22 23:15:33 -0400 |
| commit | 831b66425aa3a24e769ace8d4649299ade021717 (patch) | |
| tree | 9782da78fdaa0f34f5a39e103910d5612238dccc | |
| parent | 4b4a8b60a5b403e02117ab0a30a386664845586b (diff) | |
| download | haskell-831b66425aa3a24e769ace8d4649299ade021717.tar.gz | |
Fix build warning; add more informative information to the linker; fix linker for empty sections
| -rw-r--r-- | rts/linker/MachO.c | 19 | ||||
| -rw-r--r-- | rts/posix/GetTime.c | 1 |
2 files changed, 15 insertions, 5 deletions
diff --git a/rts/linker/MachO.c b/rts/linker/MachO.c index 6e379ffb53..58712075b2 100644 --- a/rts/linker/MachO.c +++ b/rts/linker/MachO.c @@ -677,6 +677,14 @@ static int relocateSection(ObjectCode* oc, int curSection) { Section * sect = &oc->sections[curSection]; + + IF_DEBUG(linker, debugBelch("relocateSection %d, info: %x\n", curSection, sect->info)); + + // empty sections (without segments), won't have their info filled. + // there is no relocation to be done for them. + if(sect->info == NULL) + return 1; + MachOSection * msect = sect->info->macho_section; // for access convenience MachORelocationInfo * relocs = sect->info->relocation_info; MachOSymbol * symbols = oc->info->macho_symbols; @@ -1192,7 +1200,7 @@ ocGetNames_MachO(ObjectCode* oc) SymbolAddr* commonStorage = NULL; unsigned long commonCounter; - IF_DEBUG(linker,debugBelch("ocGetNames_MachO: start\n")); + IF_DEBUG(linker,debugBelch("ocGetNames_MachO: %s start\n", OC_INFORMATIVE_FILENAME(oc))); Section *secArray; secArray = (Section*)stgCallocBytes( @@ -1449,7 +1457,7 @@ ocMprotect_MachO( ObjectCode *oc ) int ocResolve_MachO(ObjectCode* oc) { - IF_DEBUG(linker, debugBelch("ocResolve_MachO: start\n")); + IF_DEBUG(linker, debugBelch("ocResolve_MachO: %s start\n", OC_INFORMATIVE_FILENAME(oc))); if(NULL != oc->info->dsymCmd) { @@ -1460,6 +1468,9 @@ ocResolve_MachO(ObjectCode* oc) for (int i = 0; i < oc->n_sections; i++) { const char * sectionName = oc->info->macho_sections[i].sectname; + + IF_DEBUG(linker, debugBelch("ocResolve_MachO: section %d/%d: %s\n", i, oc->n_sections, sectionName)); + if( !strcmp(sectionName,"__la_symbol_ptr") || !strcmp(sectionName,"__la_sym_ptr2") || !strcmp(sectionName,"__la_sym_ptr3")) @@ -1483,7 +1494,7 @@ ocResolve_MachO(ObjectCode* oc) } else { - IF_DEBUG(linker, debugBelch("ocResolve_MachO: unknown section\n")); + IF_DEBUG(linker, debugBelch("ocResolve_MachO: unknown section %d/%d\n", i, oc->n_sections)); } } } @@ -1520,7 +1531,7 @@ ocResolve_MachO(ObjectCode* oc) for(int i = 0; i < oc->n_sections; i++) { - IF_DEBUG(linker, debugBelch("ocResolve_MachO: relocating section %d\n", i)); + IF_DEBUG(linker, debugBelch("ocResolve_MachO: relocating section %d/%d\n", i, oc->n_sections)); #if defined(aarch64_HOST_ARCH) if (!relocateSectionAarch64(oc, &oc->sections[i])) diff --git a/rts/posix/GetTime.c b/rts/posix/GetTime.c index eda18e1202..602bd17b52 100644 --- a/rts/posix/GetTime.c +++ b/rts/posix/GetTime.c @@ -71,7 +71,6 @@ Time getCurrentThreadCPUTime(void) // support clock_getcpuclockid. Hence we prefer to use the Darwin-specific // path on Darwin, even if clock_gettime is available. #if defined(darwin_HOST_OS) - mach_port_t port = pthread_mach_thread_np(osThreadId()); thread_basic_info_data_t info = { 0 }; mach_msg_type_number_t info_count = THREAD_BASIC_INFO_COUNT; kern_return_t kern_err = thread_info(mach_thread_self(), THREAD_BASIC_INFO, |