From patchwork Tue Jan 15 18:42:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Pluzhnikov X-Patchwork-Id: 212294 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 7C47F2C00A2 for ; Wed, 16 Jan 2013 05:42:29 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1358880150; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:From:To:Cc:Subject:Date:Message-ID: MIME-Version:Content-Type:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=SYhv8I+Ug5Fhr2Rpe8HfJiPSUTg=; b=nSlrZPwT0JRgoVg Q3IpmvUTDGMIMwPcPE9MPbjgzG/XNWVY083V8LIuCoOb5G4Bt+s8efPCF1d8F6eM rVluqB2HZI93yMPzqFu80g7e8q/oIYb9aioLrgKs1T/qISeR3Tybs5Yrn3sk8xzk EzQEKQ46n8/KU46Ais/T79a+Fld8= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:X-Google-DKIM-Signature:X-Received:Received:Received:Received:From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type:X-Gm-Message-State:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=B7tRpV/Ouzjtqr5A+z4gohMQO/DNsNAznUsy8UsZwcz5qumhtTjy5sp9ho71BV VI7BqKZiAWhf1GXvfLnINP8hi8D+TcwAo4lK5vTcMe+fSWtrZbqzw7lsBa/N8LAe w384opsB2rcXCmyXphKKuTjBooogNkWGIAY7IWtdlCtrs=; Received: (qmail 20785 invoked by alias); 15 Jan 2013 18:42:21 -0000 Received: (qmail 20592 invoked by uid 22791); 15 Jan 2013 18:42:19 -0000 X-SWARE-Spam-Status: No, hits=-4.9 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail-qa0-f74.google.com (HELO mail-qa0-f74.google.com) (209.85.216.74) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 15 Jan 2013 18:42:05 +0000 Received: by mail-qa0-f74.google.com with SMTP id r4so63592qaq.5 for ; Tue, 15 Jan 2013 10:42:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:mime-version :content-type:x-gm-message-state; bh=5wtp3YSZmJkz0ZGq6lVNOosGlFJeGqO0o7zIFHmHkCo=; b=P9M35/NHW3wUXPe0Y0syGImV9BNaWzW4qldvNBfTqujKIEEtlO3W+fV/fDLaseaiWU Sy4Bcs1dYWFwe76VFA5CPYYeZp6X5RjFUXu0c9p1gvb/ENLLQ0fI27NE0IIgXOFQ2qQM eEFx6ywUDg1XZ6U93phov/jgXNdihWcyt5C5pZ8CQIgRUBzWZSEOSbhjNbxEWf29ApvU jvtOY4CC1jlIvmWlp5J/rkEr2mXMd7sp89EXvl1ArvYSsb81Gt2Dr0c3W/aRuFkYy9dU iV6of3ATUZNWUKlMzwT0008i7IBcz7mpJzuF7cS9Hl804R/rFp+JgMhEtueJDsyYHWzC x+aA== X-Received: by 10.101.139.30 with SMTP id r30mr363547ann.27.1358275324973; Tue, 15 Jan 2013 10:42:04 -0800 (PST) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id a24si905432yhi.0.2013.01.15.10.42.04 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Tue, 15 Jan 2013 10:42:04 -0800 (PST) Received: from elbrus2.mtv.corp.google.com (elbrus2.mtv.corp.google.com [172.17.128.95]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id CE1F55A457B; Tue, 15 Jan 2013 10:42:04 -0800 (PST) Received: by elbrus2.mtv.corp.google.com (Postfix, from userid 74925) id 7388E1C4815; Tue, 15 Jan 2013 10:42:04 -0800 (PST) From: Paul Pluzhnikov To: dnovillo@google.com, gcc-patches@gcc.gnu.org Cc: ppluzhnikov@google.com Subject: [google gcc-4_7] Backport r195207 (fix for PR55982) into google/gcc-4_7 Date: Tue, 15 Jan 2013 10:42:04 -0800 Message-ID: MIME-Version: 1.0 X-Gm-Message-State: ALoCoQm7J83usjDnxs1OJpKxycCFcsGaH4c/wB/8f8+TIc4Q/gqKmwseVIoNNCXUBDxoSrtmJt7Kl5Lgp33BvxgD/TeJvB4woA4UBwmeYhMFRDeeaIBj9ygjRRGMJmlnmifJkQrzyOzLgn2aO4l+pj8yq3Pq6akhQVrDp6lfece4kJH+fxXUciY7+GhG8DpdD3beQPqdFSzn20ouLcX3SMwXuH+EA1dYwBm0sKXPfHNHLidljiEfEbs= Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Ok for google/gcc-4_7 ? Ref b/8003094 Thanks, --- Paul Pluzhnikov 2013-01-15 Paul Pluzhnikov 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; }