Merge from master.

This commit is contained in:
Naoki Hamada
2014-07-31 18:30:39 +09:00
parent b58682dd73
commit 3fa6818962
5 changed files with 6 additions and 1 deletions

View File

@ -79,6 +79,7 @@ struct program_load_desc {
unsigned long at_phent;
unsigned long at_phnum;
unsigned long at_entry;
unsigned long at_clktck;
char *args;
unsigned long args_len;
char *envs;

View File

@ -221,6 +221,7 @@ struct program_load_desc *load_elf(FILE *fp, char **interp_pathp)
desc->at_phent = sizeof(phdr);
desc->at_phnum = hdr.e_phnum;
desc->at_entry = hdr.e_entry;
desc->at_clktck = sysconf(_SC_CLK_TCK);
return desc;
}