r5894 - in glibc-package/branches/eglibc-2.18/debian: . patches patches/mips
Author: aurel32
Date: 2013-12-26 08:33:15 +0000 (Thu, 26 Dec 2013)
New Revision: 5894
Removed:
glibc-package/branches/eglibc-2.18/debian/patches/mips/submitted-wordsize-clang.diff
Modified:
glibc-package/branches/eglibc-2.18/debian/changelog
glibc-package/branches/eglibc-2.18/debian/patches/series
Log:
* debian/patches/mips/submitted-wordsize-clang.diff: drop now that clang
correctly defines_MIPS_SZPTR.
Modified: glibc-package/branches/eglibc-2.18/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/changelog 2013-12-24 22:26:35 UTC (rev 5893)
+++ glibc-package/branches/eglibc-2.18/debian/changelog 2013-12-26 08:33:15 UTC (rev 5894)
@@ -12,6 +12,8 @@
[ Aurelien Jarno ]
* debian/patches/any/cvs-vfscanf-0e+0.diff: new patch from upstream to
fix parsing of 0e+0. Closes: #732993.
+ * debian/patches/mips/submitted-wordsize-clang.diff: drop now that clang
+ correctly defines_MIPS_SZPTR.
-- Adam Conrad <adconrad@ubuntu.com> Tue, 10 Dec 2013 01:59:47 -0700
Deleted: glibc-package/branches/eglibc-2.18/debian/patches/mips/submitted-wordsize-clang.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/mips/submitted-wordsize-clang.diff 2013-12-24 22:26:35 UTC (rev 5893)
+++ glibc-package/branches/eglibc-2.18/debian/patches/mips/submitted-wordsize-clang.diff 2013-12-26 08:33:15 UTC (rev 5894)
@@ -1,26 +0,0 @@
-2011-06-04 Aurelien Jarno <aurelien@aurel32.net>
-
- * sysdeps/mips/bits/wordsize.h(__WORDSIZE): Define from _MIPS_SZPTR
- or __INTPTR_WIDTH__.
-
----
- ports/sysdeps/mips/bits/wordsize.h | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
---- a/ports/sysdeps/mips/bits/wordsize.h
-+++ b/ports/sysdeps/mips/bits/wordsize.h
-@@ -15,7 +15,13 @@
- License along with the GNU C Library. If not, see
- <http://www.gnu.org/licenses/>. */
-
--#define __WORDSIZE _MIPS_SZPTR
-+#if defined (_MIPS_SZPTR)
-+# define __WORDSIZE _MIPS_SZPTR
-+#elif defined (__INTPTR_WIDTH__)
-+# define __WORDSIZE __INTPTR_WIDTH__
-+#else
-+# error Cannot define __WORDSIZE
-+#endif
- #if _MIPS_SIM == _ABI64
- # define __WORDSIZE_TIME64_COMPAT32 1
- #endif
Modified: glibc-package/branches/eglibc-2.18/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/series 2013-12-24 22:26:35 UTC (rev 5893)
+++ glibc-package/branches/eglibc-2.18/debian/patches/series 2013-12-26 08:33:15 UTC (rev 5894)
@@ -180,7 +180,6 @@
mips/local-lowlevellock.diff
mips/local-r10k.diff
mips/submitted-rld_map.diff
-mips/submitted-wordsize-clang.diff
mips/cvs-prlimit64.diff
powerpc/local-math-logb.diff
Reply to: