diff mbox

[v4] Fix -Os related build and test failures.

Message ID 16b550f9-e5f0-ced0-38e9-022ccf3813b8@redhat.com
State Committed
Headers

Commit Message

Carlos O'Donell Nov. 2, 2016, 5:02 p.m. UTC 
  On 11/02/2016 07:52 AM, Carlos O'Donell wrote:
> On 11/01/2016 12:06 PM, David Miller wrote:
>> From: Tamar Christina <Tamar.Christina@arm.com>
>> Date: Tue, 1 Nov 2016 15:58:20 +0000
>>
>>> This also breaks ARM and AArch64,
>>>
>>> Would it be worth reverting the commit until this is fixed?
>>> It's currently blocking trunk builds.
>>
>> Mainline has been fixed already.
> 
> No, there is one more issue left. My automated cleanup script
> turned one of the DIAG's into an -Os diag by error. Joseph
> noticed this and I'll fix it right now.
> 
> I'm going to push out a Fedora Rawhide build to verify this
> for: arm, aarch64, ppc64le, ppc64, s390, s390x, x86, and
> x86_64.

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. The following patch fixes the mistake.
 
Tested on x86, x86_64, ppc64, ppc64le, arm, aarch64, and s390x.
 
Checked in.

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.

---

Cheers,
Carlos.
diff mbox

Patch

diff --git a/resolv/res_send.c b/resolv/res_send.c
index 4ec8c1a..e96d5d4 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);