From patchwork Mon Oct 6 17:49:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Metcalf X-Patchwork-Id: 3113 Received: (qmail 31020 invoked by alias); 6 Oct 2014 17:49:42 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 31009 invoked by uid 89); 6 Oct 2014 17:49:42 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=4.3 required=5.0 tests=AWL, BAYES_00, KAM_MARK, SPF_PASS, T_RP_MATCHES_RCVD, UNSUBSCRIBE_BODY autolearn=no version=3.3.2 X-HELO: USMAMAIL.TILERA.COM Message-ID: <5432D631.3010409@tilera.com> Date: Mon, 6 Oct 2014 13:49:37 -0400 From: Chris Metcalf User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: "Joseph S. Myers" CC: Subject: Re: [SPAM] Re: [PATCH] tilegx: provide optimized strnlen, strstr, and strcasestr References: <201410021559.s92Fx8CN020856@farm-0002.internal.tilera.com> <542DA3F5.6090409@tilera.com> In-Reply-To: On 10/6/2014 1:33 PM, Joseph S. Myers wrote: > On Thu, 2 Oct 2014, Chris Metcalf wrote: > >> Grrr - I fixed all of these the first time I imported these changes, but then >> later in the week I re-imported these files from our (2.12-based) shipping >> code repository and forgot to re-do it. I will fix them now - I don't think >> it merits another reposting, though I'm happy to if anyone would like. > It appears you've pushed additions of several files with these problems > still present. Yes, I accidentally pushed the original versions, not the corrected ones. I was fussing around with how to deal with the ChangeLog merge process and grabbed the wrong versions. Fixed now; thanks for catching it. commit 563a74d86ca2be355e6842b6fe15c33c42a5fab7 Author: Chris Metcalf Date: Mon Oct 6 13:47:02 2014 -0400 tile: fix copyright header blocks in just-committed files I accidentally committed versions not following the conventions. diff --git a/sysdeps/tile/memcmp.c b/sysdeps/tile/memcmp.c index 8d3992173498..0ddf6742c568 100644 --- a/sysdeps/tile/memcmp.c +++ b/sysdeps/tile/memcmp.c @@ -1,6 +1,5 @@ /* Copyright (C) 1991-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Torbjorn Granlund (tege@sics.se). The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/sysdeps/tile/tilegx/strcasestr.c b/sysdeps/tile/tilegx/strcasestr.c index 13b0a8485890..b8f7c6c1702a 100644 --- a/sysdeps/tile/tilegx/strcasestr.c +++ b/sysdeps/tile/tilegx/strcasestr.c @@ -1,6 +1,5 @@ /* Return the offset of one string within another. - Copyright (C) 1994, 1996-2000, 2004, 2008, 2009 - Free Software Foundation, Inc. + Copyright (C) 1994-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -14,9 +13,8 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + License along with the GNU C Library; if not, see + . */ #if HAVE_CONFIG_H # include diff --git a/sysdeps/tile/tilegx/strnlen.c b/sysdeps/tile/tilegx/strnlen.c index 33ecc033f6ac..3dcd6e34f137 100644 --- a/sysdeps/tile/tilegx/strnlen.c +++ b/sysdeps/tile/tilegx/strnlen.c @@ -1,6 +1,5 @@ /* Copyright (C) 2013 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Chris Metcalf , 2011. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -13,9 +12,8 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + License along with the GNU C Library; if not, see + . */ #include #include diff --git a/sysdeps/tile/tilegx/strstr.c b/sysdeps/tile/tilegx/strstr.c index 2627e758c739..3e727899c097 100644 --- a/sysdeps/tile/tilegx/strstr.c +++ b/sysdeps/tile/tilegx/strstr.c @@ -1,6 +1,4 @@ -/* strstr with Tile intrinsics - Copyright (C) 2013 Free Software Foundation, Inc. - Contributed by Intel Corporation. +/* Copyright (C) 2013-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or