From: Matthew Fortune <matthew.fortune@imgtec.com>
Date: Mon, 5 Jan 2015 13:34:41 +0000 (+0000)
Subject: Fix MIPS variable PAGE_SIZE bug (16191)
X-Git-Tag: upstream/2.30~6532
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b1efe3bbcfd94941556ffd5b60539207023c8224;p=external%2Fglibc.git

Fix MIPS variable PAGE_SIZE bug (16191)

MIPS supports a variable page size but glibc defines a constant.
This causes at least two glibc tests to fail when the page size
does not match the hard-coded size:

inet/test-ifaddrs
inet/test_ifindex

	[BZ #16191]
	* NEWS: Mention bug fix.
	* sysdeps/unix/sysv/linux/mips/sys/user.h (PAGE_SHIFT): Remove.
	(PAGE_SIZE, PAGE_MASK, NBPG, UPAGES): Likewise.
	(HOST_TEXT_START_ADDR, HOST_DATA_START_ADDR): Likewise.
	(HOST_STACK_END_ADDR): Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 1b08fb4..e460e9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2015-01-05  Matthew Fortune  <matthew.fortune@imgtec.com>
+
+	[BZ #16191]
+	* NEWS: Mention bug fix.
+	* sysdeps/unix/sysv/linux/mips/sys/user.h (PAGE_SHIFT): Remove.
+	(PAGE_SIZE, PAGE_MASK, NBPG, UPAGES): Likewise.
+	(HOST_TEXT_START_ADDR, HOST_DATA_START_ADDR): Likewise.
+	(HOST_STACK_END_ADDR): Likewise.
+
 2015-01-02  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #17748]
diff --git a/NEWS b/NEWS
index 4d90c85..fd00cac 100644
--- a/NEWS
+++ b/NEWS
@@ -10,13 +10,13 @@ Version 2.21
 * The following bugs are resolved with this release:
 
   6652, 10672, 12847, 12926, 13862, 14132, 14138, 14171, 14498, 15215,
-  15884, 16469, 16617, 16619, 16657, 16740, 16857, 17192, 17266, 17344,
-  17363, 17370, 17371, 17411, 17460, 17475, 17485, 17501, 17506, 17508,
-  17522, 17555, 17570, 17571, 17572, 17573, 17574, 17581, 17582, 17583,
-  17584, 17585, 17589, 17594, 17601, 17608, 17616, 17625, 17630, 17633,
-  17634, 17647, 17653, 17657, 17664, 17665, 17668, 17682, 17717, 17719,
-  17722, 17723, 17724, 17725, 17732, 17733, 17744, 17745, 17746, 17747,
-  17775, 17780, 17781, 17782
+  15884, 16191, 16469, 16617, 16619, 16657, 16740, 16857, 17192, 17266,
+  17344, 17363, 17370, 17371, 17411, 17460, 17475, 17485, 17501, 17506,
+  17508, 17522, 17555, 17570, 17571, 17572, 17573, 17574, 17581, 17582,
+  17583, 17584, 17585, 17589, 17594, 17601, 17608, 17616, 17625, 17630,
+  17633, 17634, 17647, 17653, 17657, 17664, 17665, 17668, 17682, 17717,
+  17719, 17722, 17723, 17724, 17725, 17732, 17733, 17744, 17745, 17746,
+  17747, 17775, 17780, 17781, 17782
 
 * i386 memcpy functions optimized with SSE2 unaligned load/store.
 
diff --git a/sysdeps/unix/sysv/linux/mips/sys/user.h b/sysdeps/unix/sysv/linux/mips/sys/user.h
index a249dd4..286fd57 100644
--- a/sysdeps/unix/sysv/linux/mips/sys/user.h
+++ b/sysdeps/unix/sysv/linux/mips/sys/user.h
@@ -206,13 +206,4 @@ struct user {
 
 #endif
 
-#define PAGE_SHIFT		12
-#define PAGE_SIZE		(1UL << PAGE_SHIFT)
-#define PAGE_MASK		(~(PAGE_SIZE-1))
-#define NBPG			PAGE_SIZE
-#define UPAGES			1
-#define HOST_TEXT_START_ADDR	(u.start_code)
-#define HOST_DATA_START_ADDR	(u.start_data)
-#define HOST_STACK_END_ADDR	(u.start_stack + u.u_ssize * NBPG)
-
 #endif	/* _SYS_USER_H */