diff options
| author | Carlos O'Donell <carlos@redhat.com> | 2016-11-02 13:01:36 -0400 |
|---|---|---|
| committer | Carlos O'Donell <carlos@redhat.com> | 2016-11-02 13:01:36 -0400 |
| commit | 0cb9dcc8f226ab5116df42e0e1fff06e10a85b45 (patch) | |
| tree | 3b2492a0aa37fc446ef933deb93649f24ce81457 | |
| parent | 9032070deaa03431921315f973c548c2c403fecc (diff) | |
| download | glibc-0cb9dcc8f226ab5116df42e0e1fff06e10a85b45.tar.gz glibc-0cb9dcc8f226ab5116df42e0e1fff06e10a85b45.tar.xz glibc-0cb9dcc8f226ab5116df42e0e1fff06e10a85b45.zip | |
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.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | resolv/res_send.c | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index e16451af05..920396a6f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. diff --git a/resolv/res_send.c b/resolv/res_send.c index 4ec8c1a16d..e96d5d409d 100644 --- a/resolv/res_send.c +++ b/resolv/res_send.c @@ -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); |