HelenOSHelenOS-docHelenOS-historic

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /branches/dynload/uspace/srv/loader/ @ 3399

  → /branches/dynload/uspace/srv/loader/ @ 3400

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 3399 → Rev 3400

/branches/dynload/uspace/srv/loader/main.c
231,7 → 231,7
}
printf("Load dynamic linker '%s'\n", prog_info.interp);
rc = elf_load_file("/rtld.so", RTLD_BIAS, &interp_info);
rc = elf_load_file(prog_info.interp, RTLD_BIAS, &interp_info);
if (rc < 0) {
printf("failed to load dynamic linker\n");
ipc_answer_0(rid, EINVAL);
245,7 → 245,9
pcb.rtld_bias = RTLD_BIAS;
printf("run dynamic linker\n");
printf("entry point: 0x%llx\n", interp_info.entry);
printf("rtld_dynamic = 0x%lx\n", pcb.rtld_dynamic);
printf("entry point: 0x%lx\n", interp_info.entry);
printf("pcb address: 0x%lx\n", &pcb);
close_console();
ipc_answer_0(rid, EOK);

/branches/dynload/uspace/srv/loader/elf_load.c
97,7 → 97,7
fd = open(file_name, O_RDONLY);
if (fd < 0) {
printf("failed opening file\n");
printf("failed opening file (error %d)\n", fd);
return -1;
}
286,8 → 286,8
return load_segment(elf, entry);
break;
case PT_INTERP:
/* Assume silently interp == "/rtld.so" */
elf->info->interp = "/rtld.so";
/* Assume silently interp == "/lib/rtld.so" */
elf->info->interp = "/lib/rtld.so";
break;
case PT_DYNAMIC:
case PT_SHLIB: