d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix r264346 for ia64. We need to allocate memory for the function

Browse Source 
descriptors in order to relocate RTLD itself. To allocate memory,
we need the pagesizes array initialized, but that happens after
RTLD is relocated. This ordering is important for amd64, but it's
opposite of what ia64 needs. Handle this conflict with the define
called RTLD_INIT_PAGESIZES_EARLY. When defined, obtain the page
sizes before relocating rtld, otherwise do it after.
This commit is contained in:
Marcel Moolenaar 2014-07-02 22:04:12 +00:00
parent 5a178afd41
commit 97ef768914
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libexec/rtld-elf/ia64/rtld_machdep.h
View File

@ -69,4 +69,6 @@ extern void *__tls_get_addr(unsigned long module, unsigned long offset);
#define RTLD_DEFAULT_STACK_PF_EXEC 0
#define RTLD_DEFAULT_STACK_EXEC 0
#define RTLD_INIT_PAGESIZES_EARLY 1
#endif

7
libexec/rtld-elf/rtld.c
View File

@ -1802,6 +1802,11 @@ init_rtld(caddr_t mapbase, Elf_Auxinfo **aux_info)
const Elf_Dyn *dyn_soname;
const Elf_Dyn *dyn_runpath;
#ifdef RTLD_INIT_PAGESIZES_EARLY
/* The page size is required by the dynamic memory allocator. */
init_pagesizes(aux_info);
#endif
/*
* Conjure up an Obj_Entry structure for the dynamic linker.
*
@ -1838,8 +1843,10 @@ init_rtld(caddr_t mapbase, Elf_Auxinfo **aux_info)
/* Now that non-local variables can be accesses, copy out obj_rtld. */
memcpy(&obj_rtld, &objtmp, sizeof(obj_rtld));
#ifndef RTLD_INIT_PAGESIZES_EARLY
/* The page size is required by the dynamic memory allocator. */
init_pagesizes(aux_info);
#endif
if (aux_info[AT_OSRELDATE] != NULL)
osreldate = aux_info[AT_OSRELDATE]->a_un.a_val;