about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-09-11 11:25:51 -0400
committerUlrich Drepper <drepper@gmail.com>2011-09-11 11:25:51 -0400
commit32b4c8393f6db8b0bbf9c87a09461111a423a433 (patch)
treec28c4580ea67c15705d0b9a1b0446ee68c674297
parent8e58439c92250cde8aae7c2313d08578070b95bb (diff)
downloadglibc-32b4c8393f6db8b0bbf9c87a09461111a423a433.tar.gz
glibc-32b4c8393f6db8b0bbf9c87a09461111a423a433.tar.xz
glibc-32b4c8393f6db8b0bbf9c87a09461111a423a433.zip
Provide static initializer for _dl_pagesize in statically linked code
-rw-r--r--ChangeLog4
-rw-r--r--elf/dl-support.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 03b02d3319..2736b979cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-11  Ulrich Drepper  <drepper@gmail.com>
+
+	* elf/dl-support.c (_dl_pagesize): Initialize to EXEC_PAGESIZE.
+
 2011-09-10  Ulrich Drepper  <drepper@gmail.com>
 
 	* malloc/malloc.c: Replace MALLOC_FAILURE_ACTION with use of __set_errno.
diff --git a/elf/dl-support.c b/elf/dl-support.c
index 1b128c37ff..4226d12322 100644
--- a/elf/dl-support.c
+++ b/elf/dl-support.c
@@ -1,5 +1,5 @@
 /* Support for dynamic linking code in static libc.
-   Copyright (C) 1996-2008,2009,2010 Free Software Foundation, Inc.
+   Copyright (C) 1996-2008,2009,2010,2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -24,6 +24,7 @@
 #include <libintl.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <sys/param.h>
 #include <ldsodefs.h>
 #include <dl-machine.h>
 #include <bits/libc-lock.h>
@@ -105,7 +106,7 @@ hp_timing_t _dl_cpuclock_offset;
 
 void (*_dl_init_static_tls) (struct link_map *) = &_dl_nothread_init_static_tls;
 
-size_t _dl_pagesize;
+size_t _dl_pagesize = EXEC_PAGESIZE;
 
 unsigned int _dl_osversion;