about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Fortune <matthew.fortune@imgtec.com>2015-01-05 15:12:45 +0000
committerDavid Holsgrove <david.holsgrove@xilinx.com>2015-01-09 17:34:46 +1000
commitaee6626c30dd0043990d9554c943fdfdbf9fce83 (patch)
tree6ab5ce64152bbaf2645ffe5f25afcd2bbd2ecfa0
parent9e560f4838f37362449ebb0c19a0592323e593b1 (diff)
downloadglibc-aee6626c30dd0043990d9554c943fdfdbf9fce83.tar.gz
glibc-aee6626c30dd0043990d9554c943fdfdbf9fce83.tar.xz
glibc-aee6626c30dd0043990d9554c943fdfdbf9fce83.zip
MicroBlaze: Fix BZ17791 - Remove fixed page size macros and others
Microblaze apparently has a variable page size (see thread below) and
should not hard-code any page-size related macros.
Also remove macros that are only used for BFD's trad-core support
which is not relavant for microblaze also according to the thread
starting here:

https://sourceware.org/ml/libc-ports/2013-11/msg00028.html

This patch is neither built nor tested but mirrors a MIPS patch that
fixes the same issue.

Thanks,
Matthew

     * sysdepsysdeps/unix/sysv/linux/microblaze/sys/user.h
     (PAGE_SHIFT, PAGE_SIZE, PAGE_MASK, NBPG, UPAGES): Remove.
     (HOST_TEXT_START_ADDR, HOST_STACK_END_ADDR): Remove.

Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
-rw-r--r--ChangeLog8
-rw-r--r--NEWS2
-rw-r--r--sysdeps/unix/sysv/linux/microblaze/sys/user.h8
3 files changed, 9 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index acb9e44354..fa778d28fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-01-09  Matthew Fortune <matthew.fortune@imgtec.com>
+
+	[BZ #17791]
+	* NEWS: Mention bug fix.
+	* sysdepsysdeps/unix/sysv/linux/microblaze/sys/user.h
+	(PAGE_SHIFT, PAGE_SIZE, PAGE_MASK, NBPG, UPAGES): Remove.
+	(HOST_TEXT_START_ADDR, HOST_STACK_END_ADDR): Remove.
+
 2015-01-09  Torvald Riegel <triegel@redhat.com>
 
 	* sysdeps/unix/sysv/linux/microblaze/lowlevellock.h: Delete file.
diff --git a/NEWS b/NEWS
index 0e3301ec92..e1698b2375 100644
--- a/NEWS
+++ b/NEWS
@@ -17,7 +17,7 @@ Version 2.21
   17630, 17633, 17634, 17635, 17647, 17653, 17657, 17658, 17664, 17665,
   17668, 17682, 17717, 17719, 17722, 17723, 17724, 17725, 17732, 17733,
   17744, 17745, 17746, 17747, 17748, 17775, 17777, 17780, 17781, 17782,
-  17793, 17796, 17797, 17806
+  17791, 17793, 17796, 17797, 17806
 
 * Optimized strcpy, stpcpy, strchrnul and strrchr implementations for
   AArch64.  Contributed by ARM Ltd.
diff --git a/sysdeps/unix/sysv/linux/microblaze/sys/user.h b/sysdeps/unix/sysv/linux/microblaze/sys/user.h
index e23e05c9ed..a58a5c66ce 100644
--- a/sysdeps/unix/sysv/linux/microblaze/sys/user.h
+++ b/sysdeps/unix/sysv/linux/microblaze/sys/user.h
@@ -66,12 +66,4 @@ struct user
   int				u_debugreg [8];
 };
 
-# 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_STACK_END_ADDR	(u.start_stack + u.u_ssize * NBPG)
-
 #endif	/* _SYS_USER_H */