From: Andreas Schwab <schwab@redhat.com>
Date: Thu, 10 Jun 2010 14:54:06 +0000 (+0200)
Subject: Don't assume AT_PAGESIZE is always available
X-Git-Tag: fedora/glibc-2.12.90-3~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26f25ed8b41240e0268e2e4472a4dc4564ffe146;p=thirdparty%2Fglibc.git

Don't assume AT_PAGESIZE is always available
---

diff --git a/ChangeLog b/ChangeLog
index b2d74eaf590..50ba655fc58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-06-10  Andreas Schwab  <schwab@redhat.com>
 
+	* sysdeps/unix/sysv/linux/getpagesize.c: Don't assume AT_PAGESIZE
+	is always available.
+
 	* sysdeps/unix/sysv/linux/i386/Versions: Export __uname under
 	GLIBC_PRIVATE.
 	* nptl/Versions: Export __getrlimit under GLIBC_PRIVATE.
diff --git a/sysdeps/unix/sysv/linux/getpagesize.c b/sysdeps/unix/sysv/linux/getpagesize.c
index 08660795112..fe9bc8ead72 100644
--- a/sysdeps/unix/sysv/linux/getpagesize.c
+++ b/sysdeps/unix/sysv/linux/getpagesize.c
@@ -28,7 +28,7 @@
 int
 __getpagesize ()
 {
-#ifdef __ASSUME_AT_PAGESIZE
+#if 0 && defined __ASSUME_AT_PAGESIZE
   assert (GLRO(dl_pagesize) != 0);
   return GLRO(dl_pagesize);
 #else