r6588 - in glibc-package/branches/glibc-2.22/debian: . patches patches/any
Author: adconrad
Date: 2015-09-18 08:14:47 +0000 (Fri, 18 Sep 2015)
New Revision: 6588
Removed:
glibc-package/branches/glibc-2.22/debian/patches/any/local-tester-gcc-4.9.diff
Modified:
glibc-package/branches/glibc-2.22/debian/changelog
glibc-package/branches/glibc-2.22/debian/patches/series
Log:
debian/patches/any/local-tester-gcc-4.9.diff: Dropped.
Modified: glibc-package/branches/glibc-2.22/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.22/debian/changelog 2015-09-18 04:20:05 UTC (rev 6587)
+++ glibc-package/branches/glibc-2.22/debian/changelog 2015-09-18 08:14:47 UTC (rev 6588)
@@ -9,6 +9,7 @@
- debian/patches/any/cvs-make-typo.diff: Upstreamed.
- debian/patches/any/cvs-vismain-pie.diff: Upstreamed.
- debian/patches/any/local-xfail-stdlib-linkns.diff: Dropped.
+ - debian/patches/any/local-tester-gcc-4.9.diff: Dropped.
- debian/patches/arm/cvs-arm-sfi_breg.diff: Upstreamed.
- debian/patches/arm/cvs-memcpy-memmove-always-bx.diff: Upstreamed.
- debian/patches/hppa/cvs-alloca-werror.diff: Upstreamed.
Deleted: glibc-package/branches/glibc-2.22/debian/patches/any/local-tester-gcc-4.9.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/any/local-tester-gcc-4.9.diff 2015-09-18 04:20:05 UTC (rev 6587)
+++ glibc-package/branches/glibc-2.22/debian/patches/any/local-tester-gcc-4.9.diff 2015-09-18 08:14:47 UTC (rev 6588)
@@ -1,24 +0,0 @@
-commit 9300797ee93422a87f443d5ba7e1411167e7a837
-Author: Ondřej Bílka <neleai@seznam.cz>
-Date: Tue Jan 6 17:43:09 2015 +0100
-
- Suppress warning in string/tester.c for gcc 4.9
-
-diff --git a/string/tester.c b/string/tester.c
-index f957ed2..64dc056 100644
---- a/string/tester.c
-+++ b/string/tester.c
-@@ -1305,10 +1305,10 @@ test_memset (void)
- equal(one, "axxxefgh", 2); /* Basic test. */
-
- DIAG_PUSH_NEEDS_COMMENT;
--#if __GNUC_PREREQ (5, 0)
-- /* GCC 5.0 warns about a zero-length memset because the arguments to memset
-+#if __GNUC_PREREQ (4, 9)
-+ /* GCC 4.9 warns about a zero-length memset because the arguments to memset
- may be in the wrong order. But we really want to test this. */
-- DIAG_IGNORE_NEEDS_COMMENT (5.0, "-Wmemset-transposed-args")
-+ DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmemset-transposed-args")
- #endif
- (void) memset(one+2, 'y', 0);
- equal(one, "axxxefgh", 3); /* Zero-length set. */
Modified: glibc-package/branches/glibc-2.22/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/series 2015-09-18 04:20:05 UTC (rev 6587)
+++ glibc-package/branches/glibc-2.22/debian/patches/series 2015-09-18 08:14:47 UTC (rev 6588)
@@ -230,5 +230,4 @@
any/submitted-argp-attribute.diff
any/submitted-resolv-ipv6-nameservers.diff
any/local-static-dlopen-search-path.diff
-any/local-tester-gcc-4.9.diff
any/local-math-logb.diff
Reply to: