M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

ksupport: adapt to dyld_load()

This commit is contained in:
Robert Jördens 2016-10-18 11:37:27 +02:00
parent 54f05b6fc1
commit bf942fc228
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artiq/runtime/ksupport.c
View File

@ -333,7 +333,8 @@ int dl_iterate_phdr (int (*callback)(struct dl_phdr_info *, size_t, void *), voi
return retval; return retval;
} }
static Elf32_Addr resolve_runtime_export(const char *name) static Elf32_Addr resolve_runtime_export(void *resolve_data,
const char *name)
{ {
const struct symbol *sym = runtime_exports; const struct symbol *sym = runtime_exports;
while(sym->name) { while(sym->name) {
@ -397,7 +398,7 @@ int main(void)
if(request->library != NULL) { if(request->library != NULL) {
if(!dyld_load(request->library, KERNELCPU_PAYLOAD_ADDRESS, if(!dyld_load(request->library, KERNELCPU_PAYLOAD_ADDRESS,
resolve_runtime_export, request->library_info, resolve_runtime_export, NULL, request->library_info,
&load_reply.error)) { &load_reply.error)) {
mailbox_send(&load_reply); mailbox_send(&load_reply);
while(1); while(1);