Bug 20729: Fix build failures on ppc64 and other arches.

The changes to fix bug 20729 introduced an error which removed an
ignore diagnostic from -O2 by using the new -Os related macro.
This broke ppc64 builds. This commit fixes the mistake.

Tested on x86, x86_64, ppc64, ppc64le, arm, aarch64, and s390x.
This commit is contained in:
Carlos O'Donell 2016-11-02 13:01:36 -04:00
parent 9032070dea
commit 0cb9dcc8f2
2 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,11 @@
2016-11-02 Florian Weimer <fweimer@redhat.com>
Carlos O'Donell <carlos@redhat.com>
[Bug #20729]
* resolv/res_send.c (send_vc): Revert DIAG_IGNORE_Os_NEEDS_COMMENT
change to non -Os related diagnostic. Use DIAG_IGNORE_Os_NEEDS_COMMENT
for -Os related change.
2016-11-01 Steve Ellcey <sellcey@caviumnetworks.com>
* stdio-common/tst-printf.c: Ignore -Wformat-length warning.

View File

@ -664,7 +664,7 @@ send_vc(res_state statp,
a false-positive.
*/
DIAG_PUSH_NEEDS_COMMENT;
DIAG_IGNORE_Os_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
int resplen;
DIAG_POP_NEEDS_COMMENT;
struct iovec iov[4];
@ -937,7 +937,7 @@ reopen (res_state statp, int *terrno, int ns)
the function return -1 before control flow reaches
the call to connect with slen. */
DIAG_PUSH_NEEDS_COMMENT;
DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
DIAG_IGNORE_Os_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
if (connect(EXT(statp).nssocks[ns], nsap, slen) < 0) {
DIAG_POP_NEEDS_COMMENT;
Aerror(statp, stderr, "connect(dg)", errno, nsap);