From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-patches-return-335557-listarch-gcc-patches=gcc.gnu.org@gcc.gnu.org>
Received: (qmail 4264 invoked by alias); 15 Jan 2013 18:46:46 -0000
Received: (qmail 4254 invoked by uid 22791); 15 Jan 2013 18:46:41 -0000
X-SWARE-Spam-Status: No, hits=-6.0 required=5.0	tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,KHOP_RCVD_TRUST,KHOP_THREADED,RCVD_IN_DNSWL_LOW,RCVD_IN_HOSTKARMA_YE,RP_MATCHES_RCVD
X-Spam-Check-By: sourceware.org
Received: from mail-ea0-f181.google.com (HELO mail-ea0-f181.google.com) (209.85.215.181)    by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 15 Jan 2013 18:46:36 +0000
Received: by mail-ea0-f181.google.com with SMTP id f28so180660eac.12        for <gcc-patches@gcc.gnu.org>; Tue, 15 Jan 2013 10:46:34 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;        d=google.com; s=20120113;        h=mime-version:in-reply-to:references:date:message-id:subject:from:to         :cc:content-type:x-gm-message-state;        bh=xpoNTRBzNF2LE5HYZliTpeTaupPdjOzfUclOZF8QC8g=;        b=OPxHK5gI92KElC+sbgVzFK2aMJPFJi+jxyBE31Dz/mtJq9340l0IPj4BA81d3RTRJI         pBOgPKKbNvWLQnMPQz29ysNA2EtUWRLNVx12Wj/Sk3jr6gyNXPfIdRShqRRwitosHVjA         lV6YmWtxopaxzBR/VISGdgVwbNQABNQmgW0MmxLooCpJbZwC/x3ekSAqXOdAGlfTlkKm         WJGMxuLGN4/PFHpVerCe9zWaBFTP73SCDQ8MeteodQCJj2DpPEXv+5RNOfWHPQalpFCm         G710D6sIZSevAWjEj5ZWK0FxeRLdkdqPlWEttbiuG6dh9y/fNyG76OHZj8u5eSCOnS5c         QKJw==
MIME-Version: 1.0
Received: by 10.14.223.200 with SMTP id v48mr244182902eep.24.1358275594784; Tue, 15 Jan 2013 10:46:34 -0800 (PST)
Received: by 10.223.173.199 with HTTP; Tue, 15 Jan 2013 10:46:34 -0800 (PST)
In-Reply-To: <ye6qmwwa1e6b.fsf@elbrus2.mtv.corp.google.com>
References: <ye6qmwwa1e6b.fsf@elbrus2.mtv.corp.google.com>
Date: Tue, 15 Jan 2013 18:46:00 -0000
Message-ID: <CAD_=9DTn16ZZ8_L4PkCCVfmeypEa2ZYfBHeT2oYOVhqD8L3RuA@mail.gmail.com>
Subject: Re: [google gcc-4_7] Backport r195207 (fix for PR55982) into google/gcc-4_7
From: Diego Novillo <dnovillo@google.com>
To: Paul Pluzhnikov <ppluzhnikov@google.com>
Cc: gcc-patches@gcc.gnu.org
Content-Type: text/plain; charset=ISO-8859-1
X-Gm-Message-State: ALoCoQnNETVLwDBaZlsiDKBWURN1YNJITkNd4JDARg/sw2LCYHDbPoeCVbfkobYw5fyF9fCSS+1Wl0CwLM8c+YMsQN/3q4nC56I117IiI+OzapkCT6ZNrTUgQt6BVyRznOXhnhtDSL88Wa+KP+VTkIQ58Lp/7AUIZEwBs+lzPQARTlgl+GyMVLow9kvehkUj9KSTe22zWYRF
X-IsSubscribed: yes
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
X-SW-Source: 2013-01/txt/msg00800.txt.bz2

On Tue, Jan 15, 2013 at 1:42 PM, Paul Pluzhnikov <ppluzhnikov@google.com> wrote:
> Ok for google/gcc-4_7 ?
>
> Ref b/8003094
>
> Thanks,
> --
> Paul Pluzhnikov
>
>
> 2013-01-15  Paul Pluzhnikov  <ppluzhnikov@google.com>
>
>         PR 55982
>         * strncat-chk.c (__strncat_chk): Fix loop unroll.
>
>
> Index: libssp/strncat-chk.c
> ===================================================================
> --- libssp/strncat-chk.c        (revision 195212)
> +++ libssp/strncat-chk.c        (working copy)
> @@ -87,12 +87,6 @@ __strncat_chk (char *__restrict__ dest, const char
>            *++dest = c;
>            if (c == '\0')
>              return s;
> -          if (slen-- == 0)
> -            __chk_fail ();
> -          c = *src++;
> -          *++dest = c;
> -          if (c == '\0')
> -            return s;
>          } while (--n4 > 0);
>        n &= 3;
>      }

OK.  No need to add a ChangeLog entry.  Simply put your message in the
commit log entry.


Diego.