Author: adconrad
Date: 2015-03-18 11:08:54 +0000 (Wed, 18 Mar 2015)
New Revision: 6386
Added:
glibc-package/branches/glibc-2.21/debian/patches/any/local-tester-gcc-4.9.diff
Modified:
glibc-package/branches/glibc-2.21/debian/changelog
glibc-package/branches/glibc-2.21/debian/control
glibc-package/branches/glibc-2.21/debian/control.in/main
glibc-package/branches/glibc-2.21/debian/patches/series
glibc-package/branches/glibc-2.21/debian/rules
Log:
* debian/{control.in/main,rules}: Switch to gcc-4.9 on all architectures.
* debian/patches/any/local-tester-gcc-4.9.diff: Fix gcc-4.9 regression.
Modified: glibc-package/branches/glibc-2.21/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.21/debian/changelog 2015-03-17 13:58:39 UTC
(rev 6385)
+++ glibc-package/branches/glibc-2.21/debian/changelog 2015-03-18 11:08:54 UTC
(rev 6386)
@@ -92,6 +92,8 @@
* debian/*: Update occurences of 2.19 to 2.21 and update symbols to match.
* debian/patches/any/cvs-vismain-pie.diff: Compile vismain with -fPIE
and link with -pie to fix testsuite failure with the new binutils.
+ * debian/{control.in/main,rules}: Switch to gcc-4.9 on all architectures.
+ * debian/patches/any/local-tester-gcc-4.9.diff: Fix gcc-4.9 regression.
* debian/libc*.symbols*: Remove local __invoke_dynamic_linker__ symbol,
which no longer shows up in random support libraries' symbol tables.
* debian/sysdeps/*: Neither ports nor nptl are considered add-ons anymore.
Modified: glibc-package/branches/glibc-2.21/debian/control
===================================================================
--- glibc-package/branches/glibc-2.21/debian/control 2015-03-17 13:58:39 UTC
(rev 6385)
+++ glibc-package/branches/glibc-2.21/debian/control 2015-03-18 11:08:54 UTC
(rev 6386)
@@ -8,7 +8,7 @@
mig (>= 1.4-2) [hurd-i386], hurd-dev (>= 1:0.5.git20140320~) [hurd-i386],
gnumach-dev (>= 2:1.4+git20141109-1) [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-any],
binutils (>= 2.21),
- g++-4.8 (>= 4.8.3-8), g++-4.8-multilib [amd64 i386 kfreebsd-amd64 mips mipsel
mipsn32 mipsn32el mips64 mips64el powerpc ppc64 s390x sparc sparc64 x32]
+ g++-4.9, g++-4.9-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32
mipsn32el mips64 mips64el powerpc ppc64 s390x sparc sparc64 x32]
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Maintainer: GNU Libc Maintainers <[email protected]>
Uploaders: Clint Adams <[email protected]>, Aurelien Jarno
<[email protected]>, Adam Conrad <[email protected]>
Modified: glibc-package/branches/glibc-2.21/debian/control.in/main
===================================================================
--- glibc-package/branches/glibc-2.21/debian/control.in/main 2015-03-17
13:58:39 UTC (rev 6385)
+++ glibc-package/branches/glibc-2.21/debian/control.in/main 2015-03-18
11:08:54 UTC (rev 6386)
@@ -8,7 +8,7 @@
mig (>= 1.4-2) [hurd-i386], hurd-dev (>= 1:0.5.git20140320~) [hurd-i386],
gnumach-dev (>= 2:1.4+git20141109-1) [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-any],
binutils (>= 2.21),
- g++-4.8 (>= 4.8.3-8), g++-4.8-multilib [amd64 i386 kfreebsd-amd64 mips mipsel
mipsn32 mipsn32el mips64 mips64el powerpc ppc64 s390x sparc sparc64 x32]
+ g++-4.9, g++-4.9-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32
mipsn32el mips64 mips64el powerpc ppc64 s390x sparc sparc64 x32]
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Maintainer: GNU Libc Maintainers <[email protected]>
Uploaders: Clint Adams <[email protected]>, Aurelien Jarno
<[email protected]>, Adam Conrad <[email protected]>
Added:
glibc-package/branches/glibc-2.21/debian/patches/any/local-tester-gcc-4.9.diff
===================================================================
---
glibc-package/branches/glibc-2.21/debian/patches/any/local-tester-gcc-4.9.diff
(rev 0)
+++
glibc-package/branches/glibc-2.21/debian/patches/any/local-tester-gcc-4.9.diff
2015-03-18 11:08:54 UTC (rev 6386)
@@ -0,0 +1,24 @@
+commit 9300797ee93422a87f443d5ba7e1411167e7a837
+Author: Ondřej Bílka <[email protected]>
+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.21/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.21/debian/patches/series 2015-03-17
13:58:39 UTC (rev 6385)
+++ glibc-package/branches/glibc-2.21/debian/patches/series 2015-03-18
11:08:54 UTC (rev 6386)
@@ -235,3 +235,4 @@
any/local-static-dlopen-search-path.diff
any/cvs-ldconfig-aux-cache.diff
any/cvs-vismain-pie.diff
+any/local-tester-gcc-4.9.diff
Modified: glibc-package/branches/glibc-2.21/debian/rules
===================================================================
--- glibc-package/branches/glibc-2.21/debian/rules 2015-03-17 13:58:39 UTC
(rev 6385)
+++ glibc-package/branches/glibc-2.21/debian/rules 2015-03-18 11:08:54 UTC
(rev 6386)
@@ -101,7 +101,7 @@
BASE_CC = gcc
BASE_CXX = g++
-DEB_GCC_VERSION ?= -4.8
+DEB_GCC_VERSION ?= -4.9
RUN_TESTSUITE = yes
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: https://lists.debian.org/[email protected]
