Author: peter
Date: Mon Apr 13 08:35:03 2015
New Revision: 281486
URL: https://svnweb.freebsd.org/changeset/base/281486
Log:
MFC r268182: Initialize page sizes early for ia64.
Modified:
stable/10/libexec/rtld-elf/ia64/rtld_machdep.h
stable/10/libexec/rtld-elf/rtld.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/libexec/rtld-elf/ia64/rtld_machdep.h
==============================================================================
--- stable/10/libexec/rtld-elf/ia64/rtld_machdep.h Mon Apr 13 04:48:13
2015 (r281485)
+++ stable/10/libexec/rtld-elf/ia64/rtld_machdep.h Mon Apr 13 08:35:03
2015 (r281486)
@@ -69,4 +69,6 @@ extern void *__tls_get_addr(unsigned lon
#define RTLD_DEFAULT_STACK_PF_EXEC 0
#define RTLD_DEFAULT_STACK_EXEC 0
+#define RTLD_INIT_PAGESIZES_EARLY 1
+
#endif
Modified: stable/10/libexec/rtld-elf/rtld.c
==============================================================================
--- stable/10/libexec/rtld-elf/rtld.c Mon Apr 13 04:48:13 2015
(r281485)
+++ stable/10/libexec/rtld-elf/rtld.c Mon Apr 13 08:35:03 2015
(r281486)
@@ -1807,6 +1807,11 @@ init_rtld(caddr_t mapbase, Elf_Auxinfo *
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.
*
@@ -1843,8 +1848,10 @@ init_rtld(caddr_t mapbase, Elf_Auxinfo *
/* 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;
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
