diff options
| author | David Holsgrove <david.holsgrove@xilinx.com> | 2014-02-06 09:57:56 +1000 |
|---|---|---|
| committer | David Holsgrove <david.holsgrove@xilinx.com> | 2014-02-06 09:57:56 +1000 |
| commit | dbe7af29a5fb470a6b963decb3bb88daa74cfc71 (patch) | |
| tree | 57cb63e9238a00add0f79fe998a5e7cfb767aadc | |
| parent | f482dbbec775bf72eb6510b6091fca141893c466 (diff) | |
| download | glibc-dbe7af29a5fb470a6b963decb3bb88daa74cfc71.tar.gz glibc-dbe7af29a5fb470a6b963decb3bb88daa74cfc71.tar.xz glibc-dbe7af29a5fb470a6b963decb3bb88daa74cfc71.zip | |
Revert "microblaze BZ #15705: Define MMAP2_PAGE_SHIFT"
This reverts commit 79b846ecc0275ceb02b5e2d3b03a34d7c43e6bf9. Conflicts: NEWS ports/ChangeLog.microblaze Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
| -rw-r--r-- | NEWS | 24 | ||||
| -rw-r--r-- | ports/ChangeLog.microblaze | 5 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/microblaze/mmap64.c | 4 |
3 files changed, 12 insertions, 21 deletions
diff --git a/NEWS b/NEWS index b9da86580e..4db818413f 100644 --- a/NEWS +++ b/NEWS @@ -15,18 +15,18 @@ Version 2.19 14699, 14752, 14782, 14876, 14910, 15004, 15048, 15073, 15089, 15128, 15218, 15268, 15277, 15308, 15362, 15374, 15400, 15425, 15427, 15483, 15522, 15531, 15532, 15593, 15601, 15608, 15609, 15610, 15632, 15640, - 15670, 15672, 15680, 15681, 15705, 15723, 15734, 15735, 15736, 15748, - 15749, 15754, 15760, 15763, 15764, 15797, 15799, 15825, 15843, 15844, - 15846, 15847, 15849, 15850, 15855, 15856, 15857, 15859, 15867, 15886, - 15887, 15890, 15892, 15893, 15895, 15897, 15901, 15905, 15909, 15915, - 15917, 15919, 15921, 15923, 15939, 15941, 15948, 15963, 15966, 15985, - 15988, 15997, 16032, 16034, 16036, 16037, 16038, 16041, 16046, 16055, - 16071, 16072, 16074, 16077, 16078, 16103, 16112, 16143, 16144, 16146, - 16150, 16151, 16153, 16167, 16169, 16172, 16195, 16214, 16245, 16271, - 16274, 16283, 16289, 16293, 16314, 16316, 16330, 16337, 16338, 16356, - 16365, 16366, 16369, 16372, 16375, 16379, 16384, 16385, 16386, 16387, - 16390, 16394, 16398, 16400, 16407, 16408, 16414, 16430, 16431, 16453, - 16474, 16506, 16510 + 15670, 15672, 15680, 15681, 15723, 15734, 15735, 15736, 15748, 15749, + 15754, 15760, 15763, 15764, 15797, 15799, 15825, 15843, 15844, 15846, + 15847, 15849, 15850, 15855, 15856, 15857, 15859, 15867, 15886, 15887, + 15890, 15892, 15893, 15895, 15897, 15901, 15905, 15909, 15915, 15917, + 15919, 15921, 15923, 15939, 15941, 15948, 15963, 15966, 15985, 15988, + 15997, 16032, 16034, 16036, 16037, 16038, 16041, 16046, 16055, 16071, + 16072, 16074, 16077, 16078, 16103, 16112, 16143, 16144, 16146, 16150, + 16151, 16153, 16167, 16169, 16172, 16195, 16214, 16245, 16271, 16274, + 16283, 16289, 16293, 16314, 16316, 16330, 16337, 16338, 16356, 16365, + 16366, 16369, 16372, 16375, 16379, 16384, 16385, 16386, 16387, 16390, + 16394, 16398, 16400, 16407, 16408, 16414, 16430, 16431, 16453, 16474, + 16506, 16510 * Slovenian translations for glibc messages have been contributed by the Translation Project's Slovenian team of translators. diff --git a/ports/ChangeLog.microblaze b/ports/ChangeLog.microblaze index 6a25659758..1c5bc996b1 100644 --- a/ports/ChangeLog.microblaze +++ b/ports/ChangeLog.microblaze @@ -5,11 +5,6 @@ 2014-02-04 David Holsgrove <david.holsgrove@xilinx.com> - [BZ #15705] - * sysdeps/unix/sysv/linux/microblaze/mmap64.c: New file. - -2014-02-04 David Holsgrove <david.holsgrove@xilinx.com> - * sysdeps/microblaze/fegetround.c: Delete redundant file. * sysdeps/microblaze/fesetround.c: Likewise. diff --git a/ports/sysdeps/unix/sysv/linux/microblaze/mmap64.c b/ports/sysdeps/unix/sysv/linux/microblaze/mmap64.c deleted file mode 100644 index 11a6bd8245..0000000000 --- a/ports/sysdeps/unix/sysv/linux/microblaze/mmap64.c +++ /dev/null @@ -1,4 +0,0 @@ -/* Microblaze kernel has PAGE_SHIFT set to 12. - Determine the shift dynamically with getpagesize. */ -#define MMAP2_PAGE_SHIFT -1 -#include <sysdeps/unix/sysv/linux/mmap64.c> |